cnhis-design-vue 3.1.31-beta.0 → 3.1.31-beta.2

package/es/components/button-print/src/ButtonPrint.vue_vue_type_script_setup_true_lang.js

@@ -3,7 +3,7 @@ import { isObject } from '@vue/shared';
 import { useMessage, NDropdown, NButton, NIcon } from 'naive-ui';
 import { ChevronDown } from '@vicons/ionicons5';
 import { Print } from './utils/print.js';
-import { useBrowserPrint } from './utils/browserPrint.js';
+import { isIReport } from './utils/browserPrint.js';
 import IdentityVerification from './components/IdentityVerification.js';
 import { format } from 'date-fns';
 
@@ -67,10 +67,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     printdlgshow: {
       default: "0",
       type: String
-    },
-    queryPrintFile: {
-      type: Function,
-      default: () => Promise.resolve({})
     }
   },
   emits: ["success", "error", "clickoutside"],
@@ -92,8 +88,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       },
       isInited: false,
       watchPrintParamsReformatFn: null,
-      spinTimer: null,
-      fileObject: null
+      spinTimer: null
     });
     const options = reactive([{
       label: props.printText,
@@ -179,21 +174,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       params = Object.assign({}, JSON.parse(getPrintParams(0)), obj);
       return JSON.stringify(params);
     };
-    const browserPrint = async (mode) => {
-      if (state.fileObject) {
-        useBrowserPrint(state.fileObject, mode);
-      } else {
-        const queryParams = {
-          formatId: state.currentFormatId,
-          params: getOnceParams()
-        };
-        const {
-          data
-        } = await props.queryPrintFile(queryParams) || {};
-        state.fileObject = data;
-        useBrowserPrint(data, mode);
-      }
-    };
     const handleClickPrint = () => {
       let len = state.printParams.length;
       const callLocalServicesSuccessCbTmp = async (data) => {
@@ -208,31 +188,26 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       props.prevFn().catch(() => {
         prevFnError();
         return Promise.reject();
-      }).then(async () => {
-        var _a;
-        if (((_a = currentFormatItem.value) == null ? void 0 : _a.printType) == 0) {
-          browserPrint("printDirect");
-        } else {
-          const queryParams = {
-            formatId: state.currentFormatId,
-            templateId: getTemplateIdByFormatId.value,
-            printdlgshow: props.printdlgshow
-          };
-          if (props.strategy === "MULTI") {
-            for (let i = 0; i < state.printParams.length; i++) {
-              printInstance.printDirect({
-                ...queryParams,
-                params: getPrintParams(i)
-              }, callLocalServicesSuccessCbTmp, callLocalServicesErrorCb);
-            }
-          } else {
+      }).then(() => {
+        const queryParams = {
+          formatId: state.currentFormatId,
+          templateId: getTemplateIdByFormatId.value,
+          printdlgshow: props.printdlgshow
+        };
+        if (props.strategy === "MULTI") {
+          for (let i = 0; i < state.printParams.length; i++) {
             printInstance.printDirect({
               ...queryParams,
-              params: getOnceParams()
-            }, (res) => {
-              callLocalServicesSuccessCb(res, "print");
-            }, callLocalServicesErrorCb);
+              params: getPrintParams(i)
+            }, callLocalServicesSuccessCbTmp, callLocalServicesErrorCb);
           }
+        } else {
+          printInstance.printDirect({
+            ...queryParams,
+            params: getOnceParams()
+          }, (res) => {
+            callLocalServicesSuccessCb(res, "print");
+          }, callLocalServicesErrorCb);
         }
       }).finally(() => {
         state.visible = false;
@@ -242,21 +217,16 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       props.prevFn().catch(() => {
         prevFnError();
         return Promise.reject();
-      }).then(async () => {
-        var _a;
-        if (((_a = currentFormatItem.value) == null ? void 0 : _a.printType) == 0) {
-          browserPrint("preview");
-        } else {
-          const params = props.strategy === "MULTI" ? getPrintParams() : getOnceParams();
-          const queryParams = {
-            formatId: state.currentFormatId,
-            templateId: getTemplateIdByFormatId.value,
-            params
-          };
-          printInstance.preview(queryParams, (res) => {
-            callLocalServicesSuccessCb(res, "preview");
-          }, callLocalServicesErrorCb);
-        }
+      }).then(() => {
+        const params = props.strategy === "MULTI" ? getPrintParams() : getOnceParams();
+        const queryParams = {
+          formatId: state.currentFormatId,
+          templateId: getTemplateIdByFormatId.value,
+          params
+        };
+        printInstance.preview(queryParams, (res) => {
+          callLocalServicesSuccessCb(res, "preview");
+        }, callLocalServicesErrorCb);
       }).finally(() => {
         state.visible = false;
       });
@@ -265,23 +235,18 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       props.prevFn().catch(() => {
         prevFnError();
         return Promise.reject();
-      }).then(async () => {
-        var _a;
-        if (((_a = currentFormatItem.value) == null ? void 0 : _a.printType) == 0) {
-          browserPrint("downloadPDF");
-        } else {
-          const params = props.strategy === "MULTI" ? getPrintParams() : getOnceParams();
-          const queryParams = {
-            formatId: state.currentFormatId,
-            templateId: getTemplateIdByFormatId.value,
-            print: {
-              print: "1",
-              type: "1"
-            },
-            params
-          };
-          printInstance.downloadPDF(queryParams, (res) => callLocalServicesSuccessCb(res, "preview"), callLocalServicesErrorCb);
-        }
+      }).then(() => {
+        const params = props.strategy === "MULTI" ? getPrintParams() : getOnceParams();
+        const queryParams = {
+          formatId: state.currentFormatId,
+          templateId: getTemplateIdByFormatId.value,
+          print: {
+            print: "1",
+            type: "1"
+          },
+          params
+        };
+        printInstance.downloadPDF(queryParams, (res) => callLocalServicesSuccessCb(res, "preview"), callLocalServicesErrorCb);
       }).finally(() => {
         state.visible = false;
       });
@@ -312,7 +277,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           break;
         default:
           state.currentFormatId = key;
-          state.fileObject = null;
           state.visible = false;
           break;
       }
@@ -406,7 +370,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       var _a;
       state.formatList = formatListResult ? formatFormatList(formatListResult.obj) : [];
       state.currentFormatId = getDefaultFormatId(state.formatList, "defaultFlag");
-      state.fileObject = null;
       if (!state.currentFormatId) {
         $message.error("\u83B7\u53D6\u6253\u5370\u683C\u5F0F\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\uFF01");
         return requestError();
@@ -461,10 +424,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       state.printParams = formatParams(state.templateParams, props.params);
     };
     const verifiySuccess = (token) => {
-      var _a;
       state.identityVerification.visible = false;
-      if (((_a = currentFormatItem.value) == null ? void 0 : _a.printType) == 0)
-        return;
+      if (isIReport(state.currentFormatId))
+        return callLocalServicesSuccessCb(null, "edit");
       const queryParams = {
         formatId: state.currentFormatId,
         templateId: getTemplateIdByFormatId.value,
@@ -489,7 +451,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       deep: true
     });
     return (_ctx, _cache) => {
-      var _a;
       return openBlock(), createElementBlock(Fragment, null, [createVNode(unref(NDropdown), {
         class: "c-dropdown",
         placement: "bottom-start",
@@ -518,9 +479,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }, 8, ["show", "options"]), createVNode(IdentityVerification, mergeProps(_ctx.$attrs, {
         modelValue: state.identityVerification.visible,
         "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => state.identityVerification.visible = $event),
-        printType: (_a = unref(currentFormatItem)) == null ? void 0 : _a.printType,
+        formatId: state.currentFormatId,
+        templateId: unref(getTemplateIdByFormatId),
         onSuccess: verifiySuccess
-      }), null, 16, ["modelValue", "printType"])], 64);
+      }), null, 16, ["modelValue", "formatId", "templateId"])], 64);
     };
   }
 });

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

@@ -1,6 +1,8 @@
 import { defineComponent, ref, reactive, watch, openBlock, createBlock, unref, normalizeStyle, withCtx, createElementVNode, mergeProps, createVNode, createTextVNode } from 'vue';
 import { useMessage, NModal, NForm, NFormItem, NInput, NButton } from 'naive-ui';
 import EditForm from './edit.js';
+import '../utils/print.js';
+import { isIReport } from '../utils/browserPrint.js';
 import _export_sfc from '../../../../_virtual/plugin-vue_export-helper.js';
 
 const _hoisted_1 = { class: "content" };
@@ -10,7 +12,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     verifyUser: { type: Function, default: () => Promise.resolve() },
     identityVerificationTitle: { default: "\u6253\u5370\u670D\u52A1\u8EAB\u4EFD\u6821\u9A8C" },
     modelValue: { type: Boolean },
-    printType: { default: 1 }
+    formatId: null,
+    templateId: null
   },
   emits: ["update:modelValue", "success", "close"],
   setup(__props, { emit }) {
@@ -46,11 +49,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           $message.error(data.resultMsg || "\u8EAB\u4EFD\u6821\u9A8C\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5\uFF01");
           return false;
         }
-        if (props.printType == 1) {
-          emit("success", (_a = data.map) == null ? void 0 : _a.token);
-        } else {
+        if (isIReport(props.formatId || "")) {
           showEditForm.value = true;
-          token.value = (_b = data.map) == null ? void 0 : _b.token;
+          token.value = (_a = data.map) == null ? void 0 : _a.token;
+        } else {
+          emit("success", (_b = data.map) == null ? void 0 : _b.token);
         }
       } finally {
         loading.value = false;
@@ -71,7 +74,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       var _a;
       try {
         loading.value = true;
-        const data = await ((_a = editFormRef.value) == null ? void 0 : _a.submit(token.value));
+        const data = await ((_a = editFormRef.value) == null ? void 0 : _a.submit({
+          authorizationKey: token.value,
+          id: props.formatId,
+          templateId: props.templateId,
+          datasourceName: null,
+          dataSourceId: null
+        }));
         if (!data)
           return false;
         emit("success", token.value);

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

@@ -15,10 +15,13 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         required: true;
     };
-    printType: {
-        type: (NumberConstructor | StringConstructor)[];
-        required: true;
-        default: number;
+    formatId: {
+        type: StringConstructor;
+        required: false;
+    };
+    templateId: {
+        type: StringConstructor;
+        required: false;
     };
 }, {
     $message: import("naive-ui").MessageApi;
@@ -30,7 +33,8 @@ declare const _default: import("vue").DefineComponent<{
         verifyUser: Function;
         identityVerificationTitle: string;
         modelValue: boolean;
-        printType: number | string;
+        formatId?: string | undefined;
+        templateId?: string | undefined;
     };
     emit: (event: "close" | "success" | "update:modelValue", ...args: any[]) => void;
     editFormRef: import("vue").Ref<{
@@ -354,17 +358,12 @@ declare const _default: import("vue").DefineComponent<{
         readonly ignorePathChange: boolean;
     }>;
     NInput: any;
-    EditForm: import("vue").DefineComponent<{
-        saveIReportFormat: {
-            type: FunctionConstructor;
-            required: true;
-            default: () => Promise<void>;
-        };
-    }, {
+    EditForm: import("vue").DefineComponent<{}, {
+        PROTOCOL: string;
+        HOST: string;
+        SAVEIREPORT: string;
+        instance: import("axios").AxiosInstance;
         $message: import("naive-ui").MessageApi;
-        props: {
-            saveIReportFormat: Function;
-        };
         fileList: import("vue").Ref<{
             key: string;
             value: {
@@ -402,7 +401,7 @@ declare const _default: import("vue").DefineComponent<{
                 fullPath?: string | null | undefined;
             }[];
         }[]>;
-        submit: (token: string) => Promise<unknown>;
+        submit: (datas: import("../../../../shared/types").AnyObject) => Promise<unknown>;
         onChange: (data: {
             file: import("naive-ui").UploadFileInfo;
             fileList: import("naive-ui").UploadFileInfo[];
@@ -1579,15 +1578,7 @@ declare const _default: import("vue").DefineComponent<{
         }>;
         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<{
-        saveIReportFormat: {
-            type: FunctionConstructor;
-            required: true;
-            default: () => Promise<void>;
-        };
-    }>>, {
-        saveIReportFormat: Function;
-    }>;
+    }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("close" | "success" | "update:modelValue")[], "close" | "success" | "update:modelValue", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     verifyUser: {
         type: FunctionConstructor;
@@ -1603,10 +1594,13 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         required: true;
     };
-    printType: {
-        type: (NumberConstructor | StringConstructor)[];
-        required: true;
-        default: number;
+    formatId: {
+        type: StringConstructor;
+        required: false;
+    };
+    templateId: {
+        type: StringConstructor;
+        required: false;
     };
 }>> & {
     onClose?: ((...args: any[]) => any) | undefined;
@@ -1615,6 +1609,5 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     verifyUser: Function;
     identityVerificationTitle: string;
-    printType: string | number;
 }>;
 export default _default;

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

@@ -1,16 +1,17 @@
 import { defineComponent, ref, openBlock, createBlock, unref, withCtx, createVNode, createElementBlock, Fragment, renderList, createElementVNode, createTextVNode, toDisplayString } from 'vue';
 import { useMessage, NForm, NFormItem, NSpace, NUpload, NUploadDragger, NIcon, NText, NP } from 'naive-ui';
 import { Archive } from '@vicons/ionicons5';
+import axios from 'axios';
 import _export_sfc from '../../../../_virtual/plugin-vue_export-helper.js';
 
 const _hoisted_1 = { style: { "margin-bottom": "12px" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "edit",
-  props: {
-    saveIReportFormat: { type: Function, default: () => Promise.resolve() }
-  },
   setup(__props, { expose }) {
-    const props = __props;
+    const PROTOCOL = window.location.protocol;
+    const HOST = window.location.host;
+    const SAVEIREPORT = `${PROTOCOL}//${HOST}/bi-api/reprot/print/open/client/saveIReportFormat`;
+    const instance = axios.create({});
     const $message = useMessage();
     const fileList = ref([
       {
@@ -22,7 +23,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         value: []
       }
     ]);
-    function submit(token) {
+    function submit(datas) {
       return new Promise((resolve, reject) => {
         var _a, _b, _c, _d;
         const isOk = fileList.value.every((file) => file.value.length > 0);
@@ -30,14 +31,24 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           $message.warning("\u8BF7\u5148\u4E0A\u4F20\u6587\u4EF6");
           return;
         }
-        const params = {
-          jrxml: (_b = (_a = fileList.value.find((file) => file.key === "jrxml")) == null ? void 0 : _a.value) == null ? void 0 : _b[0],
-          jasper: (_d = (_c = fileList.value.find((file) => file.key === "jasper")) == null ? void 0 : _c.value) == null ? void 0 : _d[0],
-          authorizationKey: token
+        const jrxml = (_b = (_a = fileList.value.find((file) => file.key === "jrxml")) == null ? void 0 : _a.value) == null ? void 0 : _b[0];
+        const jasper = (_d = (_c = fileList.value.find((file) => file.key === "jasper")) == null ? void 0 : _c.value) == null ? void 0 : _d[0];
+        const data = {
+          jrxml: jrxml == null ? void 0 : jrxml.file,
+          jasper: jasper == null ? void 0 : jasper.file,
+          ...datas
         };
-        props.saveIReportFormat(params).then((data = {}) => {
-          if ((data == null ? void 0 : data.result) !== "SUCCESS") {
-            $message.error((data == null ? void 0 : data.resultMsg) || "\u4E0A\u4F20\u6587\u4EF6\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5\uFF01");
+        const params = new FormData();
+        Object.keys(data).forEach((v) => {
+          params.append(v, data[v]);
+        });
+        instance.post(SAVEIREPORT, params, {
+          headers: {
+            "Content-Type": "application/x-www-form-urlencoded"
+          }
+        }).then(({ data: data2 }) => {
+          if ((data2 == null ? void 0 : data2.result) !== "SUCCESS") {
+            $message.error((data2 == null ? void 0 : data2.resultMsg) || "\u4E0A\u4F20\u6587\u4EF6\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5\uFF01");
             reject();
           } else {
             resolve("SUCCESS");

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

@@ -1,16 +1,12 @@
 /// <reference types="node" />
 import { UploadFileInfo } from 'naive-ui';
-declare const _default: import("vue").DefineComponent<{
-    saveIReportFormat: {
-        type: FunctionConstructor;
-        required: true;
-        default: () => Promise<void>;
-    };
-}, {
+import { AnyObject } from '../../../../../es/shared/types';
+declare const _default: import("vue").DefineComponent<{}, {
+    PROTOCOL: string;
+    HOST: string;
+    SAVEIREPORT: string;
+    instance: import("axios").AxiosInstance;
     $message: import("naive-ui").MessageApi;
-    props: {
-        saveIReportFormat: Function;
-    };
     fileList: import("vue").Ref<{
         key: string;
         value: {
@@ -48,7 +44,7 @@ declare const _default: import("vue").DefineComponent<{
             fullPath?: string | null | undefined;
         }[];
     }[]>;
-    submit: (token: string) => Promise<unknown>;
+    submit: (datas: AnyObject) => Promise<unknown>;
     onChange: (data: {
         file: UploadFileInfo;
         fileList: UploadFileInfo[];
@@ -1225,13 +1221,5 @@ declare const _default: import("vue").DefineComponent<{
     }>;
     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<{
-    saveIReportFormat: {
-        type: FunctionConstructor;
-        required: true;
-        default: () => Promise<void>;
-    };
-}>>, {
-    saveIReportFormat: Function;
-}>;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
 export default _default;

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

@@ -1 +1,2 @@
-export declare function useBrowserPrint(data: Blob, mode: string): void;
+export declare function useBrowserPrint(data: Blob, mode?: string): void;
+export declare function isIReport(formatId: string): boolean;

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

@@ -36,5 +36,9 @@ function useBrowserPrint(data, mode) {
       return;
   }
 }
+function isIReport(formatId) {
+  var _a;
+  return (_a = formatId == null ? void 0 : formatId.includes) == null ? void 0 : _a.call(formatId, "iReport");
+}
 
-export { useBrowserPrint };
+export { isIReport, useBrowserPrint };

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

@@ -3,6 +3,6 @@ import { ComponentInternalInstance } from 'vue';
 export declare class IdentityVerificationDialog {
     rendered: boolean;
     static createMsg(message: string): string;
-    show(instance: ComponentInternalInstance, title: string, api: Func): Promise<string>;
+    show(instance: ComponentInternalInstance, title: string, api: Func, formatId?: string, templateId?: string): Promise<string>;
     private createProviderWrapper;
 }

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

@@ -8,7 +8,7 @@ class IdentityVerificationDialog {
   static createMsg(message) {
     return `[IdentityVerificationDialog] ${message}`;
   }
-  show(instance, title, api) {
+  show(instance, title, api, formatId, templateId) {
     if (this.rendered)
       return Promise.reject(IdentityVerificationDialog.createMsg("\u8BF7\u52FF\u91CD\u590D\u6253\u5F00\u5F39\u7A97"));
     return new Promise((resolve, reject) => {
@@ -25,7 +25,9 @@ class IdentityVerificationDialog {
           "identityVerificationTitle": title,
           "onClose": onClose,
           "onAfterLeave": () => unmount(container),
-          "onSuccess": onSuccess
+          "onSuccess": onSuccess,
+          "formatId": formatId,
+          "templateId": templateId
         }, null), instance)
       }), container);
       mount(container);

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

@@ -1,2 +1,2 @@
 export { Print } from './print.js';
-export { useBrowserPrint } from './browserPrint.js';
+export { isIReport, useBrowserPrint } from './browserPrint.js';

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

@@ -32,8 +32,9 @@ export declare class Print {
     };
     _handleEventDirect({ templateId, formatId, params, cmdid, print, printdlgshow, nobillnode }: AnyObject): Promise<any>;
     _handleEventEditFormat({ templateId, formatId, params, token }: AnyObject): Promise<any>;
-    preview({ templateId, formatId, params }: AnyObject, successCallbackFn?: Func, errorCallbackFn?: Func): Promise<false | undefined>;
-    printDirect({ templateId, formatId, params, print, printdlgshow, nobillnode }: AnyObject, successCallbackFn: Func, errorCallbackFn: Func): Promise<false | undefined>;
+    _queryPrintFile(formatId: string, params?: string): Promise<any>;
+    preview({ templateId, formatId, params }: AnyObject, successCallbackFn?: Func, errorCallbackFn?: Func): Promise<any>;
+    printDirect({ templateId, formatId, params, print, printdlgshow, nobillnode }: AnyObject, successCallbackFn: Func, errorCallbackFn: Func, mode?: string): Promise<any>;
     private _downloadPDF;
     /**
      * 下载pdf

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

@@ -1,6 +1,7 @@
 import axios from 'axios';
 import { isArray } from 'lodash-es';
 import { IdentityVerificationDialog } from './dialog.js';
+import { isIReport, useBrowserPrint } from './browserPrint.js';
 
 const PRINT_ORIGIN = "http://127.0.0.1:11111";
 const EDIT_LOCAL_URL = `${PRINT_ORIGIN}/services/print`;
@@ -13,7 +14,13 @@ const testHttpFn = axios.create({
   timeout: 1e3,
   withCredentials: false
 });
-const httpFn = axios.create({ withCredentials: false });
+const httpFn = axios.create({
+  withCredentials: false
+});
+const PROTOCOL = window.location.protocol;
+const HOST = window.location.host;
+const PRINTIREPORT = `${PROTOCOL}//${HOST}/fdp-api/print/assembly/printIReport`;
+const ERRORMSG = "\u83B7\u53D6\u6587\u4EF6\u5931\u8D25\uFF01";
 class Print {
   constructor() {
     this.dialog = new IdentityVerificationDialog();
@@ -220,7 +227,27 @@ class Print {
     };
     return await this._queryServicesPrint(queryParams);
   }
+  async _queryPrintFile(formatId, params = "") {
+    const { data } = await httpFn({
+      method: "post",
+      url: PRINTIREPORT,
+      responseType: "blob",
+      params: {
+        formatId: formatId.split("_")[1],
+        params
+      }
+    }) || {};
+    return data;
+  }
   async preview({ templateId, formatId, params = "" }, successCallbackFn, errorCallbackFn) {
+    if (isIReport(formatId)) {
+      const data = await this._queryPrintFile(formatId, params);
+      if (!data)
+        return errorCallbackFn == null ? void 0 : errorCallbackFn(ERRORMSG);
+      useBrowserPrint(data, "preview");
+      successCallbackFn == null ? void 0 : successCallbackFn({ file: data });
+      return;
+    }
     const testResult = await this._testConnection();
     if (!this._handleResultTest(testResult, errorCallbackFn))
       return false;
@@ -237,7 +264,15 @@ class Print {
       return false;
     successCallbackFn && successCallbackFn(handledResult);
   }
-  async printDirect({ templateId, formatId, params = "", print, printdlgshow, nobillnode }, successCallbackFn, errorCallbackFn) {
+  async printDirect({ templateId, formatId, params = "", print, printdlgshow, nobillnode }, successCallbackFn, errorCallbackFn, mode = "printDirect") {
+    if (isIReport(formatId)) {
+      const data = await this._queryPrintFile(formatId, params);
+      if (!data)
+        return errorCallbackFn == null ? void 0 : errorCallbackFn(ERRORMSG);
+      useBrowserPrint(data, mode);
+      successCallbackFn == null ? void 0 : successCallbackFn({ file: data });
+      return;
+    }
     const testResult = await this._testConnection();
     if (!this._handleResultTest(testResult, errorCallbackFn))
       return false;
@@ -269,13 +304,16 @@ class Print {
       async (res) => {
         if (!res)
           onReject(null);
+        if (isIReport(params.formatId))
+          return onResolve(res);
         onResolve(await this._downloadPDF(getFiledir(res.filedir)));
         function getFiledir(filedir) {
           const result = JSON.parse(filedir);
           return isArray(result) ? result[0] || "" : "";
         }
       },
-      (err) => onReject(err)
+      (err) => onReject(err),
+      "downloadPDF"
     );
   }
   async print({ templateId, formatId, params = "" }, successCallbackFn, errorCallbackFn) {

package/es/components/form-render/src/hooks/useBusinessBinding.d.ts

@@ -4,6 +4,7 @@ import { FIELD_BUSINESS_TYPE } from '../constants';
 export declare class BusinessCollector {
     private formModel;
     private businessFormatter?;
+    private readonly typeLockMap;
     private readonly typeCollector;
     private readonly fieldNameCollector;
     constructor(formModel: Form, businessFormatter?: FormBusinessFormatter | undefined);
@@ -14,12 +15,12 @@ export declare class BusinessCollector {
     private getType;
     private getValueByField;
     getValueByType(type: FIELD_BUSINESS_TYPE): unknown;
-    setValueByType(type: FIELD_BUSINESS_TYPE, value: unknown, beforeChange?: () => void): void;
+    setValueByType(type: FIELD_BUSINESS_TYPE, value: unknown): void;
     registerChangeBusiness(type: FIELD_BUSINESS_TYPE, handler: () => void): this;
     registerBlurBusiness(type: FIELD_BUSINESS_TYPE, handler: () => void): this;
     private changeHandlerMap;
     private blurHandlerMap;
-    trigger(fieldName: string, triggerType?: 'change' | 'blur'): void;
+    trigger(fieldName: string, triggerType?: 'change' | 'blur'): Map<FIELD_BUSINESS_TYPE, number> | undefined;
 }
 export declare function useBusinessBinding(): {
     create: (formModel: Form, formatter?: FormBusinessFormatter) => BusinessCollector;