cnhis-design-vue 3.3.3-beta.55 → 3.3.3-beta.57

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

@@ -20,10 +20,12 @@ export declare class Print {
     private _successCallbackFn;
     private _errorCallbackFn;
     private _cancelCallbackFn;
+    private _notifyPrintQueueMap;
     constructor();
     private readonly messageHandlerQueue;
     private messageHandler;
     private _initDomesticSystem;
+    private createQueueProgressNotifyCss;
     getPicAndUpload(obj: any): Promise<void>;
     private postMessage;
     messageCollect(id: string, data: AnyObject): Promise<unknown>;
@@ -55,7 +57,7 @@ export declare class Print {
         pageCount: any;
         formatId: string;
     };
-    _handleEventDirect({ templateId, formatId, number, svrUpdateIp, apptype, uuid, hideButtons, params, paramsArr, cmdid, print, signature, copies, printdlgshow, nobillnode, btnprint, messageTimeout }: AnyObject): Promise<any>;
+    _handleEventDirect({ templateId, formatId, number, svrUpdateIp, apptype, printname, uuid, priority, hideButtons, params, paramsArr, cmdid, print, signature, copies, printdlgshow, nobillnode, btnprint, messageTimeout }: AnyObject): Promise<any>;
     _handleEventEditFormat({ templateId, formatId, number, params, token, messageTimeout }: AnyObject): Promise<any>;
     _queryProxyOrigin(): Promise<void>;
     _queryPrintFile(formatId: string, params?: string): Promise<any>;
@@ -68,7 +70,7 @@ export declare class Print {
     _base64ToBlob(fileBase64: string, fileType: string): Blob;
     preview({ iReportExecuteMode, hideButtons, templateId, number, formatId: originFormatId, formatItem, params, paramsArr, authorizationKey, signature, btnprint, messageTimeout }: AnyObject, successCallbackFn?: AnyFn, errorCallbackFn?: AnyFn): Promise<any>;
     printSync(data: AnyObject[], successCallbackFn: AnyFn, errorCallbackFn: AnyFn): Promise<void>;
-    printDirect({ iReportExecuteMode, templateId, number, formatId: originFormatId, formatItem, params, paramsArr, authorizationKey, print, signature, printdlgshow, nobillnode, copies, svrUpdateIp, apptype, uuid, isDownloadFile, messageTimeout }: AnyObject, successCallbackFn: AnyFn, errorCallbackFn: AnyFn, cancelCallbackFn?: AnyFn, mode?: string): Promise<false | undefined>;
+    printDirect({ iReportExecuteMode, templateId, number, formatId: originFormatId, formatItem, params, paramsArr, authorizationKey, print, signature, printdlgshow, nobillnode, copies, svrUpdateIp, apptype, uuid, printname, priority, isShowQueueProgressNotify, isDownloadFile, messageTimeout }: AnyObject, successCallbackFn: AnyFn, errorCallbackFn: AnyFn, cancelCallbackFn?: AnyFn, printQueueCallbackFn?: AnyFn, mode?: string): Promise<false | undefined>;
     printToHiPrint({ templateId, formatId, params, authorizationKey }: any, successCallbackFn: AnyFn, errorCallbackFn: AnyFn, cancelCallbackFn?: AnyFn): Promise<any>;
     private _downloadPDF;
     /**

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

@@ -2,7 +2,9 @@ import axios from 'axios';
 import { cloneDeep, isArray } from 'lodash-es';
 import { IdentityVerificationDialog, PreviewDialog } from './dialog.js';
 import { isIReport, getFileUrl, useBrowserPrint } from './browserPrint.js';
-import { getCurrentInstance } from 'vue';
+import { h, getCurrentInstance } from 'vue';
+import { createDiscreteApi, NIcon, NProgress } from 'naive-ui';
+import { ReloadOutline } from '@vicons/ionicons5';
 import { uuidGenerator } from '../../../../shared/utils/index.js';
 import { format } from 'date-fns';
 import { io } from 'socket.io-client';
@@ -30,6 +32,13 @@ const PREVIEWIREPOR = `${REMOTEPRINTORIGIN}/bi-api/reprot/print/open/client/prev
 const ERRORMSG = "\u83B7\u53D6\u6587\u4EF6\u5931\u8D25\uFF01";
 const QUERYPRINTORIGIN = `${REMOTEPRINTORIGIN}/bi-api/reprot/print/open/client/getRemote`;
 const FILEURL = `${REMOTEPRINTORIGIN}/printService/file`;
+const {
+  notification
+} = createDiscreteApi(["notification"], {
+  notificationProviderProps: {
+    placement: "bottom-right"
+  }
+});
 let printInstance = null;
 class Print {
   constructor() {
@@ -51,6 +60,7 @@ class Print {
     this._successCallbackFn = null;
     this._errorCallbackFn = null;
     this._cancelCallbackFn = null;
+    this._notifyPrintQueueMap = null;
     this.messageHandlerQueue = [];
     this.getIReportFormatId = (isIReport2, formatId) => {
       return isIReport2 ? formatId.split("_")[1] : formatId;
@@ -61,6 +71,10 @@ class Print {
     printInstance = this;
     const _window = window;
     this.CMonitor = _window.$CMonitor;
+    this._notifyPrintQueueMap = {
+      data: /* @__PURE__ */ new Map(),
+      callback: /* @__PURE__ */ new Map()
+    };
     try {
       this.webview = _window.top ? (_a = _window.top.chrome) == null ? void 0 : _a.webview : (_b = _window.chrome) == null ? void 0 : _b.webview;
     } catch (error) {
@@ -110,8 +124,63 @@ class Print {
       console.log("\u89E3\u6790e.data\u5931\u8D25\uFF0C" + _e);
       this._handleMonitorNotify("\u89E3\u6790e.data\u5931\u8D25\uFF0C" + e);
     }
-    if (["print", "pdf", "resetprint"].includes(data == null ? void 0 : data.cmd)) {
-      console.log("\u6253\u5370\u547D\u4EE4\u6267\u884C\u4E86", data);
+    if (["print", "pdf", "resetprint", "printback"].includes(data == null ? void 0 : data.cmd)) {
+      if ((data == null ? void 0 : data.cmd) === "printback") {
+        const {
+          ext = {}
+        } = (data == null ? void 0 : data.data) || {};
+        const curUidDom = this._notifyPrintQueueMap.data.get(ext == null ? void 0 : ext.uuid);
+        const curUidCallback = this._notifyPrintQueueMap.callback.get(ext == null ? void 0 : ext.uuid);
+        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) {
+            this._notifyPrintQueueMap.data.delete(ext == null ? void 0 : ext.uuid);
+            setTimeout(() => {
+              curUidDom == null ? void 0 : curUidDom.destroy();
+            }, 800);
+          }
+        }
+        if (curUidCallback) {
+          curUidCallback((data == null ? void 0 : data.data) || {});
+          currentV >= totalV && this._notifyPrintQueueMap.callback.delete(ext == null ? void 0 : ext.uuid);
+        }
+      }
       const handler = this.messageHandlerQueue.shift();
       if (!handler)
         return console.log("\u5F53\u524D\u56DE\u6267", e, "\u6CA1\u6709\u53EF\u7528\u7684handler");
@@ -190,6 +259,24 @@ class Print {
       cb && cb(false);
     }
   }
+  createQueueProgressNotifyCss() {
+    const notifyStyleDom = document.getElementById("queueProgressNotifyCss");
+    if (notifyStyleDom)
+      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);
+  }
   async getPicAndUpload(obj) {
     try {
       const isObject = (o) => Object.prototype.toString.call(o) === "[object Object]";
@@ -559,7 +646,9 @@ class Print {
     number,
     svrUpdateIp,
     apptype,
+    printname,
     uuid,
+    priority,
     hideButtons,
     params,
     paramsArr,
@@ -578,7 +667,9 @@ class Print {
       number,
       svrUpdateIp,
       apptype,
+      printname,
       uuid,
+      priority,
       hideButtons,
       params,
       cmdid,
@@ -924,9 +1015,12 @@ class Print {
     svrUpdateIp,
     apptype,
     uuid,
+    printname,
+    priority,
+    isShowQueueProgressNotify = false,
     isDownloadFile = true,
     messageTimeout = 0
-  }, successCallbackFn, errorCallbackFn, cancelCallbackFn, mode = "printDirect") {
+  }, successCallbackFn, errorCallbackFn, cancelCallbackFn, printQueueCallbackFn, mode = "printDirect") {
     const isObject = (o) => Object.prototype.toString.call(o) === "[object Object]";
     const iReportStatus = isIReport(originFormatId);
     const formatId = this.getIReportFormatId(iReportStatus, originFormatId);
@@ -992,6 +1086,53 @@ class Print {
         }];
         params = "";
       }
+      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, notifyDom);
+        }
+        this._notifyPrintQueueMap.callback.set(uuid, printQueueCallbackFn);
+      }
       const printdlgshowValue = printdlgshow != "0" ? printdlgshow : (formatItem == null ? void 0 : formatItem.showPrintDialog) ? "1" : "0";
       const result = await this._handleEventDirect({
         templateId,
@@ -1007,6 +1148,8 @@ class Print {
         copies,
         svrUpdateIp,
         apptype,
+        printname,
+        priority,
         uuid,
         messageTimeout
       });
@@ -1145,6 +1288,8 @@ class Print {
       }
     }, (err) => onReject(err), (err) => {
       console.log(err);
+    }, (result) => {
+      console.log(result);
     }, "downloadPDF");
   }
   async print({

package/es/components/field-set/src/types/index.d.ts

@@ -18,7 +18,7 @@ export type FieldSetItem = Partial<{
     hide: boolean;
     [key: string]: any;
 }>;
-export type FieldSetColumnName = 'show' | 'editable' | 'required' | 'sort' | 'bold' | 'sortDirection' | 'sortPriority' | 'fixedWay' | 'alias' | 'columnWidth' | 'hideExpression' | 'isSearch' | 'isSum' | 'isAvg';
+export type FieldSetColumnName = 'title' | 'show' | 'editable' | 'required' | 'sort' | 'bold' | 'sortDirection' | 'sortPriority' | 'fixedWay' | 'alias' | 'columnWidth' | 'hideExpression' | 'isSearch' | 'isSum' | 'isAvg';
 export type FieldSetColumnItem = {
     title: string;
     type: 'text' | 'checkbox' | 'select' | 'input' | 'inputNumber' | 'color' | 'custom';

package/es/shared/package.json.js

@@ -1,5 +1,5 @@
 var name = "@cnhis-design-vue/shared";
-var version = "3.3.3-beta.55";
+var version = "3.3.3-beta.57";
 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.55",
+	"version": "3.3.3-beta.57",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -74,5 +74,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "d9ec2cd94bae6d5f7ebe68e3cc9df4683ec01eb2"
+	"gitHead": "b23d52297f4db2219ed53d4026f16ae90ca52799"
 }