cnhis-design-vue 3.1.15-beta.2 → 3.1.15-beta.5

package/es/packages/fabric-chart/src/FabricChart.vue.d.ts

@@ -1,4 +1,5 @@
-import { IData, IDate } from './interface';
+import { PropType } from 'vue';
+import { IData, IDate, IPointType } from './interface';
 declare const _default: import("vue").DefineComponent<{
     data: {
         type: null;
@@ -53,10 +54,11 @@ declare const _default: import("vue").DefineComponent<{
     }>;
     topList: import("vue").ComputedRef<IDate[]>;
     propItems: any;
+    computedYCell: (type: IPointType) => number;
     cumputedX: (value: string | number) => any;
-    cumputedY: (type: import("./interface").IPointType, scaleValueList: number[], value: string | number) => number;
+    cumputedY: (type: IPointType, scaleValueList: number[], value: string | number) => number;
     getXValue: (pointX: number) => string | undefined;
-    getYValue: (type: import("./interface").IPointType, pointY: number) => number;
+    getYValue: (type: IPointType, pointY: number) => number;
     pointTipProps: {
         show: boolean;
         point: {
@@ -79,7 +81,7 @@ declare const _default: import("vue").DefineComponent<{
         target: any;
     }) => void;
     setPopup: (point: any) => void;
-    getEqualXTypes: (pointX: number) => import("./interface").IPointType[];
+    getEqualXTypes: (pointX: number) => IPointType[];
     PopupTip: import("vue").DefineComponent<{
         show: {
             type: BooleanConstructor;
@@ -151,13 +153,13 @@ declare const _default: import("vue").DefineComponent<{
             default: () => never[];
         };
         point: {
-            type: import("vue").PropType<import("./interface").ICoordinateValue>;
+            type: PropType<import("./interface").ICoordinateValue>;
         };
         propItems: {
-            type: import("vue").PropType<import("./interface").IPropItems>;
+            type: PropType<import("./interface").IPropItems>;
         };
         target: {
-            type: import("vue").PropType<any>;
+            type: PropType<any>;
         };
     }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:show" | "clickMenu")[], "clickMenu" | "update:show", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         show: {
@@ -169,13 +171,13 @@ declare const _default: import("vue").DefineComponent<{
             default: () => never[];
         };
         point: {
-            type: import("vue").PropType<import("./interface").ICoordinateValue>;
+            type: PropType<import("./interface").ICoordinateValue>;
         };
         propItems: {
-            type: import("vue").PropType<import("./interface").IPropItems>;
+            type: PropType<import("./interface").IPropItems>;
         };
         target: {
-            type: import("vue").PropType<any>;
+            type: PropType<any>;
         };
     }>> & {
         "onUpdate:show"?: ((...args: any[]) => any) | undefined;

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

@@ -129,6 +129,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     }
   }
   function setCanvasEvent() {
+    if (!propItems.event.evented)
+      return;
     canvas.value.on("mouse:up", (event) => {
       var _a;
       if (event.button === 3) {
@@ -157,7 +159,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
                     title: v.title,
                     unit: v.unit,
                     type: v.bigType,
-                    dataIndex: v.dataIndex
+                    dataIndex: v.dataIndex,
+                    key: v.key
                   },
                   pointer: event.pointer
                 });
@@ -338,7 +341,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         coolLine,
         coolPoint,
         lockMovementX: true,
-        ...pointAttr
+        ...pointAttr,
+        ...propItems.event
       };
       if (previousLine) {
         point = drawPoint(type, {
@@ -488,14 +492,12 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     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 [x, y < objOriginY.originY ? objOriginY.originY : y > objOriginY.endY ? objOriginY.endY : y];
     }
-    return points;
   }
   function clickMenu({ item, target }) {
     if (!target) {

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

@@ -31,10 +31,12 @@ function useCumputedPoint(propItems) {
       const residueX = pointX - item.left;
       const residueTime = item.scaleCell * residueX;
       const time = item.start + residueTime;
-      let d = new Date(time);
+      const d = new Date(time);
       const month = `00${d.getMonth() + 1}`.slice(-2);
       const day = `00${d.getDate()}`.slice(-2);
-      const date = `${d.getFullYear()}-${month}-${day} ${d.getHours()}:${d.getMinutes()}`;
+      const hours = `00${d.getHours()}`.slice(-2);
+      const minutes = `00${d.getMinutes()}`.slice(-2);
+      const date = `${d.getFullYear()}-${month}-${day} ${hours}:${minutes}`;
       return date;
     }
   }

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

@@ -195,10 +195,12 @@ ${item.title.slice(-2)}`,
           title: item.title,
           unit: item.unit,
           type: item.bigType,
-          dataIndex: item.dataIndex
+          dataIndex: item.dataIndex,
+          key: item.key
         },
         originLeft: leftX,
-        originTop: topY - (text.height || 30) / 2
+        originTop: topY - (text.height || 30) / 2,
+        ...propItems.event
       });
       topY -= text.height || 30;
       setPointEvent(icon);