cnhis-design-vue 3.3.3-release.12 → 3.3.3-release.14

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

@@ -156,6 +156,12 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     svrUpdateIp: {
       type: String
     },
+    apptype: {
+      type: String
+    },
+    uuid: {
+      type: String
+    },
     hidePreviewBtns: {
       type: String
     }
@@ -268,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 = {
@@ -290,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;
@@ -358,6 +376,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           signature: props.signature,
           copies: props.printCopies,
           svrUpdateIp: props.svrUpdateIp,
+          apptype: props.apptype,
+          uuid: props.uuid,
           formatItem: curFormatIdObj
         };
         if (props.strategy === "MULTI") {
@@ -426,7 +446,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         formatId: state.currentFormatId,
         templateId: getTemplateIdByFormatId.value
       }).then(() => {
+        var _a2;
         const params = props.strategy === "MULTI" ? getPrintParams() : getOnceParams();
+        const curFormatIdObj = (_a2 = state == null ? void 0 : state.formatList) == null ? void 0 : _a2.find((item) => item.id == state.currentFormatId);
         const queryParams = {
           formatId: state.currentFormatId,
           iReportExecuteMode: state.iReportExecuteMode,
@@ -439,7 +461,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             resolution: props == null ? void 0 : props.resolution
           },
           params,
-          signature: props.signature
+          signature: props.signature,
+          formatItem: curFormatIdObj
         };
         printInstance.downloadPDF(queryParams, (res) => callLocalServicesSuccessCb(res, "download"), callLocalServicesErrorCb);
       }).catch(() => {
@@ -703,13 +726,16 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       state.printParams = formatParams(state.templateParams, props.params);
     };
     const verifiySuccess = (token) => {
+      var _a2;
       state.identityVerification.visible = false;
       if (isIReport(state.currentFormatId))
         return callLocalServicesSuccessCb(null, "edit");
+      const curFormatIdObj = (_a2 = state == null ? void 0 : state.formatList) == null ? void 0 : _a2.find((item) => item.id == state.currentFormatId);
       const queryParams = {
         formatId: state.currentFormatId,
         number: state.number,
         templateId: getTemplateIdByFormatId.value,
+        formatItem: curFormatIdObj,
         params: getPrintParams(),
         token
       };

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 renderQueueProgressNotifyContent;
     getPicAndUpload(obj: any): Promise<void>;
     private postMessage;
     messageCollect(id: string, data: AnyObject): Promise<unknown>;
@@ -55,8 +57,8 @@ export declare class Print {
         pageCount: any;
         formatId: string;
     };
-    _handleEventDirect({ templateId, formatId, number, svrUpdateIp, hideButtons, params, paramsArr, cmdid, print, signature, copies, printdlgshow, nobillnode, btnprint, messageTimeout }: AnyObject): Promise<any>;
-    _handleEventEditFormat({ templateId, formatId, number, params, token, messageTimeout }: AnyObject): Promise<any>;
+    _handleEventDirect({ templateId, formatId, number, svrUpdateIp, apptype, printname, uuid, priority, hideButtons, params, paramsArr, cmdid, print, signature, copies, printdlgshow, watermark, nobillnode, btnprint, messageTimeout }: AnyObject): Promise<any>;
+    _handleEventEditFormat({ templateId, formatId, number, watermark, params, token, messageTimeout }: AnyObject): Promise<any>;
     _queryProxyOrigin(): Promise<void>;
     _queryPrintFile(formatId: string, params?: string): Promise<any>;
     paramsSerializer(params: AnyObject): AnyObject;
@@ -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, 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;
     /**
@@ -83,6 +85,6 @@ export declare class Print {
         formatId: string;
     }>;
     printFileData({ formatId, file, printerName }: AnyObject, successCallbackFn?: AnyFn, errorCallbackFn?: AnyFn): Promise<false | AnyObject>;
-    editPrintFormat({ templateId, formatId, number, params, token, messageTimeout }: AnyObject, successCallbackFn?: AnyFn, errorCallbackFn?: AnyFn): Promise<false | undefined>;
+    editPrintFormat({ templateId, formatId, number, formatItem, params, token, messageTimeout }: AnyObject, successCallbackFn?: AnyFn, errorCallbackFn?: AnyFn): Promise<false | undefined>;
     addPrintFormat({ templateId, params, token }: AnyObject, successCallbackFn?: AnyFn, errorCallbackFn?: AnyFn): Promise<false | undefined>;
 }

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, 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';
@@ -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,11 @@ class Print {
     printInstance = this;
     const _window = window;
     this.CMonitor = _window.$CMonitor;
+    this._notifyPrintQueueMap = {
+      data: /* @__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;
     } catch (error) {
@@ -110,8 +125,32 @@ 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) {
+          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(() => {
+              this.renderQueueProgressNotifyContent();
+            }, 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 +229,96 @@ class Print {
       cb && cb(false);
     }
   }
+  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;
+    }
+    clearNotifyDom();
+  }
   async getPicAndUpload(obj) {
     try {
       const isObject = (o) => Object.prototype.toString.call(o) === "[object Object]";
@@ -558,6 +687,10 @@ class Print {
     formatId,
     number,
     svrUpdateIp,
+    apptype,
+    printname,
+    uuid,
+    priority,
     hideButtons,
     params,
     paramsArr,
@@ -566,6 +699,7 @@ class Print {
     signature,
     copies,
     printdlgshow = "0",
+    watermark,
     nobillnode = "1",
     btnprint = "1",
     messageTimeout = 0
@@ -575,11 +709,16 @@ class Print {
       formatId,
       number,
       svrUpdateIp,
+      apptype,
+      printname,
+      uuid,
+      priority,
       hideButtons,
       params,
       cmdid,
       nobillnode,
       printdlgshow,
+      watermark,
       btnprint,
       copies,
       messageTimeout,
@@ -611,6 +750,7 @@ class Print {
     templateId,
     formatId = "",
     number,
+    watermark,
     params = "",
     token,
     messageTimeout = 0
@@ -626,6 +766,7 @@ class Print {
       templateId,
       formatId,
       number,
+      watermark,
       cmdid: "9",
       token,
       params: JSON.stringify(formatParams),
@@ -788,6 +929,7 @@ class Print {
     try {
       const hideButtonsValue = hideButtons ? hideButtons : (formatItem == null ? void 0 : formatItem.previewCanExport) === void 0 || (formatItem == null ? void 0 : formatItem.previewCanExport) ? void 0 : "Export";
       const btnprintValue = btnprint != "1" ? btnprint : (formatItem == null ? void 0 : formatItem.previewCanPrint) === false ? "0" : "1";
+      const watermark = (formatItem == null ? void 0 : formatItem.showWatermark) ? "1" : void 0;
       const result = await this._handleEventDirect({
         templateId,
         number,
@@ -795,6 +937,7 @@ class Print {
         params,
         paramsArr,
         cmdid: this.isRemote ? PRINT_CMD_ID : PREVIEW_CMD_ID,
+        watermark,
         signature,
         btnprint: btnprintValue,
         hideButtons: hideButtonsValue,
@@ -918,9 +1061,14 @@ class Print {
     nobillnode,
     copies,
     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);
@@ -986,7 +1134,21 @@ class Print {
         }];
         params = "";
       }
+      if (uuid && printname) {
+        if (isShowQueueProgressNotify) {
+          this._notifyPrintQueueMap.data.set(uuid, {
+            printname,
+            uuid,
+            currentV: 0,
+            totalV: paramsArr.length,
+            progressValue: 0
+          });
+          this.renderQueueProgressNotifyContent();
+        }
+        this._notifyPrintQueueMap.callback.set(uuid, printQueueCallbackFn);
+      }
       const printdlgshowValue = printdlgshow != "0" ? printdlgshow : (formatItem == null ? void 0 : formatItem.showPrintDialog) ? "1" : "0";
+      const watermark = (formatItem == null ? void 0 : formatItem.showWatermark) ? "1" : void 0;
       const result = await this._handleEventDirect({
         templateId,
         number,
@@ -997,9 +1159,14 @@ class Print {
         print,
         signature,
         printdlgshow: printdlgshowValue,
+        watermark,
         nobillnode,
         copies,
         svrUpdateIp,
+        apptype,
+        printname,
+        priority,
+        uuid,
         messageTimeout
       });
       const handledResult = this._handleResult(result, errorCallbackFn, cancelCallbackFn);
@@ -1137,6 +1304,8 @@ class Print {
       }
     }, (err) => onReject(err), (err) => {
       console.log(err);
+    }, (result) => {
+      console.log(result);
     }, "downloadPDF");
   }
   async print({
@@ -1203,6 +1372,7 @@ class Print {
     templateId,
     formatId,
     number,
+    formatItem,
     params,
     token,
     messageTimeout = 0
@@ -1210,9 +1380,11 @@ class Print {
     const testResult = await this._testConnection();
     if (!this._handleResultTest(testResult, errorCallbackFn))
       return false;
+    const watermark = (formatItem == null ? void 0 : formatItem.showWatermark) ? "1" : void 0;
     const result = await this._handleEventEditFormat({
       templateId,
       formatId,
+      watermark,
       number,
       params,
       token,

package/es/components/calendar/src/Calendar.vue2.js

@@ -114,7 +114,20 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       eventContent: eventContentRender,
       resourceLabelContent: resourceLabelContentRender,
       select: (...args) => emit("select", ...args),
-      eventDrop: (...args) => emit("eventDrag", ...args),
+      eventDrop: (...args) => {
+        var _a, _b;
+        const [info] = args;
+        const eventId = info.event.id;
+        const targetEvent = props.events.find((event) => event.id === eventId);
+        if (targetEvent && targetEvent.resourceEditable === false) {
+          const oldResourceId = (_a = info.oldResource) == null ? void 0 : _a.id;
+          const newResourceId = (_b = info.newResource) == null ? void 0 : _b.id;
+          if (oldResourceId !== newResourceId) {
+            return;
+          }
+        }
+        emit("eventDrag", ...args);
+      },
       eventResize: (...args) => emit("eventResize", ...args),
       eventClick: (...args) => emit("eventClick", ...args)
     });
@@ -200,10 +213,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       immediate: true
     });
     watch(() => props.events, (events) => {
-      calendarOptions.events = cloneDeep(events).map((event) => ({
-        ...event,
-        resourceEditable: false
-      }));
+      calendarOptions.events = cloneDeep(events);
     }, {
       deep: true,
       immediate: true