cloud-web-corejs 1.0.219 → 1.0.221

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

@@ -4,7 +4,7 @@ import axios from "axios";
 import SparkMD5 from "spark-md5";
 
 let tmixins = {};
-var XLSX = window.XLSX || { read, utils };
+let XLSX = window.XLSX || { read, utils };
 import { getToken } from "../../../../../utils/auth";
 import XEUtils from "xe-utils";
 import { getErrorMsg } from "@base/utils/index.js";
@@ -73,7 +73,7 @@ tmixins = {
   },
   methods: {
     initResGird() {
-      var that = this;
+      let that = this;
       let tableRef = "resGrid";
       let columns = [
         {
@@ -109,7 +109,7 @@ tmixins = {
           width: 150,
           ...oriCol.otherConfig,
         };
-        if (index == 0) {
+        if (index === 0) {
           col.fixed = "left";
         }
         return col;
@@ -379,15 +379,15 @@ tmixins = {
 
       const fileReader = new FileReader();
       fileReader.onload = async (ev) => {
-        var resultData;
+        let resultData;
         try {
           const data = ev.target.result;
           const workbook = configUtil.XLSX.read(data, {
             type: "binary",
           });
 
-          var sheet = workbook.Sheets[workbook.SheetNames[0]];
-          if (sheet["!ref"] == undefined) {
+          let sheet = workbook.Sheets[workbook.SheetNames[0]];
+          if (sheet["!ref"] === undefined || sheet["!ref"] === null) {
             /*that.showImportDialog2 = false;
             that.showContent = false;
             that.clearImportTimer();*/
@@ -400,25 +400,25 @@ tmixins = {
             that.handleClose2();
             return false;
           }
-          var range = configUtil.XLSX.utils.decode_range(sheet["!ref"]);
-          var dataSize = range.e.r + 1; //行数
+          let range = configUtil.XLSX.utils.decode_range(sheet["!ref"]);
+          let dataSize = range.e.r + 1; //行数
           that.dataSize = dataSize - 3 >= 0 ? dataSize - 3 : 0;
-          var titles = [];
-          var fields = [];
+          let titles = [];
+          let fields = [];
 
           const ws = workbook.Sheets[sheet];
 
           let prefix = option.prefix;
           let excelUrl = option.excel;
 
-          var excelRows = [];
-          var row;
-          var rowNum;
-          var colNum;
+          let excelRows = [];
+          let row;
+          let rowNum;
+          let colNum;
           for (rowNum = range.s.r; rowNum <= range.e.r; rowNum++) {
             row = [];
             for (colNum = range.s.c; colNum <= range.e.c; colNum++) {
-              var nextCell =
+              let nextCell =
                 sheet[
                   configUtil.XLSX.utils.encode_cell({
                     r: rowNum,
@@ -431,15 +431,15 @@ tmixins = {
                 row.push(nextCell.w.trim());
               }
             }
-            if (rowNum == 1) {
+            if (rowNum === 1) {
               titles = row;
             }
-            if (rowNum == 2) {
+            if (rowNum === 2) {
               fields = row;
               let checkResult = true;
               /*await that.checkExcelForImport(titles, fields, excelUrl, prefix).then(
                 res => {
-                  if (res.type != "success") {
+                  if (res.type !== "success") {
                     checkResult = false;
                   }
                 });
@@ -463,7 +463,7 @@ tmixins = {
           if (
             !titles.length ||
             !fields.length ||
-            titles.length != fields.length
+            titles.length !== fields.length
           ) {
             // that.showContent = false;
             // that.clearImportTimer();
@@ -477,14 +477,14 @@ tmixins = {
             return false;
           }
 
-          var columns = [];
-          var cols = [];
+          let columns = [];
+          let cols = [];
           let uniqueFields = [];
           for (let i = 0; i < titles.length; i++) {
             let title = titles[i];
             if (title) {
               let field = fields[i];
-              if (field == null) {
+              if (field === null  || field  === undefined) {
                 // that.showContent = false;
                 // that.clearImportTimer();
                 that.$baseAlert(
@@ -533,7 +533,7 @@ tmixins = {
             }
           }
 
-          var oriCols = JSON.parse(JSON.stringify(cols)); //列信息
+          let oriCols = JSON.parse(JSON.stringify(cols)); //列信息
           if (uniqueFields.length) {
             //分组唯一字段为空时，全部不发包。
             for (let i = 0; i < oriCols.length; i++) {
@@ -542,7 +542,7 @@ tmixins = {
                 for (let j = 0; j < excelRows.length; j++) {
                   let data = excelRows[j];
                   let value = data[oriCol.field];
-                  if (value == null || value == "") {
+                  if (value === null  || value === undefined  || value === "") {
                     that.clearImportTimer();
                     that.$baseAlert(
                       this.$t2(
@@ -584,12 +584,12 @@ tmixins = {
     async checkExcelForImport(titles, fields, turl, prefix) {
       if (!this.showImportDialog2) return;
       let that = this;
-      var data = {
+      let data = {
         filed_name: fields,
         field_note: titles,
         url: turl,
       };
-      var param = JSON.stringify(data);
+      let param = JSON.stringify(data);
       return this.$http({
         url: prefix + "/sf_common/compareExcelFields",
         method: "post",
@@ -601,7 +601,7 @@ tmixins = {
       });
     },
     saveImportHandle(data, opt) {
-      var multi = this.option.multi;
+      let multi = this.option.multi;
       let importOption = this.option.importOption;
 
       let entity = importOption.importEntity;
@@ -647,28 +647,28 @@ tmixins = {
     },
     syncDataForImport(opts) {
       let that = this;
-      var multi = this.option.multi;
-      var resultData = this.resultData;
-      var datas = resultData.data;
-      var titles = resultData.titles;
-      var fields = resultData.fields;
+      let multi = this.option.multi;
+      let resultData = this.resultData;
+      let datas = resultData.data;
+      let titles = resultData.titles;
+      let fields = resultData.fields;
       let uniqueFields = resultData.uniqueFields;
-      var saveUrl = opts.saveUrl;
-      var size = datas.length;
-      var index = 0;
-      var successNum = 0;
-      var failNum = 0;
-      var dialogObj = this.$refs.importDialog.$el;
-      var successNumObj = dialogObj.querySelector(".successNum");
-      var failNumObj = dialogObj.querySelector(".failNum");
-      var percentageObj = dialogObj.querySelector(".percentage");
-      var doneNumObj = dialogObj.querySelector(".doneNum");
+      let saveUrl = opts.saveUrl;
+      let size = datas.length;
+      let index = 0;
+      let successNum = 0;
+      let failNum = 0;
+      let dialogObj = this.$refs.importDialog.$el;
+      let successNumObj = dialogObj.querySelector(".successNum");
+      let failNumObj = dialogObj.querySelector(".failNum");
+      let percentageObj = dialogObj.querySelector(".percentage");
+      let doneNumObj = dialogObj.querySelector(".doneNum");
       dialogObj.querySelector(".dataSize").innerText = size;
 
       that.successRows = [];
       that.failRows = [];
 
-      var multiSize = this.option.multiSize || 2;
+      let multiSize = this.option.multiSize || 2;
 
       let groupIndex = 0;
       let groupDatas = [];
@@ -689,15 +689,15 @@ tmixins = {
         });
       }
 
-      var compareV = function (property) {
+      let compareV = function (property) {
         return function (a, b) {
-          var value1 = a[property];
-          var value2 = b[property];
+          let value1 = a[property];
+          let value2 = b[property];
           return value1 - value2;
         };
       };
 
-      var prevHandleData = function (percentageStr, excNum) {
+      let prevHandleData = function (percentageStr, excNum) {
         successNumObj.innerText = successNum;
         failNumObj.innerText = failNum;
         doneNumObj.innerText = successNum + failNum;
@@ -725,7 +725,7 @@ tmixins = {
         let value = null;
         let defaultValue = this.option.defaultValue;
         if (defaultValue) {
-          if (typeof defaultValue == "function") {
+          if (typeof defaultValue === "function") {
             value = defaultValue(row) || {};
           } else {
             value = defaultValue || {};
@@ -736,8 +736,8 @@ tmixins = {
 
       let handleData = () => {
         if (!that.isEnd && index < size) {
-          var param;
-          var excNum;
+          let param;
+          let excNum;
           if (multi) {
             if (!uniqueFields.length) {
               if (index + multiSize < size) {
@@ -748,7 +748,7 @@ tmixins = {
 
               let dataList = [];
               for (let i = 0; i < excNum; i++) {
-                var mIndex = index + i;
+                let mIndex = index + i;
                 let mData = datas[mIndex];
                 mData.impSeq = mIndex;
                 mData.impNumber = mIndex + 4;
@@ -777,7 +777,7 @@ tmixins = {
               param = groupDatas[groupIndex];
             }
           } else {
-            var data = that.resultData.data[index];
+            let data = that.resultData.data[index];
             data.impSeq = index;
             data.impNumber = index + 4;
             excNum = 1;
@@ -798,8 +798,8 @@ tmixins = {
             }
           }
 
-          var percentageStr = parseInt(((index + excNum) * 100) / size);
-          if (param == null || param.length == 0) {
+          let percentageStr = parseInt(((index + excNum) * 100) / size);
+          if (param === null  || param === undefined  || param.length === 0) {
             if (that.showContent) {
               prevHandleData(percentageStr, excNum);
             }
@@ -810,20 +810,20 @@ tmixins = {
             failMsg: false,
             callback: (resultMsg) => {
               if (multi) {
-                if (resultMsg.type == "success") {
-                  var multiRows = resultMsg.objx;
+                if (resultMsg.type === "success") {
+                  let multiRows = resultMsg.objx;
                   for (let i = 0; i < multiRows.length; i++) {
-                    var multiRow = multiRows[i];
-                    var data = datas[multiRow.impSeq];
+                    let multiRow = multiRows[i];
+                    let data = datas[multiRow.impSeq];
                     data._resultType = multiRow.impReturnType;
                     data._resultContent =
-                      multiRow.impReturnType == "success"
+                      multiRow.impReturnType === "success"
                         ? this.$t2(
                             "导入成功",
                             "components.excelImport.importSucess"
                           )
                         : multiRow.impReturnMsg;
-                    if (multiRow.impReturnType == "success") {
+                    if (multiRow.impReturnType === "success") {
                       successNum++;
                       that.successRows.push(data);
                     } else {
@@ -855,17 +855,17 @@ tmixins = {
                   return; */
                 }
               } else {
-                var data = that.resultData.data[index];
+                let data = that.resultData.data[index];
                 data._resultType = resultMsg.type;
                 data._resultContent =
-                  resultMsg.type == "success"
+                  resultMsg.type === "success"
                     ? this.$t2(
                         "导入成功",
                         "components.excelImport.importSucess"
                       )
                     : resultMsg.content;
 
-                if (resultMsg.type == "success") {
+                if (resultMsg.type === "success") {
                   successNum++;
                   that.successRows.push(data);
                 } else {
@@ -907,13 +907,13 @@ tmixins = {
       });
     },
     vailData(data, opts) {
-      var oriCols = opts.data.oriCols;
-      var errorInfo = [];
+      let oriCols = opts.data.oriCols;
+      let errorInfo = [];
       for (let i = 0; i < oriCols.length; i++) {
         let oriCol = oriCols[i];
         if (oriCol.isNeed) {
           let value = data[oriCol.field];
-          if (value == null || value == "") {
+          if (value === null  || value === undefined  || value === "") {
             errorInfo.push(
               this.$t2(
                 "[" + oriCol.title + "]不能为空;",
@@ -927,14 +927,14 @@ tmixins = {
       return errorInfo.join("");
     },
     handleRes(val) {
-      /* var content = val;
-      var text = content;
+      /* let content = val;
+      let text = content;
       if (content && content.indexOf("Exception") >= 0) {
-        var index0 = content.lastIndexOf("*]");
+        let index0 = content.lastIndexOf("*]");
         if (index0 >= 0) {
           text = content.substr(index0);
           if (text) {
-            var index1 = text.indexOf("Exception:");
+            let index1 = text.indexOf("Exception:");
             if (index1 >= 0) {
               text = text.substr(index1 + 10);
             }
@@ -1019,6 +1019,9 @@ tmixins = {
               [resultData, file]
             );
         };
+        const close = () => {
+          that.dialogClose1();
+        }
         try {
           if (importOption.onConfirmImportEnabled) {
             if (
@@ -1026,8 +1029,8 @@ tmixins = {
                 .getFieldTarget()
                 .handleCustomEvent(
                   importOption.onConfirmImport,
-                  ["resultData", "file", "done"],
-                  [resultData, file, done]
+                  ["resultData", "file", "done", 'close'],
+                  [resultData, file, done, close]
                 ) !== false
             ) {
               done();
@@ -1128,7 +1131,7 @@ tmixins = {
                 progressEvent.total
             );
           let percent = Math.floor((uploadedSize * 100) / fullFile.size);
-          if (percent == 100) {
+          if (percent === 100) {
             percent = 99;
           }
           that.loadingPercent = percent;
@@ -1139,7 +1142,7 @@ tmixins = {
         // failMsg: false,
         modal: false,
         callback: (res1) => {
-          if (res1.type == "success") {
+          if (res1.type === "success") {
             let uuid = res1.objx.uuid;
             chunkParam.uuid = uuid;
             if (preFormData.chunk + 1 >= preFormData.chunks) {
@@ -1175,7 +1178,7 @@ tmixins = {
 
       let chunkIndex = chunkParam.chunkIndex;
       let chunkSize = chunkParam.chunkSize;
-      var start = chunkIndex * chunkSize,
+      let start = chunkIndex * chunkSize,
         end =
           start + chunkSize >= fullFile.size
             ? fullFile.size
@@ -1221,7 +1224,7 @@ tmixins = {
           if (fullFile) fullFile.abort = c;
         }),
         callback: (res) => {
-          if (res.type == "success") {
+          if (res.type === "success") {
             that.loadingPercent = 100;
             // that.loadingTitle = this.getUploadText(100);
             this.changeUploadPercent(100);
@@ -1271,7 +1274,7 @@ tmixins = {
           let percent = Math.floor(
             (progressEvent.loaded * 100) / progressEvent.total
           );
-          if (percent == 100) {
+          if (percent === 100) {
             percent = 99;
           }
           that.loadingPercent = percent;
@@ -1279,7 +1282,7 @@ tmixins = {
           that.changeCheckTextPercent(percent);
         },
         callback: (res) => {
-          if (res.type == "success") {
+          if (res.type === "success") {
             that.loadingPercent = 100;
             // that.loadingTitle = this.getCheckText(100);
             that.changeCheckTextPercent(100);
@@ -1337,7 +1340,7 @@ tmixins = {
           if (fullFile) fullFile.abort = c;
         }),
         callback: (res) => {
-          if (res.type == "success") {
+          if (res.type === "success") {
             let rows = res?.objx?.datas || [];
             let fileCellFields = this.fileCellFields;
             rows.forEach((row) => {
@@ -1453,7 +1456,7 @@ tmixins = {
 
       const fileReader = new FileReader();
       fileReader.onload = async (ev) => {
-        var resultData;
+        let resultData;
         try {
           const data = ev.target.result;
           const workbook = configUtil.XLSX.read(data, {
@@ -1465,7 +1468,7 @@ tmixins = {
             let sheetName = workbook.SheetNames[pi];
             let sheet = workbook.Sheets[sheetName];
 
-            if (sheet["!ref"] == undefined) {
+            if (sheet["!ref"] === undefined || sheet["!ref"] === null) {
               that.$baseAlert(
                 this.$t2(
                   "请使用正确的导入模版！",
@@ -1475,25 +1478,25 @@ tmixins = {
               that.handleClose2();
               return false;
             }
-            var range = configUtil.XLSX.utils.decode_range(sheet["!ref"]);
-            var dataSize = range.e.r + 1; //行数
+            let range = configUtil.XLSX.utils.decode_range(sheet["!ref"]);
+            let dataSize = range.e.r + 1; //行数
             that.dataSize = dataSize - 3 >= 0 ? dataSize - 3 : 0;
-            var titles = [];
-            var fields = [];
+            let titles = [];
+            let fields = [];
 
             const ws = workbook.Sheets[sheet];
 
             let prefix = option.prefix;
             let excelUrl = option.excel;
 
-            var excelRows = [];
-            var row;
-            var rowNum;
-            var colNum;
+            let excelRows = [];
+            let row;
+            let rowNum;
+            let colNum;
             for (rowNum = range.s.r; rowNum <= range.e.r; rowNum++) {
               row = [];
               for (colNum = range.s.c; colNum <= range.e.c; colNum++) {
-                var nextCell =
+                let nextCell =
                   sheet[
                     configUtil.XLSX.utils.encode_cell({
                       r: rowNum,
@@ -1506,10 +1509,10 @@ tmixins = {
                   row.push(nextCell.w.trim());
                 }
               }
-              if (rowNum == 1) {
+              if (rowNum === 1) {
                 titles = row;
               }
-              if (rowNum == 2) {
+              if (rowNum === 2) {
                 fields = row;
                 let checkResult = true;
               }
@@ -1527,7 +1530,7 @@ tmixins = {
             if (
               !titles.length ||
               !fields.length ||
-              titles.length != fields.length
+              titles.length !== fields.length
             ) {
               that.$baseAlert(
                 this.$t2(
@@ -1539,15 +1542,15 @@ tmixins = {
               return false;
             }
 
-            var columns = [];
-            var cols = [];
+            let columns = [];
+            let cols = [];
             let uniqueFields = [];
             let uniqueKeys = [];
             for (let i = 0; i < titles.length; i++) {
               let title = titles[i];
               if (title) {
                 let field = fields[i];
-                if (field == null) {
+                if (field === null  || field  === undefined) {
                   that.$baseAlert(
                     this.$t2(
                       "请使用正确的导入模版！",
@@ -1609,7 +1612,7 @@ tmixins = {
               }
             }
 
-            var oriCols = JSON.parse(JSON.stringify(cols)); //列信息
+            let oriCols = JSON.parse(JSON.stringify(cols)); //列信息
             /* if (uniqueKeys.length) {
               //分组唯一字段为空时，全部不发包。
               for (let i = 0; i < oriCols.length; i++) {
@@ -1618,7 +1621,7 @@ tmixins = {
                   for (let j = 0; j < excelRows.length; j++) {
                     let data = excelRows[j];
                     let value = data[oriCol.field];
-                    if (value == null || value == "") {
+                    if (value === null  || value === undefined  || value === "") {
                       that.errorHandle(`[${sheetName}]`+
                       that.$t2(
                         "第" + (j + 4) + "行[" + oriCol.title + "]不能为空;",
@@ -1675,7 +1678,7 @@ tmixins = {
                     that.handleCellNotNull(k, sheetData);
                     return;
                   }
-                  if (sheetItem[uniqueKey] == uniqueValue) {
+                  if (sheetItem[uniqueKey] === uniqueValue) {
                     fDatas.push(sheetItem);
                   }
                 }
@@ -1703,7 +1706,7 @@ tmixins = {
       fileReader.readAsBinaryString(file);
     },
     isNull(val) {
-      if (val == null || val == "" || val == undefined) {
+      if (val === null  || val === undefined || val === "" || val === undefined  || val === null) {
         return true;
       }
     },
@@ -1745,7 +1748,7 @@ tmixins = {
     handleCellNotNull(i, sheetData) {
       let that = this;
       let uniqueKey = sheetData.uniqueKeys[0];
-      let oriCol = sheetData.oriCols.find((item) => item.field == uniqueKey);
+      let oriCol = sheetData.oriCols.find((item) => item.field === uniqueKey);
       that.errorHandle(
         `[${sheetData.sheetName}]` +
           that.$t2(

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

@@ -114,7 +114,7 @@ export default {
       eventParams: ["dataId", "formCode", "done"],
       showBdAttachSettingDialog: false,
       onBeforeImportParams: ["dataId", "formCode", "file", "resultData", "done"],
-      onConfirmImportParams: ["dataId", "formCode", "resultData", "file", "done"],
+      onConfirmImportParams: ["dataId", "formCode", "resultData", "file", "done", "close"],
       onSuccessImportParams: ["dataId", "formCode", "resultData", "file"],
     };
   },

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

@@ -77,7 +77,7 @@ export default {
       eventParams: ["dataId", "formCode", "done"],
       showBdAttachSettingDialog: false,
       onBeforeImportParams: ["dataId", "formCode", 'file', 'resultData', 'done'],
-      onConfirmImportParams: ["dataId", "formCode", 'resultData', 'file', 'done'],
+      onConfirmImportParams: ["dataId", "formCode", 'resultData', 'file', 'done', "close"],
       onSuccessImportParams: ["dataId", "formCode", 'resultData', 'file']
     };
   },