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

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({
@@ -779,9 +794,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         templateId,
         params: curPrintParamList
       }).then(() => {
+        var _a;
         state.curPrintParamList = curPrintParamList;
         const paramsFirst = JSON.stringify(Object.assign({}, JSON.parse(getPrintParams()), curPrintParamList[0], printCustomProps.value));
         const params = props.strategy === "MULTI" ? paramsFirst : getOnceParams(curPrintParamList, templateCode);
+        const curFormatIdObj = (_a = state == null ? void 0 : state.formatList) == null ? void 0 : _a.find((item) => item.id == formatId);
         const queryParams = {
           formatId,
           templateId,
@@ -794,7 +811,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, "preview"), callLocalServicesErrorCb);
       }).catch(() => {
@@ -1169,6 +1187,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       state.originParams = formatSomeOriginParams(state.templateParams, props.params);
     };
     const verifiySuccess = (token) => {
+      var _a;
       state.identityVerification.visible = false;
       if (isIReport(state.currentFormatId))
         return callLocalServicesSuccessCb({
@@ -1177,10 +1196,12 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         }, "edit");
       const paramsFirst = JSON.stringify(Object.assign({}, JSON.parse(getPrintParams()), state.curPrintParamList[0], printCustomProps.value));
       const params = props.strategy === "MULTI" ? paramsFirst : getOnceParams(state.curPrintParamList, getTemplateCodeByFormatId.value);
+      const curFormatIdObj = (_a = state == null ? void 0 : state.formatList) == null ? void 0 : _a.find((item) => item.id == state.currentFormatId);
       const queryParams = {
         formatId: state.currentFormatId,
         number: state.number,
         templateId: getTemplateIdByFormatId.value,
+        formatItem: curFormatIdObj,
         params,
         token
       };

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;
@@ -434,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,
@@ -447,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(() => {
@@ -711,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

@@ -57,8 +57,8 @@ export declare class Print {
         pageCount: any;
         formatId: string;
     };
-    _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>;
+    _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;
@@ -85,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

@@ -699,6 +699,7 @@ class Print {
     signature,
     copies,
     printdlgshow = "0",
+    watermark,
     nobillnode = "1",
     btnprint = "1",
     messageTimeout = 0
@@ -717,6 +718,7 @@ class Print {
       cmdid,
       nobillnode,
       printdlgshow,
+      watermark,
       btnprint,
       copies,
       messageTimeout,
@@ -748,6 +750,7 @@ class Print {
     templateId,
     formatId = "",
     number,
+    watermark,
     params = "",
     token,
     messageTimeout = 0
@@ -763,6 +766,7 @@ class Print {
       templateId,
       formatId,
       number,
+      watermark,
       cmdid: "9",
       token,
       params: JSON.stringify(formatParams),
@@ -925,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,
@@ -932,6 +937,7 @@ class Print {
         params,
         paramsArr,
         cmdid: this.isRemote ? PRINT_CMD_ID : PREVIEW_CMD_ID,
+        watermark,
         signature,
         btnprint: btnprintValue,
         hideButtons: hideButtonsValue,
@@ -1142,6 +1148,7 @@ class Print {
         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,
@@ -1152,6 +1159,7 @@ class Print {
         print,
         signature,
         printdlgshow: printdlgshowValue,
+        watermark,
         nobillnode,
         copies,
         svrUpdateIp,
@@ -1364,6 +1372,7 @@ class Print {
     templateId,
     formatId,
     number,
+    formatItem,
     params,
     token,
     messageTimeout = 0
@@ -1371,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