cnhis-design-vue 3.4.0-beta.4 → 3.4.0-beta.40

package/es/components/fabric-chart/src/hooks/surgicalAnesthesia/useSurgicalAnesthesiaChart.js

@@ -29,37 +29,30 @@ function useSurgicalAnesthesiaChart(canvas, props, emits, canvasRef, pointTipPro
   const pauseFlickerPoint = ref();
   let timeout = null;
   const oldChildrenSize = getChildrenSize(((_a = props.data.top) == null ? void 0 : _a.treeData) || []);
-  const layout = computed(() => props.data.layout || {
-    top: "drug",
-    center: "xAxis",
-    bottom: "intraoperatively"
-  });
+  const layout = computed(
+    () => props.data.layout || {
+      top: "drug",
+      center: "xAxis",
+      bottom: "intraoperatively"
+    }
+  );
   const originX = computed(() => {
     var _a2;
     return (_a2 = props.data.left.width) != null ? _a2 : 0;
   });
   const gridXNumber = computed(() => {
-    const {
-      grid
-    } = props.data;
+    const { grid } = props.data;
     return grid.mainXCell * grid.subXCell;
   });
   const gridYNumber = computed(() => {
-    const {
-      grid
-    } = props.data;
+    const { grid } = props.data;
     return grid.mainYCell * grid.subYCell;
   });
   const topGridYNumber = computed(() => {
-    const {
-      show = true,
-      tree = {}
-    } = props.data.top;
+    const { show = true, tree = {} } = props.data.top;
     if (!show)
       return 0;
-    const {
-      rowNumber = oldChildrenSize
-    } = tree;
+    const { rowNumber = oldChildrenSize } = tree;
     if (oldChildrenSize < rowNumber) {
       return rowNumber;
     }
@@ -72,17 +65,18 @@ function useSurgicalAnesthesiaChart(canvas, props, emits, canvasRef, pointTipPro
     return getOriginTop(currentLayout);
   });
   const topGridEndY = computed(() => topGridOriginY.value + topGridHeight.value);
-  const startTime = computed(() => {
-    var _a2;
-    return Date.parse(((_a2 = props.data.xAxis) == null ? void 0 : _a2.startTime) || format(new Date(), "yyyy-MM-dd HH:mm:ss"));
-  });
+  const startTime = computed(
+    () => {
+      var _a2;
+      return Date.parse(((_a2 = props.data.xAxis) == null ? void 0 : _a2.startTime) || format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+    }
+  );
   const xAxis = computed(() => {
     const cloneXAxis = cloneDeep(props.data.xAxis);
-    const {
-      spaceValue,
-      spaceTimeStamp
-    } = cloneXAxis;
-    const list = range(gridXNumber.value / spaceValue + 1).map((n) => n === 0 ? cloneXAxis.startTime : format(new Date(startTime.value + n * spaceValue * spaceTimeStamp), "yyyy-MM-dd HH:mm:ss"));
+    const { spaceValue, spaceTimeStamp } = cloneXAxis;
+    const list = range(gridXNumber.value / spaceValue + 1).map(
+      (n) => n === 0 ? cloneXAxis.startTime : format(new Date(startTime.value + n * spaceValue * spaceTimeStamp), "yyyy-MM-dd HH:mm:ss")
+    );
     return {
       ...cloneXAxis,
       list,
@@ -96,10 +90,7 @@ function useSurgicalAnesthesiaChart(canvas, props, emits, canvasRef, pointTipPro
   });
   const endX = computed(() => {
     var _a2;
-    const {
-      width,
-      right
-    } = props.data;
+    const { width, right } = props.data;
     if (!right)
       return width;
     const endWidth = (_a2 = right.width) != null ? _a2 : 0;
@@ -111,60 +102,49 @@ function useSurgicalAnesthesiaChart(canvas, props, emits, canvasRef, pointTipPro
   });
   const extracorporealCirculationHeight = computed(() => {
     var _a2;
-    const {
-      show,
-      height
-    } = ((_a2 = props.data.other) == null ? void 0 : _a2.extracorporealCirculation) || {};
+    const { show, height } = ((_a2 = props.data.other) == null ? void 0 : _a2.extracorporealCirculation) || {};
     if (!show || !height)
       return 0;
     return height;
   });
   const markHeight = computed(() => {
     var _a2;
-    const {
-      show,
-      height
-    } = ((_a2 = props.data.other) == null ? void 0 : _a2.mark) || {};
+    const { show, height } = ((_a2 = props.data.other) == null ? void 0 : _a2.mark) || {};
     if (!show || !height)
       return 0;
     return height;
   });
-  const endY = computed(() => originY.value + (props.data.height - topGridHeight.value - xAxis.value.height - markHeight.value - extracorporealCirculationHeight.value));
+  const endY = computed(
+    () => originY.value + (props.data.height - topGridHeight.value - xAxis.value.height - markHeight.value - extracorporealCirculationHeight.value)
+  );
   const xCellWidth = computed(() => (endX.value - originX.value) / gridXNumber.value);
   const yCellHeight = computed(() => (endY.value - originY.value) / gridYNumber.value);
   const timeXCell = computed(() => xAxis.value.spaceTimeStamp / xCellWidth.value);
   const itemList = computed(() => {
-    const {
-      scaleValues
-    } = props.data;
-    return flatten(scaleValues.map((item) => {
-      return item.dataList.filter((v) => v.show).map((v, dataIndex) => {
-        return {
-          ...v,
-          bigType: item.type,
-          unit: item.unit,
-          dataIndex
-        };
-      });
-    }));
+    const { scaleValues } = props.data;
+    return flatten(
+      scaleValues.map((item) => {
+        return item.dataList.filter((v) => v.show).map((v, dataIndex) => {
+          return {
+            ...v,
+            bigType: item.type,
+            unit: item.unit,
+            dataIndex
+          };
+        });
+      })
+    );
   });
   const pulseYCell = computed(() => computedYCell("pulse"));
   const temperatureYCell = computed(() => computedYCell("temperature"));
   const event = computed(() => {
     var _a2;
-    return ((_a2 = props.data.grid) == null ? void 0 : _a2.event) || {
-      selectable: true,
-      evented: true,
-      hovered: true
-    };
+    return ((_a2 = props.data.grid) == null ? void 0 : _a2.event) || { selectable: true, evented: true, hovered: true };
   });
   const propItems = reactive({
     canvasWidth: props.data.width,
     canvasHeight: props.data.height,
-    borderStyle: {
-      ...defaultBorderStyle,
-      ...props.data.borderStyle
-    },
+    borderStyle: { ...defaultBorderStyle, ...props.data.borderStyle },
     pointSelectionStyle: props.data.pointSelectionStyle || {},
     grid: props.data.grid,
     top: props.data.top,
@@ -232,21 +212,13 @@ function useSurgicalAnesthesiaChart(canvas, props, emits, canvasRef, pointTipPro
     }
   }
   function getTreeData() {
-    const {
-      show = true,
-      tree = {}
-    } = props.data.top;
+    const { show = true, tree = {} } = props.data.top;
     if (!show)
       return [];
     const cloneData = cloneDeep(props.data.top.treeData);
     let levelRow = 0;
-    const {
-      cellWidth,
-      cellHeight
-    } = props.data.top.tree;
-    const {
-      rowNumber = oldChildrenSize
-    } = tree;
+    const { cellWidth, cellHeight } = props.data.top.tree;
+    const { rowNumber = oldChildrenSize } = tree;
     if (oldChildrenSize < rowNumber) {
       cloneData.push(...range(rowNumber - oldChildrenSize).map(() => ({})));
     }
@@ -276,18 +248,19 @@ function useSurgicalAnesthesiaChart(canvas, props, emits, canvasRef, pointTipPro
     return cloneData;
   }
   function computedYCell(type) {
-    const {
-      scaleValues
-    } = props.data;
+    const { scaleValues } = props.data;
     const item = scaleValues.find((v) => v.type === type);
     return yCellHeight.value * (item.spaceGridNumber || 1) / (item.spaceValue || 1);
   }
   onMounted(async () => {
     await nextTick();
-    const {
-      redrawLinePoints: _redrawLinePoints,
-      clickMenu: _clickTopMenu
-    } = useTop(canvas, propItems, emits, pointTipProps, pointMenuProps);
+    const { redrawLinePoints: _redrawLinePoints, clickMenu: _clickTopMenu } = useTop(
+      canvas,
+      propItems,
+      emits,
+      pointTipProps,
+      pointMenuProps
+    );
     const {
       redrawPoints: _redrawPoints,
       clickMenu: _clickMenu,
@@ -302,17 +275,22 @@ function useSurgicalAnesthesiaChart(canvas, props, emits, canvasRef, pointTipPro
     } = useCenter(canvas, propItems, emits, pointTipProps, pointMenuProps, isPopupTipRender);
     pauseFlickerPoint.value = _pauseFlickerPoint;
     useLeft(canvas, propItems, emits, pointTipProps, moveLimit, setPopup, updateData, getGridPoints);
-    const {
-      clickMenu: _clickOtherMenu,
-      handleKeydown
-    } = useOther(canvas, propItems, emits, pointTipProps, pointMenuProps, moveLimit, getContainPoints, showDialog, removeCurrentSelection);
+    const { clickMenu: _clickOtherMenu, handleKeydown } = useOther(
+      canvas,
+      propItems,
+      emits,
+      pointTipProps,
+      pointMenuProps,
+      moveLimit,
+      getContainPoints,
+      showDialog,
+      removeCurrentSelection
+    );
     inputKeydownFunc = handleKeydown;
     exposeMethods.redrawPoints = _redrawPoints;
     exposeMethods.redrawLinePoints = _redrawLinePoints;
     exposeMethods.clickMenu = (params) => {
-      const {
-        item
-      } = params;
+      const { item } = params;
       switch (item._type) {
         case "tree":
           _clickTopMenu(params);
@@ -332,20 +310,22 @@ function useSurgicalAnesthesiaChart(canvas, props, emits, canvasRef, pointTipPro
       window.removeEventListener("keydown", inputKeydownFunc, true);
   });
   if (isPopupTipRender) {
-    watch(() => pointTipProps == null ? void 0 : pointTipProps.point, () => {
-      if (pointTipProps.movable) {
-        pointTipProps.show = true;
-        timeout && clearTimeout(timeout);
-        timeout = setTimeout(() => {
-          pointTipProps.show = false;
-          pointTipProps.movable = false;
-        }, 3e3);
-      } else {
-        timeout && clearTimeout(timeout);
-      }
-    }, {
-      deep: true
-    });
+    watch(
+      () => pointTipProps == null ? void 0 : pointTipProps.point,
+      () => {
+        if (pointTipProps.movable) {
+          pointTipProps.show = true;
+          timeout && clearTimeout(timeout);
+          timeout = setTimeout(() => {
+            pointTipProps.show = false;
+            pointTipProps.movable = false;
+          }, 3e3);
+        } else {
+          timeout && clearTimeout(timeout);
+        }
+      },
+      { deep: true }
+    );
   }
   return {
     propItems,

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

@@ -1,3 +1,4 @@
+import { i18n } from '../../../../../_virtual/_virtual_i18n-methods.js';
 import { fabric } from '../../../../../shared/utils/fabricjs/index.js';
 import { defaultStyle, drawText, defaultRectStyle, drawTextGroup, drawLine, drawPoint } from '../useDraw.js';
 import { useGrid } from '../useGrid.js';
@@ -158,14 +159,7 @@ function useTop(canvas, propItems, emits, pointTipProps, pointMenuProps) {
     canvas.value.add(rect);
     if (!hasScale()) {
       const {
-        title = function() {
-          var _a, _b, _c;
-          try {
-            return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.234")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.234")) || "\u603B\u91CF";
-          } catch (e) {
-            return "\u603B\u91CF";
-          }
-        }(),
+        title = i18n("10010.1.234", "\u603B\u91CF"),
         style: style2
       } = (top == null ? void 0 : top.total) || {};
       const totalText = drawText([endX + (canvasWidth - endX) / 2, y], {

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

@@ -55,35 +55,45 @@ function useBottom(canvas, propItems) {
       };
       if (text)
         flag = !flag;
-      const group2 = drawTextGroup({
-        width: xCellWidth,
+      const group2 = drawTextGroup(
+        {
+          width: xCellWidth,
+          height,
+          ...borderStyle
+        },
+        Object.assign(
+          {},
+          {
+            text: String(text),
+            ...defaultTextStyle
+          },
+          text ? style : {}
+        ),
+        {
+          left,
+          top: endY
+        }
+      );
+      list.push(group2);
+    });
+    const titleGroup = drawTextGroup(
+      {
+        width: endX,
         height,
         ...borderStyle
-      }, Object.assign({}, {
-        text: String(text),
-        ...defaultTextStyle
-      }, text ? style : {}), {
-        left,
+      },
+      {
+        text: String(((_b = bottom.breathing) == null ? void 0 : _b.title) + ((_c = bottom.breathing) == null ? void 0 : _c.unit)),
+        ...defaultTextStyle,
+        left: -((endX - originX) / 2)
+      },
+      {
+        left: 0,
         top: endY
-      });
-      list.push(group2);
-    });
-    const titleGroup = drawTextGroup({
-      width: endX,
-      height,
-      ...borderStyle
-    }, {
-      text: String(((_b = bottom.breathing) == null ? void 0 : _b.title) + ((_c = bottom.breathing) == null ? void 0 : _c.unit)),
-      ...defaultTextStyle,
-      left: -((endX - originX) / 2)
-    }, {
-      left: 0,
-      top: endY
-    });
+      }
+    );
     list.push(titleGroup);
-    const group = list.length > 0 ? new fabric.Group([...list], {
-      ...defaultStyle
-    }) : null;
+    const group = list.length > 0 ? new fabric.Group([...list], { ...defaultStyle }) : null;
     group && group.sendToBack();
     group && canvas.value.add(group);
   }

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

@@ -1,3 +1,4 @@
+import { i18n } from '../../../../../_virtual/_virtual_i18n-methods.js';
 import { fabric } from '../../../../../shared/utils/fabricjs/index.js';
 import { drawLine, defaultStyle, drawPoint, drawText, drawArrow } from '../useDraw.js';
 import { useGrid } from '../useGrid.js';
@@ -157,7 +158,10 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
           });
         }
       }
-      const data = getShadowData();
+      const {
+        data,
+        otherLineData
+      } = getShadowData();
       if (data.length > 0) {
         removePulsePointLine(data);
       }
@@ -188,6 +192,12 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
             });
           } else {
             const finalData = getLineData(item);
+            if (finalData.length > 0) {
+              const otherFilters = otherLineData.filter(([[x1, _]]) => {
+                return item.some(([x]) => Math.trunc(x) === Math.trunc(x1));
+              });
+              finalData.push(...otherFilters);
+            }
             finalData.forEach((_item) => {
               const l = drawLine([...flatten(_item)], {
                 ...style,
@@ -221,23 +231,40 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
   }
   function getShadowData() {
     const data = [];
+    const otherLineData = [];
     const pulsePoints = [];
     const sames = [];
     for (const item of shadowPointCache) {
       pulsePoints.push(item[1]);
       if (item[0] === SHADOWKEYS[0]) {
         item[1].forEach((_item) => {
-          const someIndex = (shadowPointCache.get(SHADOWKEYS[1]) || []).findIndex((v) => v.left === _item.left);
-          someIndex > -1 && sames.push(_item.left);
+          const someIndex = (shadowPointCache.get(SHADOWKEYS[1]) || []).findIndex((v) => v.left === _item.left || v.time === _item.time);
+          someIndex > -1 && sames.push({
+            time: _item.time,
+            left: _item.left
+          });
         });
       }
     }
     const [points1, points2] = pulsePoints;
     let _arr1 = [];
     let _arr2 = [];
-    sames.forEach((left2) => {
-      const index1 = points1.findIndex((point) => point.left === left2);
-      const index2 = points2.findIndex((point) => point.left === left2);
+    const setData = () => {
+      const dataItem = [..._arr1, ..._arr2.reverse()];
+      const [firstPoint] = dataItem;
+      const lastPoint = last(dataItem);
+      if (firstPoint[0] === lastPoint[0] && firstPoint[1] === lastPoint[1])
+        dataItem.splice(-1, 1);
+      data.push(dataItem);
+      _arr1 = [];
+      _arr2 = [];
+    };
+    sames.forEach(({
+      time,
+      left: left2
+    }) => {
+      const index1 = points1.findIndex((point) => point.left === left2 || point.time === time);
+      const index2 = points2.findIndex((point) => point.left === left2 || point.time === time);
       const currentPoint1 = points1[index1];
       const currentPoint2 = points2[index2];
       const prevPoint1 = getPointWidthRightLine(points1[index1 - 1]);
@@ -245,7 +272,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
       const prevPoint2 = getPointWidthRightLine(points2[index2 - 1]);
       const nextPoint2 = points2[index2 + 1];
       if (prevPoint1 && prevPoint2) {
-        if (prevPoint1.left !== prevPoint2.left) {
+        if (prevPoint1.left !== prevPoint2.left && prevPoint1.time !== prevPoint2.time) {
           const maxPoint = Math.max(prevPoint1.left, prevPoint2.left);
           _arr1.push(getXY([prevPoint1, prevPoint2].find((point) => point.left === maxPoint)));
         }
@@ -254,16 +281,6 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
       } else if (prevPoint2) {
         _arr2.push(getXY(prevPoint2));
       }
-      const setData = () => {
-        const dataItem = [..._arr1, ..._arr2.reverse()];
-        const [firstPoint] = dataItem;
-        const lastPoint = last(dataItem);
-        if (firstPoint[0] === lastPoint[0] && firstPoint[1] === lastPoint[1])
-          dataItem.splice(-1, 1);
-        data.push(dataItem);
-        _arr1 = [];
-        _arr2 = [];
-      };
       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)));
@@ -273,7 +290,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
       }
       if (!currentPoint1.breakpoint && !currentPoint2.breakpoint) {
         if (nextPoint1 && nextPoint2) {
-          if (nextPoint1.left !== nextPoint2.left) {
+          if (nextPoint1.left !== nextPoint2.left && nextPoint1.time !== nextPoint2.time) {
             const minPoint = Math.min(nextPoint1.left, nextPoint2.left);
             _arr1.push(getXY([nextPoint1, nextPoint2].find((point) => point.left === minPoint)));
             setData();
@@ -288,8 +305,14 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
           setData();
         }
       }
+      if (currentPoint1.time === currentPoint2.time && currentPoint1.left != currentPoint2.left && currentPoint1.top != currentPoint2.top) {
+        otherLineData.push([getXY(currentPoint1), getXY(currentPoint2)]);
+      }
     });
-    return data;
+    return {
+      data,
+      otherLineData
+    };
   }
   function setCanvasEvent() {
     canvas.value.on("mouse:up", (event2) => {
@@ -324,14 +347,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
             pointMenuProps.target = target;
           } else {
             pointMenuProps.target = null;
-            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";
-              }
-            }()];
+            pointMenuProps.list = [i18n("10010.1.219", "\u65B0\u589E\u8282\u70B9")];
             itemList.forEach((v) => {
               if (!getEqualXTypes([...gridPoints], x, "_type").includes(v.bigType)) {
                 const newY = ["pain"].includes(v.bigType) ? painOriginY : vitalSignsOriginY;
@@ -483,7 +499,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
       let nextDoublePointsX2 = null;
       const getData = (data) => {
         return data.map((point, index, arr) => {
-          var _a2, _b;
+          var _a2, _b, _c, _d;
           const nextPoint = arr[index + 1];
           if (nextPoint && getFloorNumber(point.left, 1) === getFloorNumber(nextPoint.left, 1)) {
             const pointOriginX = point.left - xCellWidth / 2;
@@ -499,6 +515,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
             nextDoublePointsX2 = null;
           }
           return {
+            time: (_d = (_c = point.origin) == null ? void 0 : _c.data) == null ? void 0 : _d.time,
             left: point.left,
             top: point.top,
             breakpoint: !point.rightLine