cnhis-design-vue 3.1.20-beta.1 → 3.1.20-beta.3

package/es/components/fabric-chart/src/FabricChart.js

@@ -178,7 +178,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         originY: endY.value,
         endY: endY.value
       };
-      if (painIndex.value === 0) {
+      if (painIndex.value === 0 && left.yScaleValue.length > 1) {
         obj.originY = originYLimit.value;
         obj.endY = originYLimit.value + painHeight.value;
       } else if (painIndex.value === left.yScaleValue.length - 1) {
@@ -193,7 +193,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         originY: originY.value,
         endY: endY.value
       };
-      if (painIndex.value === 0) {
+      if (painIndex.value === 0 && left.yScaleValue.length > 1) {
         obj.originY = originYLimit.value + painHeight.value;
         obj.endY = endY.value;
       } else if (painIndex.value === left.yScaleValue.length - 1) {

package/es/components/fabric-chart/src/hooks/useCenter2.js

@@ -458,7 +458,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     pointTipProps.list = [getListValue(), `\u65F6\u95F4 ${((data == null ? void 0 : data.time) || getXValue(point.left)).slice(-5)}`];
     pointTipProps.show = true;
     function getListValue() {
-      const { value, drugReduce, physicsReduce } = data;
+      const { value = getYValue(type, point.top), drugReduce, physicsReduce } = data || {};
       if (drugReduce) {
         return `\u836F\u7269\u964D${type == "pain" ? "\u75DB" : "\u6E29"} ${value}\u2014>${drugReduce}${unit || ""}`;
       }

package/es/components/fabric-chart/src/hooks/useEvent2.js

@@ -51,16 +51,21 @@ function useCanvasEvent(canvas, propItems, emits) {
         top: topY + 1,
         height: propItems[`${item.key}Height`] - 1
       };
+      selections2.push(drawRect({
+        left: iconsWidth,
+        width: endX - iconsWidth,
+        ...commonOptions
+      }, item.key + "All"));
       selections2.push(drawRect({
         left: iconsWidth,
         width: originX - iconsWidth,
         ...commonOptions
-      }, item.key));
+      }, item.key + "Title"));
       selections2.push(drawRect({
         left: originX,
         width: endX - originX,
         ...commonOptions
-      }, item.key + "Title"));
+      }, item.key));
     });
     selections2.push(drawRect({
       left: originX,

package/es/components/fabric-chart/src/hooks/useLeft2.js

@@ -17,6 +17,8 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
     itemList,
     painIndex,
     right,
+    canvasWidth,
+    canvasHeight,
     getRightInfo
   } = propItems;
   const mainScaleWidth = 9;
@@ -267,6 +269,16 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
       }
     });
   }
+  function drawBorder() {
+    canvas.value.add(new fabric.Rect({
+      left: iconsWidth,
+      top: 0,
+      width: canvasWidth - iconsWidth,
+      height: canvasHeight - 1,
+      fill: "transparent",
+      ...defaultBorderStyle
+    }));
+  }
   onMounted(() => {
     nextTick(() => {
       var _a;
@@ -275,9 +287,10 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
       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 == 0 && left.yScaleValue.length > 1 && yScaleValueList.unshift(left.yScaleValue[painIndex]);
       painIndex == left.yScaleValue.length - 1 && yScaleValueList.push(left.yScaleValue[painIndex]);
       drawScaleValue(yScaleValueList);
+      drawBorder();
       canvas.value.renderAll();
     });
   });

package/es/components/fabric-chart/src/hooks/useOther2.js

@@ -4,6 +4,7 @@ import { defaultStyle } from './useDraw2.js';
 
 function useOther(canvas, propItems, cumputedX) {
   const { other, vitalSignsOriginY, xCellWidth, yCellHeight } = propItems;
+  let textDiff = 0;
   function drawOther() {
     if (!(other == null ? void 0 : other.list))
       return false;
@@ -71,8 +72,9 @@ function useOther(canvas, propItems, cumputedX) {
     group && canvas.value.add(group);
     function hasNode(x, y, currentLenght) {
       return list.find((v) => {
-        const condition1 = y < v.top + v.trueHeight;
-        const condition2 = y + currentLenght * yCellHeight < v.top + v.trueHeight;
+        const trueY = y + textDiff;
+        const condition1 = trueY < v.top + v.trueHeight;
+        const condition2 = trueY + currentLenght * yCellHeight < v.top + v.trueHeight;
         return v.left === x && (condition1 || condition2);
       });
     }
@@ -87,12 +89,13 @@ function useOther(canvas, propItems, cumputedX) {
         ...defaultStyle,
         ...v.style || {}
       });
+      textDiff = (yCellHeight - (text.height || 0)) / 2;
       texts.push(text);
     });
     return new fabric.Group(texts, {
       originX: "center",
       left: x,
-      top: y,
+      top: y + textDiff,
       baseTop: v.baseTop,
       trueHeight: texts.length * yCellHeight
     });

package/es/components/form-render/src/hooks/useFieldListAdaptor2.js

@@ -70,6 +70,7 @@ function useFieldListAdaptor(collector) {
       const multiple = item2.multi_select === "0";
       Object.assign(schema2["x-component-props"], {
         multiple,
+        options: item2.option,
         maxTagCount: parseNumberFromMaybeString(item2.multi_select_value)
       });
       multiple && (schema2.type = "array");
@@ -83,8 +84,7 @@ function useFieldListAdaptor(collector) {
     }
     function bindUrlProps(schema2, item2) {
       Object.assign(schema2["x-component-props"], {
-        ...pick(item2, ["lazyRequest", "urlConfig"]),
-        options: item2.option
+        ...pick(item2, ["lazyRequest", "urlConfig"])
       });
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "3.1.20-beta.1",
+  "version": "3.1.20-beta.3",
   "license": "ISC",
   "module": "./es/components/index.js",
   "main": "./es/components/index.js",
@@ -66,5 +66,5 @@
     "iOS 7",
     "last 3 iOS versions"
   ],
-  "gitHead": "2a197511d35c7dc055d301d16d929f9da1850e20"
+  "gitHead": "0036e68fe20366c90758a8afe964be6a201b61d1"
 }