cnhis-design-vue 3.1.33-beta.8 → 3.1.33

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

@@ -11,11 +11,7 @@ function useCumputedPoint(propItems) {
     const index = xScaleList.findIndex((v) => v.end >= time);
     if (index > -1) {
       const item = xScaleList[index];
-      if (time === item.start && !setAllCenter) {
-        return item.left;
-      } else {
-        return item.center;
-      }
+      return item.center;
     }
   }
   function cumputedY(type, scaleValueList, value) {
@@ -57,15 +53,36 @@ function useCumputedPoint(propItems) {
   };
 }
 function useBirthProcessCumputedPoint(propItems) {
-  const { xAxis, originX, originY, xCellWidth } = propItems;
+  const { xAxis, originX, originY, xCellWidth, endY, timeXCell, startTime, scaleValues } = propItems;
   function cumputedX(value) {
     const time = new Date(value).getTime();
-    const startTime = new Date(xAxis.time.startTime).getTime();
-    const timeCell = 1 * 60 * 60 * 1e3 / xCellWidth;
-    return (time - startTime) / timeCell + originX;
+    return (time - startTime) / timeXCell + originX;
+  }
+  function cumputedY(key, range, value) {
+    const [minValue] = range;
+    return endY - (+value - minValue) / propItems[`${key}YCell`];
+  }
+  function getXValue(pointX) {
+    const time = (pointX - originX) * timeXCell + startTime;
+    const d = new Date(time);
+    const month = `00${d.getMonth() + 1}`.slice(-2);
+    const day = `00${d.getDate()}`.slice(-2);
+    const hours = `00${d.getHours()}`.slice(-2);
+    const minutes = `00${d.getMinutes()}`.slice(-2);
+    const date = `${d.getFullYear()}-${month}-${day} ${hours}:${minutes}`;
+    return date;
+  }
+  function getYValue(key, pointY) {
+    const item = scaleValues.find((item2) => key === item2.key);
+    const [minValue] = (item == null ? void 0 : item.range) || [0];
+    const y = (endY - pointY) * propItems[`${key}YCell`] + minValue;
+    return Math.floor(y * 100) / 100;
   }
   return {
-    cumputedX
+    cumputedX,
+    cumputedY,
+    getXValue,
+    getYValue
   };
 }
 

package/es/components/fabric-chart/src/hooks/useLeft.d.ts

@@ -1,6 +1,6 @@
 import { Ref } from 'vue';
 import { fabric } from '../utils';
 import { IPropItems } from '../interface';
-export declare function useLeft(canvas: Ref<fabric.Canvas>, propItems: IPropItems, emits: any, setPopup: Function, pointTipProps: any, getXValue: Function, getYValue: Function, getEqualXTypes: Function, isAddPoint: Function, updateData: Function): {
+export declare function useLeft(canvas: Ref<fabric.Canvas>, propItems: IPropItems, emits: any, setPopup: Function, pointTipProps: any, cumputedX: Function, cumputedY: Function, getXValue: Function, getYValue: Function, isAddPoint: Function, updateData: Function): {
     drawScaleValue: (yScaleValueList: any[]) => void;
 };

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

@@ -1,13 +1,16 @@
 import { onMounted, nextTick } from 'vue';
 import { fabric } from '../utils/index.js';
 import { defaultBorderStyle, defaultTextStyle, defaultStyle, defaultRectStyle, drawPoint, drawTextGroup } from './useDraw.js';
+import useCommmon from './useCommon.js';
 
-function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, getYValue, getEqualXTypes, isAddPoint, updateData) {
+function useLeft(canvas, propItems, emits, setPopup, pointTipProps, cumputedX, cumputedY, getXValue, getYValue, isAddPoint, updateData) {
+  const { getEqualXTypes, repeatTip } = useCommmon(canvas);
   const {
     originY,
     endY,
     originX,
     endX,
+    xCellWidth,
     yCellHeight,
     left,
     vitalSignsOriginY,
@@ -19,8 +22,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
     right,
     canvasWidth,
     canvasHeight,
-    getRightInfo,
-    hospitalizationDate
+    getRightInfo
   } = propItems;
   const mainScaleWidth = 9;
   const subScaleWidth = 5;
@@ -230,7 +232,8 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
           unit: item.unit,
           type: item.bigType,
           dataIndex: item.dataIndex,
-          key: item.key
+          key: item.key,
+          isMenu: true
         },
         originLeft: leftX,
         originTop: topY - (text.height || 30) / 2 - 1,
@@ -270,7 +273,11 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
       pointTipProps.show = false;
       if (event.e.button === 0) {
         if (isLimit(point)) {
-          if (!getEqualXTypes(point.left).includes(point.origin.type) && isAddPoint(point.left)) {
+          const isRepeat = getEqualXTypes(point.left, "type", xCellWidth).includes(point.origin.type);
+          const isLimitAdd = isAddPoint(point.left);
+          if (!isLimitAdd || isRepeat) {
+            isRepeat && isLimitAdd && repeatTip();
+          } else {
             const params = {
               data: {
                 time: getXValue(point.left),
@@ -281,8 +288,6 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
             };
             emits("add", params);
             updateData(params);
-          } else {
-            console.log("\u5F53\u524D\u65F6\u95F4\u6BB5\u5185\u65E0\u53EF\u65B0\u589E\u8282\u70B9");
           }
         }
       }

package/es/components/fabric-chart/src/interface.d.ts

@@ -147,4 +147,5 @@ export interface IBirthProcessData {
     xAxis: IBirthProcessXAxis;
     scaleValues: AnyObject[];
 }
+export declare type IObject = fabric.Object & AnyObject;
 export {};