cnhis-design-vue 3.1.22-beta.5 → 3.1.22-beta.6

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

@@ -82,6 +82,7 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
     }) => void;
     setPopup: (point: any) => void;
     getEqualXTypes: (pointX: number) => import("./src/interface").IPointType[];
+    isAddPoint: (x: number) => boolean;
     drawScaleValue: (yScaleValueList: any[]) => void;
     PopupTip: import("vue").DefineComponent<{
         show: {

package/es/components/fabric-chart/src/FabricChart.js

@@ -240,6 +240,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       xScalevalueHeight: xScalevalueHeight.value,
       topList: topList.value,
       breathingHeight: breathingHeight.value,
+      hospitalizationDate: props.data.hospitalizationDate,
       grid: props.data.grid,
       top: props.data.top,
       left: props.data.left,
@@ -280,8 +281,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     const { cumputedX, cumputedY, getXValue, getYValue } = useCumputedPoint(propItems);
     useTop(canvas, propItems);
-    const { pointTipProps, pointMenuProps, clickMenu, setPopup, getEqualXTypes } = useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, getYValue, props.addRenderItem);
-    const { drawScaleValue } = useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, getYValue, getEqualXTypes);
+    const { pointTipProps, pointMenuProps, clickMenu, setPopup, getEqualXTypes, isAddPoint } = useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, getYValue, props.addRenderItem);
+    const { drawScaleValue } = useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, getYValue, getEqualXTypes, isAddPoint);
     useRight(canvas, propItems, drawScaleValue);
     useBottom(canvas, propItems);
     useOther(canvas, propItems, cumputedX);

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

@@ -83,6 +83,7 @@ declare const _default: import("vue").DefineComponent<{
     }) => void;
     setPopup: (point: any) => void;
     getEqualXTypes: (pointX: number) => IPointType[];
+    isAddPoint: (x: number) => boolean;
     drawScaleValue: (yScaleValueList: any[]) => void;
     PopupTip: import("vue").DefineComponent<{
         show: {

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

@@ -26,4 +26,5 @@ export declare function useCenter(canvas: Ref<fabric.Canvas>, propItems: IPropIt
     }) => void;
     setPopup: (point: any) => void;
     getEqualXTypes: (pointX: number) => IPointType[];
+    isAddPoint: (x: number) => boolean;
 };

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

@@ -33,7 +33,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     itemList,
     event,
     vitalSignsOriginY,
-    painOriginY
+    painOriginY,
+    hospitalizationDate
   } = propItems;
   const pointTipProps = reactive({
     show: false,
@@ -170,7 +171,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
                 }
               }
             });
-            if (pointMenuProps.list.length === 1) {
+            if (!isAddPoint(x) || pointMenuProps.list.length === 1) {
               pointMenuProps.show = false;
               console.log("\u5F53\u524D\u65F6\u95F4\u6BB5\u5185\u65E0\u53EF\u65B0\u589E\u8282\u70B9");
             }
@@ -530,6 +531,16 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       return [x, y < objOriginY.originY ? objOriginY.originY : y > objOriginY.endY ? objOriginY.endY : y];
     }
   }
+  function isAddPoint(x) {
+    const d = new Date();
+    const month = `00${d.getMonth() + 1}`.slice(-2);
+    const day = `00${d.getDate()}`.slice(-2);
+    const todayTime = new Date(`${d.getFullYear()}-${month}-${day} 23:59:59`).getTime();
+    const pointTime = new Date(`${getXValue(x)}:00`).getTime();
+    if (pointTime < new Date(hospitalizationDate).getTime() || pointTime > todayTime)
+      return false;
+    return true;
+  }
   function clickMenu({ item, target }) {
     if (!target) {
       emits("add", {
@@ -560,7 +571,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     pointMenuProps,
     clickMenu,
     setPopup,
-    getEqualXTypes
+    getEqualXTypes,
+    isAddPoint
   };
 }
 

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): {
+export declare function useLeft(canvas: Ref<fabric.Canvas>, propItems: IPropItems, emits: any, setPopup: Function, pointTipProps: any, getXValue: Function, getYValue: Function, getEqualXTypes: Function, isAddPoint: Function): {
     drawScaleValue: (yScaleValueList: any[]) => void;
 };

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

@@ -2,7 +2,7 @@ import { onMounted, nextTick } from 'vue';
 import { fabric } from '../utils/index.js';
 import { defaultBorderStyle, defaultTextStyle, defaultStyle, defaultRectStyle, drawPoint, drawTextGroup } from './useDraw2.js';
 
-function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, getYValue, getEqualXTypes) {
+function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, getYValue, getEqualXTypes, isAddPoint) {
   const {
     originY,
     endY,
@@ -19,7 +19,8 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
     right,
     canvasWidth,
     canvasHeight,
-    getRightInfo
+    getRightInfo,
+    hospitalizationDate
   } = propItems;
   const mainScaleWidth = 9;
   const subScaleWidth = 5;
@@ -233,7 +234,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
     });
   }
   function isLimit(point) {
-    return point.left >= originX && point.left <= endX && point.top >= originY && point.top <= endY;
+    return point.left >= originX && point.left < endX && point.top >= originY && point.top <= endY;
   }
   function moveLimit(point) {
     if (point.left >= originX && point.left <= endX) {
@@ -249,6 +250,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
   }
   function setPointEvent(point) {
     point.on("moving", () => {
+      point.set("originX", "center");
       moveLimit(point);
       if (isLimit(point)) {
         setPopup(point);
@@ -260,7 +262,7 @@ 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)) {
+          if (!getEqualXTypes(point.left).includes(point.origin.type) && isAddPoint(point.left)) {
             emits("add", {
               data: {
                 time: getXValue(point.left),
@@ -279,7 +281,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
       }
       function setRestore() {
         point.setCoords();
-        point.set({ left: point.originLeft, top: point.originTop });
+        point.set({ originX: "right", left: point.originLeft, top: point.originTop });
       }
     });
   }

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

@@ -34,6 +34,7 @@ export interface IPropItems {
     xScalevalueHeight: number;
     topList: IDate[];
     breathingHeight: number;
+    hospitalizationDate: string;
     grid: IGrid;
     top: ITop;
     left: ILeft;
@@ -106,6 +107,7 @@ export interface IData {
     height: number;
     borderStyle?: fabric.ILineOptions;
     selectionStyle?: any;
+    hospitalizationDate: string;
     grid: IGrid;
     other?: IOther;
     top: ITop;