cnhis-design-vue 3.3.3-beta.60 → 3.3.3-beta.62

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

@@ -535,18 +535,28 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const callLocalServicesErrorCb = (res) => {
       toggleExpandLoading(false);
+      let info = {
+        formatId: state.currentFormatId,
+        templateId: getTemplateIdByFormatId.value,
+        templateCode: getTemplateCodeByFormatId.value
+      };
       encapBrowserLog({
         type: "\u8FDB\u5165\u5931\u8D25\u7684\u56DE\u8C03",
         res
       }, "PRINT-SDK");
-      emit("error", res);
+      emit("error", res, info);
       if (isObject(res) && res.type === "notInstalledApp") {
         $message.error(res.message);
       }
     };
     const callLocalServicesCancelCb = (res) => {
       toggleExpandLoading(false);
-      emit("cancel", res);
+      let info = {
+        formatId: state.currentFormatId,
+        templateId: getTemplateIdByFormatId.value,
+        templateCode: getTemplateCodeByFormatId.value
+      };
+      emit("cancel", res, info);
     };
     const prevFnError = (type) => {
       const error = {
@@ -561,7 +571,12 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         type,
         preExecution: true
       };
-      emit("error", error);
+      let info = {
+        formatId: state.currentFormatId,
+        templateId: getTemplateIdByFormatId.value,
+        templateCode: getTemplateCodeByFormatId.value
+      };
+      emit("error", error, info);
     };
     const getPrintParams = () => {
       return JSON.stringify({

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

@@ -274,14 +274,22 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const callLocalServicesErrorCb = (res) => {
       state.spinning = false;
-      emit("error", res);
+      let info = {
+        formatId: state.currentFormatId,
+        templateId: getTemplateIdByFormatId.value
+      };
+      emit("error", res, info);
       if (isObject(res) && res.type === "notInstalledApp") {
         $message.error(res.message);
       }
     };
     const callLocalServicesCancelCb = (res) => {
       state.spinning = false;
-      emit("cancel", res);
+      let info = {
+        formatId: state.currentFormatId,
+        templateId: getTemplateIdByFormatId.value
+      };
+      emit("cancel", res, info);
     };
     const prevFnError = (type) => {
       const error = {
@@ -296,7 +304,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         type,
         preExecution: true
       };
-      emit("error", error);
+      let info = {
+        formatId: state.currentFormatId,
+        templateId: getTemplateIdByFormatId.value
+      };
+      emit("error", error, info);
     };
     const getPrintParams = (index = 0) => {
       var _a2;

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

@@ -25,7 +25,7 @@ export declare class Print {
     private readonly messageHandlerQueue;
     private messageHandler;
     private _initDomesticSystem;
-    private createQueueProgressNotifyCss;
+    private renderQueueProgressNotifyContent;
     getPicAndUpload(obj: any): Promise<void>;
     private postMessage;
     messageCollect(id: string, data: AnyObject): Promise<unknown>;

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

@@ -3,8 +3,8 @@ import { cloneDeep, isArray } from 'lodash-es';
 import { IdentityVerificationDialog, PreviewDialog } from './dialog.js';
 import { isIReport, getFileUrl, useBrowserPrint } from './browserPrint.js';
 import { h, getCurrentInstance } from 'vue';
-import { createDiscreteApi, NIcon, NProgress } from 'naive-ui';
-import { ReloadOutline } from '@vicons/ionicons5';
+import { createDiscreteApi, NIcon, NProgress, NDivider } from 'naive-ui';
+import { PrintOutline } from '@vicons/ionicons5';
 import { uuidGenerator } from '../../../../shared/utils/index.js';
 import { format } from 'date-fns';
 import { io } from 'socket.io-client';
@@ -73,7 +73,8 @@ class Print {
     this.CMonitor = _window.$CMonitor;
     this._notifyPrintQueueMap = {
       data: /* @__PURE__ */ new Map(),
-      callback: /* @__PURE__ */ new Map()
+      callback: /* @__PURE__ */ new Map(),
+      dom: null
     };
     try {
       this.webview = _window.top ? (_a = _window.top.chrome) == null ? void 0 : _a.webview : (_b = _window.chrome) == null ? void 0 : _b.webview;
@@ -134,45 +135,14 @@ class Print {
         const currentV = (ext == null ? void 0 : ext.currentcount) || 0;
         const totalV = (ext == null ? void 0 : ext.totalcount) || 0;
         if (curUidDom) {
-          const value = totalV ? parseInt((100 * currentV / totalV).toString()) : 0;
-          curUidDom.content = () => h("div", {}, [h("div", {
-            style: {
-              display: "flex",
-              alignItems: "center",
-              fontSize: "12px",
-              marginBottom: "8px"
-            }
-          }, [h(NIcon, {
-            color: "#0e7a0d",
-            size: 12,
-            component: ReloadOutline,
-            style: {
-              animation: "rotateQueueProgressNotify 1s linear infinite",
-              willChange: "transform",
-              backfaceVisibility: "hidden"
-            }
-          }), h("span", {
-            style: {
-              color: "#0e7a0d",
-              marginLeft: "4px",
-              marginRight: "8px"
-            }
-          }, "\u6B63\u5728\u6253\u5370\u4E2D..."), h("span", {}, `${value}%`)]), h(NProgress, {
-            type: "line",
-            strokeWidth: 2,
-            percentage: value,
-            showIndicator: false,
-            processing: value < 100 ? true : false
-          }), h("div", {
-            style: {
-              marginTop: "6px",
-              fontSize: "12px"
-            }
-          }, `\u5DF2\u5B8C\u6210${currentV}\u6761\uFF0C\u5171${totalV}\u6761`)]);
-          if (value >= 100) {
+          curUidDom.currentV = currentV;
+          curUidDom.totalV = totalV;
+          curUidDom.progressValue = totalV ? parseInt((100 * currentV / totalV).toString()) : 0;
+          this.renderQueueProgressNotifyContent();
+          if (curUidDom.progressValue >= 100) {
             this._notifyPrintQueueMap.data.delete(ext == null ? void 0 : ext.uuid);
             setTimeout(() => {
-              curUidDom == null ? void 0 : curUidDom.destroy();
+              this.renderQueueProgressNotifyContent();
             }, 800);
           }
         }
@@ -259,23 +229,95 @@ class Print {
       cb && cb(false);
     }
   }
-  createQueueProgressNotifyCss() {
-    const notifyStyleDom = document.getElementById("queueProgressNotifyCss");
-    if (notifyStyleDom)
+  renderQueueProgressNotifyContent() {
+    const clearNotifyDom = () => {
+      this._notifyPrintQueueMap.dom.destroy();
+      this._notifyPrintQueueMap.data.clear();
+      this._notifyPrintQueueMap.dom = null;
+    };
+    if (!this._notifyPrintQueueMap.dom) {
+      this._notifyPrintQueueMap.dom = notification.create({
+        title: "\u6253\u5370\u5217\u8868",
+        onClose: () => {
+          clearNotifyDom();
+        }
+      });
+    }
+    if (this._notifyPrintQueueMap.data.size > 0) {
+      const childrens = [];
+      const keys = Array.from(this._notifyPrintQueueMap.data.keys());
+      const lastKey = keys[keys.length - 1];
+      for (const [key, value] of this._notifyPrintQueueMap.data) {
+        const dom = h("div", {
+          style: {
+            boxSizing: "border-box",
+            marginBottom: lastKey === key ? 0 : "12px",
+            display: "flex",
+            flexDirection: "column"
+          }
+        }, [h("div", {
+          style: {
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "between-space",
+            overflow: "hidden",
+            marginBottom: "4px"
+          }
+        }, [h(NIcon, {
+          size: 16,
+          component: PrintOutline,
+          style: {
+            marginRight: "4px"
+          }
+        }), h("span", {
+          style: {
+            flex: 1,
+            fontSize: "14px",
+            fontWeight: 700,
+            marginRight: "6px",
+            overflow: "hidden",
+            whiteSpace: "noWrap",
+            textOverflow: "ellipsis"
+          }
+        }, value.printname), h("span", {
+          style: {
+            fontSize: "12px",
+            color: "rgba(30, 30, 30, 0.60)"
+          }
+        }, `${value.progressValue}%`)]), h(NProgress, {
+          type: "line",
+          strokeWidth: 2,
+          percentage: value.progressValue,
+          showIndicator: false,
+          processing: true
+        }), h("div", {
+          style: {
+            marginTop: "6px",
+            display: "flex",
+            alignItems: "center",
+            fontSize: "12px",
+            color: "rgba(30, 30, 30, 0.60)"
+          }
+        }, [h("span", {}, "\u7B2C"), h("span", {
+          style: {
+            color: "#FF0000"
+          }
+        }, value.currentV), h("span", {}, "\u4EFD/\u5171"), h("span", {
+          style: {
+            color: "#FF0000"
+          }
+        }, value.totalV), h("span", {}, "\u4EFD")]), lastKey === key ? null : h(NDivider, {
+          style: {
+            marginTop: "12px",
+            marginBottom: 0
+          }
+        })]);
+        childrens.push(dom);
+      }
+      this._notifyPrintQueueMap.dom.content = () => childrens;
       return;
-    const style = document.createElement("style");
-    style.textContent = `
-			@keyframes rotateQueueProgressNotify {
-				from {
-					transform: rotate(0deg);
-				}
-				to {
-					transform: rotate(360deg);
-				}
-			}
-		`;
-    style.id = "queueProgressNotifyCss";
-    document.head.appendChild(style);
+    }
+    clearNotifyDom();
   }
   async getPicAndUpload(obj) {
     try {
@@ -1088,48 +1130,14 @@ class Print {
       }
       if (uuid && printname) {
         if (isShowQueueProgressNotify) {
-          this.createQueueProgressNotifyCss();
-          const notifyDom = notification.create({
-            title: `${printname}`,
-            content: () => h("div", {}, [h("div", {
-              style: {
-                display: "flex",
-                alignItems: "center",
-                fontSize: "12px",
-                marginBottom: "8px"
-              }
-            }, [h(NIcon, {
-              color: "#0e7a0d",
-              size: 12,
-              component: ReloadOutline,
-              style: {
-                animation: "rotateQueueProgressNotify 1s linear infinite",
-                willChange: "transform",
-                backfaceVisibility: "hidden"
-              }
-            }), h("span", {
-              style: {
-                color: "#0e7a0d",
-                marginLeft: "4px",
-                marginRight: "8px"
-              }
-            }, "\u6B63\u5728\u6253\u5370\u4E2D..."), h("span", {}, "0%")]), h(NProgress, {
-              type: "line",
-              strokeWidth: 2,
-              percentage: 0,
-              showIndicator: false,
-              processing: true
-            }), h("div", {
-              style: {
-                marginTop: "6px",
-                fontSize: "12px"
-              }
-            }, `\u5DF2\u5B8C\u62100\u6761\uFF0C\u5171${paramsArr.length}\u6761`)]),
-            onClose: () => {
-              this._notifyPrintQueueMap.data.delete(uuid);
-            }
+          this._notifyPrintQueueMap.data.set(uuid, {
+            printname,
+            uuid,
+            currentV: 0,
+            totalV: paramsArr.length,
+            progressValue: 0
           });
-          this._notifyPrintQueueMap.data.set(uuid, notifyDom);
+          this.renderQueueProgressNotifyContent();
         }
         this._notifyPrintQueueMap.callback.set(uuid, printQueueCallbackFn);
       }

package/es/shared/package.json.js

@@ -1,5 +1,5 @@
 var name = "@cnhis-design-vue/shared";
-var version = "3.3.3-beta.60";
+var version = "3.3.3-beta.62";
 var main = "index.ts";
 var peerDependencies = {
 	"naive-ui": "^2.30.0",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.3.3-beta.60",
+	"version": "3.3.3-beta.62",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -74,5 +74,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "6265446918240d469c5c48024d404c3495d01429"
+	"gitHead": "5e472ae10b431508c5ae65ad1db0da928cdcc0d1"
 }