cnhis-design-vue 3.1.17-beta.4 → 3.1.17-beta.5

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

@@ -133,8 +133,8 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
     }[];
     currentFormatItem: import("vue").ComputedRef<{} | undefined>;
     formatTitle: import("vue").ComputedRef<any>;
+    getTemplateIdByFormatId: import("vue").ComputedRef<any>;
     renderLabel: (option: any) => any;
-    getTemplateIdByFormatId: (id: any) => any;
     callLocalServicesSuccessCb: (res: any, type: any) => void;
     callLocalServicesErrorCb: (res: any) => void;
     prevFnError: () => void;

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

@@ -137,8 +137,8 @@ declare const _default: import("vue").DefineComponent<{
     }[];
     currentFormatItem: import("vue").ComputedRef<{} | undefined>;
     formatTitle: import("vue").ComputedRef<any>;
+    getTemplateIdByFormatId: import("vue").ComputedRef<any>;
     renderLabel: (option: any) => any;
-    getTemplateIdByFormatId: (id: any) => any;
     callLocalServicesSuccessCb: (res: any, type: any) => void;
     callLocalServicesErrorCb: (res: any) => void;
     prevFnError: () => void;

package/es/packages/button-print/src/ButtonPrint.vue_vue_type_script_setup_true_lang.js

@@ -102,6 +102,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       return state.formatList.find((item) => item.id === id);
     });
     const formatTitle = computed(() => currentFormatItem.value.name || "\u683C\u5F0F\u9009\u62E9");
+    const getTemplateIdByFormatId = computed(() => {
+      let find = state.formatList.find((item) => item.id === state.currentFormatId);
+      return find == null ? void 0 : find.templateId;
+    });
     const renderLabel = (option) => {
       return createVNode("span", {
         "class": {
@@ -109,15 +113,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         }
       }, [option.label]);
     };
-    const getTemplateIdByFormatId = (id) => {
-      let find = state.formatList.find((item) => item.id === id);
-      return find.templateId;
-    };
     const callLocalServicesSuccessCb = (res, type) => {
       let info = {
         type,
         formatId: state.currentFormatId,
-        templateId: getTemplateIdByFormatId(state.currentFormatId)
+        templateId: getTemplateIdByFormatId.value
       };
       emit("success", res, info);
     };
@@ -180,7 +180,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           for (let i = 0; i < state.printParams.length; i++) {
             const queryParams = {
               formatId: state.currentFormatId,
-              templateId: getTemplateIdByFormatId(state.currentFormatId),
+              templateId: getTemplateIdByFormatId.value,
               params: getPrintParams(i)
             };
             printInstance.printDirect(queryParams, callLocalServicesSuccessCbTmp, callLocalServicesErrorCb);
@@ -188,7 +188,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         } else {
           const queryParams = {
             formatId: state.currentFormatId,
-            templateId: getTemplateIdByFormatId(state.currentFormatId),
+            templateId: getTemplateIdByFormatId.value,
             params: getOnceParams()
           };
           printInstance.printDirect(queryParams, (res) => {
@@ -207,7 +207,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         const params = props.strategy === "MULTI" ? getPrintParams() : getOnceParams();
         const queryParams = {
           formatId: state.currentFormatId,
-          templateId: getTemplateIdByFormatId(state.currentFormatId),
+          templateId: getTemplateIdByFormatId.value,
           params
         };
         printInstance.preview(queryParams, (res) => {
@@ -225,7 +225,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         const params = props.strategy === "MULTI" ? getPrintParams() : getOnceParams();
         const queryParams = {
           formatId: state.currentFormatId,
-          templateId: getTemplateIdByFormatId(state.currentFormatId),
+          templateId: getTemplateIdByFormatId.value,
           print: {
             print: "1",
             type: "1",
@@ -357,7 +357,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const initCRM = async (formatListResult) => {
       var _a;
-      console.log("formatListResult", formatListResult);
       state.formatList = formatListResult ? formatFormatList(formatListResult.obj) : [];
       state.currentFormatId = getDefaultFormatId(state.formatList, "defaultFlag");
       if (!state.currentFormatId) {
@@ -365,14 +364,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         return requestError();
       }
       setOptions();
-      if (!state.currentFormatId) {
-        requestError();
-        return;
-      }
-      let templateParamsResult = ((_a = await props.queryTemplateParams()) == null ? void 0 : _a.obj) || {};
-      if (templateParamsResult) {
+      let templateParamsResult = (_a = await props.queryTemplateParams()) == null ? void 0 : _a.obj;
+      if (templateParamsResult && getTemplateIdByFormatId.value) {
         state.templateParams = templateParamsResult;
       } else {
+        $message.error("\u83B7\u53D6\u6253\u5370\u6A21\u677F\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\uFF01");
         return requestError();
       }
       state.printParams = formatParams(state.templateParams, props.params);
@@ -420,7 +416,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       state.identityVerification.visible = false;
       const queryParams = {
         formatId: state.currentFormatId,
-        templateId: getTemplateIdByFormatId(state.currentFormatId),
+        templateId: getTemplateIdByFormatId.value,
         params: getPrintParams(),
         token
       };

package/es/packages/fabric-chart/src/hooks/useLeft.js

@@ -261,10 +261,12 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
     nextTick(() => {
       var _a;
       iconsWidth && drawIcons();
-      const yScaleValueList = left.yScaleValue.filter((v) => v.layout === "left" || v.type === "pain");
+      const yScaleValueList = left.yScaleValue.filter((v) => v.layout === "left" && v.type !== "pain");
       if ((right == null ? void 0 : right.width) && ((_a = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _a.layout) === "left") {
         yScaleValueList.push(getRightInfo);
       }
+      painIndex == 0 && yScaleValueList.unshift(left.yScaleValue[painIndex]);
+      painIndex == left.yScaleValue.length - 1 && yScaleValueList.push(left.yScaleValue[painIndex]);
       drawScaleValue(yScaleValueList);
       canvas.value.renderAll();
     });

package/es/packages/fabric-chart/src/hooks/useRight.js

@@ -3,15 +3,21 @@ import { fabric } from '../utils/index.js';
 import { defaultBorderStyle } from './useDraw.js';
 
 function useRight(canvas, propItems, drawScaleValue) {
-  const { left, right, getRightInfo, canvasWidth, endY } = propItems;
+  const { left, right, getRightInfo, canvasWidth, endY, endX, originY } = propItems;
   onMounted(() => {
     nextTick(() => {
       var _a;
       const yScaleValueList = left.yScaleValue.filter((v) => v.layout === "right");
       if ((right == null ? void 0 : right.width) && ((_a = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _a.layout) === "right") {
         yScaleValueList.push(getRightInfo);
+      }
+      if ((right == null ? void 0 : right.width) || yScaleValueList.length > 0) {
         const rightBorderLine = new fabric.Line([canvasWidth - 1, 0, canvasWidth - 1, endY], defaultBorderStyle);
-        canvas.value.add(rightBorderLine);
+        const rightBorderLine2 = new fabric.Line([endX + 1, originY, canvasWidth - 1, originY], {
+          ...defaultBorderStyle,
+          stroke: "#fff"
+        });
+        canvas.value.add(rightBorderLine, rightBorderLine2);
       }
       drawScaleValue(yScaleValueList);
     });

package/es/packages/form-render/style/index.css

@@ -115,7 +115,7 @@
 }
 .form-render__combinationClose {
   position: absolute;
-  right: 0;
+  right: 5px;
   top: 5px;
   width: 14px;
   height: 14px;

package/es/packages/index.css

@@ -2936,7 +2936,7 @@ body > .vxe-table--tooltip-wrapper {
 }
 .form-render__combinationClose {
   position: absolute;
-  right: 0;
+  right: 5px;
   top: 5px;
   width: 14px;
   height: 14px;

package/global.d.ts

@@ -1,8 +1,8 @@
-import * as NaiveUI from 'naive-ui';
-
-declare module 'naive-ui' {
-  // @ts-ignore
-  export const NTree: any;
-}
-
-export {};
+import * as NaiveUI from 'naive-ui';
+
+declare module 'naive-ui' {
+  // @ts-ignore
+  export const NTree: any;
+}
+
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.17-beta.4",
+  "version": "3.1.17-beta.5",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",