cnhis-design-vue 3.1.20 → 3.1.21-beta.0

package/es/components/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.js

@@ -1464,7 +1464,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         checked: setChecked,
         row,
         index: $rowIndex,
-        records: checkedRow
+        records: table.getCheckboxRecords()
       });
       setChecked && emit("handlerClickRow", row, $rowIndex);
     };

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

@@ -45,10 +45,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return ((_a = top.operationDays) == null ? void 0 : _a.show) && (top.operationDays.height || defaultHeight) || 0;
     });
     const xScalevalueHeight = computed(() => {
-      var _a, _b;
+      var _a, _b, _c;
       const { top } = props.data;
       const height = ((_a = top.xScalevalue) == null ? void 0 : _a.show) && (top.xScalevalue.height || defaultHeight) || 0;
-      const dayHeight = ((_b = top.xScalevalue) == null ? void 0 : _b.show) ? top.dayHeight || 0 : 0;
+      const dayHeight = ((_b = top.xScalevalue) == null ? void 0 : _b.show) ? (_c = top.dayHeight) != null ? _c : 0 : 0;
       return height + dayHeight;
     });
     const breathingHeight = computed(() => {
@@ -89,8 +89,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return height - endHeight;
     });
     const originY = computed(() => {
+      var _a;
       const { top } = props.data;
-      const dayHeight = top.xScalevalue.show && (top.dayHeight || defaultHeight) || 0;
+      const dayHeight = top.xScalevalue.show && ((_a = top.dayHeight) != null ? _a : 0) || 0;
       const xScaleHeight = top.xScalevalue.show && (top.xScalevalue.height || defaultHeight) || 0;
       const topHeight = dateHeight.value + dayHeight + xScaleHeight + hospitalDaysHeight.value + operationDaysHeight.value;
       return topHeight;

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

@@ -281,14 +281,17 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
   }
   onMounted(() => {
     nextTick(() => {
-      var _a;
+      var _a, _b;
       iconsWidth && drawIcons();
-      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") {
+      const yScaleValueList = left.yScaleValue.filter((v) => v.layout === "left" && v.type !== "pain" && v.show);
+      if ((right == null ? void 0 : right.width) && ((_a = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _a.layout) === "left" && ((_b = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _b.show)) {
         yScaleValueList.push(getRightInfo);
       }
-      painIndex == 0 && left.yScaleValue.length > 1 && yScaleValueList.unshift(left.yScaleValue[painIndex]);
-      painIndex == left.yScaleValue.length - 1 && yScaleValueList.push(left.yScaleValue[painIndex]);
+      if (painIndex > 0 && left.yScaleValue[painIndex].show) {
+        const painObj = left.yScaleValue[painIndex];
+        painIndex === 0 && left.yScaleValue.length > 1 && yScaleValueList.unshift(painObj);
+        painIndex == left.yScaleValue.length - 1 && yScaleValueList.push(painObj);
+      }
       drawScaleValue(yScaleValueList);
       drawBorder();
       canvas.value.renderAll();

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

@@ -6,9 +6,9 @@ function useRight(canvas, propItems, drawScaleValue) {
   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") {
+      var _a, _b;
+      const yScaleValueList = left.yScaleValue.filter((v) => v.layout === "right" && v.show);
+      if ((right == null ? void 0 : right.width) && ((_a = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _a.layout) === "right" && ((_b = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _b.show)) {
         yScaleValueList.push(getRightInfo);
       }
       if ((right == null ? void 0 : right.width) || yScaleValueList.length > 0) {

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

@@ -35,7 +35,8 @@ function useTop(canvas, propItems) {
     group && canvas.value.add(group);
   }
   function drawTime(item, list, topY) {
-    const dayHeight = top.xScalevalue.show ? top.dayHeight || 0 : 0;
+    var _a;
+    const dayHeight = top.xScalevalue.show ? (_a = top.dayHeight) != null ? _a : 0 : 0;
     const height = xScalevalueHeight - dayHeight;
     const title = drawTextGroup({
       width: originX - iconsWidth,
@@ -61,9 +62,10 @@ function useTop(canvas, propItems) {
         width: xCellWidth,
         height
       }, {
-        value: v,
+        value: v.value,
         ...defaultTextStyle,
-        ...item.style || {}
+        ...item.style || {},
+        ...v.style || {}
       }, {
         left,
         top: topY + dayHeight

package/package.json

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