cnhis-design-vue 2.1.143 → 2.1.145

package/packages/multi-chat/setting/index.vue

@@ -61,6 +61,9 @@ export default {
     isOtherEntry: {
       type: Boolean,
       default: false
+    },
+    decrypt: {
+      type: Function
     }
   },
   data() {
@@ -187,7 +190,16 @@ export default {
         })
         .then(({ data }) => {
           if (data.result === "SUCCESS") {
-            const { vendor } = data.obj;
+            let useObj = data?.obj || {}
+            const {isEncrypt, obj} = useObj;
+            if(isEncrypt && obj && this.decrypt && typeof this.decrypt === 'function') {
+              try {
+                useObj = JSON.parse(this.decrypt(obj)) || {};
+              } catch(err) {
+                console.log(err)
+              }
+            }
+            const { vendor } = useObj;
             this.skdVender = vendor;
           }
         });

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

@@ -311,10 +311,13 @@
                       :authorizationKey="item.__printConfig && item.__printConfig.authorizationKey"
                       :templateNumber="item.__printConfig && item.__printConfig.number"
                       :hisParams="item.__printConfig && item.__printConfig.hisParams"
+                      :newPrintSetting="item.__newPrintSetting"
+                      :printFormatByNumberData="item.__printFormatByNumberData"
                       :params="getPrintBtnParams(item)"
                       :prevFn="() => printBtnPrevFn(clickRowData, item, 2, j)"
                       @success="receivePrintSuccess"
                       @error="receivePrintError"
+                      @saveOuterPrint="(val) => saveOuterPrint(val, item)"
                     ></PrintBtn>
                   </template>
                 </li>
@@ -439,6 +442,7 @@ import { durationMixin, $utils, filterApiFn, outQuickSearchFn, outQuickSearchDef
 import tableSearchCon from '../mixins/tableSearchCon';
 import OutQuickMethod from '../mixins/out-quick-method'
 import dynamicMethod from '../components/render-widget/mixins/dynamic-method'
+import printNew from '../mixins/printNew'
 import svgIcon from '@/component/svg/index.vue';
 import 'text-security/text-security.css';
 import create from '@/core/create';
@@ -491,7 +495,7 @@ const BTNOBJ = {
 
 export default create({
   name: 'base-search',
-  mixins: [durationMixin, $utils, filterApiFn, tableSearchCon, outQuickSearchFn, outQuickSearchDefCommon, OutQuickMethod, dynamicMethod],
+  mixins: [durationMixin, $utils, filterApiFn, tableSearchCon, outQuickSearchFn, outQuickSearchDefCommon, OutQuickMethod, dynamicMethod, printNew],
   directives: { resize, preventReClick },
   props: {
     width: {
@@ -687,6 +691,9 @@ export default create({
     }
   },
   computed: {
+    isLowCode() {
+      return this.libSource === 'lowCode';
+    },
     isOrgAdmin() {
       return this.isAdmin;
     },
@@ -1590,7 +1597,8 @@ export default create({
       });
 
       let printNumberList = (await this.getPrintNumber(rowPrintBtnList)) || [];
-      rowPrintBtnList = this.setPrintNumberToBtnList(printNumberList, rowPrintBtnList);
+      let configObj = await this.getPrintUserConfigReuqestAll(printNumberList, rowPrintBtnList)
+      rowPrintBtnList = this.setPrintNumberToBtnList(printNumberList, rowPrintBtnList, configObj);
       // this.rowPrintBtnList = rowPrintBtnList;
       // 添加批量打印策略：strategy: MULTI(循环多条, 默认值, 为空时使用该策略)  ONCE(聚合一条)
       this.rowPrintBtnList = rowPrintBtnList.map(item => {
@@ -1968,77 +1976,14 @@ export default create({
           table: i
         };
         // paramsArray.push(utils.setParamsValue(setData[0].params, Object.assign(paramsData, { obj })));
-        paramsArray.push(utils.setParamsValue(setData[0].params, Object.assign(paramsData, { obj, table: i })));
-      });
-
-      return paramsArray;
-    },
-    setPrintNumberToBtnList(printNumberList = [], btnList = []) {
-      let cloneList = cloneDeep(btnList);
-
-      printNumberList.forEach((item, index) => {
-        const i = cloneList.findIndex(v => v.settingObj[0].trigger_id == item.id);
-        if (i > -1) {
-          cloneList[i].__printConfig = {
-            number: item.number,
-            authorizationKey: item.authorizationKey,
-            port: item.port,
-            versionType: item.versionType,
-            hisParams: { reportid: item.number }
-          };
+        let resParams = utils.setParamsValue(setData[0].params, Object.assign(paramsData, { obj, table: i })) || {}
+        if(btn?.__printConfig?.number) {
+          resParams.templateNumbers = [btn.__printConfig.number]
         }
-        // cloneList[index].__printConfig = {
-        //   number: item.number,
-        //   authorizationKey: item.authorizationKey,
-        //   port: item.port,
-        //   versionType: item.versionType,
-        //   hisParams: { reportid: item.number }
-        // };
+        paramsArray.push(resParams);
       });
-
-      return cloneList;
-    },
-    async getPrintNumber(list) {
-      if (!list?.length) return;
-
-      let ids = list.map(item => item.settingObj[0].trigger_id).join(',');
-
-      let printNumberCacheKeys = Object.keys(this.printNumberCache);
-      let haveCache = printNumberCacheKeys.includes(ids);
-      if (haveCache) {
-        let printNumberList = this.printNumberCache[ids];
-        this.printBtnStrategys = printNumberList;
-        return Promise.resolve(printNumberList);
-      }
-
-      let res = await this.handleGetConfigApi({ ids }, 'requestGetByIds');
-
-      const { status, data } = res;
-      if (status) {
-        let resList = data?.list || [];
-        this.printBtnStrategys = resList;
-        list = resList.map(item => {
-          return {
-            number: item.number,
-            authorizationKey: data.authorizationKey,
-            versionType: data.versionType,
-            port: data.port,
-            id: item.id,
-            ...item
-          };
-        });
-        let len = list?.length || 0;
-        if (len > 0) {
-          this.setPrintNumberCache({
-            ids,
-            list
-          });
-        }
-
-        return list;
-      }
-      return list;
-    },
+      return paramsArray;
+    },   
     async receivePrintSuccessAboutPrint(res, info) {
       const printBtn = this.printBtn;
       const templateId = info.templateId;
@@ -2378,6 +2323,11 @@ export default create({
     justify-content: space-between;
     text-align: left;
     background: #fff;
+    .rowPrintBtn-btn {
+      /deep/ .newprint-button-outer {
+        margin: 0px 8px 8px 0px;
+      }
+    }
   }
   .bease-left {
     display: flex;

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

@@ -0,0 +1,184 @@
+import cloneDeep from 'lodash/cloneDeep';
+export default {
+  data() {
+    return {
+      printConfigCache: {}
+    };
+  },
+  methods: {
+    setPrintConfigCache(key, value, isUpdate) {
+      let cacheItem = this.printConfigCache[key];
+      if (!cacheItem) {
+        if (isUpdate) return;
+        this.printConfigCache[key] = value;
+        return;
+      }
+      Object.assign(cacheItem, { ...value });
+    },
+    async handlePrintFormatByNumber(printItem) {
+      if (!this.isLowCode || !printItem?.number || !printItem?.authorizationKey) {
+        return;
+      }
+      let params = {
+        number: printItem.number,
+        authorizationKey: printItem.authorizationKey
+      };
+      let res = await this.handleGetConfigApi(params, 'requestGetPrintFormatByNumber');
+      return res;
+    },
+    async handlePrintNumberList(list, config) {
+      if (!list || !list.length) return [];
+      const { isNew, data } = config || {};
+      let i = 0,
+        item,
+        len = list.length;
+      let resList = [];
+      for (; i < len; i++) {
+        item = list[i];
+        let obj = { ...item };
+        if (isNew) {
+          obj = {
+            number: item.number,
+            authorizationKey: data?.authorizationKey,
+            port: data?.port,
+            versionType: data?.versionType,
+            id: item.id,
+            ...item
+          };
+        }
+        if (obj.versionType == 2) {
+          let formatRes = await this.handlePrintFormatByNumber(obj);
+          formatRes && (obj.__printFormatByNumberData = formatRes);
+        }
+        resList.push(obj);
+      }
+      return resList;
+    },
+    async saveOuterPrint(list, item) {
+      if (!item?.id) return;
+      let formatIds = '';
+      if (list.length) {
+        formatIds = list
+          .map(v => v.key)
+          .filter(Boolean)
+          .join(',');
+      }
+      let templateId = item.__printConfig?.id;
+      let params = {
+        // id: item.__configItem?.id,
+        buttonId: item.id,
+        templateId,
+        formatIds
+      };
+      let res = await this.handleGetConfigApi(params, 'requestSavePrintUserConfig');
+      if (!res) return;
+      // 保存成功后 打印按钮的宽度有调整, 如果是按钮自适应则需要重新计算按钮宽度
+      this.setPrintConfigCache(templateId, { formatIds }, true);
+      this.pageResize({ type: 'resize' });
+    },
+    async getPrintUserConfigReuqestAll(printNumberList = [], btnList = []) {
+      if (!this.isLowCode) return;
+      if (!printNumberList.length) return;
+      if (!btnList.length) return;
+      let reqList = [];
+      printNumberList.forEach((item, index) => {
+        let btnItem = btnList.find(v => v.settingObj[0].trigger_id == item.id);
+        if (!~btnItem) return;
+        let cacheItem = this.printConfigCache[item.id];
+        if (cacheItem) {
+          reqList.push(Promise.resolve({ [item.id]: cacheItem, _id: item.id }));
+          return;
+        }
+        let params = {
+          buttonId: btnItem.id,
+          templateId: item.id
+        };
+        reqList.push(this.handleGetConfigApi(params, 'requestGetPrintUserConfig'));
+      });
+      if (!reqList.length) return;
+      let res = await Promise.allSettled(reqList);
+      if (!res?.length) return;
+      let resObj = {};
+      res.map(v => {
+        if (v.status !== 'fulfilled' || !v.value || !Object.keys(v.value).length) return null;
+        let obj = v.value;
+        this.setPrintConfigCache(obj._id, obj[obj._id]);
+        Object.assign(resObj, { ...v.value });
+      });
+      return Promise.resolve(resObj);
+    },
+    async getPrintNumber(list) {
+      if (!list?.length) return;
+      let ids = list.map(item => item.settingObj[0].trigger_id).join(',');
+
+      let printNumberCacheKeys = Object.keys(this.printNumberCache);
+      let haveCache = printNumberCacheKeys.includes(ids);
+      if (haveCache) {
+        let printNumberList = this.printNumberCache[ids];
+        let hasId = printNumberList?.length && printNumberList?.every(item => !!item.id);
+        if (hasId) {
+          this.printBtnStrategys = printNumberList;
+          let hasPrintFormat = printNumberList.every(item => !!item.__printFormatByNumberData);
+          if (!hasPrintFormat) {
+            printNumberList = await this.handlePrintNumberList(printNumberList);
+          }
+          return Promise.resolve(printNumberList);
+        }
+      }
+
+      let res = await this.handleGetConfigApi({ ids }, 'requestGetByIds');
+      let newList = await this.handleGetByIdsList(res, { ids, list });
+      return Promise.resolve(newList);
+    },
+    async handleGetByIdsList(res, config) {
+      const { ids, list: oldList } = config;
+      const { status, data } = res;
+      if (!status) return oldList;
+      let resList = data?.list || [];
+      this.printBtnStrategys = resList;
+      let list = await this.handlePrintNumberList(resList, { isNew: true, data });
+      let len = list?.length || 0;
+      if (len) {
+        this.setPrintNumberCache({ ids, list });
+      }
+      return list;
+    },
+    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;
+      });
+
+      return cloneList;
+    }
+  }
+};