cnhis-design-vue 2.1.158 → 2.1.159

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.1.158",
+  "version": "2.1.159",
   "description": "前端业务UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",

package/packages/button/src/ButtonPrint/new.vue

@@ -1062,15 +1062,35 @@ export default create({
     },
     handleClickPrint(curPrintParamList, templateCode, templateId, formatId, printToParam=[], needContinuePrint) {
       let len = curPrintParamList.length;
-      const callLocalServicesSuccessCb = async data => {
+      const successParams = [];
+      const errorParams = [];
+      const callLocalServicesSuccessErrorCb = async data => {
         try {
+          if (data.printCbStatus) {
+            successParams.push(data);
+          } else {
+            errorParams.push(data);
+          }
           if (--len <= 0) {
-            this.callLocalServicesSuccessCb(data, 'print');
+            if (errorParams.length == curPrintParamList.length) {
+              this.callLocalServicesErrorCb(data, {
+                successList: [],
+                errorList: errorParams,
+                isMulti: true
+              });
+            } else {
+              this.callLocalServicesSuccessCb(data, 'print', {
+                successList: successParams,
+                errorList: errorParams,
+                isMulti: true
+              });
+            }
           }
         } catch (error) {
           console.log('error', error);
         }
       };
+
       if (this.getCurrentLoading() && !needContinuePrint) return;
       this.toggleExpandLoading(true, formatId);
       this.prevFn()
@@ -1111,49 +1131,47 @@ export default create({
               printdlgshow: this.printdlgshow
             };
             if (this.strategy === 'MULTI') {
-              // 循环多条
-              // for (let i = 0; i < curPrintParamList.length; i++) {
-              //   if (i > 0) queryParams.printdlgshow = '0';
-              //   const params = JSON.stringify(Object.assign({}, JSON.parse(this.getPrintParams()), this.printCustomProps, curPrintParamList[i]));
-              //   this.printInstance.printDirect(
-              //     {
-              //       ...queryParams,
-              //       params
-              //     },
-              //     callLocalServicesSuccessCb,
-              //     this.callLocalServicesErrorCb,
-              //     this.callLocalServicesCancelCb
-              //   );
-              // }
               // 循环剩余数据
               const multiOtherPrint = () => {
                 for (let i = 1; i < curPrintParamList.length; i++) {
                   queryParams.printdlgshow = '0';
                   const params = JSON.stringify(Object.assign({}, JSON.parse(this.getPrintParams()), this.printCustomProps, curPrintParamList[i]));
+                  const originParam = this.findOriginParam(curPrintParamList[i], printToParam);
                   this.printInstance.printDirect(
                     {
                       ...queryParams,
                       params
                     },
-                    callLocalServicesSuccessCb,
-                    this.callLocalServicesErrorCb,
+                    (res) => {
+                      res.originPrintParam = originParam || undefined;
+                      res.printCbStatus = true;
+                      callLocalServicesSuccessErrorCb(res);
+                    },
+                    (error) => {
+                      error.originPrintParam = originParam || undefined;
+                      callLocalServicesSuccessErrorCb(error);
+                    },
                     this.callLocalServicesCancelCb
                   );
                 }
               }
               // 先执行第一条如果取消了，则不再往下执行
               const params = JSON.stringify(Object.assign({}, JSON.parse(this.getPrintParams()), this.printCustomProps, curPrintParamList[0]));
+              const originParam = this.findOriginParam(curPrintParamList[0], printToParam);
               this.printInstance.printDirect(
                 {
                   ...queryParams,
                   params
                 },
                 (res) => {
-                  callLocalServicesSuccessCb(res);
+                  res.originPrintParam = originParam || undefined;
+                  res.printCbStatus = true;
+                  callLocalServicesSuccessErrorCb(res);
                   multiOtherPrint();
                 },
                 (error) => {
-                  this.callLocalServicesErrorCb(error);
+                  error.originPrintParam = originParam || undefined;
+                  callLocalServicesSuccessErrorCb(error);
                   multiOtherPrint();
                 },
                 (res) => {
@@ -1180,6 +1198,11 @@ export default create({
           }
         })
     },
+
+    findOriginParam(printParam, originParams) {
+      const keys = Object.keys(printParam);
+      return originParams.find(param => keys.every(key => printParam[key] == param[key]));
+    },
     getHisParams(index = 0) {
       const { templateParams, hisParams, params } = this;
       const { reportid = '280' } = hisParams;
@@ -1346,7 +1369,7 @@ export default create({
       this.visible = false;
     },
     /*  */
-    callLocalServicesSuccessCb(res, type) {
+    callLocalServicesSuccessCb(res, type, config) {
       this.toggleExpandLoading(false);
       let info = {
         type,
@@ -1354,11 +1377,11 @@ export default create({
         templateId: res?.templateId || this.getTemplateIdByFormatId(this.currentFormatId),
         templateCode: res?.templateCode || this.getTemplateCodeByFormatId(this.currentFormatId),
       };
-      this.$emit('success', res, info);
+      this.$emit('success', res, info, config);
     },
-    callLocalServicesErrorCb(res) {
+    callLocalServicesErrorCb(res, config) {
       this.toggleExpandLoading(false);
-      this.$emit('error', res);
+      this.$emit('error', res, config);
     },
     callLocalServicesCancelCb(res) {
       this.toggleExpandLoading(false);

package/packages/upload/chunk-upload/chunk-upload-new.vue

@@ -739,7 +739,8 @@ export default {
       return new Promise((resolve, reject) => {
         const obj = {
           ...data,
-          ...this.uploadArguments
+          ...this.uploadArguments,
+          size: file.size,
         };
 
         instance