cnhis-design-vue 3.3.2-beta.6 → 3.3.2-release.2

package/es/components/fabric-chart/src/hooks/temperature/useCenter.js

@@ -149,8 +149,12 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
         } = target.origin || {};
         if (type === "pulse") {
           const list = shadowPointCache.get(key);
-          const index = list == null ? void 0 : list.findIndex((point) => point[0] === target.left);
-          list.splice(index, 1, [target.left, target.top]);
+          const index = list == null ? void 0 : list.findIndex((point) => point.left === target.left);
+          list.splice(index, 1, {
+            ...list[index],
+            left: target.left,
+            top: target.top
+          });
         }
       }
       const data = getShadowData();
@@ -209,6 +213,12 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
     const finalResult = Object.values(result).filter((item) => item.length === 2 && Math.trunc(item[0][1]) !== Math.trunc(item[1][1]));
     return finalResult;
   }
+  function getXY(point) {
+    return [point.left, point.top];
+  }
+  function getPointWidthRightLine(point) {
+    return point && !point.breakpoint ? point : null;
+  }
   function getShadowData() {
     const data = [];
     const pulsePoints = [];
@@ -217,8 +227,8 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
       pulsePoints.push(item[1]);
       if (item[0] === SHADOWKEYS[0]) {
         item[1].forEach((_item) => {
-          const someIndex = (shadowPointCache.get(SHADOWKEYS[1]) || []).findIndex((v) => v[0] === _item[0]);
-          someIndex > -1 && sames.push(_item[0]);
+          const someIndex = (shadowPointCache.get(SHADOWKEYS[1]) || []).findIndex((v) => v.left === _item.left);
+          someIndex > -1 && sames.push(_item.left);
         });
       }
     }
@@ -226,28 +236,24 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
     let _arr1 = [];
     let _arr2 = [];
     sames.forEach((left2) => {
-      const index1 = points1.findIndex((point) => point[0] === left2);
-      const index2 = points2.findIndex((point) => point[0] === left2);
+      const index1 = points1.findIndex((point) => point.left === left2);
+      const index2 = points2.findIndex((point) => point.left === left2);
       const currentPoint1 = points1[index1];
       const currentPoint2 = points2[index2];
-      const prevPoint1 = points1[index1 - 1];
+      const prevPoint1 = getPointWidthRightLine(points1[index1 - 1]);
       const nextPoint1 = points1[index1 + 1];
-      const prevPoint2 = points2[index2 - 1];
+      const prevPoint2 = getPointWidthRightLine(points2[index2 - 1]);
       const nextPoint2 = points2[index2 + 1];
       if (prevPoint1 && prevPoint2) {
-        if (prevPoint1[0] !== prevPoint2[0]) {
-          const maxPoint = Math.max(prevPoint1[0], prevPoint2[0]);
-          _arr1.push([prevPoint1, prevPoint2].find((point) => point[0] === maxPoint));
+        if (prevPoint1.left !== prevPoint2.left) {
+          const maxPoint = Math.max(prevPoint1.left, prevPoint2.left);
+          _arr1.push(getXY([prevPoint1, prevPoint2].find((point) => point.left === maxPoint)));
         }
       } else if (prevPoint1) {
-        _arr1.push(prevPoint1);
+        _arr1.push(getXY(prevPoint1));
       } else if (prevPoint2) {
-        _arr2.push(prevPoint2);
+        _arr2.push(getXY(prevPoint2));
       }
-      const minYPoint = Math.min(currentPoint1[1], currentPoint2[1]);
-      _arr1.push([currentPoint1, currentPoint2].find((point) => point[1] === minYPoint));
-      const maxYPoint = Math.max(currentPoint1[1], currentPoint2[1]);
-      _arr2.push([currentPoint1, currentPoint2].find((point) => point[1] === maxYPoint));
       const setData = () => {
         const dataItem = [..._arr1, ..._arr2.reverse()];
         const [firstPoint] = dataItem;
@@ -258,27 +264,35 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
         _arr1 = [];
         _arr2 = [];
       };
-      if (nextPoint1 && nextPoint2) {
-        if (nextPoint1[0] !== nextPoint2[0]) {
-          const minPoint = Math.min(nextPoint1[0], nextPoint2[0]);
-          _arr1.push([nextPoint1, nextPoint2].find((point) => point[0] === minPoint));
+      const minYPoint = Math.min(currentPoint1.top, currentPoint2.top);
+      const maxYPoint = Math.max(currentPoint1.top, currentPoint2.top);
+      _arr1.push(getXY([currentPoint1, currentPoint2].find((point) => point.top === minYPoint)));
+      _arr2.push(getXY([currentPoint1, currentPoint2].find((point) => point.top === maxYPoint)));
+      if (currentPoint1.breakpoint || currentPoint2.breakpoint) {
+        setData();
+      }
+      if (!currentPoint1.breakpoint && !currentPoint2.breakpoint) {
+        if (nextPoint1 && nextPoint2) {
+          if (nextPoint1.left !== nextPoint2.left) {
+            const minPoint = Math.min(nextPoint1.left, nextPoint2.left);
+            _arr1.push(getXY([nextPoint1, nextPoint2].find((point) => point.left === minPoint)));
+            setData();
+          }
+        } else if (nextPoint1) {
+          _arr1.push(getXY(nextPoint1));
+          setData();
+        } else if (nextPoint2) {
+          _arr2.push(getXY(nextPoint2));
+          setData();
+        } else {
           setData();
         }
-      } else if (nextPoint1) {
-        _arr1.push(nextPoint1);
-        setData();
-      } else if (nextPoint2) {
-        _arr2.push(nextPoint2);
-        setData();
-      } else {
-        setData();
       }
     });
     return data;
   }
   function setCanvasEvent() {
     canvas.value.on("mouse:up", (event2) => {
-      var _a, _b, _c;
       const {
         button,
         target,
@@ -310,7 +324,14 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
             pointMenuProps.target = target;
           } else {
             pointMenuProps.target = null;
-            pointMenuProps.list = [((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.219")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.219")) || "\u65B0\u589E\u8282\u70B9"];
+            pointMenuProps.list = [function() {
+              var _a, _b, _c;
+              try {
+                return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.219")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.219")) || "\u65B0\u589E\u8282\u70B9";
+              } catch (e) {
+                return "\u65B0\u589E\u8282\u70B9";
+              }
+            }()];
             itemList.forEach((v) => {
               if (!getEqualXTypes([...gridPoints], x, "_type").includes(v.bigType)) {
                 const newY = ["pain"].includes(v.bigType) ? painOriginY : vitalSignsOriginY;
@@ -360,10 +381,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
     const pulseObj = yScaleValue.find((item) => item.show && item.type === "pulse");
     if (!pulseObj || !((_a = pulseObj.dataList) == null ? void 0 : _a.length))
       return;
-    if (!pulseObj.dataList.some((item) => {
-      var _a2, _b, _c;
-      return item.title.includes(((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.235")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.235")) || "\u8109\u640F");
-    }))
+    if (!pulseObj.dataList.some((item) => item.key === "mai"))
       return;
     const overlap = Object.assign({}, OVERLAP, left.overlap || {});
     const points = [];
@@ -430,7 +448,6 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
     };
     const _isOneLine = isOneLine(scaleValue);
     (_a = item.list) == null ? void 0 : _a.forEach((v, index) => {
-      var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
       const _item = !_isOneLine ? item : dataList.find((_v) => _v.key === v.key);
       const points = getPointer(isRespirator(v) ? {
         ...v,
@@ -443,9 +460,10 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
       } : nextV, scaleValue) : void 0;
       const nextItem = nextV ? !_isOneLine ? item : dataList.find((_v) => _v.key === nextV.key) : {};
       const {
-        title = ""
+        key = ""
       } = _item;
-      if (!(title === (((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.235")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.235")) || "\u8109\u640F") && nextItem.title !== (((_d = window.getLanguageByCode) == null ? void 0 : _d.call(window, "10010.1.235")) || ((_f = (_e = window.top) == null ? void 0 : _e.getLanguageByCode) == null ? void 0 : _f.call(_e, "10010.1.235")) || "\u8109\u640F") || title !== (((_g = window.getLanguageByCode) == null ? void 0 : _g.call(window, "10010.1.235")) || ((_i = (_h = window.top) == null ? void 0 : _h.getLanguageByCode) == null ? void 0 : _i.call(_h, "10010.1.235")) || "\u8109\u640F") && nextItem.title === (((_j = window.getLanguageByCode) == null ? void 0 : _j.call(window, "10010.1.235")) || ((_l = (_k = window.top) == null ? void 0 : _k.getLanguageByCode) == null ? void 0 : _l.call(_k, "10010.1.235")) || "\u8109\u640F")) && points && nextPoint && getFloorNumber(points[0], 1) === getFloorNumber(nextPoint[0], 1)) {
+      const mai = "mai";
+      if (!(key === mai && nextItem.key !== mai || key !== mai && nextItem.key === mai) && points && nextPoint && getFloorNumber(points[0], 1) === getFloorNumber(nextPoint[0], 1)) {
         const pointOriginX = points[0] - xCellWidth / 2;
         points[0] = pointOriginX + xCellWidth / 4;
         nextPoint[0] = nextDoublePointsX = points[0] + xCellWidth / 2;
@@ -480,7 +498,11 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
             }
             nextDoublePointsX2 = null;
           }
-          return [point.left, point.top];
+          return {
+            left: point.left,
+            top: point.top,
+            breakpoint: !point.rightLine
+          };
         });
       };
       if (_isOneLine) {
@@ -790,7 +812,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
           overlapKey,
           unit: scaleValue.unit,
           type,
-          _type: setOtherType(title, type),
+          _type: setOtherType(key, type),
           dataIndex,
           index,
           isOneLine: _isOneLine
@@ -884,7 +906,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
       x: point.left,
       y: point.top
     };
-    let timeText = `\u65F6\u95F4 ${((data == null ? void 0 : data.time) || getXValue(point.left)).slice(-5)}`;
+    let timeText = `${config.timeLabel} ${((data == null ? void 0 : data.time) || getXValue(point.left)).slice(-5)}`;
     pointTipProps.list = [getListValue(), timeText];
     pointTipProps.show = true;
     function getListValue() {

package/es/components/fabric-chart/src/hooks/temperature/useTemperatureChart.js

@@ -211,7 +211,7 @@ function useTemperatureChart(canvas, props, emits, canvasRef, pointTipProps, poi
       return item.dataList.filter((v) => v.show).map((v, dataIndex) => {
         return {
           ...v,
-          bigType: setOtherType(v.title, item.type),
+          bigType: setOtherType(v.key, item.type),
           unit: item.unit,
           dataIndex,
           isOneLine: isOneLine(item)

package/es/components/fabric-chart/src/hooks/temperature/useTop.js

@@ -111,7 +111,11 @@ function useTop(canvas, propItems) {
     const dayList = (gridXNumber - surplusCell[1] - surplusCell[3]) / grid.subSecondXCell;
     for (let i = 0; i < dayList; i++) {
       const left = originX + i * width;
-      const value = i % 2 === 0 ? "\u4E0A\u5348" : "\u4E0B\u5348";
+      const {
+        am,
+        pm
+      } = top.xScalevalue || {};
+      const value = i % 2 === 0 ? am : pm;
       const textGroup = drawTextGroup({
         width,
         height,

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

@@ -1,8 +1,28 @@
-var _a, _b, _c, _d, _e, _f, _g, _h, _i;
 const messages = {
-  repeat: ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.216")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.216")) || "\u8BE5\u65F6\u6BB5\u5DF2\u5B58\u5728\u6570\u503C\u4E0D\u80FD\u65B0\u589E",
-  exceedMax: ((_d = window.getLanguageByCode) == null ? void 0 : _d.call(window, "10010.1.217")) || ((_f = (_e = window.top) == null ? void 0 : _e.getLanguageByCode) == null ? void 0 : _f.call(_e, "10010.1.217")) || "\u672A\u6765\u65F6\u95F4\u4E0D\u5141\u8BB8\u5F55\u5165",
-  exceedMin: ((_g = window.getLanguageByCode) == null ? void 0 : _g.call(window, "10010.1.218")) || ((_i = (_h = window.top) == null ? void 0 : _h.getLanguageByCode) == null ? void 0 : _i.call(_h, "10010.1.218")) || "\u4E0D\u5141\u8BB8\u5C0F\u4E8E\u5165\u9662\u65F6\u95F4"
+  repeat: function() {
+    var _a, _b, _c;
+    try {
+      return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.216")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.216")) || "\u8BE5\u65F6\u6BB5\u5DF2\u5B58\u5728\u6570\u503C\u4E0D\u80FD\u65B0\u589E";
+    } catch (e) {
+      return "\u8BE5\u65F6\u6BB5\u5DF2\u5B58\u5728\u6570\u503C\u4E0D\u80FD\u65B0\u589E";
+    }
+  }(),
+  exceedMax: function() {
+    var _a, _b, _c;
+    try {
+      return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.217")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.217")) || "\u672A\u6765\u65F6\u95F4\u4E0D\u5141\u8BB8\u5F55\u5165";
+    } catch (e) {
+      return "\u672A\u6765\u65F6\u95F4\u4E0D\u5141\u8BB8\u5F55\u5165";
+    }
+  }(),
+  exceedMin: function() {
+    var _a, _b, _c;
+    try {
+      return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.218")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.218")) || "\u4E0D\u5141\u8BB8\u5C0F\u4E8E\u5165\u9662\u65F6\u95F4";
+    } catch (e) {
+      return "\u4E0D\u5141\u8BB8\u5C0F\u4E8E\u5165\u9662\u65F6\u95F4";
+    }
+  }()
 };
 function useCommon(canvas, emits, propItems) {
   function getEqualXTypes(points, pointX, field, range = propItems.xCellWidth) {

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

@@ -109,9 +109,12 @@ function useBirthProcessCumputedPoint(propItems) {
   }
   function getYValue(key, pointY) {
     const item = scaleValues.find((item2) => [item2.key, item2.type || ""].includes(key));
+    const {
+      changeByInteger
+    } = item;
     const [minValue] = (item == null ? void 0 : item.range) || [0];
     const y = (endY - pointY) / propItems[`${key}YCell`] + minValue;
-    return getFloorNumber(y);
+    return changeByInteger ? getRoundNumber(y) : getFloorNumber(y);
   }
   return {
     computedX,

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

@@ -312,6 +312,25 @@ function drawPoint(type = "circle", style) {
       });
       return new fabric.Group([bigIcon, smallIcon], _newStyle);
     }
+    case "arrow": {
+      const {
+        width = 10,
+        height = 10
+      } = newStyle;
+      return new fabric.Polyline([{
+        x: 0,
+        y: 0
+      }, {
+        x: width / 2,
+        y: height
+      }, {
+        x: width,
+        y: 0
+      }], {
+        fill: "transparent",
+        ...omit(newStyle, ["width", "height"])
+      });
+    }
     default:
       style && Reflect.deleteProperty(style, "stroke");
       return new fabric.Text(String(type), {

package/es/components/fabric-chart/src/utils/index.d.ts

@@ -9,7 +9,7 @@ export declare function deleteProperty(data: AnyObject, list: AnyObject[]): {};
  */
 export declare function isOneLine(scaleItem: AnyObject): any;
 export declare function getIndex(time: string, list: AnyObject[], isEqual?: boolean): number;
-export declare function setOtherType(title: string, type: string): string;
+export declare function setOtherType(key: string, type: string): string;
 export declare function getType(type: string): string;
 export declare function isValidValue(value: number | string): boolean;
 export declare function isOverlapPoint(pointObj1: any, pointObj2: any): boolean;

package/es/components/fabric-chart/src/utils/index.js

@@ -23,8 +23,8 @@ function getIndex(time, list, isEqual = false) {
   });
   return !~index ? list.length : index;
 }
-function setOtherType(title, type) {
-  return title.includes("\u5FC3\u7387") ? "pulse_other" : type;
+function setOtherType(key, type) {
+  return key === "xinmai" ? "pulse_other" : type;
 }
 function getType(type) {
   return type.includes("_other") ? type.split("_")[0] : type;