cnhis-design-vue 3.4.0-beta.30 → 3.4.0-beta.33

package/es/components/button-print/index.d.ts

@@ -124,6 +124,10 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<import("
     hidePreviewBtns: {
         type: StringConstructor;
     };
+    isShowResetPrinter: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>, {
     $attrs: {
         [x: string]: unknown;
@@ -251,6 +255,10 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<import("
         hidePreviewBtns: {
             type: StringConstructor;
         };
+        isShowResetPrinter: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & Readonly<{
         onSuccess?: ((...args: any[]) => any) | undefined;
         onError?: ((...args: any[]) => any) | undefined;
@@ -1085,6 +1093,9 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<import("
         hidePreviewBtns: {
             type: StringConstructor;
         };
+        isShowResetPrinter: {
+            type: BooleanConstructor;
+        };
     }>, {
         $attrs: {
             [x: string]: unknown;
@@ -1208,6 +1219,9 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<import("
             hidePreviewBtns: {
                 type: StringConstructor;
             };
+            isShowResetPrinter: {
+                type: BooleanConstructor;
+            };
         }>> & Readonly<{}> & {}>;
         emit: any;
         defaultFormatInfo: import("../../shared/types").AnyObject;
@@ -1247,6 +1261,7 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<import("
         handleClickPreview: () => Promise<void>;
         handleClickPdf: () => Promise<void>;
         handleClickEdit: () => void;
+        handleResetPrinter: () => Promise<void>;
         handleSelect: (key: string, option: import("../../shared/types").AnyObject) => Promise<void>;
         handleClickOutside: () => void;
         instantiatePrintSDK: () => false | undefined;
@@ -1602,6 +1617,9 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<import("
         hidePreviewBtns: {
             type: StringConstructor;
         };
+        isShowResetPrinter: {
+            type: BooleanConstructor;
+        };
     }>> & Readonly<{}>, {
         params: import("../../shared/types").AnyObject[];
         btnText: string;
@@ -1626,6 +1644,7 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<import("
         showLoading: boolean;
         hideButtons: unknown[];
         printCustomProps: Record<string, any>;
+        isShowResetPrinter: boolean;
     }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>>;
     getProps: import("vue").ComputedRef<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         printParams: {
@@ -1750,6 +1769,10 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<import("
         hidePreviewBtns: {
             type: StringConstructor;
         };
+        isShowResetPrinter: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & Readonly<{
         onSuccess?: ((...args: any[]) => any) | undefined;
         onError?: ((...args: any[]) => any) | undefined;
@@ -1887,6 +1910,10 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<import("
     hidePreviewBtns: {
         type: StringConstructor;
     };
+    isShowResetPrinter: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & Readonly<{
     onSuccess?: ((...args: any[]) => any) | undefined;
     onError?: ((...args: any[]) => any) | undefined;
@@ -1920,5 +1947,6 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<import("
     printCustomProps: Record<string, any>;
     placement: string;
     newPrintSetting: Record<string, any>;
+    isShowResetPrinter: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>>;
 export default ButtonPrint;

package/es/components/button-print/src/ButtonPrint.vue.d.ts

@@ -127,6 +127,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     hidePreviewBtns: {
         type: StringConstructor;
     };
+    isShowResetPrinter: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>, {
     $attrs: {
         [x: string]: unknown;
@@ -257,6 +261,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         hidePreviewBtns: {
             type: StringConstructor;
         };
+        isShowResetPrinter: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & Readonly<{
         onSuccess?: ((...args: any[]) => any) | undefined;
         onError?: ((...args: any[]) => any) | undefined;
@@ -1091,6 +1099,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         hidePreviewBtns: {
             type: StringConstructor;
         };
+        isShowResetPrinter: {
+            type: BooleanConstructor;
+        };
     }>, {
         $attrs: {
             [x: string]: unknown;
@@ -1214,6 +1225,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             hidePreviewBtns: {
                 type: StringConstructor;
             };
+            isShowResetPrinter: {
+                type: BooleanConstructor;
+            };
         }>> & Readonly<{}> & {}>;
         emit: any;
         defaultFormatInfo: AnyObject;
@@ -1253,6 +1267,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         handleClickPreview: () => Promise<void>;
         handleClickPdf: () => Promise<void>;
         handleClickEdit: () => void;
+        handleResetPrinter: () => Promise<void>;
         handleSelect: (key: string, option: AnyObject) => Promise<void>;
         handleClickOutside: () => void;
         instantiatePrintSDK: () => false | undefined;
@@ -1608,6 +1623,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         hidePreviewBtns: {
             type: StringConstructor;
         };
+        isShowResetPrinter: {
+            type: BooleanConstructor;
+        };
     }>> & Readonly<{}>, {
         params: AnyObject[];
         btnText: string;
@@ -1632,6 +1650,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         showLoading: boolean;
         hideButtons: unknown[];
         printCustomProps: Record<string, any>;
+        isShowResetPrinter: boolean;
     }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>>;
     getProps: import("vue").ComputedRef<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         printParams: {
@@ -1759,6 +1778,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         hidePreviewBtns: {
             type: StringConstructor;
         };
+        isShowResetPrinter: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & Readonly<{
         onSuccess?: ((...args: any[]) => any) | undefined;
         onError?: ((...args: any[]) => any) | undefined;
@@ -1899,6 +1922,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     hidePreviewBtns: {
         type: StringConstructor;
     };
+    isShowResetPrinter: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & Readonly<{
     onSuccess?: ((...args: any[]) => any) | undefined;
     onError?: ((...args: any[]) => any) | undefined;
@@ -1932,5 +1959,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     printCustomProps: Record<string, any>;
     placement: string;
     newPrintSetting: Record<string, any>;
+    isShowResetPrinter: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

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

@@ -125,6 +125,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     },
     hidePreviewBtns: {
       type: String
+    },
+    isShowResetPrinter: {
+      type: Boolean,
+      default: false
     }
   },
   emits: [

package/es/components/button-print/src/components/OldPrintComponent.vue.d.ts

@@ -119,6 +119,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     hidePreviewBtns: {
         type: StringConstructor;
     };
+    isShowResetPrinter: {
+        type: BooleanConstructor;
+    };
 }>, {
     $attrs: {
         [x: string]: unknown;
@@ -245,6 +248,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         hidePreviewBtns: {
             type: StringConstructor;
         };
+        isShowResetPrinter: {
+            type: BooleanConstructor;
+        };
     }>> & Readonly<{}> & {}>;
     emit: any;
     defaultFormatInfo: AnyObject;
@@ -284,6 +290,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     handleClickPreview: () => Promise<void>;
     handleClickPdf: () => Promise<void>;
     handleClickEdit: () => void;
+    handleResetPrinter: () => Promise<void>;
     handleSelect: (key: string, option: AnyObject) => Promise<void>;
     handleClickOutside: () => void;
     instantiatePrintSDK: () => false | undefined;
@@ -642,6 +649,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     hidePreviewBtns: {
         type: StringConstructor;
     };
+    isShowResetPrinter: {
+        type: BooleanConstructor;
+    };
 }>> & Readonly<{}>, {
     params: AnyObject[];
     btnText: string;
@@ -666,5 +676,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     showLoading: boolean;
     hideButtons: unknown[];
     printCustomProps: Record<string, any>;
+    isShowResetPrinter: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

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

@@ -125,6 +125,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     },
     hidePreviewBtns: {
       type: String
+    },
+    isShowResetPrinter: {
+      type: Boolean
     }
   },
   setup(__props, {
@@ -167,6 +170,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     }, {
       label: props.formatEditText,
       key: "formatEditText"
+    }, {
+      label: i18n("10010.1.484", "\u91CD\u7F6E\u6253\u5370\u673A"),
+      key: "resetPrinter"
     }, ...((_a = props.externalOptionConfig) == null ? void 0 : _a.options) || []]);
     const tempOptions = ref([]);
     const currentFormatItem = computed(() => {
@@ -433,6 +439,28 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         state.spinning = false;
       });
     };
+    const handleResetPrinter = async () => {
+      if (props.showLoading && state.spinning)
+        return;
+      state.spinning = true;
+      props.prevFn("resetPrinter", {
+        formatId: state.currentFormatId,
+        templateId: getTemplateIdByFormatId.value
+      }).then(async () => {
+        const data = await printInstance.resetPrinter(state.currentFormatId, state.iReportExecuteMode);
+        state.spinning = false;
+        if ((data == null ? void 0 : data.result) == "success") {
+          $message.success((data == null ? void 0 : data.message) || i18n("10010.1.487", "\u91CD\u7F6E\u6253\u5370\u673A\u6210\u529F"));
+          return;
+        }
+        $message.warning((data == null ? void 0 : data.message) || i18n("10010.1.488", "\u91CD\u7F6E\u6253\u5370\u673A\u5931\u8D25"));
+      }).catch(() => {
+        prevFnError("resetPrinter");
+        state.spinning = false;
+      }).finally(() => {
+        state.visible = false;
+      });
+    };
     const handleSelect = async (key, option) => {
       var _a2, _b;
       switch (key) {
@@ -448,6 +476,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         case "downloadPdf":
           handleClickPdf();
           break;
+        case "resetPrinter":
+          handleResetPrinter();
+          break;
         default: {
           state.visible = false;
           const formatObj = state.formatList.find((item) => item.id === key) || {};
@@ -548,6 +579,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       if (isIReport(state.currentFormatId)) {
         options.value = tempOptions.value.filter((option) => option.key != "formatEditText");
       }
+      if (!props.isShowResetPrinter) {
+        options.value = options.value.filter((option) => option.key != "resetPrinter");
+      }
     };
     const formatFormatList = (list) => {
       let formatList = [];

package/es/components/fabric-chart/src/hooks/surgicalAnesthesia/useLeft.js

@@ -74,7 +74,7 @@ function useLeft(canvas, propItems, emits, pointTipProps, moveLimit, setPopup, u
     list.forEach((item) => {
       var _a;
       const targetList = !item.linkKey ? item.list : (_a = list.find((_item) => _item.key === item.linkKey)) == null ? void 0 : _a.list;
-      let firstPointLeft = originX;
+      let firstPointLeft = 0;
       targetList.find((k) => {
         let con = false;
         if (isEffectiveNode(k)) {
@@ -85,7 +85,7 @@ function useLeft(canvas, propItems, emits, pointTipProps, moveLimit, setPopup, u
         }
         return con;
       });
-      item.limitRight = firstPointLeft - xCellWidth;
+      item.limitRight = firstPointLeft ? firstPointLeft - xCellWidth : endX;
     });
     const externalIconList = cloneDeep(left.externalIconList || []).map((item) => ({
       ...item,
@@ -107,7 +107,7 @@ function useLeft(canvas, propItems, emits, pointTipProps, moveLimit, setPopup, u
           leftX,
           topY,
           originX: "center",
-          ...item.isExternal ? { evented: false, selectable: false } : {},
+          ...item.isExternal && { evented: false, selectable: false },
           origin: {
             linkKey: item.linkKey,
             limitRight: item.limitRight

package/es/components/iho-table/src/plugins/verticalTablePlugin/src/utils.js

@@ -35,9 +35,12 @@ function bindHeaderInfoAndFlatten(fieldList, depth) {
     Object.entries(fieldItem).forEach(([key, value]) => {
       if (!key.match(/^header_(\d+)$/))
         return;
+      if (key === `header_${depth}`)
+        return;
       if (value !== prevItem[key] || !value)
         return;
-      if (key === `header_${depth}`)
+      const fieldKey = key + "_key";
+      if (fieldItem[fieldKey] && prevItem[fieldKey] && fieldItem[fieldKey] !== prevItem[fieldKey])
         return;
       fieldItem[`${key}_colspan`] = 0;
       fieldItem[`${key}_rowspan`] = 0;
@@ -47,6 +50,7 @@ function bindHeaderInfoAndFlatten(fieldList, depth) {
   function setHeaderInfo(field, depth2) {
     if (!field.parent) {
       field[`header_${depth2}`] = field.title;
+      field[`header_${depth2}_key`] = field.val_key;
       range(depth2 + 1).forEach((idx) => {
         field[`header_${idx}_colspan`] = idx === depth2 ? depth2 + 1 : 0;
         field[`header_${idx}_rowspan`] = idx === depth2 ? 1 : 0;
@@ -61,15 +65,17 @@ function bindHeaderInfoAndFlatten(fieldList, depth) {
       fieldLine.unshift(currentField);
     }
     range(depth2 + 1).forEach((index) => {
-      var _a, _b;
+      var _a, _b, _c, _d;
       const item = fieldLine[index];
       if (!item) {
         field[`header_${index}`] = "";
+        field[`header_${index}_key`] = "";
         field[`header_${index}_colspan`] = 0;
         field[`header_${index}_rowspan`] = 0;
         return;
       }
       field[`header_${index}`] = (_b = (_a = fieldLine[index]) == null ? void 0 : _a.title) != null ? _b : "";
+      field[`header_${index}_key`] = (_d = (_c = fieldLine[index]) == null ? void 0 : _c.val_key) != null ? _d : "";
       field[`header_${index}_colspan`] = index < fieldDepth ? 1 : depth2 - fieldDepth + 1;
       field[`header_${index}_rowspan`] = getChildrenNum(item);
     });

package/es/shared/package.json.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.4.0-beta.30",
+	"version": "3.4.0-beta.33",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -73,5 +73,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "5db80cf14a13537f6072106d3f97b61d3c1e1899"
+	"gitHead": "8354c1494663058951b0f3ec155d0d7032eaa938"
 }