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

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

@@ -539,7 +539,7 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
             readonly ignorePathChange: boolean;
         }>;
         NInput: any;
-        EditForm: import("vue").DefineComponent<{}, {
+        EditFormat: import("vue").DefineComponent<{}, {
             PROTOCOL: string;
             HOST: string;
             SAVEIREPORT: string;

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

@@ -543,7 +543,7 @@ declare const _default: import("vue").DefineComponent<{
             readonly ignorePathChange: boolean;
         }>;
         NInput: any;
-        EditForm: import("vue").DefineComponent<{}, {
+        EditFormat: import("vue").DefineComponent<{}, {
             PROTOCOL: string;
             HOST: string;
             SAVEIREPORT: string;

package/es/components/button-print/src/components/{edit.js → EditFormat.js}

@@ -6,7 +6,7 @@ import _export_sfc from '../../../../_virtual/plugin-vue_export-helper.js';
 
 const _hoisted_1 = { style: { "margin-bottom": "12px" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
-  __name: "edit",
+  __name: "EditFormat",
   setup(__props, { expose }) {
     const PROTOCOL = window.location.protocol;
     const HOST = window.location.host;
@@ -148,6 +148,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-var EditForm = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "edit.vue"]]);
+var EditFormat = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "EditFormat.vue"]]);
 
-export { EditForm as default };
+export { EditFormat as default };

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

@@ -1,6 +1,6 @@
 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.js';
 import '../utils/print.js';
 import { isIReport } from '../utils/browserPrint.js';
 import _export_sfc from '../../../../_virtual/plugin-vue_export-helper.js';
@@ -113,7 +113,7 @@ 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

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

@@ -358,7 +358,7 @@ declare const _default: import("vue").DefineComponent<{
         readonly ignorePathChange: boolean;
     }>;
     NInput: any;
-    EditForm: import("vue").DefineComponent<{}, {
+    EditFormat: import("vue").DefineComponent<{}, {
         PROTOCOL: string;
         HOST: string;
         SAVEIREPORT: string;

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

@@ -0,0 +1,6 @@
+import _sfc_main from './Preview.vue_vue_type_script_setup_true_lang.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.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_vue_type_script_setup_true_lang.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,2 +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");

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

@@ -4,5 +4,9 @@ export declare class IdentityVerificationDialog {
     rendered: boolean;
     static createMsg(message: string): string;
     show(instance: ComponentInternalInstance, title: string, api: Func, formatId?: string, templateId?: string): Promise<string>;
-    private createProviderWrapper;
+}
+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 Preview from '../components/Preview.js';
 
 class IdentityVerificationDialog {
   constructor() {
@@ -15,7 +16,7 @@ class IdentityVerificationDialog {
       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,
@@ -51,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/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>;

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

@@ -1,7 +1,8 @@
 import axios from 'axios';
 import { isArray } from 'lodash-es';
-import { IdentityVerificationDialog } from './dialog.js';
+import { IdentityVerificationDialog, PreviewDialog } from './dialog.js';
 import { isIReport, useBrowserPrint } from './browserPrint.js';
+import { getCurrentInstance } from 'vue';
 
 const PRINT_ORIGIN = "http://127.0.0.1:11111";
 const EDIT_LOCAL_URL = `${PRINT_ORIGIN}/services/print`;
@@ -24,6 +25,8 @@ const ERRORMSG = "\u83B7\u53D6\u6587\u4EF6\u5931\u8D25\uFF01";
 class Print {
   constructor() {
     this.dialog = new IdentityVerificationDialog();
+    this.dialogPreview = new PreviewDialog();
+    this.instance = null;
     this.messageHandlerQueue = [];
     var _a;
     const _window = window;
@@ -62,6 +65,9 @@ class Print {
   show(...args) {
     return this.dialog.show(...args);
   }
+  showPreview(...args) {
+    return this.dialogPreview.show(...args);
+  }
   _testConnection() {
     if (this.webview)
       return Promise.resolve(true);
@@ -244,7 +250,10 @@ class Print {
       const data = await this._queryPrintFile(formatId, params);
       if (!data)
         return errorCallbackFn == null ? void 0 : errorCallbackFn(ERRORMSG);
-      useBrowserPrint(data, "preview");
+      const src = useBrowserPrint(data, "preview");
+      if (!this.instance)
+        this.instance = getCurrentInstance();
+      this.showPreview(this.instance, src);
       successCallbackFn == null ? void 0 : successCallbackFn({ file: data });
       return;
     }

package/es/components/button-print/style/index.css

@@ -1 +1 @@
-.dropdown-button{border-color:#d5d5d5!important;color:#212121}.c-dropdown .n-dropdown-menu-wrapper span.active{color:#5585f5}.login-form-button{border-radius:24px;color:#fff;font-size:16px;height:50px;width:100%}.login-form-button-print{padding-top:15px}.login-form-button-print .n-input{border-radius:6px;color:#757575;font-size:14px;height:50px;line-height:50px}.c-button-print-modal .n-form-item-feedback-wrapper{display:none}
+.dropdown-button{border-color:#d5d5d5!important;color:#212121}.c-dropdown .n-dropdown-menu-wrapper span.active{color:#5585f5}.login-form-button{border-radius:24px;color:#fff;font-size:16px;height:50px;width:100%}.login-form-button-print{padding-top:15px}.login-form-button-print .n-input{border-radius:6px;color:#757575;font-size:14px;height:50px;line-height:50px}.c-button-print-modal .n-form-item-feedback-wrapper{display:none}.c-button-preview-modal{max-width:none}.c-button-preview-modal .n-dialog__content{height:98%}