cnhis-design-vue 3.1.14-beta.7.1 → 3.1.14

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

@@ -1,24 +1,23 @@
 import { onMounted, nextTick } from 'vue';
 import { fabric } from '../utils/index.js';
-import { defaultStyle, drawTextGroup, defaultTextStyle, defaultRectStyle } from './useDraw.js';
+import { defaultBorderStyle, defaultStyle, drawTextGroup, defaultTextStyle, defaultRectStyle } from './useDraw.js';
 
 function useTop(canvas, propItems) {
   const {
-    originY,
     grid,
     originX,
     xCellWidth,
     gridXNumber,
     top,
-    dateHeight,
-    hospitalDaysHeight,
-    operationDaysHeight,
     xScalevalueHeight,
     iconsWidth,
-    topList
+    topList,
+    endXLimit,
+    canvasWidth
   } = propItems;
   function drawTop() {
-    let list = [];
+    const list = [];
+    endXLimit && list.push(new fabric.Line([endXLimit, 0, canvasWidth, 0], defaultBorderStyle));
     let topY = 0;
     topList.forEach((item, index) => {
       if (index > 0) {
@@ -53,7 +52,7 @@ function useTop(canvas, propItems) {
       top: topY
     });
     list.push(title);
-    let timeList = [];
+    const timeList = [];
     for (let j = 0; j < grid.mainXCell; j++) {
       timeList.push(top.xScalevalue.list);
     }
@@ -80,7 +79,7 @@ function useTop(canvas, propItems) {
       return false;
     const height = top.dayHeight;
     const width = xCellWidth * grid.subSecondXCell;
-    const dayList = gridXNumber / grid.subSecondXCell;
+    const dayList = (gridXNumber - grid.surplusXCell) / grid.subSecondXCell;
     for (let i = 0; i < dayList; i++) {
       const left = originX + i * width;
       const value = i % 2 === 0 ? "\u4E0A\u5348" : "\u4E0B\u5348";
@@ -99,7 +98,7 @@ function useTop(canvas, propItems) {
     }
   }
   function drawDate(item, list, topY) {
-    let height = propItems[`${item.key}Height`];
+    const height = propItems[`${item.key}Height`];
     const title = drawTextGroup({
       width: originX - iconsWidth,
       height,

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

@@ -14,6 +14,8 @@ interface IGrid {
     subSecondXCell: number;
     mainYCell: number;
     subYCell: number;
+    surplusXCell: number;
+    surplusYCell: number;
     mainLineStyle?: ImainLineStyle;
     subLineStyle?: fabric.ILineOptions;
     subSecondLineStyle?: fabric.ILineOptions;
@@ -45,7 +47,9 @@ export interface IPropItems {
     iconsWidth: number;
     originX: number;
     originY: number;
+    originYLimit: number;
     endX: number;
+    endXLimit: number;
     endY: number;
     xCellWidth: number;
     yCellHeight: number;