cloud-web-corejs 1.0.54-dev.84 → 1.0.54-dev.86

package/package.json

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

package/src/components/xform/form-designer/form-widget/dialog/importDialog.vue

@@ -2,7 +2,7 @@
   <div v-if="showContent">
     <el-dialog
       :title="$t2('导入', 'components.excelImport.title')"
-      :append-to-body="falseValue"
+      :append-to-body="true"
       :modal-append-to-body="falseValue"
       :close-on-click-modal="falseValue"
       :visible.sync="showImportDialog"
@@ -55,7 +55,7 @@
     <el-dialog
       ref="importDialog"
       :title="$t2('导入', 'components.excelImport.title')"
-      :append-to-body="falseValue"
+      :append-to-body="true"
       :modal-append-to-body="falseValue"
       :close-on-click-modal="falseValue"
       :visible.sync="showImportDialog2"

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/onCheckboxChange-editor.vue

@@ -21,7 +21,7 @@ export default {
   },
   data() {
     return {
-      eventParams: ['{ checked, row, rowIndex, $rowIndex, column, columnIndex, $columnIndex, $event }'],
+      eventParams: ['param'],
     }
   }
 }

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

@@ -41,24 +41,66 @@
           stripe=""
         >
           <el-table-column type="index" width="35" fixed="left"></el-table-column>
-          <el-table-column :label="i18nt('流程模板')" width="250" prop="label">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.modelId" @change="changeModelId">
-                <el-option v-for="(wfDefItem,index) in wfDefItems" :key="index" :value="wfDefItem.modelId"
-                           :label="wfDefItem.modelName"></el-option>
+          <el-table-column :label="i18nt('服务')" width="150">
+            <template slot-scope="{row}">
+              <el-select v-model="row.serveType" @change="changeServeType(row)">
+                <el-option :value="1" label="正式"></el-option>
+                <el-option :value="2" label="UAT"></el-option>
+                <el-option :value="3" label="测试"></el-option>
+                <el-option :value="4" label="自定义"></el-option>
               </el-select>
-
             </template>
           </el-table-column>
-          <el-table-column :label="i18nt('流程节点')" width="550" prop="prop">
-            <template slot-scope="scope">
-              <el-checkbox-group v-model="scope.row.nodeIds" v-if="!!wfNodeMap[scope.row.modelId]">
-                <el-checkbox v-for="(node,index) in wfNodeMap[scope.row.modelId]" :key="index"
-                             :label="node.nodeId">{{ node.nodeName }}
-                </el-checkbox>
-              </el-checkbox-group>
+          <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
+                class="search-input"
+                :value="getCompanyNames(row)"
+                clearable
+                @clear="
+                  row.companyInfos = [];
+                "
+                v-el-readonly
+              >
+                <i slot="suffix" class="el-input__icon el-icon-search"
+                   @click="openCompanyDialog(row, $index)"></i>
+              </el-input>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('流程模板')" width="150">
+            <template slot-scope="{row}">
+              <el-input v-model="row.modelKey" clearable></el-input>
             </template>
           </el-table-column>
+          <el-table-column :label="i18nt('节点')" width="250">
+            <template slot-scope="{row}">
+              <el-input v-model="row.taskSteps" clearable></el-input>
+            </template>
+          </el-table-column>
+
+          <!--          <el-table-column :label="i18nt('流程模板')" width="250" prop="label">
+                      <template slot-scope="scope">
+                        <el-select v-model="scope.row.modelId" @change="changeModelId">
+                          <el-option v-for="(wfDefItem,index) in wfDefItems" :key="index" :value="wfDefItem.modelId"
+                                     :label="wfDefItem.modelName"></el-option>
+                        </el-select>
+
+                      </template>
+                    </el-table-column>
+                    <el-table-column :label="i18nt('流程节点')" width="550" prop="prop">
+                      <template slot-scope="scope">
+                        <el-checkbox-group v-model="scope.row.nodeIds" v-if="!!wfNodeMap[scope.row.modelId]">
+                          <el-checkbox v-for="(node,index) in wfNodeMap[scope.row.modelId]" :key="index"
+                                       :label="node.nodeId">{{ node.nodeName }}
+                          </el-checkbox>
+                        </el-checkbox-group>
+                      </template>
+                    </el-table-column>-->
           <el-table-column :label="i18nt('designer.setting.actionColumn')" width="100" align="center">
             <template #header>
               <span>{{ i18nt('designer.setting.actionColumn') }}</span>
@@ -88,14 +130,19 @@
         </el-button>
       </div>
     </el-dialog>
+    <companyInfoDialog v-if="showCompanyInfoDialog" :visiable.sync="showCompanyInfoDialog"
+                       @confirm="confirmCompanyDialog" :multi="true" :allCompany="true" :rows="currentCompanyInfos"
+                       fieldKey="companyCode"/>
   </div>
 </template>
 
 <script>
 import i18n from "../../../../../components/xform/utils/i18n"
+import companyInfoDialog from "@base/views/user/company_info/dialog.vue";
 
 export default {
   name: "wfFlag-editor",
+  components: {companyInfoDialog},
   mixins: [i18n],
   props: {
     designer: Object,
@@ -108,7 +155,12 @@ export default {
       dialogVisible: false,
       tableData: [],
       wfDefItems: [],
-      wfNodeMap: {}
+      wfNodeMap: {},
+
+      currentCompanyInfos: [],
+      operateIndex: 0,
+      showCompanyInfoDialog: false
+
     }
   },
   computed: {
@@ -122,11 +174,13 @@ export default {
       let reportTemplate = this.getReportTemplate();
       let objTypeCode = reportTemplate.objTypeCode;
       let wfConfigData = this.optionModel.wfConfigData || [];
-      wfConfigData.forEach(item => {
+      this.dialogVisible = true;
+      this.tableData = this.$baseLodash.cloneDeep(wfConfigData)
+      /*wfConfigData.forEach(item => {
         this.getWfObjConfigItem(item.modelId)
-      })
+      })*/
 
-      this.$http({
+      /*this.$http({
         url: this.current_prefix + "/wf_obj_config_item/list",
         data: {
           objTypeCode: objTypeCode,
@@ -139,7 +193,7 @@ export default {
           this.dialogVisible = true;
           this.tableData = this.$baseLodash.cloneDeep(wfConfigData)
         },
-      });
+      });*/
     },
     getWfObjConfigItem(modelId) {
       let reportTemplate = this.getReportTemplate();
@@ -160,10 +214,14 @@ export default {
       });
     },
     addItem() {
-      this.tableData.push({
-        modelId: null,
-        nodeIds: []
-      });
+      let newItem = {
+        serveType: null,
+        serveName: null,
+        modelKey: null,
+        taskSteps: null,
+        companyInfos: []
+      }
+      this.tableData.push(newItem);
     },
     colSubmit() {
       this.dialogVisible = !1;
@@ -189,6 +247,35 @@ export default {
       if (val) {
         this.optionModel.enabledByWf = false;
       }
+    },
+    changeServeType(row) {
+      // modelKey
+      let map = {
+        1: "prod",
+        2: "at",
+        3: "dev"
+      }
+      let serveName = null;
+      let serveType = row.serveType;
+      if (serveType && map[serveType]) {
+        serveName = map[row.serveType];
+      }
+      row.serveName = serveName;
+    },
+    openCompanyDialog(row, rowIndex) {
+      this.operateIndex = rowIndex;
+      this.currentCompanyInfos = row.companyInfos || [];
+      this.showCompanyInfoDialog = true;
+
+    },
+    confirmCompanyDialog(rows) {
+      if (rows.length) {
+        let item = this.tableData[this.operateIndex];
+        item.companyInfos = rows;
+      }
+    },
+    getCompanyNames(item) {
+      return item.companyInfos.map(item => item.companyName).join(',');
     }
   }
 }