cloud-web-corejs 1.0.54-dev.105 → 1.0.54-dev.106

package/package.json

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

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

@@ -156,6 +156,7 @@ export default {
     }
 
     this.selectMulti = this.option.multiple ?? true;
+    this.dataTableOption.config.checkboxConfig.showHeader = this.selectMulti;
     this.getReportTemplate();
   },
   methods: {
@@ -207,6 +208,8 @@ export default {
         let tableColumns = widgetList[0].options.tableColumns;
         let column = tableColumns.find(column => !!column.prop);
         this.showFormField = column.prop;
+      }else{
+        this.showFormField = showFormField
       }
     },
     async getFormInsData() {

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

@@ -104,7 +104,7 @@
               </a>
             </template>
           </el-table-column>
-          <el-table-column :label="i18nt('编辑下拉列')" width="70" prop="sortable">
+          <el-table-column :label="i18nt('下拉列')" width="70" prop="sortable">
             <template slot-scope="scope">
               <el-switch v-model="scope.row.treeNode"></el-switch>
             </template>

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-show="false">
     <el-form-item label-width="0">
       <el-divider class="custom-divider-margin-top">文本显示设置</el-divider>
     </el-form-item>

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

@@ -77,20 +77,9 @@
               <el-input v-model="row.serveName" clearable :disabled="row.serveType!==4"></el-input>
             </template>
           </el-table-column>
-          <el-table-column :label="i18nt('组织')" width="250">
+          <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>
+              <el-input v-model="row.companyCodes" clearable></el-input>
             </template>
           </el-table-column>
           <el-table-column :label="i18nt('流程模板编码')" width="150">
@@ -195,24 +184,24 @@
               </el-select>
             </template>
           </el-table-column>
-<!--          <el-table-column :label="i18nt('值类型')" width="250">
-            <template slot-scope="{row}">
-              <el-select v-model="row.valueType" @change="changeValueType">
-                <el-option :value="1" label="文本"></el-option>
-                <el-option :value="2" label="数值"></el-option>
-                <el-option :value="3" label="布尔值"></el-option>
-              </el-select>
-            </template>
-          </el-table-column>-->
+          <!--          <el-table-column :label="i18nt('值类型')" width="250">
+                      <template slot-scope="{row}">
+                        <el-select v-model="row.valueType" @change="changeValueType">
+                          <el-option :value="1" label="文本"></el-option>
+                          <el-option :value="2" label="数值"></el-option>
+                          <el-option :value="3" label="布尔值"></el-option>
+                        </el-select>
+                      </template>
+                    </el-table-column>-->
           <el-table-column :label="i18nt('设置的值')" width="650">
             <template slot-scope="{row}">
               <el-input v-model="row.toValue" clearable></el-input>
-<!--              <el-input v-model="row.toValue" clearable v-if="row.valueType==1"></el-input>
-              <base-input-number v-model="row.toValue" clearable v-else-if="row.valueType==2"></base-input-number>
-              <el-radio-group v-model="row.toValue" v-else-if="row.valueType==3">
-                <el-radio :label="true">true</el-radio>
-                <el-radio :label="false">false</el-radio>
-              </el-radio-group>-->
+              <!--              <el-input v-model="row.toValue" clearable v-if="row.valueType==1"></el-input>
+                            <base-input-number v-model="row.toValue" clearable v-else-if="row.valueType==2"></base-input-number>
+                            <el-radio-group v-model="row.toValue" v-else-if="row.valueType==3">
+                              <el-radio :label="true">true</el-radio>
+                              <el-radio :label="false">false</el-radio>
+                            </el-radio-group>-->
 
             </template>
           </el-table-column>
@@ -337,7 +326,7 @@ export default {
         serveName: null,
         modelKey: null,
         taskSteps: null,
-        companyInfos: []
+        companyCodes: null
       }
       this.tableData.push(newItem);
     },
@@ -380,22 +369,6 @@ export default {
       }
       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(',');
-    },
-
     openDialog2() {
       this.tableData2 = this.$baseLodash.cloneDeep(this.optionModel.wfModifyDataConfig || []);
       this.dialogVisible2 = true;

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -13,7 +13,8 @@ export const containers = [
       // colHeight: null,
       width: '',
       containerClass: '',
-      customClass: ""
+      customClass: "",
+      ...defaultWfConfig,
     }
   },
   {
@@ -27,7 +28,8 @@ export const containers = [
       hidden: !1,
       customClass: "",
       styleTableClass: '',
-      fullWidth: false
+      fullWidth: false,
+      ...defaultWfConfig,
     }
   },
   {
@@ -42,7 +44,8 @@ export const containers = [
       height: '',
       // isFullscreen: false,
       tabClass: 'tab-boxCard tabCard-sty1',
-      customClass: ""
+      customClass: "",
+      ...defaultWfConfig,
     }
   },
   /* {
@@ -277,6 +280,7 @@ export const containers = [
       sortScriptCode: null,
       importTemplateFile: null,
 
+      ...defaultWfConfig,
       showRuleFlag: 1,
       showRuleEnabled: 1,
       showRules: [],
@@ -748,7 +752,6 @@ export const containers = [
   }
 ]
 
-
 export const defaultSearchDialogConfig = {
   formCode: null,
   tableEnabled: false,
@@ -761,6 +764,16 @@ export const defaultSearchDialogConfig = {
   confirmCallback: null
 }
 
+export const defaultWfConfig = {
+  wfFlag: 1,
+  wfEdit: false,
+  enabledByWf: false,
+  hiddenByWf: false,
+  wfConfigData: [],
+  wfModifyDataEnabled: false,
+  wfModifyDataConfig: [],
+}
+
 export const basicFields = [
   {
     type: "input",
@@ -814,13 +827,7 @@ export const basicFields = [
       onAppendButtonClick: "",
       widgetWidth: "",
       accessType: "1",
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -884,13 +891,7 @@ export const basicFields = [
       onAppendButtonClick: "",
       widgetWidth: "",
       accessType: "1",
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -946,13 +947,7 @@ export const basicFields = [
       onBlur: "",
       onValidate: "",
       accessType: "1",
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1009,13 +1004,7 @@ export const basicFields = [
       onBlur: "",
       onValidate: "",
       accessType: "1",
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1085,13 +1074,7 @@ export const basicFields = [
       formScriptEnabled: false,
       formScriptCode: "getList",
       formScriptParam: null,
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1160,13 +1143,7 @@ export const basicFields = [
       formScriptEnabled: false,
       formScriptCode: "getList",
       formScriptParam: null,
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1246,13 +1223,7 @@ export const basicFields = [
       formScriptEnabled: false,
       formScriptCode: "getList",
       formScriptParam: null,
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1306,13 +1277,7 @@ export const basicFields = [
       onBlur: "",
       onValidate: "",
       accessType: "1",
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1367,13 +1332,7 @@ export const basicFields = [
       onBlur: "",
       onValidate: "",
       accessType: "1",
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1430,13 +1389,7 @@ export const basicFields = [
       onBlur: "",
       onValidate: "",
       accessType: "1",
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1494,13 +1447,7 @@ export const basicFields = [
       onBlur: "",
       onValidate: "",
       accessType: "1",
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1652,6 +1599,7 @@ export const basicFields = [
       onCreated: "",
       onMounted: "",
       accessType: "1",
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1678,6 +1626,7 @@ export const basicFields = [
       onCreated: "",
       onMounted: "",
       accessType: "1",
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1738,13 +1687,7 @@ export const basicFields = [
         tableRef: null,
         tableData: {}
       },
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1769,6 +1712,7 @@ export const basicFields = [
       contentPosition: "center",
       hidden: !1,
       customClass: "",
+      ...defaultWfConfig,
       onCreated: "",
       onMounted: ""
     }
@@ -1850,6 +1794,7 @@ export const basicFields = [
       onMounted: "",
       accessType: "1",
       labelColor: '#555555',
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1898,13 +1843,7 @@ export const basicFields = [
       onChange: "",
       onClick: "",
       accessType: "1",
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1948,13 +1887,7 @@ export const basicFields = [
         tableRef: null,
         tableData: {}
       },
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -2060,6 +1993,7 @@ export const advancedFields = [
       onCreated: "",
       onMounted: "this.loadDataDefaultHandle()",
 
+      ...defaultWfConfig,
       showRuleFlag: 1,
       showRuleEnabled: 1,
       showRules: []
@@ -2231,7 +2165,7 @@ export const advancedFields = [
       onClick: "",
       onCreated: "",
       onMounted: "this.loadDataDefaultHandle()",
-
+      ...defaultWfConfig,
       showRuleFlag: 1,
       showRuleEnabled: 1,
       showRules: []
@@ -2445,7 +2379,7 @@ export const advancedFields = [
       onClick: "",
       onCreated: "",
       onMounted: "this.loadDataDefaultHandle()",
-
+      ...defaultWfConfig,
       showRuleFlag: 1,
       showRuleEnabled: 1,
       showRules: []
@@ -2585,13 +2519,7 @@ export const advancedFields = [
       formScriptEnabled: true,
       formScriptCode: "getList",
       formScriptParam: null,
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -2640,13 +2568,7 @@ export const advancedFields = [
         ...defaultSearchDialogConfig,
         multipleChoices: false
       },
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
       valueField: null,
       multipleChoices: false,
 
@@ -2691,13 +2613,7 @@ export const advancedFields = [
         ...defaultSearchDialogConfig,
         tableEnabled: true
       },
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -2734,13 +2650,7 @@ export const advancedFields = [
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: true,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -2776,13 +2686,7 @@ export const advancedFields = [
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: true,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -2808,13 +2712,7 @@ export const advancedFields = [
 
       onCreated: "",
       onMounted: "",
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -2849,13 +2747,7 @@ export const advancedFields = [
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -2892,13 +2784,7 @@ export const advancedFields = [
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: true,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -2932,13 +2818,7 @@ export const advancedFields = [
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
       importEntity: '',
       importAttachCode: '',
       importScriptCode: '',
@@ -2975,13 +2855,7 @@ export const advancedFields = [
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
       printTableRef: "",
       printItems: [],
 
@@ -3014,13 +2888,7 @@ export const advancedFields = [
       onCreated: "",
       onMounted: "",
       onAfterConfirmFile: "",
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -3049,14 +2917,7 @@ export const advancedFields = [
       statusParam: [],
       onCreated: "",
       onMounted: "",
-
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -3105,7 +2966,7 @@ export const advancedFields = [
       formScriptParam: null,
       onCreated: "",
       onMounted: "",
-
+      ...defaultWfConfig,
       showRuleFlag: 1,
       showRuleEnabled: 1,
       showRules: []
@@ -3136,13 +2997,7 @@ export const advancedFields = [
       formScriptEnabled: true,
       formScriptCode: "getList",
       formScriptParam: null,
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
-      wfModifyDataEnabled: false,
-      wfModifyDataConfig: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -3170,7 +3025,7 @@ export const advancedFields = [
       formScriptParam: null,
       onCreated: "this.loadDataDefaultHandle()",
       onMounted: "",
-
+      ...defaultWfConfig,
       showRuleFlag: 1,
       showRuleEnabled: 1,
       showRules: []

package/src/components/xform/form-render/indexMixin.js

@@ -378,8 +378,9 @@ modules = {
             let type = item.type;
             let taskStepList = item.taskSteps ? item.taskSteps.split(',') : []
             if (type && taskStepList.includes(taskStep)) {
-              let companyInfos = item.companyInfos || [];
-              let companyCodes = companyInfos.map(item => item.companyCode);
+              let companyCodeStr = item.companyCodes;
+              let companyCodes = companyCodeStr ? companyCodeStr.split(",").filter(item => !!item) : [];
+              // let companyCodes = companyInfos.map(item => item.companyCode);
               let flag1 = !item.serveName || item.serveName == bdService;
               let flag2 = !item.modelKey || item.modelKey == modelKey;
               let flag3 = !companyCodes.length || companyCodes.includes(companyCode)

package/src/views/bd/setting/form_template/mixins/list.js

@@ -293,7 +293,7 @@ modules = {
               }
             }
           },
-          {title: this.$t1('默认单据类型名称'), field: "objTypeName", width: 200},
+          {title: this.$t1('默认流程单据类型名称'), field: "objTypeName", width: 200},
           {title: this.$t1('引用流程的表单编码'), field: "fromWfFormCode", width: 200},
           {
             title: this.$t1('备注'),