cnhis-design-vue 3.1.17-beta.9 → 3.1.17

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

@@ -228,14 +228,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     });
   }
   function drawPolyLine(item, dataIndex, scaleValue) {
-    const {
-      pointAttr = {},
-      lineAttr = {},
-      noRiseStyle = {},
-      verifiedStyle = {},
-      reduceStyle = {},
-      type = "circle"
-    } = item;
+    const { pointAttr = {}, lineAttr = {}, type = "circle" } = item;
+    const { noRiseStyle = {}, verifiedStyle = {}, reduceStyle = {}, pacemaker = {} } = scaleValue;
     const pointList = [];
     const lineList = [];
     const otherList = [];
@@ -337,11 +331,12 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         reduceLine,
         reducePoint,
         lockMovementX: true,
-        ...pointAttr,
+        ...pacemaker.show && scaleValue.type == "pulse" ? pacemaker.style : pointAttr,
         ...propItems.event
       };
+      const pointType = pacemaker.show && scaleValue.type == "pulse" ? pacemaker.value : type;
       if (previousLine) {
-        point = drawPoint(type, {
+        point = drawPoint(pointType, {
           left: previousLine.get("x2"),
           top: previousLine.get("y2"),
           ...pointAttrNew
@@ -349,13 +344,13 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       } else {
         if (points) {
           pointAttrNew.leftLine = null;
-          if (scaleValue.type === "temperature" && index === 0) {
+          if (scaleValue.type == "temperature" && index === 0) {
             const objLine = [...prevLines].find((v2) => v2.dataIndex === dataIndex - 1);
             if (objLine) {
               pointAttrNew.leftLine = objLine.line;
             }
           }
-          point = drawPoint(type, {
+          point = drawPoint(pointType, {
             left: points[0],
             top: points[1],
             ...pointAttrNew

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

@@ -120,7 +120,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
       }
       const rectWidth = index === 0 ? firstColWidth : colWidth;
       const rectLeft = index === 0 ? start : firstColWidth + start + (index - 1) * colWidth;
-      const line = index > 0 ? new fabric.Line([rectLeft, painIndex == 0 ? vitalSignsOriginY.originY : originY, rectLeft, vitalSignsOriginY.endY], {
+      const line = index > 0 ? new fabric.Line([rectLeft, vitalSignsOriginY.originY, rectLeft, vitalSignsOriginY.endY], {
         ...defaultBorderStyle
       }) : null;
       line && list.push(line);
@@ -135,8 +135,8 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
           const top = vitalSignsOriginY.endY - i * yCellHeight * spaceGridNumber;
           const isMaxMinNumber = i === 0 || i === listLen - 1;
           if (item.showNumber && (isMaxMinNumber ? item.showMaxMinNumber : true)) {
-            const text = drawScaleNumber(v, item, textLeft, i === 0 ? top - 5 : top);
-            list.push(text);
+            const y = i == 0 ? top - 5 : top;
+            y > vitalSignsOriginY.originY && list.push(drawScaleNumber(v, item, textLeft, y));
           }
           if (item.showScale && i !== listLen - 1) {
             for (let j = 0; j < 5; j++) {
@@ -144,9 +144,11 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
                 const x1 = j == 0 ? lineXMain[0] : lineXSub[0];
                 const x2 = j == 0 ? lineXMain[1] : lineXSub[1];
                 const y = top - j * spaceScale;
-                createLine([x1, y, x2, y]);
-                if (i == listLen - 2 && j == 4) {
-                  createLine([lineXMain[0], y - spaceScale, lineXMain[1], y - spaceScale]);
+                if (y > vitalSignsOriginY.originY) {
+                  createLine([x1, y, x2, y]);
+                  if (i == listLen - 2 && j == 4) {
+                    createLine([lineXMain[0], y - spaceScale, lineXMain[1], y - spaceScale]);
+                  }
                 }
               }
             }

package/package.json

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