cnhis-design-vue 3.4.0-beta.39 → 3.4.0-beta.40

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

@@ -617,14 +617,31 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       return state.spinning;
     };
     const handleOneTypePrint = (templateCode, templateId, formatId, isOuterClick) => {
-      props.prevPrintFn().then(() => {
-        const tmpParam = state.printParams[templateCode];
+      const tmpParam = state.printParams[templateCode];
+      props.prevPrintFn({
+        templateId,
+        formatId,
+        params: tmpParam
+      }).then(() => {
+        var _a;
         if (!tmpParam)
           return;
         state.isClickOuterPrint = isOuterClick;
         state.currentFormatId = formatId;
         const printToParam = state.originParams[templateCode] || [];
-        handleClickPrint(tmpParam, templateCode, templateId, formatId, printToParam);
+        handleClickPrint(tmpParam, templateCode, templateId, formatId, printToParam, true);
+        if (isPrintAllType.value == 4 && ((_a = printAllFormatIds == null ? void 0 : printAllFormatIds.value) == null ? void 0 : _a.includes(formatId))) {
+          const printFormatIds = printAllFormatIds.value.filter((id) => id != formatId);
+          printFormatIds.forEach((id) => {
+            const curFormatItem = state.formatList.find((item) => item.id === id);
+            if (curFormatItem) {
+              const tmpParam2 = state.printParams[curFormatItem.number];
+              const printToParam2 = state.originParams[curFormatItem.number] || [];
+              state.currentFormatId = id;
+              handleClickPrint(tmpParam2, curFormatItem.number, curFormatItem.templateId, id, printToParam2, true);
+            }
+          });
+        }
       });
     };
     const handleClickPrint = async (curPrintParamList = [], templateCode, templateId, formatId, printToParam = [], needContinuePrint) => {
@@ -1370,7 +1387,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
               component: unref(PrintOutline),
               size: "18"
             }, null, 8, ["component"])]),
-            default: withCtx(() => [createTextVNode(" " + toDisplayString(!isShowPrintAllBtn.value || isPrintAllType.value == 3 ? __props.btnText : i18n("10010.1.475", "\u6253\u5370\u5168\u90E8")) + " ", 1), printAllShortcut.value ? (openBlock(), createElementBlock("span", _hoisted_7, toDisplayString(printAllShortcut.value), 1)) : createCommentVNode("v-if", true)]),
+            default: withCtx(() => [createTextVNode(" " + toDisplayString(!isShowPrintAllBtn.value || isPrintAllType.value == 3 || isPrintAllType.value == 4 ? __props.btnText : i18n("10010.1.475", "\u6253\u5370\u5168\u90E8")) + " ", 1), printAllShortcut.value ? (openBlock(), createElementBlock("span", _hoisted_7, toDisplayString(printAllShortcut.value), 1)) : createCommentVNode("v-if", true)]),
             _: 1
           }, 16, ["loading", "class"]), createCommentVNode(" \u53EA\u6709\u4E0B\u62C9\u6846\u6709\u9879\uFF0C\u624D\u5C55\u793A\u56FE\u6807\u6309\u94AE "), createVNode(unref(NButton), mergeProps({
             class: "icon-select"

package/es/shared/package.json.js

@@ -1,5 +1,5 @@
 var name = "@cnhis-design-vue/shared";
-var version = "3.4.0-beta.39";
+var version = "3.4.0-beta.40";
 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.39",
+	"version": "3.4.0-beta.40",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -73,5 +73,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "d55312f4966c5a5631441207b127e301c021a2f0"
+	"gitHead": "38feade657a5fc3ef92bbe001805e69547bb1fdf"
 }