cnhis-design-vue 3.3.3-beta.7 → 3.3.3-beta.70

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),
@@ -753,6 +894,7 @@ class Print {
     templateId,
     number,
     formatId: originFormatId,
+    formatItem,
     params = "",
     paramsArr,
     authorizationKey,
@@ -785,6 +927,9 @@ class Print {
     if (!this._handleResultTest(testResult, errorCallbackFn))
       return false;
     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,
@@ -792,9 +937,10 @@ class Print {
         params,
         paramsArr,
         cmdid: this.isRemote ? PRINT_CMD_ID : PREVIEW_CMD_ID,
+        watermark,
         signature,
-        btnprint,
-        hideButtons,
+        btnprint: btnprintValue,
+        hideButtons: hideButtonsValue,
         messageTimeout
       });
       const handledResult = this._handleResult(result, errorCallbackFn);
@@ -915,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);
@@ -983,6 +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,
@@ -992,10 +1158,15 @@ class Print {
         cmdid: PRINT_CMD_ID,
         print,
         signature,
-        printdlgshow,
+        printdlgshow: printdlgshowValue,
+        watermark,
         nobillnode,
         copies,
         svrUpdateIp,
+        apptype,
+        printname,
+        priority,
+        uuid,
         messageTimeout
       });
       const handledResult = this._handleResult(result, errorCallbackFn, cancelCallbackFn);
@@ -1133,6 +1304,8 @@ class Print {
       }
     }, (err) => onReject(err), (err) => {
       console.log(err);
+    }, (result) => {
+      console.log(result);
     }, "downloadPDF");
   }
   async print({
@@ -1199,6 +1372,7 @@ class Print {
     templateId,
     formatId,
     number,
+    formatItem,
     params,
     token,
     messageTimeout = 0
@@ -1206,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/button-print/style/index.css

@@ -1 +1 @@
-.dropdown-button{border-color:#d5d5d5!important;color:#212121;padding-right:0}.dropdown-button .n-button__content{height:100%}.dropdown-button .n-button__content .n-icon{align-items:center;display:flex;height:100%;justify-content:center;padding-right:10px;width:30px}.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!important}.c-button-preview-modal .n-dialog__content{height:98%}.newprint-button-component .icon-select{padding:0 8px!important}.newprint-button-poperOver{border-radius:3px;overflow-y:auto}.newprint-button-poperOver .bold{font-weight:700}.newprint-button-poperOver .isDisabled{color:#999;cursor:default}.newprint-button-poperOver .print-li{overflow:hidden}.newprint-button-poperOver .print-li .n-divider{margin-bottom:6px;margin-top:6px}.newprint-button-poperOver .print-li .print-lite{align-items:center;border-radius:3px;cursor:pointer;display:flex;height:32px;justify-content:space-between;margin:3px 0}.newprint-button-poperOver .print-li .print-lite .label{padding:0 8px;white-space:nowrap}.newprint-button-poperOver .print-li .print-lite .n-icon{align-items:center;border-radius:0 3px 3px 0;display:flex;height:100%;justify-content:center;width:30px}.newprint-button-poperOver .print-li .print-lite .n-checkbox{white-space:nowrap}.newprint-button-poperOver .print-li.active{color:#2563f4}.newprint-button-poperOver .print-li.active .print-lite{background:rgba(37,99,244,.1)}.newprint-button-poperOver .print-li.active .n-icon{background:rgba(37,99,244,.15)}.newprint-button-outer{align-items:center;display:flex;overflow-x:auto}.newprint-button-outer .outButtonGroup .isPrintDisabled .n-button__border{border-right-width:0!important}.newprint-button-outer .outButtonGroup .n-button.n-button--disabled+.n-button.n-button--default-type:not(.n-button--disabled) .n-button__border{border-left-width:1px!important}.newprint-button-outer .outerLastButton .n-button__border{border-bottom-right-radius:0;border-right:none;border-top-right-radius:0}.newprint-button-outer .outerLastButton:hover .n-button__state-border{border-bottom-right-radius:0;border-top-right-radius:0}.newprint-button-outer .printAllLeftCls .n-button__border,.newprint-button-outer .printAllLeftCls:hover .n-button__state-border{border-bottom-left-radius:0;border-top-left-radius:0}.newprint-button-outer__shortcut{color:#76797f}
+.dropdown-button{border-color:#d5d5d5!important;color:#212121;padding-right:0}.dropdown-button .n-button__content{height:100%}.dropdown-button .n-button__content .n-icon{align-items:center;display:flex;height:100%;justify-content:center;padding-right:10px;width:30px}.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!important}.c-button-preview-modal .n-dialog__content{height:98%}.newprint-button-component .icon-select{padding:0 8px!important}.newprint-button-poperOver{border-radius:3px;overflow-y:auto}.newprint-button-poperOver .bold{font-weight:700}.newprint-button-poperOver .isDisabled{color:#999;cursor:default}.newprint-button-poperOver .print-li{overflow:hidden}.newprint-button-poperOver .print-li .n-divider{margin-bottom:6px;margin-top:6px}.newprint-button-poperOver .print-li .print-lite{align-items:center;border-radius:3px;cursor:pointer;display:flex;height:32px;justify-content:space-between;margin:3px 0;white-space:nowrap}.newprint-button-poperOver .print-li .print-lite .label{padding:0 8px;white-space:nowrap}.newprint-button-poperOver .print-li .print-lite .n-icon{align-items:center;border-radius:0 3px 3px 0;display:flex;height:100%;justify-content:center;width:30px}.newprint-button-poperOver .print-li .print-lite .n-checkbox{white-space:nowrap}.newprint-button-poperOver .print-li.active{color:#2563f4}.newprint-button-poperOver .print-li.active .print-lite{background:rgba(37,99,244,.1)}.newprint-button-poperOver .print-li.active .print-li-icon{background:rgba(37,99,244,.15)}.newprint-button-poperOver .print-li .print-preview-item:hover{color:#2563f4}.newprint-button-outer{align-items:center;display:flex;overflow-x:auto}.newprint-button-outer .outButtonGroup .isPrintDisabled .n-button__border{border-right-width:0!important}.newprint-button-outer .outButtonGroup .n-button.n-button--disabled+.n-button.n-button--default-type:not(.n-button--disabled) .n-button__border{border-left-width:1px!important}.newprint-button-outer .outerLastButton .n-button__border{border-bottom-right-radius:0;border-right:none;border-top-right-radius:0}.newprint-button-outer .outerLastButton:hover .n-button__state-border{border-bottom-right-radius:0;border-top-right-radius:0}.newprint-button-outer .printAllLeftCls .n-button__border,.newprint-button-outer .printAllLeftCls:hover .n-button__state-border{border-bottom-left-radius:0;border-top-left-radius:0}.newprint-button-outer__shortcut{color:#76797f}

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

package/es/components/callback/src/components/render/popupMaps.d.ts

@@ -35,6 +35,10 @@ export declare const CallbackMaps: Map<string, {
             businessFormatter: {
                 type: import("vue").PropType<import("../../../../../components/form-render").FormBusinessFormatter>;
             };
+            nominalAge: {
+                type: BooleanConstructor;
+                default: boolean;
+            };
             schema: {
                 type: import("vue").PropType<import("@formily/json-schema").Stringify<{
                     [key: symbol]: any;
@@ -207,6 +211,7 @@ export declare const CallbackMaps: Map<string, {
                 type: BooleanConstructor;
             };
             lazyRender: BooleanConstructor;
+            linebreaksToTitle: BooleanConstructor;
             dialogFn: {};
         }, {
             props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
@@ -239,6 +244,10 @@ export declare const CallbackMaps: Map<string, {
                 businessFormatter: {
                     type: import("vue").PropType<import("../../../../../components/form-render").FormBusinessFormatter>;
                 };
+                nominalAge: {
+                    type: BooleanConstructor;
+                    default: boolean;
+                };
                 schema: {
                     type: import("vue").PropType<import("@formily/json-schema").Stringify<{
                         [key: symbol]: any;
@@ -411,6 +420,7 @@ export declare const CallbackMaps: Map<string, {
                     type: BooleanConstructor;
                 };
                 lazyRender: BooleanConstructor;
+                linebreaksToTitle: BooleanConstructor;
                 dialogFn: {};
             }>> & {
                 onFormChange?: ((...args: any[]) => any) | undefined;
@@ -588,6 +598,7 @@ export declare const CallbackMaps: Map<string, {
                 feedbackType: "default" | "tooltip";
                 fixMemoLeak: boolean;
                 lazyRender: boolean;
+                linebreaksToTitle: boolean;
                 dialogFn: any;
             }>) => Record<string, import("@formily/json-schema").Stringify<{
                 [key: symbol]: any;
@@ -804,6 +815,10 @@ export declare const CallbackMaps: Map<string, {
             businessFormatter: {
                 type: import("vue").PropType<import("../../../../../components/form-render").FormBusinessFormatter>;
             };
+            nominalAge: {
+                type: BooleanConstructor;
+                default: boolean;
+            };
             schema: {
                 type: import("vue").PropType<import("@formily/json-schema").Stringify<{
                     [key: symbol]: any;
@@ -976,6 +991,7 @@ export declare const CallbackMaps: Map<string, {
                 type: BooleanConstructor;
             };
             lazyRender: BooleanConstructor;
+            linebreaksToTitle: BooleanConstructor;
             dialogFn: {};
         }>> & {
             onFormChange?: ((...args: any[]) => any) | undefined;
@@ -1010,6 +1026,8 @@ export declare const CallbackMaps: Map<string, {
             feedbackType: "default" | "tooltip";
             fixMemoLeak: boolean;
             lazyRender: boolean;
+            linebreaksToTitle: boolean;
+            nominalAge: boolean;
             operationalFormInit: boolean;
             incrementalRender: boolean;
         }>;

package/es/components/card-reader-sdk-cn/src/henan/index.js

@@ -208,7 +208,14 @@ const ageCodeMap = {
       return "\u5468";
     }
   }(),
-  N: "\u5206\u949F"
+  N: function() {
+    var _a, _b, _c;
+    try {
+      return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.638")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.638")) || "\u5206\u949F";
+    } catch (e) {
+      return "\u5206\u949F";
+    }
+  }()
 };
 function birthdayToAge(birthday) {
   const {