cnhis-design-vue 3.4.0-beta.9 → 3.4.0-release.7

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

@@ -22,70 +22,77 @@ const _hoisted_2 = {
   class: "newprint-button-outer__shortcut"
 };
 const _hoisted_3 = {
-  class: "print-lite"
+  key: 0,
+  class: "label bold",
+  style: {
+    "margin-right": "8px"
+  }
 };
 const _hoisted_4 = {
-  class: "label bold"
+  class: "print-lite"
 };
 const _hoisted_5 = {
-  class: "print-li"
+  class: "label bold"
 };
 const _hoisted_6 = {
-  class: "print-lite"
+  class: "print-li"
 };
 const _hoisted_7 = {
+  class: "print-lite"
+};
+const _hoisted_8 = {
   key: 0,
   class: "newprint-button-outer__shortcut"
 };
-const _hoisted_8 = ["onMouseenter", "onClick"];
-const _hoisted_9 = {
+const _hoisted_9 = ["onMouseenter", "onClick"];
+const _hoisted_10 = {
   class: "label bold"
 };
-const _hoisted_10 = {
+const _hoisted_11 = {
   class: "print-lite",
   style: {
     "background": "transparent"
   }
 };
-const _hoisted_11 = {
+const _hoisted_12 = {
   class: "label bold"
 };
-const _hoisted_12 = {
+const _hoisted_13 = {
   class: "print-li"
 };
-const _hoisted_13 = {
+const _hoisted_14 = {
   class: "print-lite",
   style: {
     "background": "transparent"
   }
 };
-const _hoisted_14 = ["onClick"];
-const _hoisted_15 = {
+const _hoisted_15 = ["onClick"];
+const _hoisted_16 = {
   key: 0,
   class: "newprint-button-outer__shortcut"
 };
-const _hoisted_16 = {
+const _hoisted_17 = {
   class: "newprint-button-poperOver"
 };
-const _hoisted_17 = ["onMouseenter"];
-const _hoisted_18 = {
+const _hoisted_18 = ["onMouseenter"];
+const _hoisted_19 = {
   class: "print-lite",
   style: {
     "background": "transparent"
   }
 };
-const _hoisted_19 = {
+const _hoisted_20 = {
   class: "label"
 };
-const _hoisted_20 = ["onClick"];
-const _hoisted_21 = {
+const _hoisted_21 = ["onClick"];
+const _hoisted_22 = {
   key: 1,
   class: "print-lite",
   style: {
     "background": "transparent"
   }
 };
-const _hoisted_22 = ["onClick"];
+const _hoisted_23 = ["onClick"];
 const downloadPdfCode = "RY7.2.21.1.M2.G94181E";
 const formatEditTextCode = "RY7.2.21.1.M2.G33633A";
 const resetPrintButtonCode = "RY7.2.21.1.M2.G99314S";
@@ -193,7 +200,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         buttonProps: {},
         showMaxHeight: null,
         initLoadPrintParams: false,
-        showPreviewDataList: false
+        showPreviewDataList: false,
+        noShowOutSettingText: false
       })
     },
     svrUpdateIp: {
@@ -341,6 +349,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       var _a;
       return (_a = props.newPrintSetting) == null ? void 0 : _a.showPreviewDataList;
     });
+    const noShowOutSettingText = computed(() => {
+      var _a;
+      return (_a = props.newPrintSetting) == null ? void 0 : _a.noShowOutSettingText;
+    });
     const printAllShortcut = computed(() => {
       var _a, _b;
       const keys = Object.keys(shortcutSettings.value);
@@ -617,14 +629,31 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       return state.spinning;
     };
     const handleOneTypePrint = (templateCode, templateId, formatId, isOuterClick) => {
-      props.prevPrintFn().then(() => {
-        const tmpParam = state.printParams[templateCode];
+      const tmpParam = state.printParams[templateCode];
+      props.prevPrintFn({
+        templateId,
+        formatId,
+        params: tmpParam
+      }).then(() => {
+        var _a;
         if (!tmpParam)
           return;
         state.isClickOuterPrint = isOuterClick;
         state.currentFormatId = formatId;
-        const printToParam = (isPrintAllType.value == 3 ? state.originFormatIdParams[formatId] : state.originParams[templateCode]) || [];
-        handleClickPrint(tmpParam, templateCode, templateId, formatId, printToParam);
+        const printToParam = state.originParams[templateCode] || [];
+        handleClickPrint(tmpParam, templateCode, templateId, formatId, printToParam, true);
+        if (isPrintAllType.value == 4 && ((_a = printAllFormatIds == null ? void 0 : printAllFormatIds.value) == null ? void 0 : _a.includes(formatId))) {
+          const printFormatIds = printAllFormatIds.value.filter((id) => id != formatId);
+          printFormatIds.forEach((id) => {
+            const curFormatItem = state.formatList.find((item) => item.id === id);
+            if (curFormatItem) {
+              const tmpParam2 = state.printParams[curFormatItem.number];
+              const printToParam2 = state.originParams[curFormatItem.number] || [];
+              state.currentFormatId = id;
+              handleClickPrint(tmpParam2, curFormatItem.number, curFormatItem.templateId, id, printToParam2, true);
+            }
+          });
+        }
       });
     };
     const handleClickPrint = async (curPrintParamList = [], templateCode, templateId, formatId, printToParam = [], needContinuePrint) => {
@@ -719,6 +748,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           btnprint: props.btnprint,
           signature: props.signature,
           hideButtons: props.hidePreviewBtns,
+          svrUpdateIp: props.svrUpdateIp,
           formatItem: curFormatIdObj
         };
         printInstance.preview(queryParams, (res) => {
@@ -1112,7 +1142,9 @@ 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 = (isPrintAllType.value == 3 ? state.originFormatIdParams[curTypeItem.key] : originParamsClone[curTypeItem == null ? void 0 : curTypeItem.templateCode]) || [];
+                  if (!tmpParam)
+                    return;
+                  const printToParam = originParamsClone[curTypeItem == null ? void 0 : curTypeItem.templateCode] || [];
                   handleClickPrint(tmpParam, curTypeItem.templateCode, curTypeItem.templateId, curTypeItem.key, printToParam);
                 }
               } else {
@@ -1295,12 +1327,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           class: outerPrintItems.value.length > 0 ? "printAllLeftCls" : "",
           onClick: _cache[0] || (_cache[0] = ($event) => handleTwoShow("isOutSetting"))
         }), {
-          default: withCtx(() => [_cache[12] || (_cache[12] = createElementVNode("span", {
-            class: "label bold"
-          }, i18n("10010.1.473", "\u5916\u663E\u8BBE\u7F6E"), -1)), createVNode(unref(NIcon), {
-            style: {
-              "margin-left": "8px"
-            },
+          default: withCtx(() => [!noShowOutSettingText.value ? (openBlock(), createElementBlock("span", _hoisted_3, i18n("10010.1.473", "\u5916\u663E\u8BBE\u7F6E"))) : createCommentVNode("v-if", true), createVNode(unref(NIcon), {
             component: unref(SettingsOutline),
             size: "18"
           }, null, 8, ["component"])]),
@@ -1315,26 +1342,26 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           return openBlock(), createElementBlock("div", {
             class: "print-li",
             key: sItem.key
-          }, [createElementVNode("div", _hoisted_3, [createElementVNode("span", _hoisted_4, toDisplayString(sItem.label), 1), createVNode(unref(NCheckbox), {
+          }, [createElementVNode("div", _hoisted_4, [createElementVNode("span", _hoisted_5, toDisplayString(sItem.label), 1), createVNode(unref(NCheckbox), {
             checked: sItem.selected,
             "onUpdate:checked": ($event) => sItem.selected = $event
           }, {
-            default: withCtx(() => [..._cache[13] || (_cache[13] = [createTextVNode(i18n("10010.1.474", "\u5916\u663E"), -1)])]),
+            default: withCtx(() => [..._cache[12] || (_cache[12] = [createTextVNode(i18n("10010.1.474", "\u5916\u663E"), -1)])]),
             _: 2
           }, 1032, ["checked", "onUpdate:checked"])])]);
-        }), 128)), createElementVNode("div", _hoisted_5, [createVNode(unref(NDivider)), createElementVNode("div", _hoisted_6, [createVNode(unref(NButton), {
+        }), 128)), createElementVNode("div", _hoisted_6, [createVNode(unref(NDivider)), createElementVNode("div", _hoisted_7, [createVNode(unref(NButton), {
           type: "primary",
           size: "small",
           onClick: savePrintOutSetting
         }, {
-          default: withCtx(() => [..._cache[14] || (_cache[14] = [createTextVNode(i18n("10010.1.244", "\u4FDD\u5B58"), -1)])]),
+          default: withCtx(() => [..._cache[13] || (_cache[13] = [createTextVNode(i18n("10010.1.244", "\u4FDD\u5B58"), -1)])]),
           _: 1
         }), showSettingItems.value && showSettingItems.value.length > 1 ? (openBlock(), createBlock(unref(NCheckbox), {
           key: 0,
           checked: isSelectedAll.value,
           "onUpdate:checked": _cache[1] || (_cache[1] = ($event) => isSelectedAll.value = $event)
         }, {
-          default: withCtx(() => [..._cache[15] || (_cache[15] = [createTextVNode(i18n("10010.1.37", "\u5168\u9009"), -1)])]),
+          default: withCtx(() => [..._cache[14] || (_cache[14] = [createTextVNode(i18n("10010.1.37", "\u5168\u9009"), -1)])]),
           _: 1
         }, 8, ["checked"])) : createCommentVNode("v-if", true)])])], 4)]),
         _: 1
@@ -1368,7 +1395,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
               component: unref(PrintOutline),
               size: "18"
             }, null, 8, ["component"])]),
-            default: withCtx(() => [createTextVNode(" " + toDisplayString(!isShowPrintAllBtn.value || isPrintAllType.value == 3 ? __props.btnText : i18n("10010.1.475", "\u6253\u5370\u5168\u90E8")) + " ", 1), printAllShortcut.value ? (openBlock(), createElementBlock("span", _hoisted_7, toDisplayString(printAllShortcut.value), 1)) : createCommentVNode("v-if", true)]),
+            default: withCtx(() => [createTextVNode(" " + toDisplayString(!isShowPrintAllBtn.value || isPrintAllType.value == 3 || isPrintAllType.value == 4 ? __props.btnText : i18n("10010.1.475", "\u6253\u5370\u5168\u90E8")) + " ", 1), printAllShortcut.value ? (openBlock(), createElementBlock("span", _hoisted_8, toDisplayString(printAllShortcut.value), 1)) : createCommentVNode("v-if", true)]),
             _: 1
           }, 16, ["loading", "class"]), createCommentVNode(" \u53EA\u6709\u4E0B\u62C9\u6846\u6709\u9879\uFF0C\u624D\u5C55\u793A\u56FE\u6807\u6309\u94AE "), createVNode(unref(NButton), mergeProps({
             class: "icon-select"
@@ -1408,7 +1435,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             trigger: withCtx(() => [createElementVNode("div", {
               class: "print-lite",
               onClick: _cache[5] || (_cache[5] = ($event) => handleTwoShow("isOutSetting"))
-            }, [createElementVNode("span", _hoisted_9, toDisplayString(option.label), 1), createVNode(unref(NIcon), {
+            }, [createElementVNode("span", _hoisted_10, toDisplayString(option.label), 1), createVNode(unref(NIcon), {
               class: "print-li-icon",
               color: outerPrintItems.value.length > 0 ? "#2563F4" : "",
               component: unref(SettingsOutline),
@@ -1423,26 +1450,26 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
               return openBlock(), createElementBlock("div", {
                 class: "print-li",
                 key: sItem.key
-              }, [createElementVNode("div", _hoisted_10, [createElementVNode("span", _hoisted_11, toDisplayString(sItem.label), 1), createVNode(unref(NCheckbox), {
+              }, [createElementVNode("div", _hoisted_11, [createElementVNode("span", _hoisted_12, toDisplayString(sItem.label), 1), createVNode(unref(NCheckbox), {
                 checked: sItem.selected,
                 "onUpdate:checked": ($event) => sItem.selected = $event
               }, {
-                default: withCtx(() => [..._cache[16] || (_cache[16] = [createTextVNode(i18n("10010.1.474", "\u5916\u663E"), -1)])]),
+                default: withCtx(() => [..._cache[15] || (_cache[15] = [createTextVNode(i18n("10010.1.474", "\u5916\u663E"), -1)])]),
                 _: 2
               }, 1032, ["checked", "onUpdate:checked"])])]);
-            }), 128)), createElementVNode("div", _hoisted_12, [createVNode(unref(NDivider)), createElementVNode("div", _hoisted_13, [createVNode(unref(NButton), {
+            }), 128)), createElementVNode("div", _hoisted_13, [createVNode(unref(NDivider)), createElementVNode("div", _hoisted_14, [createVNode(unref(NButton), {
               type: "primary",
               size: "small",
               onClick: savePrintOutSetting
             }, {
-              default: withCtx(() => [..._cache[17] || (_cache[17] = [createTextVNode(i18n("10010.1.244", "\u4FDD\u5B58"), -1)])]),
+              default: withCtx(() => [..._cache[16] || (_cache[16] = [createTextVNode(i18n("10010.1.244", "\u4FDD\u5B58"), -1)])]),
               _: 1
             }), showSettingItems.value && showSettingItems.value.length > 1 ? (openBlock(), createBlock(unref(NCheckbox), {
               key: 0,
               checked: isSelectedAll.value,
               "onUpdate:checked": _cache[6] || (_cache[6] = ($event) => isSelectedAll.value = $event)
             }, {
-              default: withCtx(() => [..._cache[18] || (_cache[18] = [createTextVNode(i18n("10010.1.37", "\u5168\u9009"), -1)])]),
+              default: withCtx(() => [..._cache[17] || (_cache[17] = [createTextVNode(i18n("10010.1.37", "\u5168\u9009"), -1)])]),
               _: 1
             }, 8, ["checked"])) : createCommentVNode("v-if", true)])])], 4)]),
             _: 2
@@ -1456,7 +1483,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           }, [createElementVNode("span", {
             class: "label bold",
             onClick: ($event) => handleOneTypePrint(option.templateCode, option.templateId, option.key, false)
-          }, [createTextVNode(toDisplayString(option.label) + " ", 1), option.shortcutLabel ? (openBlock(), createElementBlock("span", _hoisted_15, toDisplayString(option.shortcutLabel), 1)) : createCommentVNode("v-if", true)], 8, _hoisted_14), state.printParams[option.templateCode] ? (openBlock(), createBlock(unref(NPopover), {
+          }, [createTextVNode(toDisplayString(option.label) + " ", 1), option.shortcutLabel ? (openBlock(), createElementBlock("span", _hoisted_16, toDisplayString(option.shortcutLabel), 1)) : createCommentVNode("v-if", true)], 8, _hoisted_15), state.printParams[option.templateCode] ? (openBlock(), createBlock(unref(NPopover), {
             key: 0,
             trigger: "click",
             "show-arrow": false,
@@ -1471,7 +1498,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
               size: "18",
               onClick: ($event) => handleTwoShow(option.key)
             }, null, 8, ["component", "onClick"])]),
-            default: withCtx(() => [createElementVNode("div", _hoisted_16, [(openBlock(true), createElementBlock(Fragment, null, renderList(getDownList(unref(operations), option), (operation) => {
+            default: withCtx(() => [createElementVNode("div", _hoisted_17, [(openBlock(true), createElementBlock(Fragment, null, renderList(getDownList(unref(operations), option), (operation) => {
               return openBlock(), createElementBlock("div", {
                 class: normalizeClass(["print-li", downlistOperation.twoMouseType == operation.key ? "active" : ""]),
                 key: operation.key,
@@ -1485,7 +1512,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                 placement: "right-start",
                 show: downlistPopover[operation.key]
               }, {
-                trigger: withCtx(() => [createElementVNode("div", _hoisted_18, [createElementVNode("span", _hoisted_19, toDisplayString(operation.label), 1), createVNode(unref(NIcon), {
+                trigger: withCtx(() => [createElementVNode("div", _hoisted_19, [createElementVNode("span", _hoisted_20, toDisplayString(operation.label), 1), createVNode(unref(NIcon), {
                   component: unref(ArrowForward),
                   size: "18"
                 }, null, 8, ["component"])])]),
@@ -1499,16 +1526,16 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                       "background": "transparent"
                     },
                     onClick: ($event) => handleSelect(previewBtn.key, option, false)
-                  }, toDisplayString(previewBtn.label), 9, _hoisted_20)]);
+                  }, toDisplayString(previewBtn.label), 9, _hoisted_21)]);
                 }), 128))]),
                 _: 2
-              }, 1032, ["show"])) : (openBlock(), createElementBlock("div", _hoisted_21, [createElementVNode("span", {
+              }, 1032, ["show"])) : (openBlock(), createElementBlock("div", _hoisted_22, [createElementVNode("span", {
                 class: "label",
                 onClick: ($event) => handleSelect(operation.key, option, false)
-              }, toDisplayString(operation.label), 9, _hoisted_22)]))], 42, _hoisted_17);
+              }, toDisplayString(operation.label), 9, _hoisted_23)]))], 42, _hoisted_18);
             }), 128))])]),
             _: 2
-          }, 1032, ["show", "onClickoutside"])) : createCommentVNode("v-if", true)], 2)], 2112))], 42, _hoisted_8);
+          }, 1032, ["show", "onClickoutside"])) : createCommentVNode("v-if", true)], 2)], 2112))], 42, _hoisted_9);
         }), 128))], 4)]),
         _: 3
       }, 8, ["to", "show"])], 2112))]), createVNode(IdentityVerification, mergeProps(_ctx.$attrs, {

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

@@ -119,6 +119,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     hidePreviewBtns: {
         type: StringConstructor;
     };
+    isShowResetPrinter: {
+        type: BooleanConstructor;
+    };
 }>, {
     $attrs: {
         [x: string]: unknown;
@@ -245,6 +248,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         hidePreviewBtns: {
             type: StringConstructor;
         };
+        isShowResetPrinter: {
+            type: BooleanConstructor;
+        };
     }>> & Readonly<{}> & {}>;
     emit: any;
     defaultFormatInfo: AnyObject;
@@ -284,6 +290,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     handleClickPreview: () => Promise<void>;
     handleClickPdf: () => Promise<void>;
     handleClickEdit: () => void;
+    handleResetPrinter: () => Promise<void>;
     handleSelect: (key: string, option: AnyObject) => Promise<void>;
     handleClickOutside: () => void;
     instantiatePrintSDK: () => false | undefined;
@@ -642,6 +649,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     hidePreviewBtns: {
         type: StringConstructor;
     };
+    isShowResetPrinter: {
+        type: BooleanConstructor;
+    };
 }>> & Readonly<{}>, {
     params: AnyObject[];
     btnText: string;
@@ -666,5 +676,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     showLoading: boolean;
     hideButtons: unknown[];
     printCustomProps: Record<string, any>;
+    isShowResetPrinter: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

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

@@ -125,6 +125,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     },
     hidePreviewBtns: {
       type: String
+    },
+    isShowResetPrinter: {
+      type: Boolean
     }
   },
   setup(__props, {
@@ -167,6 +170,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     }, {
       label: props.formatEditText,
       key: "formatEditText"
+    }, {
+      label: i18n("10010.1.484", "\u91CD\u7F6E\u6253\u5370\u673A"),
+      key: "resetPrinter"
     }, ...((_a = props.externalOptionConfig) == null ? void 0 : _a.options) || []]);
     const tempOptions = ref([]);
     const currentFormatItem = computed(() => {
@@ -371,6 +377,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           btnprint: props.btnprint,
           signature: props.signature,
           hideButtons: props.hidePreviewBtns,
+          svrUpdateIp: props.svrUpdateIp,
           formatItem: curFormatIdObj
         };
         printInstance.preview(queryParams, (res) => {
@@ -433,6 +440,28 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         state.spinning = false;
       });
     };
+    const handleResetPrinter = async () => {
+      if (props.showLoading && state.spinning)
+        return;
+      state.spinning = true;
+      props.prevFn("resetPrinter", {
+        formatId: state.currentFormatId,
+        templateId: getTemplateIdByFormatId.value
+      }).then(async () => {
+        const data = await printInstance.resetPrinter(state.currentFormatId, state.iReportExecuteMode);
+        state.spinning = false;
+        if ((data == null ? void 0 : data.result) == "success") {
+          $message.success((data == null ? void 0 : data.message) || i18n("10010.1.487", "\u91CD\u7F6E\u6253\u5370\u673A\u6210\u529F"));
+          return;
+        }
+        $message.warning((data == null ? void 0 : data.message) || i18n("10010.1.488", "\u91CD\u7F6E\u6253\u5370\u673A\u5931\u8D25"));
+      }).catch(() => {
+        prevFnError("resetPrinter");
+        state.spinning = false;
+      }).finally(() => {
+        state.visible = false;
+      });
+    };
     const handleSelect = async (key, option) => {
       var _a2, _b;
       switch (key) {
@@ -448,6 +477,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         case "downloadPdf":
           handleClickPdf();
           break;
+        case "resetPrinter":
+          handleResetPrinter();
+          break;
         default: {
           state.visible = false;
           const formatObj = state.formatList.find((item) => item.id === key) || {};
@@ -548,6 +580,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       if (isIReport(state.currentFormatId)) {
         options.value = tempOptions.value.filter((option) => option.key != "formatEditText");
       }
+      if (!props.isShowResetPrinter) {
+        options.value = options.value.filter((option) => option.key != "resetPrinter");
+      }
     };
     const formatFormatList = (list) => {
       let formatList = [];

package/es/components/button-print/src/utils/print.d.ts

@@ -68,8 +68,9 @@ export declare class Print {
     _queryPrintForPdf(templateId: string, formatId: string, params: string | undefined, authorizationKey: String): Promise<any>;
     _browserPrint(result: AnyObject, mode: string): Promise<string | void>;
     _base64ToBlob(fileBase64: string, fileType: string): Blob;
-    preview({ iReportExecuteMode, hideButtons, templateId, number, formatId: originFormatId, formatItem, params, paramsArr, authorizationKey, signature, btnprint, messageTimeout }: AnyObject, successCallbackFn?: AnyFn, errorCallbackFn?: AnyFn): Promise<any>;
+    preview({ iReportExecuteMode, hideButtons, templateId, number, formatId: originFormatId, formatItem, params, paramsArr, authorizationKey, signature, btnprint, svrUpdateIp, messageTimeout }: AnyObject, successCallbackFn?: AnyFn, errorCallbackFn?: AnyFn): Promise<any>;
     printSync(data: AnyObject[], successCallbackFn: AnyFn, errorCallbackFn: AnyFn): Promise<void>;
+    isObject(o: any): boolean;
     printDirect({ iReportExecuteMode, templateId, number, formatId: originFormatId, formatItem, params, paramsArr, authorizationKey, print, signature, printdlgshow, nobillnode, copies, svrUpdateIp, apptype, uuid, printname, priority, isShowQueueProgressNotify, isDownloadFile, messageTimeout }: AnyObject, successCallbackFn: AnyFn, errorCallbackFn: AnyFn, cancelCallbackFn?: AnyFn, printQueueCallbackFn?: AnyFn, mode?: string): Promise<false | undefined>;
     printToHiPrint({ templateId, formatId, params, authorizationKey }: any, successCallbackFn: AnyFn, errorCallbackFn: AnyFn, cancelCallbackFn?: AnyFn): Promise<any>;
     private _downloadPDF;

package/es/components/button-print/src/utils/print.js

@@ -308,11 +308,10 @@ class Print {
   }
   async getPicAndUpload(obj) {
     try {
-      const isObject = (o) => Object.prototype.toString.call(o) === "[object Object]";
       if ((obj == null ? void 0 : obj.result) === "success" && (obj == null ? void 0 : obj.uploadTemplateFlag) == "Y" && !(obj == null ? void 0 : obj.filebase64) && this.queryServicesParams) {
-        const params = isObject(this.queryServicesParams.params) ? this.queryServicesParams.params : JSON.parse(this.queryServicesParams.params);
+        const params = this.isObject(this.queryServicesParams.params) ? this.queryServicesParams.params : JSON.parse(this.queryServicesParams.params);
         params.uploadTemplateFlag = "Y";
-        this.queryServicesParams.params = JSON.stringify(params);
+        this.queryServicesParams.params = params;
         this.queryServicesParams.cmdid = PRINT_CMD_ID;
         this.queryServicesParams.print = {
           print: 1,
@@ -320,7 +319,7 @@ class Print {
           zip: 0
         };
         this.queryServicesParams.paramsArr = [{
-          params: JSON.stringify(params)
+          params
         }];
         const data = await this._queryBase64ServicesPrint(this.queryServicesParams);
       }
@@ -866,8 +865,10 @@ class Print {
     authorizationKey,
     signature,
     btnprint,
+    svrUpdateIp,
     messageTimeout = 0
   }, successCallbackFn, errorCallbackFn) {
+    params = this.isObject(params) || !params ? params : JSON.parse(params);
     const iReportStatus = isIReport(originFormatId);
     const formatId = this.getIReportFormatId(iReportStatus, originFormatId);
     if (iReportStatus && (isDomestic || iReportExecuteMode == 2)) {
@@ -894,7 +895,7 @@ class Print {
       return false;
     try {
       const hideButtonsValue = hideButtons ? hideButtons : (formatItem == null ? void 0 : formatItem.previewCanExport) === void 0 || (formatItem == null ? void 0 : formatItem.previewCanExport) ? void 0 : "Export";
-      const btnprintValue = btnprint != "1" ? btnprint : (formatItem == null ? void 0 : formatItem.previewCanPrint) === false ? "0" : "1";
+      const btnprintValue = btnprint != "1" && btnprint !== void 0 ? btnprint : (formatItem == null ? void 0 : formatItem.previewCanPrint) === false ? "0" : "1";
       const watermark = (formatItem == null ? void 0 : formatItem.showWatermark) ? "1" : void 0;
       const result = await this._handleEventDirect({
         templateId,
@@ -905,6 +906,7 @@ class Print {
         cmdid: this.isRemote ? PRINT_CMD_ID : PREVIEW_CMD_ID,
         watermark,
         signature,
+        svrUpdateIp,
         btnprint: btnprintValue,
         hideButtons: hideButtonsValue,
         messageTimeout
@@ -991,6 +993,9 @@ class Print {
       this._handleMonitorNotify(error);
     }
   }
+  isObject(o) {
+    return Object.prototype.toString.call(o) === "[object Object]";
+  }
   async printDirect({
     iReportExecuteMode,
     templateId,
@@ -1014,7 +1019,7 @@ class Print {
     isDownloadFile = true,
     messageTimeout = 0
   }, successCallbackFn, errorCallbackFn, cancelCallbackFn, printQueueCallbackFn, mode = "printDirect") {
-    const isObject = (o) => Object.prototype.toString.call(o) === "[object Object]";
+    params = this.isObject(params) || !params ? params : JSON.parse(params);
     const iReportStatus = isIReport(originFormatId);
     const formatId = this.getIReportFormatId(iReportStatus, originFormatId);
     if (iReportStatus && (isDomestic || iReportExecuteMode == 2)) {
@@ -1059,7 +1064,7 @@ class Print {
       return false;
     try {
       if (formatItem == null ? void 0 : formatItem.queuePrint) {
-        const printParams = isObject(params) ? cloneDeep(params) : params;
+        const printParams = this.isObject(params) ? cloneDeep(params) : params;
         paramsArr = [{
           params: printParams
         }];
@@ -1078,7 +1083,7 @@ class Print {
         }
         this._notifyPrintQueueMap.callback.set(uuid, printQueueCallbackFn);
       }
-      const printdlgshowValue = printdlgshow != "0" ? printdlgshow : (formatItem == null ? void 0 : formatItem.showPrintDialog) ? "1" : "0";
+      const printdlgshowValue = printdlgshow != "0" && printdlgshow !== void 0 ? printdlgshow : (formatItem == null ? void 0 : formatItem.showPrintDialog) ? "1" : "0";
       const watermark = (formatItem == null ? void 0 : formatItem.showWatermark) ? "1" : void 0;
       const result = await this._handleEventDirect({
         templateId,