cloud-web-corejs 1.0.69 → 1.0.71

package/src/components/xform/form-designer/form-widget/field-widget/baseAttachment-widget.vue

@@ -81,7 +81,10 @@ export default {
         },
         confirm: (rows, fileInfos) => {
           this.fieldModel = rows;
-          this.field.options.onAfterConfirmFile && this.field.options.onAfterConfirmFile(rows, fileInfos);
+          // this.field.options.onAfterConfirmFile && this.field.options.onAfterConfirmFile(rows, fileInfos);
+          let eventParamNames = ['attachments', 'fileInfos'];
+          let eventParamValues = [rows, fileInfos];
+          this.handleCustomEvent(this.field.options.onAfterConfirmFile, eventParamNames, eventParamValues)
         }
       };
     }

package/src/components/xform/form-designer/form-widget/field-widget/table-export-button-widget.vue

@@ -79,7 +79,8 @@ export default {
       let opt = {
         title: this.field.options.exportFileName || null,
         targetRef: this.field.options.tableRef || null,
-        pageSize: (this.field.options.exportPageSize || null)
+        pageSize: (this.field.options.exportPageSize || null),
+        showImageAtTable: this.field.options.showImageAtTable || null
       };
       let tableExportParam = this.handleCustomEvent(this.field.options.tableExportParam);
       let options = {...opt, ...tableExportParam, type: type};

package/src/components/xform/form-designer/form-widget/field-widget/vabUpload-widget.vue

@@ -146,10 +146,12 @@ export default {
       }
     },
     submitFile(rows, fileInfos) {
-      this.handlLineCode(fileInfos);
-      this.field.options.onAfterConfirmFile && this.field.options.onAfterConfirmFile(rows, fileInfos);
+      // this.handlLineCode(fileInfos);
+      let eventParamNames = ['attachments', 'fileInfos'];
+      let eventParamValues = [rows, fileInfos];
+      this.handleCustomEvent(this.field.options.onAfterConfirmFile, eventParamNames, eventParamValues)
     },
-    handlLineCode(fileInfos) {
+    /*handlLineCode(fileInfos) {
       let allPromise = [];
       fileInfos.forEach(async fileInfo => {
         await this.processFile(fileInfo.file, (lineCode) => {
@@ -176,7 +178,7 @@ export default {
     async processImage(base64, callback) {
       try {
         // 使用 ZXing 3.x 的 API
-        const result = await decode(base64,(result, err) => {
+        const result = await decode(base64, (result, err) => {
           if (err) {
             this.handleError(`条码识别失败: ${err}`);
             callback && callback(null)
@@ -205,7 +207,7 @@ export default {
       // const imageData = Uint8Array.from(atob(base64), c => c.charCodeAt(0));
       // const source = new ZXing.ImageLuminanceSource(imageData, base64.length);
 
-     decode(base64, (result, err) => {
+      decode(base64, (result, err) => {
         if (err) {
           this.handleError(`条码识别失败: ${err}`);
           callback && callback(null)
@@ -220,7 +222,7 @@ export default {
     handleError(errorMessage) {
       this.error = errorMessage;
       this.loading = false;
-    },
+    },*/
   }
 }
 </script>

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

@@ -13,7 +13,7 @@
           <el-form-item :label="i18nt('启用流程')">
             <el-switch v-model="formConfig.wfEnabled" @change="designer.vueInstance.reportTemplate.objTypeName=null"></el-switch>
           </el-form-item>
-          <el-form-item :label="i18nt('默认流程对象名')">
+          <el-form-item :label="i18nt('默认流程单据类型名称')">
             <el-input type="text" v-model="designer.vueInstance.reportTemplate.objTypeName"></el-input>
           </el-form-item>
 <!--          <el-form-item label="流程单据定义">

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

@@ -13,6 +13,12 @@
         </el-form-item>-->
     <!-- <el-form-item :label="i18nt('designer.setting.showIndex')"><el-switch v-model="optionModel.showIndex"></el-switch></el-form-item>
     <el-form-item :label="i18nt('designer.setting.showCheckBox')"><el-switch v-model="optionModel.showCheckBox"></el-switch></el-form-item> -->
+    <el-form-item label="启用数据行合并">
+      <el-switch v-model="optionModel.mergeRowEnabled"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('合并行唯一字段')">
+      <el-input v-model="optionModel.mergeRowKey"></el-input>
+    </el-form-item>
     <el-form-item label="查询列表">
       <el-switch v-model="optionModel.isQueryTable"></el-switch>
     </el-form-item>

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

@@ -63,6 +63,11 @@
               <el-switch v-model="scope.row.sortable"></el-switch>
             </template>
           </el-table-column>
+          <el-table-column :label="i18nt('明细行')" width="70" prop="sortable">
+            <template slot-scope="scope">
+              <el-switch v-model="scope.row.isItemLine"></el-switch>
+            </template>
+          </el-table-column>
           <el-table-column :label="i18nt('designer.setting.fixedColumn')" width="100" prop="fixed">
             <template slot-scope="scope">
               <el-select v-model="scope.row.fixed" clearable>
@@ -118,6 +123,14 @@
                          :disabled="!scope.row.editFormatS"></el-button>
             </template>
           </el-table-column>
+          <el-table-column :label="i18nt('导出类型')" width="200" prop="formatS">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.exportType" clearable>
+                <el-option value="Image2" label="图片"></el-option>
+                <el-option value="Number" label="数值"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
           <el-table-column label="格式化配置" width="90" fixed="right" align="center">
             <template slot-scope="scope">
               <el-button size="mini" plain="" round="" icon="el-icon-edit"

package/src/components/xform/form-designer/setting-panel/property-editor/event-handler/onAfterConfirmFile-editor.vue

@@ -1,6 +1,7 @@
 <template>
   <el-form-item label="onAfterConfirmFile" label-width="150px">
-    <a href="javascript:void(0);" class="a-link link-oneLind" @click="editEventHandler('onAfterConfirmFile', eventParams)">
+    <a href="javascript:void(0);" class="a-link link-oneLind"
+       @click="editEventHandler('onAfterConfirmFile', eventParams)">
       <span>{{ optionModel.onAfterConfirmFile }}</span>
       <i class="el-icon-edit"></i>
     </a>
@@ -9,7 +10,8 @@
 
 <script>
 import i18n from "../../../../../../components/xform/utils/i18n";
-import eventMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+import eventMixin
+  from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
 
 export default {
   name: "onAfterConfirmFile-editor",
@@ -21,7 +23,7 @@ export default {
   },
   data() {
     return {
-      eventParams: ["attachments", "fileInfos"],
+      eventParams: ["dataId", "formCode", "attachments", "fileInfos"],
     };
   },
 };

package/src/components/xform/form-designer/setting-panel/property-editor/field-import-button/import-button-editor.vue

@@ -6,6 +6,9 @@
     <el-form-item label="导入数据表名">
       <el-input v-model="optionModel.importEntity"></el-input>
     </el-form-item>
+    <el-form-item label="文件大小限制（M）">
+      <base-input-number v-model="optionModel.importFileLimitSize" :max="200"></base-input-number>
+    </el-form-item>
     <el-form-item label="选择导入模板文件">
       <el-input
         class="search-input"

package/src/components/xform/form-designer/setting-panel/property-editor/field-table-export-button/table-export-button-editor.vue

@@ -9,18 +9,27 @@
     <el-form-item label="表格唯一名称">
       <el-input v-model="optionModel.tableRef"></el-input>
     </el-form-item>
-  <el-form-item label="导出参数" label-width="150px">
-    <a href="javascript:void(0);" class="a-link link-oneLind" @click="editEventHandler('tableExportParam', eventParams)">
-      <span>{{ optionModel.tableExportParam }}</span>
-      <i class="el-icon-edit"></i>
-    </a>
-  </el-form-item>
+    <el-form-item label="导出列表显示图片">
+      <el-switch v-model="optionModel.showImageAtTable" @change="changeShowImageAtTable"></el-switch>
+    </el-form-item>
+    <el-form-item label="导出每页查询数量">
+      <base-input-number v-model="optionModel.exportPageSize"
+                         :max="optionModel.showImageAtTable?150:1000"></base-input-number>
+    </el-form-item>
+    <el-form-item label="导出参数" label-width="150px">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('tableExportParam', eventParams)">
+        <span>{{ optionModel.tableExportParam }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
   </div>
 </template>
 
 <script>
 import i18n from "../../../../../../components/xform/utils/i18n";
-import eventMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+import eventMixin
+  from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
 
 export default {
   name: "table-export-button-editor",
@@ -35,6 +44,16 @@ export default {
       eventParams: [],
     };
   },
+  methods: {
+    changeShowImageAtTable(val) {
+      if (val) {
+        let exportPageSize = this.optionModel.exportPageSize || 0;
+        if (exportPageSize > 150) {
+          this.optionModel.exportPageSize = 150
+        }
+      }
+    }
+  }
 };
 </script>
 

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: {
@@ -160,10 +212,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 +245,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(',');
     }
   }
 }

package/src/components/xform/form-render/container-item/data-table-item.vue

@@ -2,7 +2,8 @@
   <vxe-grid :ref="widget.id" v-bind="vxeOption" :auto-resize="true" v-show="!widget.options.hidden"
             @resizable-change="$vxeTableUtil.onColumnWitchChange" @custom="$vxeTableUtil.customHandle"
             @checkbox-change="handleCheckboxChange" @checkbox-all="handleCheckboxAll"
-            @cell-dblclick="handleCellDblclick" :class="dataTableConfig.class" :data="fieldModel">
+            @cell-dblclick="handleCellDblclick" :class="dataTableConfig.class" :data="fieldModel"
+            :span-method="mergeRowMethod">
     <template #form>
       <!--            <div v-if="widget.options.showSearchArea" class="clearfix screen-btns">
                     <div class="fl">
@@ -191,7 +192,7 @@
         :field="fieldWidget"
         :form-model="globalModel.formModel"
         :designer="null"
-        :key="fieldWidget.id"
+        :key="fieldWidget.id+'-'+obj.rowIndex"
         :parent-widget="widget"
         :columnConfig="obj.column.params.columnConfig"
         :subFormRowIndex="obj.rowIndex"
@@ -209,7 +210,7 @@
         :field="obj.column.params.widget"
         :form-model="globalModel.formModel"
         :designer="null"
-        :key="obj.column.params.widget.id"
+        :key="obj.column.params.widget.id+'-'+obj.rowIndex"
         :parent-widget="widget"
         :columnConfig="obj.column.params.columnConfig"
         :subFormRowIndex="obj.rowIndex"
@@ -227,7 +228,7 @@
         :field="obj.column.params.editWidget"
         :form-model="globalModel.formModel"
         :designer="null"
-        :key="obj.column.params.editWidget.id"
+        :key="obj.column.params.editWidget.id+'-'+obj.rowIndex"
         :parent-widget="widget"
         :columnConfig="obj.column.params.columnConfig"
         :subFormRowIndex="obj.rowIndex"