Merge remote-tracking branch 'upstream/dev' into params-trans

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

@@ -59,7 +59,7 @@
         </el-select>
       </template>
       <el-input
-              :disabled="isDetails && !isStartProcess"
+              :disabled="isDetails"
               type="text"
               size="small"
               v-model="localParamsList[$index].value"
@@ -68,18 +68,18 @@
               @blur="_handleValue()"
               :style="inputStyle">
       </el-input>
-      <span class="lt-add" v-show="!isStartProcess">
+      <span class="lt-add">
         <a href="javascript:" style="color:red;" @click="!isDetails && _removeUdp($index)" >
           <em class="el-icon-delete" :class="_isDetails" data-toggle="tooltip" :title="$t('delete')" ></em>
         </a>
       </span>
-      <span class="add" v-if="$index === (localParamsList.length - 1)" v-show="!isStartProcess">
+      <span class="add" v-if="$index === (localParamsList.length - 1)">
         <a href="javascript:" @click="!isDetails && _addUdp()" >
           <em class="el-icon-circle-plus-outline" :class="_isDetails" data-toggle="tooltip" :title="$t('Add')"></em>
         </a>
       </span>
     </div>
-    <span class="add-dp" v-if="!localParamsList.length" v-show="isStartProcess">
+    <span class="add-dp" v-if="!localParamsList.length">
       <a href="javascript:" @click="!isDetails && _addUdp()" >
         <em class="iconfont el-icon-circle-plus-outline" :class="_isDetails" data-toggle="tooltip" :title="$t('Add')"></em>
       </a>
@@ -112,10 +112,6 @@
       hide: {
         type: Boolean,
         default: true
-      },
-      isStartProcess: {
-        type: Boolean,
-        default: false
       }
     },
     methods: {

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

@@ -120,8 +120,7 @@
                   ref="refLocalParams"
                   @on-local-params="_onLocalParams"
                   :udp-list="udpList"
-                  :hide="false"
-                  :isStartProcess="true">
+                  :hide="false">
           </m-local-params>
         </div>
       </div>

dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue

@@ -239,7 +239,9 @@
               }
             })
             this.$nextTick(() => {
-              this.tenantId = this.tenantList[0].id
+              if (this.tenantList.length) {
+                this.tenantId = this.tenantList[0].id
+              }
             })
             resolve()
           })
@@ -291,9 +293,14 @@
             this.email = this.item.email
             this.phone = this.item.phone
             this.userState = this.item.state + '' || '1'
-            this.tenantId = this.item.tenantId
+            if (this.item.tenantName) {
+              this.tenantId = this.item.tenantId
+            }
             this.$nextTick(() => {
-              this.queueName = _.find(this.queueList, ['code', this.item.queue]).id || ''
+              let queue = _.find(this.queueList, ['code', this.item.queue])
+              if (queue) {
+                this.queueName = queue.id || ''
+              }
             })
           }
         })
@@ -304,9 +311,14 @@
           this.email = this.item.email
           this.phone = this.item.phone
           this.userState = this.state + '' || '1'
-          this.tenantId = this.item.tenantId
+          if (this.item.tenantName) {
+            this.tenantId = this.item.tenantId
+          }
           if (this.queueList.length > 0) {
-            this.queueName = _.find(this.queueList, ['code', this.item.queue]).id
+            let queue = _.find(this.queueList, ['code', this.item.queue])
+            if (queue) {
+              this.queueName = queue.id || ''
+            }
           } else {
             this.queueName = ''
           }