cloud-web-corejs 1.0.54-dev.387 → 1.0.54-dev.388

package/package.json

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

package/src/components/xform/form-designer/form-widget/dialog/importDialogMixin.js

@@ -208,14 +208,20 @@ tmixins = {
         return false;
       }
 
-      this.createImportTimer();
+      /* this.createImportTimer();
       this.showImportDialog = false;
       if (!option.onConfirm) {
         this.showImportDialog2 = true;
-      }
-      this.$nextTick(() => {
-        try {
-          this.readExcel(this.fileRaw, function (resultData) {
+      } */
+      // this.$nextTick(() => {
+      try {
+        this.readExcel(this.fileRaw, function (resultData) {
+          that.createImportTimer();
+          that.showImportDialog = false;
+          if (!option.onConfirm) {
+            that.showImportDialog2 = true;
+          }
+          that.$nextTick(() => {
             if (option.onConfirm) {
               option.onConfirm(resultData.data, that.fileRaw);
             } else {
@@ -228,11 +234,12 @@ tmixins = {
               });
             }
           });
-        } catch (et) {
-          that.clearImportTimer();
-          console.error(et);
-        }
-      });
+        });
+      } catch (et) {
+        that.clearImportTimer();
+        console.error(et);
+      }
+      // });
     },
     handleBeforeImport(file, resultData, callback) {
       let importOption = this.option.importOption;
@@ -365,6 +372,11 @@ tmixins = {
       let that = this;
       let option = this.option;
 
+      if (option.importOption.multipleSheet) {
+        this.readExcel2(file, callback);
+        return;
+      }
+
       const fileReader = new FileReader();
       fileReader.onload = async (ev) => {
         var resultData;
@@ -1447,7 +1459,7 @@ tmixins = {
             type: "binary",
           });
 
-          let sheetDatas = []
+          let sheetDatas = [];
           for (let pi = 0; pi < workbook.SheetNames.length; pi++) {
             let sheetName = workbook.SheetNames[pi];
             let sheet = workbook.Sheets[sheetName];
@@ -1522,7 +1534,7 @@ tmixins = {
                   "components.excelImport.warmMsg2"
                 )
               );
-              that.handleClose2();
+              // that.handleClose2();
               return false;
             }
 
@@ -1541,7 +1553,7 @@ tmixins = {
                       "components.excelImport.warmMsg2"
                     )
                   );
-                  that.handleClose2();
+                  // that.handleClose2();
                   return false;
                 }
                 let t = title.substr(-1);
@@ -1561,19 +1573,15 @@ tmixins = {
                   uniqueKeys.push(field);
                   isSheetUnique = true;
                 }
-                if(!uniqueKeys.length){
-                  that.clearImportTimer();
-                      that.$baseAlert(
-                        `[${sheetName}]`+
-                        that.$t2(
-                          "缺失单据唯一标识"
-                        )
-                      );
-                      that.handleClose2();
-                      return false;
+                if (!uniqueKeys.length) {
+                  // that.clearImportTimer();
+                  that.$baseAlert(
+                    `[${sheetName}]` + that.$t1("缺失单据唯一标识***")
+                  );
+                  // that.handleClose2();
+                  return false;
                 }
 
-
                 let otherConfig = {};
                 let isFile = false;
                 if (field.startsWith("attachments_")) {
@@ -1594,14 +1602,14 @@ tmixins = {
                   isUnique: isUnique,
                   isFile,
                   otherConfig,
-                  isSheetUnique
+                  isSheetUnique,
                 };
                 cols.push(col);
               }
             }
 
             var oriCols = JSON.parse(JSON.stringify(cols)); //列信息
-            if (uniqueKeys.length) {
+            /* if (uniqueKeys.length) {
               //分组唯一字段为空时，全部不发包。
               for (let i = 0; i < oriCols.length; i++) {
                 let oriCol = oriCols[i];
@@ -1610,26 +1618,21 @@ tmixins = {
                     let data = excelRows[j];
                     let value = data[oriCol.field];
                     if (value == null || value == "") {
-                      that.clearImportTimer();
-                      that.$baseAlert(
-                        `[${sheetName}]`+
-                        that.$t2(
-                          "第" + (j + 4) + "行[" + oriCol.title + "]不能为空;",
-                          "components.excelImport.warmMsg3",
-                          {
-                            lineNo: j + 4,
-                            title: oriCol.title,
-                          }
-                        )
-                      );
-                      that.handleClose2();
+                      that.errorHandle(`[${sheetName}]`+
+                      that.$t2(
+                        "第" + (j + 4) + "行[" + oriCol.title + "]不能为空;",
+                        "components.excelImport.warmMsg3",
+                        {
+                          lineNo: j + 4,
+                          title: oriCol.title,
+                        }
+                      ));
                       return false;
                     }
                   }
                 }
               }
-            }
-
+            } */
             // this.oriCols = oriCols;
 
             let resultData1 = {
@@ -1639,37 +1642,54 @@ tmixins = {
               fields: fields,
               uniqueFields: uniqueFields,
               oriCols: oriCols,
-              uniqueKeys
+              uniqueKeys,
             };
             sheetDatas.push(resultData1);
           }
-          // var sheet = workbook.Sheets[workbook.SheetNames[0]];
-          let newDatas = [];
-          resultData = that.$baseLodash.cloneDeep(sheetDatas[0])
-          resultData.sheetDatas = sheetDatas;
 
+          //校验必填
+          if (!that.checkAllSheetData(sheetDatas)) {
+            return false;
+          }
+
+          //合并多sheet数据
+          let newDatas = [];
+          resultData = that.$baseLodash.cloneDeep(sheetDatas[0]);
           let uniqueKey = resultData.uniqueKeys[0];
-          for(let i = 0; i < resultData.data.length; i++){
+          let data2 = [];
+          for (let i = 0; i < resultData.data.length; i++) {
             let item = resultData.data[i];
+            let sheetName = resultData[sheetName];
             let uniqueValue = item[uniqueKey];
 
-            if(uniqueValue){
-              let index = newDatas.findIndex((item) => item[uniqueKey] == uniqueValue);
-              if(index == -1){
-                newDatas.push(item);
-              }
-              for(let j = 1; j < sheetDatass.length; j++){
-                let sheetData = sheetDatass[j];
-                let sheetDataIndex = sheetData.data.findIndex((item) => item[uniqueKey] == uniqueValue);
-                if(sheetDataIndex != -1){
-                  sheetData.data.splice(sheetDataIndex, 1);
+            if (!that.isNull(uniqueValue)) {
+              let newItem = { ...item };
+              let allItems = [];
+              for (let j = 1; j < sheetDatas.length; j++) {
+                let sheetData = sheetDatas[j];
+                let fDatas = [];
+                for (let k = 0; k < sheetData.data.length; k++) {
+                  let sheetItem = sheetData.data[k];
+                  if (that.isNull(sheetItem[uniqueKey])) {
+                    that.handleCellNotNull(k, sheetData);
+                    return;
+                  }
+                  if (sheetItem[uniqueKey] == uniqueValue) {
+                    fDatas.push(sheetItem);
+                  }
                 }
+                allItems.push(fDatas);
               }
-
-
+              newItem.sheetItems = allItems;
+              data2.push(newItem);
+            } else {
+              that.handleCellNotNull(i, resultData);
+              return false;
             }
           }
 
+          resultData.sheetDatas = sheetDatas;
+          resultData.data = data2;
           this.oriCols = resultData.oriCols;
           this.resultData = resultData;
           callback(resultData);
@@ -1681,6 +1701,67 @@ tmixins = {
       };
       fileReader.readAsBinaryString(file);
     },
+    isNull(val) {
+      if (val == null || val == "" || val == undefined) {
+        return true;
+      }
+    },
+    checkAllSheetData(sheetItems){
+      let that = this;
+      for(let sheetItem of sheetItems){
+        let oriCols = sheetItem.oriCols;
+        let uniqueKeys = sheetItem.uniqueKeys;
+        let excelRows = sheetItem.data;
+        let sheetName = sheetItem.sheetName;
+
+        for (let i = 0; i < oriCols.length; i++) {
+          let oriCol = oriCols[i];
+          if (oriCol.isNeed || uniqueKeys.includes(oriCol.field)) {
+            for (let j = 0; j < excelRows.length; j++) {
+              let data = excelRows[j];
+              let value = data[oriCol.field];
+              if (that.isNull(value)) {
+                that.errorHandle(`[${sheetName}]`+
+                that.$t2(
+                  "第" + (j + 4) + "行[" + oriCol.title + "]不能为空;",
+                  "components.excelImport.warmMsg3",
+                  {
+                    lineNo: j + 4,
+                    title: oriCol.title,
+                  }
+                ));
+                return false;
+              }
+            }
+          }
+        }
+
+      }
+      return true;
+    },
+
+
+    handleCellNotNull(i, sheetData) {
+      let that = this;
+      let uniqueKey = sheetData.uniqueKeys[0];
+      let oriCol = sheetData.oriCols.find((item) => item.field == uniqueKey);
+      that.errorHandle(
+        `[${sheetData.sheetName}]` +
+          that.$t2(
+            "第" + (i + 4) + "行[" + oriCol.title + "]不能为空;",
+            "components.excelImport.warmMsg3",
+            {
+              lineNo: i + 4,
+              title: oriCol.title,
+            }
+          )
+      );
+    },
+    errorHandle(errorText) {
+      this.clearImportTimer();
+      this.$baseAlert(errorText);
+      // this.handleClose2();
+    },
     /***sheet2 */
   },
 };

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

@@ -7,7 +7,10 @@
       <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>
+      <base-input-number
+        v-model="optionModel.importFileLimitSize"
+        :max="200"
+      ></base-input-number>
     </el-form-item>
     <el-form-item label="导入模板文件编码">
       <el-input
@@ -15,41 +18,60 @@
         max="200"
         :value="optionModel.importAttachCode"
         clearable
-        @clear="optionModel.importAttachCode=null;optionModel.importAttachName=null;"
+        @clear="
+          optionModel.importAttachCode = null;
+          optionModel.importAttachName = null;
+        "
       >
-        <i slot="suffix" class="el-input__icon el-icon-search" @click="showBdAttachSettingDialog = true"></i>
+        <i
+          slot="suffix"
+          class="el-input__icon el-icon-search"
+          @click="showBdAttachSettingDialog = true"
+        ></i>
       </el-input>
     </el-form-item>
-        <el-form-item label="导入模板文件名称">
-          <span>{{optionModel.importAttachName}}</span>
-        </el-form-item>
+    <el-form-item label="导入模板文件名称">
+      <span>{{ optionModel.importAttachName }}</span>
+    </el-form-item>
     <el-form-item label="关联表格唯一名称">
       <el-input v-model="optionModel.tableRef"></el-input>
     </el-form-item>
     <el-form-item label="执行后台脚本编码">
       <el-input v-model="optionModel.importScriptCode"></el-input>
     </el-form-item>
+    <el-form-item label="多sheet导入">
+      <el-switch v-model="optionModel.multipleSheet"></el-switch>
+    </el-form-item>
     <el-form-item label="批量导入">
       <el-switch v-model="optionModel.importMultiple"></el-switch>
     </el-form-item>
     <el-form-item label="批量导入大小">
-      <base-input-number v-model="optionModel.importMultiSize" :max="200"></base-input-number>
+      <base-input-number
+        v-model="optionModel.importMultiSize"
+        :max="200"
+      ></base-input-number>
     </el-form-item>
 
     <el-form-item label="启用图片处理">
       <el-switch v-model="optionModel.enabledImportPreHandle"></el-switch>
     </el-form-item>
     <el-form-item label="导入前数据处理" label-width="150px">
-      <a href="javascript:void(0);" class="a-link link-oneLind"
-         @click="editEventHandler('onBeforeImport', onBeforeImportParams)">
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="editEventHandler('onBeforeImport', onBeforeImportParams)"
+      >
         <span>{{ optionModel.onBeforeImport }}</span>
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>
 
     <el-form-item label="导入完成回调" label-width="150px">
-      <a href="javascript:void(0);" class="a-link link-oneLind"
-         @click="editEventHandler('onSuccessImport', onSuccessImportParams)">
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="editEventHandler('onSuccessImport', onSuccessImportParams)"
+      >
         <span>{{ optionModel.onSuccessImport }}</span>
         <i class="el-icon-edit"></i>
       </a>
@@ -58,20 +80,23 @@
       <el-switch v-model="optionModel.hideCancelButton"></el-switch>
     </el-form-item>
 
-    <bdAttachSettingDialog v-if="showBdAttachSettingDialog" :visiable.sync="showBdAttachSettingDialog" :multi="false"
-                           @confirm="confirmBdAttachSettingDialog"></bdAttachSettingDialog>
+    <bdAttachSettingDialog
+      v-if="showBdAttachSettingDialog"
+      :visiable.sync="showBdAttachSettingDialog"
+      :multi="false"
+      @confirm="confirmBdAttachSettingDialog"
+    ></bdAttachSettingDialog>
   </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";
 import bdAttachSettingDialog from "../../../../../../views/bd/setting/bd_attach_setting/dialog.vue";
 
 export default {
   name: "import-button-editor",
-  components: {bdAttachSettingDialog},
+  components: { bdAttachSettingDialog },
   mixins: [i18n, eventMixin],
   props: {
     designer: Object,
@@ -82,9 +107,9 @@ export default {
     return {
       eventParams: [],
       showBdAttachSettingDialog: false,
-      onBeforeImportParams: ["dataId", "formCode", 'file', 'resultData', 'done'],
-      onConfirmImportParams: ["dataId", "formCode", 'resultData', 'file', 'done'],
-      onSuccessImportParams: ["dataId", "formCode", 'resultData', 'file']
+      onBeforeImportParams: ["dataId", "formCode", "file", "resultData", "done"],
+      onConfirmImportParams: ["dataId", "formCode", "resultData", "file", "done"],
+      onSuccessImportParams: ["dataId", "formCode", "resultData", "file"],
     };
   },
   methods: {
@@ -94,8 +119,8 @@ export default {
         this.optionModel.importAttachName = row.name;
         this.optionModel.importAttachCode = row.code;
       }
-    }
-  }
+    },
+  },
 };
 </script>