cnhis-design-vue 2.1.156 → 2.1.158

package/package.json

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

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

@@ -1112,19 +1112,54 @@ export default create({
             };
             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
-                );
+              // 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]));
+                  this.printInstance.printDirect(
+                    {
+                      ...queryParams,
+                      params
+                    },
+                    callLocalServicesSuccessCb,
+                    this.callLocalServicesErrorCb,
+                    this.callLocalServicesCancelCb
+                  );
+                }
               }
+              // 先执行第一条如果取消了，则不再往下执行
+              const params = JSON.stringify(Object.assign({}, JSON.parse(this.getPrintParams()), this.printCustomProps, curPrintParamList[0]));
+              this.printInstance.printDirect(
+                {
+                  ...queryParams,
+                  params
+                },
+                (res) => {
+                  callLocalServicesSuccessCb(res);
+                  multiOtherPrint();
+                },
+                (error) => {
+                  this.callLocalServicesErrorCb(error);
+                  multiOtherPrint();
+                },
+                (res) => {
+                  this.callLocalServicesCancelCb(res);
+                }
+              );
             } else {
               // 聚合一条
               this.printInstance.printDirect(

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

@@ -578,19 +578,39 @@ export default create({
               printdlgshow: this.printdlgshow
             };
             if (this.strategy === 'MULTI') {
-              // 循环多条
-              for (let i = 0; i < this.printParams.length; i++) {
-                if (i > 0) queryParams.printdlgshow = '0';
-                this.printInstance.printDirect(
-                  {
-                    ...queryParams,
-                    params: this.getPrintParams(i)
-                  },
-                  callLocalServicesSuccessCb,
-                  this.callLocalServicesErrorCb,
-                  this.callLocalServicesCancelCb
-                );
+              // 循环剩余数据
+              const multiOtherPrint = () => {
+                for (let i = 1; i < this.printParams.length; i++) {
+                  queryParams.printdlgshow = '0';
+                  this.printInstance.printDirect(
+                    {
+                      ...queryParams,
+                      params: this.getPrintParams(i)
+                    },
+                    callLocalServicesSuccessCb,
+                    this.callLocalServicesErrorCb,
+                    this.callLocalServicesCancelCb
+                  );
+                }
               }
+              // 先执行第一条如果取消了，则不再往下执行
+              this.printInstance.printDirect(
+                {
+                  ...queryParams,
+                  params: this.getPrintParams()
+                },
+                (res) => {
+                  callLocalServicesSuccessCb(res);
+                  multiOtherPrint();
+                },
+                (error) => {
+                  this.callLocalServicesErrorCb(error);
+                  multiOtherPrint();
+                },
+                (res) => {
+                  this.callLocalServicesCancelCb(res);
+                }
+              );
             } else {
               // 聚合一条
               this.printInstance.printDirect(

package/packages/table-filter/src/base-search-com/BaseSearch.vue

@@ -1346,7 +1346,7 @@ export default create({
       this.$refs.quicksearch?.clearData();
       this.$emit('reloadList', item);
     },
-    clickBtn(data, item, index, skip, j) {
+    clickBtn(data, item, index, skip, j, config={}) {
       this.$emit('clearTeamTitleName');
       if ((item.name.includes('批量') && item.type == 'ADD' && !skip) || (item.type == 'BATCH' && !skip)) {
         this.showDrawer(item, j);
@@ -1360,7 +1360,7 @@ export default create({
       Object.assign(item, {
         _index_: j
       });
-      this.$emit('clickBtn', data, item, index);
+      this.$emit('clickBtn', data, item, index, j, config);
     },
     clickGroupBtn(btn, j) {
       this.clickBtn(this.clickRowData, btn, this.clickRowData.my_index, undefined, j);
@@ -2065,7 +2065,7 @@ export default create({
           触发原按钮流程，在EditTable中触发原打印按钮节点时，修改[printPrevFinish]状态
           触发watch，再执行Promise.resolve()
         */
-        this.clickBtn(clickBtn, btn, clickBtn.my_index, true, j);
+        this.clickBtn(clickBtn, btn, clickBtn.my_index, true, j, {printBtnTrigger: true});
         const timestamp = Date.now();
 
         this.resetAllPrintFnWatch();

package/packages/table-filter/src/mixins/printNew.js

@@ -143,39 +143,45 @@ export default {
       }
       return list;
     },
+    setBtnItemSetting(item, cItem, configObj) {
+      let printConfig = {
+        number: item.number,
+        authorizationKey: item.authorizationKey,
+        port: item.port,
+        versionType: item.versionType,
+        hisParams: { reportid: item.number },
+        id: item.id
+      };
+      cItem.__printConfig = printConfig;
+      if (!this.isLowCode) return;
+      let configItem = configObj[item.id] || {};
+      let outerPrintKeys = (configItem.formatIds && configItem.formatIds?.split(',').filter(Boolean)) || [];
+      let formatList = item.__printFormatByNumberData?.obj?.[0]?.format || [];
+      // 如果仅存在一个格式，哪怕没默认格式，按钮也展示 打印{格式名称}，点击名称就是直接打印
+      let defaultFormatId = formatList.find(v => v.defaultFlag == 1)?.id || '';
+      // 低代码都走新的打印逻辑
+      let newPrintSetting = {
+        isShowPrintAll: false,
+        isShowOutSetting: true,
+        customProps: {},
+        outerPrintKeys,
+        defaultFormatId
+      };
+      cItem.__configItem = configItem || {};
+      cItem.__newPrintSetting = newPrintSetting;
+      cItem.__printFormatByNumberData = item.__printFormatByNumberData;
+    },
+
     setPrintNumberToBtnList(printNumberList = [], btnList = [], configObj = {}) {
       let cloneList = cloneDeep(btnList);
 
       printNumberList.forEach((item, index) => {
-        const i = cloneList.findIndex(v => v.settingObj[0].trigger_id == item.id);
-        if (!~i) return;
-        let cItem = cloneList[i];
-        let printConfig = {
-          number: item.number,
-          authorizationKey: item.authorizationKey,
-          port: item.port,
-          versionType: item.versionType,
-          hisParams: { reportid: item.number },
-          id: item.id
-        };
-        cItem.__printConfig = printConfig;
-        if (!this.isLowCode) return;
-        let configItem = configObj[item.id] || {};
-        let outerPrintKeys = (configItem.formatIds && configItem.formatIds?.split(',').filter(Boolean)) || [];
-        let formatList = item.__printFormatByNumberData?.obj?.[0]?.format || [];
-        // 如果仅存在一个格式，哪怕没默认格式，按钮也展示 打印{格式名称}，点击名称就是直接打印
-        let defaultFormatId = formatList.find(v => v.defaultFlag == 1)?.id || '';
-        // 低代码都走新的打印逻辑
-        let newPrintSetting = {
-          isShowPrintAll: false,
-          isShowOutSetting: true,
-          customProps: {},
-          outerPrintKeys,
-          defaultFormatId
-        };
-        cItem.__configItem = configItem || {};
-        cItem.__newPrintSetting = newPrintSetting;
-        cItem.__printFormatByNumberData = item.__printFormatByNumberData;
+        // 不能直接找index,因为可能多个print按钮配置了同一个trigger_id, 导致第二个一直无法赋值
+        const filterCList = cloneList.filter(v => v.settingObj?.[0]?.trigger_id == item.id);
+        if (!filterCList?.length) return;
+        filterCList.forEach(v => {
+          this.setBtnItemSetting(item, v, configObj);
+        });
       });
 
       return cloneList;