cloud-web-corejs 1.0.54-dev.227 → 1.0.54-dev.228

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.227",
+  "version": "1.0.54-dev.228",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/setting-panel/form-setting.vue

@@ -356,7 +356,7 @@
               <el-input v-model="row.modelKey" clearable></el-input>
             </template>
           </el-table-column>
-          <el-table-column :label="i18nt('节点步骤')" width="250">
+          <el-table-column :label="i18nt('节点步骤（多个值用“,”隔开）')" width="250">
             <template slot-scope="{row}">
               <el-input v-model="row.taskSteps" clearable></el-input>
             </template>
@@ -453,7 +453,7 @@
               <el-input v-model="row.modelKey" clearable></el-input>
             </template>
           </el-table-column>
-          <el-table-column :label="i18nt('节点步骤')" width="250">
+          <el-table-column :label="i18nt('节点步骤（多个值用“,”隔开）')" width="250">
             <template slot-scope="{row}">
               <el-input v-model="row.taskSteps" clearable></el-input>
             </template>

package/src/components/xform/form-designer/setting-panel/property-editor/wfFlag-editor.vue

@@ -59,17 +59,18 @@
                 <el-option :value="2" label="UAT"></el-option>
                 <el-option :value="3" label="测试"></el-option>
                 <el-option :value="4" label="自定义"></el-option>
+                <el-option :value="5" label="默认"></el-option>
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column :label="i18nt('自定义服务')" width="150">
+          <el-table-column :label="i18nt('服务名称')" width="150">
             <template slot-scope="{row}">
               <el-input v-model="row.serveName" clearable :disabled="row.serveType!==4"></el-input>
             </template>
           </el-table-column>
           <el-table-column :label="i18nt('组织编码')" width="250">
             <template slot-scope="{row,$index}">
-              <el-input v-model="row.companyCodes" clearable></el-input>
+              <el-input v-model="row.companyCodes" clearable :disabled="row.serveType==5"></el-input>
             </template>
           </el-table-column>
           <el-table-column :label="i18nt('流程模板编码')" width="150">
@@ -77,7 +78,7 @@
               <el-input v-model="row.modelKey" clearable></el-input>
             </template>
           </el-table-column>
-          <el-table-column :label="i18nt('节点步骤')" width="250">
+          <el-table-column :label="i18nt('节点步骤（多个值用“,”隔开）')" width="250">
             <template slot-scope="{row}">
               <el-input v-model="row.taskSteps" clearable></el-input>
             </template>
@@ -294,8 +295,8 @@ export default {
     addItem() {
       let newItem = {
         type: 1,
-        serveType: null,
-        serveName: null,
+        serveType: 3,
+        serveName: "dev",
         modelKey: null,
         taskSteps: null,
         companyCodes: null
@@ -303,6 +304,42 @@ export default {
       this.tableData.push(newItem);
     },
     colSubmit() {
+
+      let searveNameList = ["prod", "uat", "dev"];
+      let tableData = this.tableData;
+      let map = {}
+      for (let i = 0; i < tableData.length; i++) {
+        let item = tableData[i];
+        if (item.serveType === 4) {
+          if (!item.serveName) {
+            this.$message({
+              type: "error",
+              message: "自定义服务的服务名称不能为空"
+            })
+            return
+          } else if(searveNameList.includes(item.serveName)){
+            this.$message({
+              type: "error",
+              message: "自定义服务的服务名称不能为`prod,uat,dev`"
+            })
+            return
+          }
+        }
+        let serveName = item.serveName || "";
+        if (item.serveType === 5) serveName = "_all";
+        let companyCodes = item.companyCodes || "";
+        let key = serveName + "_" + companyCodes;
+        if (!map[key]) {
+          map[key] = true;
+        } else {
+          this.$message({
+            type: "error",
+            message: "[服务+组织]不能重复"
+          })
+          return
+        }
+      }
+
       this.dialogVisible = !1;
       this.optionModel.wfConfigData = this.tableData;
     },
@@ -339,6 +376,9 @@ export default {
       if (serveType && map[serveType]) {
         serveName = map[row.serveType];
       }
+      if (serveType === 5) {
+        row.companyCodes = null
+      }
       row.serveName = serveName;
     },
     openDialog2() {