cnhis-design-vue 3.4.0-beta.7 → 3.4.0-beta.8

package/es/components/button-print/index.d.ts

@@ -577,16 +577,16 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
         formatFormatList: (list: any[]) => any;
         formatDefaultVal: (i: any, tableVal?: any) => any;
         formatSomeTypeParams: (templateParams: any[], params?: any[]) => any;
-        mergeFormatList: (list: any[]) => any;
         formatSomeFormatIdTypeParams: (formatList?: any[], params?: any[]) => any;
-        formatSomeOriginParams: (templateParams: any[], params?: any[]) => any;
         formatPrintParams: (paramObj: any, fieldList: any[], keyName: string) => any;
         formatItemParam: ({ customizeDataset, param }: {
             customizeDataset?: never[] | undefined;
             param?: never[] | undefined;
         }, paramObj?: any) => any;
-        findTemplateAndInsertData: (mergeData: any, paramItem: any, templateParams: any) => any;
-        findTemplateAndInsertParams: (mergeData: any, paramItem: any, templateParams: any) => any;
+        findTemplateAndInsertData: (mergeData: any, mergeOriginParams: any, paramItem: any, templateParams: any) => {
+            mergeOriginParams: any;
+            mergeData: any;
+        };
         mergeTemplateList: (list: any[]) => any;
         initCRM: (formatListResult: any) => Promise<void>;
         init: () => Promise<boolean>;

package/es/components/button-print/src/ButtonPrint.vue.d.ts

@@ -583,16 +583,16 @@ declare const _default: import("vue").DefineComponent<{
         formatFormatList: (list: any[]) => any;
         formatDefaultVal: (i: any, tableVal?: any) => any;
         formatSomeTypeParams: (templateParams: any[], params?: any[]) => any;
-        mergeFormatList: (list: any[]) => any;
         formatSomeFormatIdTypeParams: (formatList?: any[], params?: any[]) => any;
-        formatSomeOriginParams: (templateParams: any[], params?: any[]) => any;
         formatPrintParams: (paramObj: any, fieldList: any[], keyName: string) => any;
         formatItemParam: ({ customizeDataset, param }: {
             customizeDataset?: never[] | undefined;
             param?: never[] | undefined;
         }, paramObj?: any) => any;
-        findTemplateAndInsertData: (mergeData: any, paramItem: any, templateParams: any) => any;
-        findTemplateAndInsertParams: (mergeData: any, paramItem: any, templateParams: any) => any;
+        findTemplateAndInsertData: (mergeData: any, mergeOriginParams: any, paramItem: any, templateParams: any) => {
+            mergeOriginParams: any;
+            mergeData: any;
+        };
         mergeTemplateList: (list: any[]) => any;
         initCRM: (formatListResult: any) => Promise<void>;
         init: () => Promise<boolean>;

package/es/components/button-print/src/components/NewPrintComponent.vue.d.ts

@@ -325,16 +325,16 @@ declare const _default: import("vue").DefineComponent<{
     formatFormatList: (list: any[]) => any;
     formatDefaultVal: (i: any, tableVal?: any) => any;
     formatSomeTypeParams: (templateParams: any[], params?: any[]) => any;
-    mergeFormatList: (list: any[]) => any;
     formatSomeFormatIdTypeParams: (formatList?: any[], params?: any[]) => any;
-    formatSomeOriginParams: (templateParams: any[], params?: any[]) => any;
     formatPrintParams: (paramObj: any, fieldList: any[], keyName: string) => any;
     formatItemParam: ({ customizeDataset, param }: {
         customizeDataset?: never[] | undefined;
         param?: never[] | undefined;
     }, paramObj?: any) => any;
-    findTemplateAndInsertData: (mergeData: any, paramItem: any, templateParams: any) => any;
-    findTemplateAndInsertParams: (mergeData: any, paramItem: any, templateParams: any) => any;
+    findTemplateAndInsertData: (mergeData: any, mergeOriginParams: any, paramItem: any, templateParams: any) => {
+        mergeOriginParams: any;
+        mergeData: any;
+    };
     mergeTemplateList: (list: any[]) => any;
     initCRM: (formatListResult: any) => Promise<void>;
     init: () => Promise<boolean>;

package/es/components/button-print/src/components/NewPrintComponent.vue2.js

@@ -236,6 +236,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       printParams: {},
       printFormatIdParams: {},
       originParams: {},
+      originFormatIdParams: {},
       currentFormatId: "",
       identityVerification: {
         templateCode: "",
@@ -589,7 +590,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           needPrintOptions.forEach((optItem) => {
             if (canPrintFormatIds.includes(optItem.key)) {
               const tmpParam = state.printFormatIdParams[optItem.key];
-              const printToParam = originParamsClone[optItem.templateCode] || [];
+              const printToParam = state.originFormatIdParams[optItem.key] || [];
               state.currentFormatId = optItem.key;
               handleClickPrint(tmpParam, optItem.templateCode, optItem.templateId, optItem.key, printToParam, true);
             }
@@ -625,7 +626,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           return;
         state.isClickOuterPrint = isOuterClick;
         state.currentFormatId = formatId;
-        const printToParam = state.originParams[templateCode] || [];
+        const printToParam = (isPrintAllType.value == 3 ? state.originFormatIdParams[formatId] : state.originParams[templateCode]) || [];
         handleClickPrint(tmpParam, templateCode, templateId, formatId, printToParam);
       });
     };
@@ -634,6 +635,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       const callLocalServicesSuccessCbTmp = async (data) => {
         try {
           if (--len <= 0) {
+            data.params = printToParam;
+            data.templateCode = templateCode;
+            data.templateId = templateId;
             callLocalServicesSuccessCb(data, "print");
           }
         } catch (error) {
@@ -927,11 +931,17 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const formatSomeTypeParams = (templateParams, params = []) => {
       let mergeParams = {};
+      let mergeOriginParams = {};
       params = params ? params : [];
       params.forEach((paramObj) => {
-        mergeParams = Object.assign({}, findTemplateAndInsertData(mergeParams, paramObj, templateParams));
+        const result = Object.assign({}, findTemplateAndInsertData(mergeParams, mergeOriginParams, paramObj, templateParams));
+        mergeParams = result.mergeData;
+        mergeOriginParams = result.mergeOriginParams;
       });
-      return mergeParams;
+      return {
+        tepMergeOriginParams: mergeOriginParams,
+        tepMergeParams: mergeParams
+      };
     };
     const formatSomeFormatIdTypeParams = (formatList = [], params = []) => {
       let mergeParams = {};
@@ -959,15 +969,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           }
         });
       }
-      return mergeParams;
-    };
-    const formatSomeOriginParams = (templateParams, params = []) => {
-      let mergeOriginParams = {};
-      params = params ? params : [];
-      params.forEach((paramObj) => {
-        mergeOriginParams = Object.assign({}, findTemplateAndInsertParams(mergeOriginParams, paramObj, templateParams));
-      });
-      return mergeOriginParams;
+      return {
+        mergeParams,
+        paramsMap
+      };
     };
     const formatPrintParams = (paramObj, fieldList, keyName) => {
       const obj = {};
@@ -997,63 +1002,50 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       res = Object.assign({}, res, formatPrintParams(paramObj, param, "key"));
       return res;
     };
-    const findTemplateAndInsertData = (mergeData, paramItem, templateParams) => {
+    const findTemplateAndInsertData = (mergeData, mergeOriginParams, paramItem, templateParams) => {
       if (paramItem.templateNumbers) {
         for (let i = 0; i < paramItem.templateNumbers.length; i++) {
           const tempNumber = paramItem.templateNumbers[i];
           const templateObj = templateParams[tempNumber];
           if (!templateObj) {
-            return mergeData;
+            return {
+              mergeOriginParams,
+              mergeData
+            };
           }
           if (!mergeData[tempNumber]) {
+            mergeOriginParams[tempNumber] = [];
             mergeData[tempNumber] = [];
           }
+          mergeOriginParams[tempNumber].push(paramItem);
           mergeData[tempNumber].push(formatItemParam(templateObj, paramItem));
         }
-        return mergeData;
+        return {
+          mergeOriginParams,
+          mergeData
+        };
       }
       const templateParamKeys = Object.keys(templateParams);
       for (let i = 0; i < templateParamKeys.length; i++) {
         const tempNumber = templateParamKeys[i];
         const templateObj = templateParams[tempNumber];
         if (!templateObj) {
-          return mergeData;
+          return {
+            mergeOriginParams,
+            mergeData
+          };
         }
         if (!mergeData[tempNumber]) {
+          mergeOriginParams[tempNumber] = [];
           mergeData[tempNumber] = [];
         }
+        mergeOriginParams[tempNumber].push(paramItem);
         mergeData[tempNumber].push(formatItemParam(templateObj, paramItem));
       }
-      return mergeData;
-    };
-    const findTemplateAndInsertParams = (mergeData, paramItem, templateParams) => {
-      if (paramItem.templateNumbers) {
-        for (let i = 0; i < paramItem.templateNumbers.length; i++) {
-          const tempNumber = paramItem.templateNumbers[i];
-          const templateObj = templateParams[tempNumber];
-          if (!templateObj) {
-            return mergeData;
-          }
-          if (!mergeData[tempNumber]) {
-            mergeData[tempNumber] = [];
-          }
-          mergeData[tempNumber].push(paramItem);
-        }
-        return mergeData;
-      }
-      const templateParamKeys = Object.keys(templateParams);
-      for (let i = 0; i < templateParamKeys.length; i++) {
-        const tempNumber = templateParamKeys[i];
-        const templateObj = templateParams[tempNumber];
-        if (!templateObj) {
-          return mergeData;
-        }
-        if (!mergeData[tempNumber]) {
-          mergeData[tempNumber] = [];
-        }
-        mergeData[tempNumber].push(paramItem);
-      }
-      return mergeData;
+      return {
+        mergeOriginParams,
+        mergeData
+      };
     };
     const mergeTemplateList = (list) => {
       let templateObj = {};
@@ -1070,9 +1062,18 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       state.iReportExecuteMode = ((_a = formatListResult == null ? void 0 : formatListResult.obj) == null ? void 0 : _a.length) > 0 ? formatListResult.obj[0].iReportExecuteMode || 1 : 1;
       setOptions();
       state.templateParams = mergeTemplateList(formatListResult.obj);
-      state.printParams = formatSomeTypeParams(state.templateParams, props.params);
-      state.printFormatIdParams = formatSomeFormatIdTypeParams(state.formatList, props.params);
-      state.originParams = formatSomeOriginParams(state.templateParams, props.params);
+      const {
+        tepMergeOriginParams,
+        tepMergeParams
+      } = formatSomeTypeParams(state.templateParams, props.params);
+      state.originParams = tepMergeOriginParams;
+      state.printParams = tepMergeParams;
+      const {
+        mergeParams,
+        paramsMap
+      } = formatSomeFormatIdTypeParams(state.formatList, props.params);
+      state.printFormatIdParams = mergeParams;
+      state.originFormatIdParams = paramsMap;
       registerShort();
     };
     const init = async () => {
@@ -1114,7 +1115,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                 const curTypeItem = showSettingItems.value.find((item) => item.key == key);
                 if (curTypeItem) {
                   const tmpParam = state.printParams[curTypeItem == null ? void 0 : curTypeItem.templateCode];
-                  const printToParam = originParamsClone[curTypeItem == null ? void 0 : curTypeItem.templateCode] || [];
+                  const printToParam = (isPrintAllType.value == 3 ? state.originFormatIdParams[curTypeItem.key] : originParamsClone[curTypeItem == null ? void 0 : curTypeItem.templateCode]) || [];
                   handleClickPrint(tmpParam, curTypeItem.templateCode, curTypeItem.templateId, curTypeItem.key, printToParam);
                 }
               } else {
@@ -1143,9 +1144,18 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }
     };
     const reformatPrintParams = () => {
-      state.printParams = formatSomeTypeParams(state.templateParams, props.params);
-      state.printFormatIdParams = formatSomeFormatIdTypeParams(state.formatList, props.params);
-      state.originParams = formatSomeOriginParams(state.templateParams, props.params);
+      const {
+        tepMergeOriginParams,
+        tepMergeParams
+      } = formatSomeTypeParams(state.templateParams, props.params);
+      state.originParams = tepMergeOriginParams;
+      state.printParams = tepMergeParams;
+      const {
+        mergeParams,
+        paramsMap
+      } = formatSomeFormatIdTypeParams(state.formatList, props.params);
+      state.printFormatIdParams = mergeParams;
+      state.originFormatIdParams = paramsMap;
     };
     const verifiySuccess = (token, templateCode) => {
       var _a;

package/es/components/iho-chat/src/components/ChatFooter.vue2.js

@@ -257,7 +257,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                       msg = removeImgBySrc(msg, srcMatch[1]);
                       continue;
                     }
-                    const newImgTag = msgList[i].replace(srcMatch[1], data.fileUrl).replace(/<img/, `<img data-clicked='1' data-msg='${JSON.stringify(data)}'`);
+                    const newImgTag = msgList[i].replace(srcMatch[1], data.fileUrl).replace(/<img/, `<img data-clicked="1" data-msg="${JSON.stringify(data)}" data-filename="${data.fileName}" data-filesize="${data.fileSize}" data-fileurl="${data.fileUrl}"`);
                     msg = msg.replace(msgList[i], newImgTag);
                   }
                 }

package/es/components/iho-chat/src/components/ChatMain.vue2.js

@@ -148,8 +148,19 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       if (!imgList)
         return;
       imgList.forEach((img) => {
-        var _a;
-        const objstr = (_a = img.match(/data-msg=[']([^']+)[']/i)) == null ? void 0 : _a[1];
+        var _a, _b, _c, _d;
+        let objstr = (_a = img.match(/data-msg=[']([^']+)[']/i)) == null ? void 0 : _a[1];
+        const fileUrl = (_b = img.match(/data-fileurl="(.*?)"/i)) == null ? void 0 : _b[1];
+        if (fileUrl) {
+          const fileName = (_c = img.match(/data-filename="(.*?)"/i)) == null ? void 0 : _c[1];
+          const fileSize = (_d = img.match(/data-filesize="(.*?)"/i)) == null ? void 0 : _d[1];
+          const obj = {
+            fileName,
+            fileSize,
+            fileUrl
+          };
+          objstr = JSON.stringify(obj);
+        }
         if (objstr) {
           addImageItem(list, {
             ...item,
@@ -163,17 +174,24 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       if ((target == null ? void 0 : target.tagName) === "IMG") {
         const {
           clicked = "0",
-          msg
+          msg,
+          fileurl
         } = target.dataset || {};
         if (clicked == "1") {
           let msgData;
-          try {
-            msgData = JSON.parse(JSON.parse(msg || "{}"));
-          } catch (e) {
+          if (fileurl) {
+            msgData = {
+              fileUrl: fileurl
+            };
+          } else {
             try {
-              msgData = JSON.parse(msg || "{}");
-            } catch (e2) {
-              msgData = {};
+              msgData = JSON.parse(JSON.parse(msg || "{}"));
+            } catch (e) {
+              try {
+                msgData = JSON.parse(msg || "{}");
+              } catch (e2) {
+                msgData = {};
+              }
             }
           }
           if (msgData.fileUrl) {

package/es/components/iho-chat/src/components/ImageLightbox.vue2.js

@@ -248,7 +248,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }, {
         default: withCtx(() => [createVNode(unref(NIcon), {
           size: "22",
-          component: unref(RefreshOutline)
+          component: unref(RefreshOutline),
+          style: {
+            "transform": "rotateY(180deg)",
+            "transform-origin": "center"
+          }
         }, null, 8, ["component"])]),
         _: 1
       }), createVNode(unref(NButton), {

package/es/shared/package.json.js

@@ -1,5 +1,5 @@
 var name = "@cnhis-design-vue/shared";
-var version = "3.4.0-beta.7";
+var version = "3.4.0-beta.8";
 var main = "index.ts";
 var peerDependencies = {
 	"naive-ui": "^2.30.0",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.4.0-beta.7",
+	"version": "3.4.0-beta.8",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -73,5 +73,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "8771052e2c57f8d1f139ad7755a4fb18a7a83c25"
+	"gitHead": "69026dff930e733ebdde3321ee90215c8dd0b214"
 }