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

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,64 +358,69 @@ declare const _default: import("vue").DefineComponent<{
         readonly ignorePathChange: boolean;
     }>;
     NInput: any;
-    EditForm: import("vue").DefineComponent<{
-        saveIReportFormat: {
-            type: FunctionConstructor;
+    EditFormat: import("vue").DefineComponent<{
+        formatId: {
+            type: StringConstructor;
+            required: false;
+        };
+        token: {
+            type: StringConstructor;
             required: true;
-            default: () => Promise<void>;
         };
     }, {
+        PROTOCOL: string;
+        HOST: string;
+        BASEURL: string;
+        SAVEIREPORT: string;
+        QUERYFILELIST: string;
+        DELETEFILE: string;
+        instance: import("axios").AxiosInstance;
         $message: import("naive-ui").MessageApi;
         props: {
-            saveIReportFormat: Function;
+            formatId?: string | undefined;
+            token: string;
         };
         fileList: import("vue").Ref<{
-            key: string;
-            value: {
-                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;
-            }[];
+            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;
         }[]>;
-        submit: (token: string) => Promise<unknown>;
-        onChange: (data: {
-            file: import("naive-ui").UploadFileInfo;
-            fileList: import("naive-ui").UploadFileInfo[];
-        }, index: number) => void;
-        onBeforeUpload: (data: {
+        queryFileList: () => void;
+        onRemove: (options: {
             file: import("naive-ui").UploadFileInfo;
             fileList: import("naive-ui").UploadFileInfo[];
-        }) => Promise<boolean>;
-        validateFormat: (file: import("naive-ui").UploadFileInfo, format: string) => boolean;
+        }) => Promise<unknown>;
+        submit: (datas: import("../../../../shared/types").AnyObject) => Promise<unknown>;
+        validateFormat: () => boolean;
         NForm: any;
         NFormItem: import("vue").DefineComponent<{
             readonly label: StringConstructor;
@@ -1580,14 +1589,15 @@ 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;
+        formatId: {
+            type: StringConstructor;
+            required: false;
+        };
+        token: {
+            type: StringConstructor;
             required: true;
-            default: () => Promise<void>;
         };
-    }>>, {
-        saveIReportFormat: Function;
-    }>;
+    }>>, {}>;
 }, 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 +1613,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 +1628,5 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     verifyUser: Function;
     identityVerificationTitle: string;
-    printType: string | number;
 }>;
 export default _default;

package/es/components/button-print/src/components/{IdentityVerification.js → IdentityVerification.vue.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 EditFormat from './EditFormat.vue.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;
@@ -68,10 +71,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
     };
     const submitEditFile = async () => {
-      var _a;
+      var _a, _b;
       try {
         loading.value = true;
-        const data = await ((_a = editFormRef.value) == null ? void 0 : _a.submit(token.value));
+        const data = await ((_b = editFormRef.value) == null ? void 0 : _b.submit({
+          authorizationKey: token.value,
+          id: (_a = props.formatId) == null ? void 0 : _a.split("_")[1],
+          templateId: props.templateId,
+          datasourceName: null,
+          dataSourceId: null
+        }));
         if (!data)
           return false;
         emit("success", token.value);
@@ -104,11 +113,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }, {
         default: withCtx(() => [
           createElementVNode("div", _hoisted_1, [
-            showEditForm.value ? (openBlock(), createBlock(EditForm, mergeProps({
+            showEditForm.value ? (openBlock(), createBlock(EditFormat, mergeProps({
               key: 0,
               ref_key: "editFormRef",
               ref: editFormRef
-            }, _ctx.$attrs), null, 16)) : (openBlock(), createBlock(unref(NForm), {
+            }, _ctx.$attrs, {
+              formatId: __props.formatId,
+              token: token.value
+            }), null, 16, ["formatId", "token"])) : (openBlock(), createBlock(unref(NForm), {
               key: 1,
               class: "login-form-button-print",
               ref_key: "formRef",

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

@@ -0,0 +1,41 @@
+declare const _default: import("vue").DefineComponent<{
+    visible: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    src: {
+        type: StringConstructor;
+    };
+}, {
+    props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
+        visible: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
+        src: {
+            type: StringConstructor;
+        };
+    }>> & {
+        "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
+    }>>;
+    emit: (event: "update:visible", ...args: any[]) => void;
+    isNormalSize: import("vue").Ref<boolean>;
+    style: import("vue").ComputedRef<string>;
+    titleRender: () => JSX.Element;
+    changeSize: () => void;
+    onClose: () => void;
+    NModal: any;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:visible"[], "update:visible", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    visible: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    src: {
+        type: StringConstructor;
+    };
+}>> & {
+    "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
+}, {
+    visible: boolean;
+}>;
+export default _default;

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

@@ -0,0 +1,6 @@
+import _sfc_main from './Preview.vue2.js';
+import _export_sfc from '../../../../_virtual/plugin-vue_export-helper.js';
+
+var Preview = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "Preview.vue"]]);
+
+export { Preview as default };

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

@@ -0,0 +1,67 @@
+import { defineComponent, ref, computed, openBlock, createBlock, unref, normalizeStyle, withCtx, createElementVNode, createVNode, Fragment, createTextVNode } from 'vue';
+import { NModal, NIcon } from 'naive-ui';
+import { SquareOutline, CopyOutline } from '@vicons/ionicons5';
+
+const _hoisted_1 = ["src"];
+var _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "Preview",
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    src: {
+      type: String
+    }
+  },
+  emits: ["update:visible"],
+  setup(__props, {
+    emit
+  }) {
+    const props = __props;
+    const isNormalSize = ref(true);
+    const style = computed(() => {
+      const size = isNormalSize.value ? 80 : 100;
+      return `width: ${size}vw; height: ${size}vh`;
+    });
+    function titleRender() {
+      return createVNode(Fragment, null, [createVNode("div", null, [createTextVNode("\u9884\u89C8")]), createVNode(NIcon, {
+        "style": {
+          margin: "0 0 0 auto",
+          transform: isNormalSize.value ? "none" : "rotate(90deg)"
+        },
+        "onClick": changeSize,
+        "component": isNormalSize.value ? SquareOutline : CopyOutline
+      }, null)]);
+    }
+    function changeSize() {
+      isNormalSize.value = !isNormalSize.value;
+    }
+    function onClose() {
+      props.src && window.URL.revokeObjectURL(props.src);
+      emit("update:visible", false);
+    }
+    return (_ctx, _cache) => {
+      return openBlock(), createBlock(unref(NModal), {
+        preset: "dialog",
+        show: __props.visible,
+        "show-icon": false,
+        style: normalizeStyle(unref(style)),
+        class: "c-button-preview-modal",
+        title: titleRender,
+        onClose,
+        onMaskClick: onClose
+      }, {
+        default: withCtx(() => [createElementVNode("iframe", {
+          src: __props.src,
+          frameborder: "0",
+          width: "100%",
+          height: "97%"
+        }, null, 8, _hoisted_1)]),
+        _: 1
+      }, 8, ["show", "style"]);
+    };
+  }
+});
+
+export { _sfc_main as 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): string | void;
+export declare function isIReport(formatId: string): boolean;

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

@@ -20,8 +20,7 @@ function useBrowserPrint(data, mode) {
       }
       break;
     case "preview":
-      window.open(src);
-      break;
+      return src;
     default:
       {
         const a = document.createElement("a");
@@ -36,5 +35,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,10 @@ import { ComponentInternalInstance } from 'vue';
 export declare class IdentityVerificationDialog {
     rendered: boolean;
     static createMsg(message: string): string;
-    show(instance: ComponentInternalInstance, title: string, api: Func): Promise<string>;
-    private createProviderWrapper;
+    show(instance: ComponentInternalInstance, title: string, api: Func, formatId?: string, templateId?: string): Promise<string>;
+}
+export declare class PreviewDialog {
+    rendered: boolean;
+    static createMsg(message: string): string;
+    show(instance: ComponentInternalInstance, src: string): Promise<string>;
 }

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

@@ -1,5 +1,6 @@
 import { ref, render, createVNode, withCtx, nextTick, defineComponent, provide } from 'vue';
-import IdentityVerification from '../components/IdentityVerification.js';
+import IdentityVerification from '../components/IdentityVerification.vue.js';
+import Preview from '../components/Preview.vue.js';
 
 class IdentityVerificationDialog {
   constructor() {
@@ -8,14 +9,14 @@ 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) => {
       this.rendered = true;
       const container = document.createElement("div");
       const visible = ref(false);
-      const ProviderWrapper = this.createProviderWrapper(instance);
+      const ProviderWrapper = createProviderWrapper(instance);
       render(createVNode(ProviderWrapper, null, {
         default: withCtx(() => createVNode(IdentityVerification, {
           "to": container,
@@ -25,7 +26,9 @@ class IdentityVerificationDialog {
           "identityVerificationTitle": title,
           "onClose": onClose,
           "onAfterLeave": () => unmount(container),
-          "onSuccess": onSuccess
+          "onSuccess": onSuccess,
+          "formatId": formatId,
+          "templateId": templateId
         }, null), instance)
       }), container);
       mount(container);
@@ -49,29 +52,70 @@ class IdentityVerificationDialog {
       }
     });
   }
-  createProviderWrapper(instance) {
-    return defineComponent({
-      setup(_, {
-        slots
-      }) {
-        let provides = (instance == null ? void 0 : instance.parent) && Reflect.get(instance.parent, "provides");
-        const keys = [];
-        while (provides) {
-          Object.entries(provides).forEach(([k, v]) => {
-            if (keys.includes(k))
-              return;
-            keys.push(k);
-            provide(k, v);
-          });
-          provides = Object.getPrototypeOf(provides);
-        }
-        return () => {
-          var _a;
-          return createVNode("div", null, [(_a = slots.default) == null ? void 0 : _a.call(slots)]);
-        };
+}
+class PreviewDialog {
+  constructor() {
+    this.rendered = false;
+  }
+  static createMsg(message) {
+    return `[PreviewDialog] ${message}`;
+  }
+  show(instance, src) {
+    if (this.rendered)
+      return Promise.reject(PreviewDialog.createMsg("\u8BF7\u52FF\u91CD\u590D\u6253\u5F00\u5F39\u7A97"));
+    return new Promise((resolve, reject) => {
+      this.rendered = true;
+      const container = document.createElement("div");
+      const visible = ref(false);
+      const ProviderWrapper = createProviderWrapper(instance);
+      render(createVNode(ProviderWrapper, null, {
+        default: withCtx(() => createVNode(Preview, {
+          "visible": visible.value,
+          "onUpdate:visible": ($event) => visible.value = $event,
+          "src": src,
+          "onAfterLeave": () => unmount(container)
+        }, null), instance)
+      }), container);
+      mount(container);
+      nextTick(() => {
+        visible.value = true;
+        resolve("success");
+      });
+      function mount(target) {
+        document.body.appendChild(target);
+      }
+      const that = this;
+      function unmount(target) {
+        if (!target.parentElement)
+          return;
+        that.rendered = false;
+        target.parentElement.removeChild(target);
       }
     });
   }
 }
+function createProviderWrapper(instance) {
+  return defineComponent({
+    setup(_, {
+      slots
+    }) {
+      let provides = (instance == null ? void 0 : instance.parent) && Reflect.get(instance.parent, "provides");
+      const keys = [];
+      while (provides) {
+        Object.entries(provides).forEach(([k, v]) => {
+          if (keys.includes(k))
+            return;
+          keys.push(k);
+          provide(k, v);
+        });
+        provides = Object.getPrototypeOf(provides);
+      }
+      return () => {
+        var _a;
+        return createVNode("div", null, [(_a = slots.default) == null ? void 0 : _a.call(slots)]);
+      };
+    }
+  });
+}
 
-export { IdentityVerificationDialog };
+export { IdentityVerificationDialog, PreviewDialog };

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

@@ -1,9 +1,11 @@
 import { AnyObject, Func } from '../../../../../es/shared/types';
-import { IdentityVerificationDialog } from '../../../../../es/components/button-print/src/utils/dialog';
+import { IdentityVerificationDialog, PreviewDialog } from '../../../../../es/components/button-print/src/utils/dialog';
 export declare class Print {
     private readonly webview;
     private currentMessageHandler?;
     private dialog;
+    private dialogPreview;
+    private instance;
     constructor();
     private readonly messageHandlerQueue;
     private messageHandler;
@@ -13,6 +15,7 @@ export declare class Print {
      * @desc 调用实例方法打开弹窗
      */
     show(...args: Parameters<IdentityVerificationDialog['show']>): Promise<string>;
+    showPreview(...args: Parameters<PreviewDialog['show']>): Promise<string>;
     _testConnection(): Promise<unknown>;
     _queryServicesPrint(params: AnyObject): Promise<any>;
     _callPrintWithFile(queryParams: AnyObject): Promise<any>;
@@ -32,8 +35,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