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

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

@@ -2,7 +2,7 @@
 import { AnyObject } from '../../../../shared/types';
 import { PropType } from 'vue';
 import { Print } from '../utils';
-declare const _default: import("vue").DefineComponent<{
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     printParams: {
         type: PropType<AnyObject[]>;
     };
@@ -119,16 +119,19 @@ declare const _default: import("vue").DefineComponent<{
     hidePreviewBtns: {
         type: StringConstructor;
     };
-}, {
+    isShowResetPrinter: {
+        type: BooleanConstructor;
+    };
+}>, {
     $attrs: {
         [x: string]: unknown;
     };
-    $message: import("naive-ui").MessageApi;
+    $message: import("naive-ui/es/message").MessageApi;
     printInstance: Print | null;
     downloadPdfCode: string;
     formatEditTextCode: string;
     isDomestic: boolean;
-    props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
+    props: import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         printParams: {
             type: PropType<AnyObject[]>;
         };
@@ -245,10 +248,13 @@ declare const _default: import("vue").DefineComponent<{
         hidePreviewBtns: {
             type: StringConstructor;
         };
-    }>> & {}>>;
+        isShowResetPrinter: {
+            type: BooleanConstructor;
+        };
+    }>> & Readonly<{}> & {}>;
     emit: any;
     defaultFormatInfo: AnyObject;
-    authorizationKey: import("vue").Ref<string>;
+    authorizationKey: import("vue").Ref<string, string>;
     state: {
         spinning: boolean;
         visible: boolean;
@@ -265,13 +271,13 @@ declare const _default: import("vue").DefineComponent<{
         iReportExecuteMode: number;
         number: string;
     };
-    options: import("vue").Ref<AnyObject[]>;
-    tempOptions: import("vue").Ref<AnyObject[]>;
+    options: import("vue").Ref<AnyObject[], AnyObject[]>;
+    tempOptions: import("vue").Ref<AnyObject[], AnyObject[]>;
     currentFormatItem: import("vue").ComputedRef<{} | undefined>;
     formatTitle: import("vue").ComputedRef<any>;
     getTemplateIdByFormatId: import("vue").ComputedRef<any>;
     buttonClick: (origin: string) => Promise<false | undefined>;
-    renderLabel: (option: AnyObject) => JSX.Element;
+    renderLabel: (option: AnyObject) => any;
     debounce: (fn: any, delay: number, immediate?: boolean) => (...args: any) => void;
     callLocalServicesSuccessCb: (res: any, type: any) => void;
     callLocalServicesErrorCb: (res: unknown) => void;
@@ -284,6 +290,7 @@ declare const _default: import("vue").DefineComponent<{
     handleClickPreview: () => Promise<void>;
     handleClickPdf: () => Promise<void>;
     handleClickEdit: () => void;
+    handleResetPrinter: () => Promise<void>;
     handleSelect: (key: string, option: AnyObject) => Promise<void>;
     handleClickOutside: () => void;
     instantiatePrintSDK: () => false | undefined;
@@ -303,11 +310,11 @@ declare const _default: import("vue").DefineComponent<{
     reformatPrintParams: () => void;
     verifiySuccess: (token: string) => void;
     directPrint: () => Promise<void>;
-    NDropdown: any;
-    NButton: any;
-    NIcon: any;
-    ChevronDown: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
-    IdentityVerification: import("vue").DefineComponent<{
+    readonly NDropdown: any;
+    readonly NButton: any;
+    readonly NIcon: any;
+    readonly ChevronDown: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+    IdentityVerification: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
         verifyUser: {
             type: FunctionConstructor;
             required: false;
@@ -334,50 +341,50 @@ declare const _default: import("vue").DefineComponent<{
             type: StringConstructor;
             required: false;
         };
-    }, {
-        $message: import("naive-ui").MessageApi;
+    }>, {
+        $message: import("naive-ui/es/message").MessageApi;
         DEFAULT_FORM: {
             account: string;
             password: string;
         };
-        props: {
-            verifyUser: Function;
-            identityVerificationTitle: string;
-            modelValue: boolean;
-            formatId?: string | undefined;
-            templateId?: string | undefined;
-            templateCode?: string | undefined;
-        };
+        props: any;
         emit: (event: "close" | "success" | "update:modelValue" | "afterLeaveComponent", ...args: any[]) => void;
         editFormRef: import("vue").Ref<{
             submit: Function;
+        } | null, {
+            submit: Function;
+        } | {
+            submit: Function;
         } | null>;
-        showEditForm: import("vue").Ref<boolean>;
-        token: import("vue").Ref<string>;
+        showEditForm: import("vue").Ref<boolean, boolean>;
+        token: import("vue").Ref<string, string>;
         form: {
             account: string;
             password: string;
         };
-        rules: import("naive-ui").FormRules;
+        rules: import("naive-ui/es/form").FormRules;
         style: {
             width: string;
         };
         formRef: import("vue").Ref<{
             validate: import("naive-ui/es/form/src/interface").FormValidate;
             restoreValidation: () => void;
+        } | null, import("naive-ui/es/form").FormInst | {
+            validate: import("naive-ui/es/form/src/interface").FormValidate;
+            restoreValidation: () => void;
         } | null>;
         handleClickClose: () => void;
         handleAfterLeave: () => void;
-        loading: import("vue").Ref<boolean>;
+        loading: import("vue").Ref<boolean, boolean>;
         submit: () => Promise<false | undefined>;
         handleClickSubmit: () => void;
         submitEditFile: () => Promise<false | undefined>;
-        NButton: any;
-        NModal: any;
-        NForm: any;
-        NFormItem: any;
-        NInput: any;
-        EditFormat: import("vue").DefineComponent<{
+        readonly NButton: any;
+        readonly NModal: any;
+        readonly NForm: any;
+        readonly NFormItem: any;
+        readonly NInput: any;
+        EditFormat: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
             formatId: {
                 type: StringConstructor;
                 required: false;
@@ -386,7 +393,7 @@ declare const _default: import("vue").DefineComponent<{
                 type: StringConstructor;
                 required: true;
             };
-        }, {
+        }>, {
             PROTOCOL: string;
             HOST: string;
             BASEURL: string;
@@ -394,11 +401,8 @@ declare const _default: import("vue").DefineComponent<{
             QUERYFILELIST: string;
             DELETEFILE: string;
             instance: import("axios").AxiosInstance;
-            $message: import("naive-ui").MessageApi;
-            props: {
-                formatId?: string | undefined;
-                token: string;
-            };
+            $message: import("naive-ui/es/message").MessageApi;
+            props: any;
             fileList: import("vue").Ref<{
                 id: string;
                 name: string;
@@ -432,6 +436,39 @@ declare const _default: import("vue").DefineComponent<{
                 thumbnailUrl?: string | null | undefined;
                 type?: string | null | undefined;
                 fullPath?: string | null | undefined;
+            }[], import("naive-ui/es/upload").UploadFileInfo[] | {
+                id: string;
+                name: string;
+                batchId?: string | null | undefined;
+                percentage?: number | null | undefined;
+                status: "error" | "pending" | "uploading" | "finished" | "removed";
+                url?: string | null | undefined;
+                file?: {
+                    readonly lastModified: number;
+                    readonly name: string;
+                    readonly webkitRelativePath: string;
+                    readonly size: number;
+                    readonly type: string;
+                    arrayBuffer: {
+                        (): Promise<ArrayBuffer>;
+                        (): Promise<ArrayBuffer>;
+                    };
+                    slice: {
+                        (start?: number | undefined, end?: number | undefined, contentType?: string | undefined): Blob;
+                        (start?: number | undefined, end?: number | undefined, contentType?: string | undefined): Blob;
+                    };
+                    stream: {
+                        (): ReadableStream<Uint8Array>;
+                        (): NodeJS.ReadableStream;
+                    };
+                    text: {
+                        (): Promise<string>;
+                        (): Promise<string>;
+                    };
+                } | null | undefined;
+                thumbnailUrl?: string | null | undefined;
+                type?: string | null | undefined;
+                fullPath?: string | null | undefined;
             }[]>;
             queryFileList: () => void;
             onRemove: (options: {
@@ -440,16 +477,16 @@ declare const _default: import("vue").DefineComponent<{
             }) => Promise<unknown>;
             submit: (datas: AnyObject) => Promise<unknown>;
             validateFormat: () => boolean;
-            NForm: any;
-            NFormItem: any;
-            NUpload: any;
-            NUploadDragger: any;
-            NP: any;
-            NIcon: any;
-            NText: any;
-            NSpace: any;
-            Archive: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
-        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+            readonly NForm: any;
+            readonly NFormItem: any;
+            readonly NUpload: any;
+            readonly NUploadDragger: any;
+            readonly NP: any;
+            readonly NIcon: any;
+            readonly NText: any;
+            readonly NSpace: any;
+            readonly Archive: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+        }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
             formatId: {
                 type: StringConstructor;
                 required: false;
@@ -458,8 +495,8 @@ declare const _default: import("vue").DefineComponent<{
                 type: StringConstructor;
                 required: true;
             };
-        }>>, {}>;
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("close" | "success" | "update:modelValue" | "afterLeaveComponent")[], "close" | "success" | "update:modelValue" | "afterLeaveComponent", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        }>> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+    }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("close" | "success" | "update:modelValue" | "afterLeaveComponent")[], "close" | "success" | "update:modelValue" | "afterLeaveComponent", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
         verifyUser: {
             type: FunctionConstructor;
             required: false;
@@ -486,16 +523,16 @@ declare const _default: import("vue").DefineComponent<{
             type: StringConstructor;
             required: false;
         };
-    }>> & {
+    }>> & Readonly<{
         onSuccess?: ((...args: any[]) => any) | undefined;
         onClose?: ((...args: any[]) => any) | undefined;
         "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
         onAfterLeaveComponent?: ((...args: any[]) => any) | undefined;
-    }, {
+    }>, {
         verifyUser: Function;
         identityVerificationTitle: string;
-    }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     printParams: {
         type: PropType<AnyObject[]>;
     };
@@ -612,7 +649,10 @@ declare const _default: import("vue").DefineComponent<{
     hidePreviewBtns: {
         type: StringConstructor;
     };
-}>>, {
+    isShowResetPrinter: {
+        type: BooleanConstructor;
+    };
+}>> & Readonly<{}>, {
     params: AnyObject[];
     btnText: string;
     printText: string;
@@ -636,5 +676,6 @@ declare const _default: import("vue").DefineComponent<{
     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

@@ -11,6 +11,8 @@ import { format } from 'date-fns';
 import { savePrivateFormatApi, getPrivateFormatApi } from '../api.js';
 import { cloneDeep } from 'lodash-es';
 
+const downloadPdfCode = "RY7.2.21.1.M2.G94181E";
+const formatEditTextCode = "RY7.2.21.1.M2.G33633A";
 var _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "OldPrintComponent",
   props: {
@@ -123,19 +125,20 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     },
     hidePreviewBtns: {
       type: String
+    },
+    isShowResetPrinter: {
+      type: Boolean
     }
   },
   setup(__props, {
-    expose
+    expose: __expose
   }) {
     var _a;
-    const props = __props;
     const $attrs = useAttrs();
     const $message = useMessage();
     let printInstance;
-    const downloadPdfCode = "RY7.2.21.1.M2.G94181E";
-    const formatEditTextCode = "RY7.2.21.1.M2.G33633A";
     String(navigator.platform).toLowerCase().includes("linux");
+    const props = __props;
     const emit = inject(InjectionButtonPrintEmits);
     const defaultFormatInfo = {};
     const authorizationKey = ref("");
@@ -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 = [];
@@ -702,7 +737,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       await handleClickBtn(false);
       handleDebounceClickPrint();
     }
-    expose({
+    __expose({
       directPrint
     });
     return (_ctx, _cache) => {
@@ -741,7 +776,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         modelValue: state.identityVerification.visible,
         "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => state.identityVerification.visible = $event),
         formatId: state.currentFormatId,
-        templateId: unref(getTemplateIdByFormatId),
+        templateId: getTemplateIdByFormatId.value,
         onSuccess: verifiySuccess
       }), null, 16, ["modelValue", "formatId", "templateId"])], 64);
     };

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

@@ -1,4 +1,4 @@
-declare const _default: import("vue").DefineComponent<{
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     visible: {
         type: BooleanConstructor;
         default: boolean;
@@ -6,8 +6,8 @@ declare const _default: import("vue").DefineComponent<{
     src: {
         type: StringConstructor;
     };
-}, {
-    props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
+}>, {
+    props: import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         visible: {
             type: BooleanConstructor;
             default: boolean;
@@ -15,20 +15,20 @@ declare const _default: import("vue").DefineComponent<{
         src: {
             type: StringConstructor;
         };
-    }>> & {
+    }>> & Readonly<{
         onAfterLeaveComponent?: ((...args: any[]) => any) | undefined;
         "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
-    }>>;
+    }> & {}>;
     emit: (event: "afterLeaveComponent" | "update:visible", ...args: any[]) => void;
-    iframeId: import("vue").Ref<string>;
-    isNormalSize: import("vue").Ref<boolean>;
+    iframeId: import("vue").Ref<string, string>;
+    isNormalSize: import("vue").Ref<boolean, boolean>;
     style: import("vue").ComputedRef<string>;
-    titleRender: () => JSX.Element;
+    titleRender: () => any;
     changeSize: () => void;
     onClose: () => void;
     handleAfterLeave: () => void;
-    NModal: any;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("afterLeaveComponent" | "update:visible")[], "afterLeaveComponent" | "update:visible", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    readonly NModal: any;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("afterLeaveComponent" | "update:visible")[], "afterLeaveComponent" | "update:visible", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     visible: {
         type: BooleanConstructor;
         default: boolean;
@@ -36,10 +36,10 @@ declare const _default: import("vue").DefineComponent<{
     src: {
         type: StringConstructor;
     };
-}>> & {
+}>> & Readonly<{
     onAfterLeaveComponent?: ((...args: any[]) => any) | undefined;
     "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
-}, {
+}>, {
     visible: boolean;
-}>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

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

@@ -17,9 +17,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
   },
   emits: ["update:visible", "afterLeaveComponent"],
   setup(__props, {
-    emit
+    emit: __emit
   }) {
     const props = __props;
+    const emit = __emit;
     const iframeId = ref(`iframe-${Date.now()}`);
     const isNormalSize = ref(true);
     const style = computed(() => {
@@ -59,7 +60,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         preset: "dialog",
         show: __props.visible,
         "show-icon": false,
-        style: normalizeStyle(unref(style)),
+        style: normalizeStyle(style.value),
         class: "c-button-preview-modal",
         title: titleRender,
         onClose,

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,