cnhis-design-vue 3.1.14-beta.10 → 3.1.14-beta.11.2

package/es/packages/fabric-chart/src/FabricChart.vue_vue_type_script_setup_true_lang.js

@@ -287,7 +287,8 @@ var script = /* @__PURE__ */ defineComponent({
       canvas.value = null;
     });
     expose({
-      select
+      select,
+      canvas
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock(Fragment, null, [

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

@@ -38,6 +38,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
   const shadowLinesCache = /* @__PURE__ */ new Set();
   const maiboPoints = /* @__PURE__ */ new Set();
   const otherPoints = /* @__PURE__ */ new Set();
+  const prevLines = /* @__PURE__ */ new Set();
   onMounted(() => {
     nextTick(() => {
       init();
@@ -47,6 +48,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     drawShaDow();
     maiboPoints.clear();
     otherPoints.clear();
+    prevLines.clear();
     left.yScaleValue.forEach((scaleValue) => {
       drawPositionLine(scaleValue);
       scaleValue.dataList.forEach((item, dataIndex) => {
@@ -94,12 +96,11 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
             y: item.y
           };
         }
-        if (isEffectiveNode(item) && isLimit(item.time)) {
-          let y = cumputedY(pulseObj.type, pulseObj.list, item.value);
-          y = y < vitalSignsOriginY.originY ? vitalSignsOriginY.originY : y > vitalSignsOriginY.endY ? vitalSignsOriginY.endY : y;
+        const point = getPointer(item, pulseObj);
+        if (point == null ? void 0 : point.length) {
           return {
-            x: cumputedX(item.time),
-            y
+            x: point[0],
+            y: point[1]
           };
         }
       };
@@ -278,24 +279,10 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     const lineList = [];
     const otherList = [];
     item.list.forEach((v, index) => {
-      const newY = scaleValue.type === "pain" ? painOriginY : vitalSignsOriginY;
-      let points = null;
-      if (isEffectiveNode(v)) {
-        const x = cumputedX(v.time);
-        const y = cumputedY(scaleValue.type, scaleValue.list, v.value);
-        if (isLimit(v.time)) {
-          points = [x, y < newY.originY ? newY.originY : y > newY.endY ? newY.endY : y];
-        }
-      }
+      var _a;
+      const points = getPointer(v, scaleValue);
       const nextV = item.list[index + 1];
-      let nextPoint = null;
-      if (isEffectiveNode(nextV)) {
-        const nextX = cumputedX(nextV.time);
-        const nextY = cumputedY(scaleValue.type, scaleValue.list, nextV.value);
-        if (isLimit(nextV.time)) {
-          nextPoint = [nextX, nextY < newY.originY ? newY.originY : nextY > newY.endY ? newY.endY : nextY];
-        }
-      }
+      const nextPoint = getPointer(nextV, scaleValue);
       let coolLine, coolPoint, noRiseText, arrowGroup, verifiedText;
       if (points && scaleValue.type === "temperature") {
         if (v.noRise) {
@@ -357,9 +344,22 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         }
       }
       let point;
-      const line = points && nextPoint && !v.breakpoint ? drawLine([...points, ...nextPoint], {
-        ...lineAttr
-      }) : null;
+      let line;
+      if (points && nextPoint && !v.breakpoint) {
+        line = drawLine([...points, ...nextPoint], {
+          ...lineAttr
+        });
+      } else if (points && !nextPoint && !v.breakpoint && scaleValue.type === "temperature" && dataIndex < scaleValue.dataList.length - 1 && index === item.list.length - 1) {
+        const nextV2 = (_a = scaleValue.dataList[dataIndex + 1].list) == null ? void 0 : _a[0];
+        const nextLinePoint = getPointer(nextV2, scaleValue);
+        line = nextLinePoint ? drawLine([...points, ...nextLinePoint], {
+          ...lineAttr
+        }) : null;
+        nextLinePoint && prevLines.add({
+          dataIndex,
+          line
+        });
+      }
       const previousLine = lineList[index - 1];
       const pointAttrNew = {
         origin: {
@@ -390,6 +390,12 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       } else {
         if (points) {
           pointAttrNew.leftLine = null;
+          if (scaleValue.type === "temperature" && index === 0) {
+            const objLine = [...prevLines].find((v2) => v2.dataIndex === dataIndex - 1);
+            if (objLine) {
+              pointAttrNew.leftLine = objLine.line;
+            }
+          }
           point = drawPoint(type, {
             left: points[0],
             top: points[1],
@@ -521,6 +527,16 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     const getTime = new Date(time).getTime();
     return getTime >= minMinute && getTime <= maxMinute;
   }
+  function getPointer(v, scaleValue) {
+    let points;
+    const objOriginY = scaleValue.type === "pain" ? painOriginY : vitalSignsOriginY;
+    if (isEffectiveNode(v) && isLimit(v.time)) {
+      const x = cumputedX(v.time);
+      const y = cumputedY(scaleValue.type, scaleValue.list, v.value);
+      points = [x, y < objOriginY.originY ? objOriginY.originY : y > objOriginY.endY ? objOriginY.endY : y];
+    }
+    return points;
+  }
   function clickMenu({ item, target }) {
     if (!target) {
       emits("add", {

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

@@ -23,6 +23,7 @@ function useCanvasEvent(canvas, propItems, emits) {
       lockMovementX: true,
       lockMovementY: true,
       transparentCorners: false,
+      hasControls: false,
       ...selectionStyle
     });
     canvas.value.add(rect);
@@ -37,9 +38,9 @@ function useCanvasEvent(canvas, propItems, emits) {
     const selections2 = [];
     selections2.push(drawRect({
       left: iconsWidth,
-      top: originY,
+      top: originY + 1,
       width: originX - iconsWidth,
-      height: endY
+      height: endY - originY - 3
     }, "left"));
     let topY = 0;
     topList.forEach((item, index) => {
@@ -48,16 +49,16 @@ function useCanvasEvent(canvas, propItems, emits) {
       }
       selections2.push(drawRect({
         left: iconsWidth,
-        top: topY,
+        top: topY + 1,
         width: endX - iconsWidth,
-        height: propItems[`${item.key}Height`]
+        height: propItems[`${item.key}Height`] - 1
       }, item.key));
     });
     selections2.push(drawRect({
       left: originX,
-      top: originY,
+      top: originY + 1,
       width: endX - originX,
-      height: endY - originY
+      height: endY - originY - 3
     }, "grid"));
     canvas.value.renderAll();
     return selections2;
@@ -67,7 +68,7 @@ function useCanvasEvent(canvas, propItems, emits) {
     canvas.value.discardActiveObject();
     canvas.value.renderAll();
     const obj = selections == null ? void 0 : selections.find((obj2) => obj2.key === key);
-    obj && obj.bringToFront();
+    obj == null ? void 0 : obj.bringToFront();
     obj && canvas.value.setActiveObject(obj);
   }
   return { select };