cnhis-design-vue 3.1.18-beta.7 → 3.1.18

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

@@ -1,6 +1,8 @@
 import { Func } from '../../../../../es/shared/types';
 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 createContainer;
+    private createProviderWrapper;
 }

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

@@ -1,29 +1,22 @@
-import { ref, h, withCtx, createVNode, render, defineComponent, provide } from 'vue';
-import { isFunction } from 'lodash-es';
+import { ref, render, createVNode, withCtx, nextTick, defineComponent, provide } from 'vue';
 import IdentityVerification from '../components/IdentityVerification.js';
 
 class IdentityVerificationDialog {
+  constructor() {
+    this.rendered = false;
+  }
+  static createMsg(message) {
+    return `[IdentityVerificationDialog] ${message}`;
+  }
   show(instance, title, api) {
+    if (this.rendered)
+      return Promise.reject(IdentityVerificationDialog.createMsg("\u8BF7\u52FF\u91CD\u590D\u6253\u5F00\u5F39\u7A97"));
     return new Promise((resolve, reject) => {
-      if (!isFunction(api)) {
-        return reject({
-          message: "\u9700\u8981\u63D0\u4F9B\u6B63\u786E\u7684api"
-        });
-      }
+      this.rendered = true;
       const container = document.createElement("div");
-      document.body.appendChild(container);
-      const visible = ref(true);
-      function onClose() {
-        if (container.parentElement) {
-          container.parentElement.removeChild(container);
-          reject("\u5F39\u7A97\u5173\u95ED");
-        }
-      }
-      function onSuccess(token) {
-        resolve(token);
-        onClose();
-      }
-      const vnodes = h(this.createContainer(instance), null, {
+      const visible = ref(false);
+      const ProviderWrapper = this.createProviderWrapper(instance);
+      render(createVNode(ProviderWrapper, null, {
         default: withCtx(() => createVNode(IdentityVerification, {
           "to": container,
           "verifyUser": api,
@@ -31,13 +24,32 @@ class IdentityVerificationDialog {
           "onUpdate:modelValue": ($event) => visible.value = $event,
           "identityVerificationTitle": title,
           "onClose": onClose,
+          "onAfterLeave": () => unmount(container),
           "onSuccess": onSuccess
         }, null), instance)
-      });
-      render(vnodes, container);
+      }), container);
+      mount(container);
+      nextTick(() => visible.value = true);
+      function onClose() {
+        reject(IdentityVerificationDialog.createMsg("\u5F39\u7A97\u5173\u95ED"));
+      }
+      function onSuccess(token) {
+        resolve(token);
+        visible.value = false;
+      }
+      function mount(target) {
+        document.body.appendChild(target);
+      }
+      const that = this;
+      function unmount(target) {
+        if (!target.parentElement)
+          return;
+        that.rendered = false;
+        target.parentElement.removeChild(target);
+      }
     });
   }
-  createContainer(instance) {
+  createProviderWrapper(instance) {
     return defineComponent({
       setup(_, {
         slots

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

@@ -34,6 +34,11 @@ export declare class Print {
     _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>;
+    private _downloadPDF;
+    /**
+     * 下载pdf
+     */
+    downloadPDF(params: AnyObject, onResolve: Func, onReject: Func): void;
     print({ templateId, formatId, params }: AnyObject, successCallbackFn?: Func, errorCallbackFn?: Func): Promise<false | undefined>;
     queryPrintData({ templateId, formatId, params }: AnyObject, successCallbackFn?: Func, errorCallbackFn?: Func): Promise<false | {
         file: any;

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

@@ -1,9 +1,11 @@
 import axios from 'axios';
+import { isArray } from 'lodash-es';
 import { IdentityVerificationDialog } from './dialog.js';
 
 const PRINT_ORIGIN = "http://127.0.0.1:11111";
 const EDIT_LOCAL_URL = `${PRINT_ORIGIN}/services/print`;
 const PRINT_URL = `${PRINT_ORIGIN}/PrintLocal`;
+const PDF_URL = `${PRINT_ORIGIN}/download`;
 const PRINT_CMD_ID = "7";
 const PREVIEW_CMD_ID = "8";
 const PRINTER_NAME_DEFAULT = "Default";
@@ -255,6 +257,20 @@ class Print {
       return false;
     successCallbackFn && successCallbackFn(handledResult);
   }
+  _downloadPDF(inputData) {
+    return httpFn.get(PDF_URL, { params: { inputData } }).then(({ data }) => data);
+  }
+  downloadPDF(params, onResolve, onReject) {
+    this.printDirect(params, async (res) => {
+      if (!res)
+        onReject(null);
+      onResolve(await this._downloadPDF(getFiledir(res.filedir)));
+      function getFiledir(filedir) {
+        const result = JSON.parse(filedir);
+        return isArray(result) ? result[0] || "" : "";
+      }
+    }, (err) => onReject(err));
+  }
   async print({ templateId, formatId, params = "" }, successCallbackFn, errorCallbackFn) {
     const testResult = await this._testConnection();
     if (!this._handleResultTest(testResult, errorCallbackFn))

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

@@ -1,24 +1 @@
-.dropdown-button {
-  color: #212121;
-  border-color: #d5d5d5 !important;
-}
-.c-dropdown .n-dropdown-menu-wrapper span.active {
-  color: #5585f5;
-}
-.login-form-button {
-  width: 100%;
-  height: 50px;
-  border-radius: 24px;
-  font-size: 16px;
-  color: #ffffff;
-}
-.login-form-button-print {
-  padding-top: 15px;
-}
-.login-form-button-print .n-input {
-  height: 50px;
-  line-height: 50px;
-  font-size: 14px;
-  color: #757575;
-  border-radius: 6px;
-}
+.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}