Merge pull request #4644 from break60/dev

[Improvement-3878][ui] Fixed the problem that custom parameters could not be edited and zk displayed abnormally when the workflow started

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue

@@ -16,26 +16,21 @@
  */
 <template>
   <div class="dep-list-model">
-    <div v-for="(el,$index) in dependItemList" :key='$index' class="list" @click="itemIndex = $index">
-      <el-select filterable :style="{width:isInstance ? '450px' : '450px'}" :disabled="isDetails" v-model="el.projectId" @change="_onChangeProjectId" size="small">
-        <el-option v-for="item in projectList" :key="item.value" :value="item.value" :label="item.label">
-        </el-option>
+    <div v-for="(el,$index) in dependItemList" :key='$index' @click="itemIndex = $index">
+      <el-select filterable :disabled="isDetails" style="width: 450px" v-model="el.projectId" @change="_onChangeProjectId" size="small">
+        <el-option v-for="item in projectList" :key="item.value" :value="item.value" :label="item.label"></el-option>
       </el-select>
-      <el-select filterable :style="{width:isInstance ? '450px' : '450px'}" :disabled="isDetails" v-model="el.definitionId" @change="_onChangeDefinitionId" size="small">
-        <el-option v-for="item in el.definitionList" :key="item.value" :value="item.value" :label="item.label">
-        </el-option>
+      <el-select filterable :disabled="isDetails" style="width: 450px" v-model="el.definitionId" @change="_onChangeDefinitionId" size="small">
+        <el-option v-for="item in el.definitionList" :key="item.value" :value="item.value" :label="item.label"></el-option>
       </el-select>
-      <el-select filterable :style="{width:isInstance ? '450px' : '450px'}" :disabled="isDetails" v-model="el.depTasks" size="small">
-        <el-option v-for="item in el.depTasksList || []" :key="item" :value="item" :label="item">
-        </el-option>
+      <el-select filterable :disabled="isDetails" style="width: 450px" v-model="el.depTasks" size="small">
+        <el-option v-for="item in el.depTasksList || []" :key="item" :value="item" :label="item"></el-option>
       </el-select>
-      <el-select style="width: 150px;" v-model="el.cycle" :disabled="isDetails" @change="_onChangeCycle">
-        <el-option v-for="item in cycleList" :key="item.value" :value="item.value" :label="item.label">
-        </el-option>
+      <el-select v-model="el.cycle" :disabled="isDetails" @change="_onChangeCycle" size="small">
+        <el-option v-for="item in cycleList" :key="item.value" :value="item.value" :label="item.label"></el-option>
       </el-select>
-      <el-select style="width: 116px;" v-model="el.dateValue" :disabled="isDetails">
-        <el-option v-for="item in el.dateValueList || []" :key="item.value" :value="item.value" :label="item.label">
-        </el-option>
+      <el-select v-model="el.dateValue" :disabled="isDetails" size="small">
+        <el-option v-for="item in el.dateValueList || []" :key="item.value" :value="item.value" :label="item.label"></el-option>
       </el-select>
       <template v-if="isInstance">
         <span class="instance-state">
@@ -55,6 +50,7 @@
     </div>
   </div>
 </template>
+
 <script>
   import _ from 'lodash'
   import { cycleList, dateValueList } from './commcon'
@@ -109,6 +105,7 @@
        * remove task
        */
       _remove (i) {
+        // this.dependTaskList[this.index].dependItemList.splice(i, 1)
         this._removeTip()
         if (!this.dependItemList.length || this.dependItemList.length === 0) {
           this.$emit('on-delete-all', {
@@ -294,6 +291,7 @@
     .list {
       margin-bottom: 6px;
       .operation {
+        width: 80px;
         padding-left: 4px;
         a {
           i {

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue

@@ -79,7 +79,7 @@
         </a>
       </span>
     </div>
-    <span class="add-dp" v-if="!localParamsList.length" v-show="!isStartProcess">
+    <span class="add-dp" v-if="!localParamsList.length" v-show="isStartProcess">
       <a href="javascript:" @click="!isDetails && _addUdp()" >
         <em class="iconfont el-icon-circle-plus-outline" :class="_isDetails" data-toggle="tooltip" :title="$t('Add')"></em>
       </a>

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue

@@ -97,7 +97,6 @@
         $('body').find('.tooltip.fade.top.in').remove()
       },
       _onDeleteAll (i) {
-        this.dependTaskList[this.index].dependItemList.splice(i, 1)
         this.dependTaskList.map((item, i) => {
           if (item.dependItemList.length === 0) {
             this.dependTaskList.splice(i, 1)

dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperDirectories.vue

@@ -15,13 +15,9 @@
 * limitations under the License.
 */
 <template>
-  <div class="container">
-    <div class="title-box">
-      <span class="name">{{$t('zkDirectory')}}</span>
-    </div>
-
+  <div>
     <div class="table-box" v-if="zkDirectories.length > 0">
-      <el-table :data="zkDirectories" size="mini" style="width: 100%">
+      <el-table :data="zkDirectories" size="mini" style="width: 100%;">
         <el-table-column type="index" :label="$t('#')" width="50"></el-table-column>
         <el-table-column prop="zkDirectory" :label="$t('zkDirectory')"></el-table-column>
       </el-table>

dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue

@@ -94,6 +94,7 @@
     methods: {
       ...mapActions('monitor', ['getWorkerData']),
       _showZkDirectories (item) {
+        this.zkDirectories = []
         item.zkDirectories.forEach(zkDirectory => {
           this.zkDirectories.push({
             zkDirectory: zkDirectory
@@ -104,7 +105,6 @@
     },
     watch: {},
     created () {
-
     },
     mounted () {
       this.isLoading = true

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue

@@ -35,7 +35,7 @@
       </div>
     </div>
     <div class="clearfix list">
-      <el-button type="info"  style="margin-left:20px" size="small" round :loading="spinnerLoading" @click="preview()">{{$t('Execute time')}}</el-button>
+      <el-button type="primary"  style="margin-left:20px" size="small" round :loading="spinnerLoading" @click="preview()">{{$t('Execute time')}}</el-button>
       <div class="text">
         {{$t('Timing')}}
       </div>
@@ -115,15 +115,16 @@
     </div>
     <div class="clearfix list">
       <div class="text">
-        {{$t('Notification group')}}
+        {{$t('Alarm group')}}
       </div>
       <div class="cont">
         <el-select
           style="width: 200px;"
+          clearable
           size="small"
           :disabled="!notifyGroupList.length"
           v-model="warningGroupId">
-          <el-input slot="trigger" readonly slot-scope="{ selectedModel }" :placeholder="$t('Please select a notification group')" :value="selectedModel ? selectedModel.label : ''" style="width: 200px;" @on-click-icon.stop="warningGroupId = {}">
+          <el-input slot="trigger" readonly slot-scope="{ selectedModel }" :value="selectedModel ? selectedModel.label : ''" style="width: 200px;" @on-click-icon.stop="warningGroupId = {}">
             <em slot="suffix" class="el-icon-error" style="font-size: 15px;cursor: pointer;" v-show="warningGroupId.id"></em>
             <em slot="suffix" class="el-icon-bottom" style="font-size: 12px;" v-show="!warningGroupId.id"></em>
           </el-input>

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue

@@ -18,7 +18,9 @@
   <m-list-construction :title="$t('Cron Manage')">
     <template slot="operation">
       <span style=" float: right; padding-right:50px">
-        <em class="el-icon-circle-close" style="font-size:20px " data-container="body" data-toggle="tooltip" :title="$t('Return')" @click="_close()"></em>
+        <el-tooltip :content="$t('Return')" placement="top">
+          <el-button type="primary" icon="el-icon-back" size="mini" @click="_close()"></el-button>
+        </el-tooltip>
       </span>
     </template>
     <template slot="content">