cnhis-design-vue 3.1.16-beta.1 → 3.1.16-beta.12

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

@@ -3,25 +3,75 @@ import { fabric } from '../utils/index.js';
 import { defaultStyle } from './useDraw.js';
 
 function useOther(canvas, propItems, cumputedX) {
-  const { originY, other, vitalSignsOriginY } = propItems;
+  const { other, vitalSignsOriginY } = propItems;
   function drawOther() {
-    if (!other || !other.list)
+    if (!(other == null ? void 0 : other.list))
       return false;
     const list = [];
-    other.list.forEach((v, i) => {
-      var _a;
-      const text = new fabric.Text(String(v.value.toString().split("").join("\n")), {
-        originX: "center",
-        top: (((_a = v.style) == null ? void 0 : _a.baseTop) || 0) + vitalSignsOriginY.originY,
-        left: cumputedX(v.time),
-        textAlign: "center",
-        ...defaultStyle,
-        ...v.style || {}
+    const otherList = [];
+    other.list.forEach((item) => {
+      const align = item.align || "vertical";
+      const left = cumputedX(item.time);
+      const obj = otherList.find((v) => v.left == left);
+      if (obj) {
+        obj[align].push(item);
+      } else {
+        const initObj = {
+          left,
+          vertical: [],
+          horizontal: []
+        };
+        initObj[align].push(item);
+        otherList.push(initObj);
+      }
+    });
+    let textWidth = 0;
+    otherList.forEach((item) => {
+      let topY = vitalSignsOriginY.originY;
+      let leftX = item.left;
+      let textHeight = 0;
+      item.vertical.forEach((v) => {
+        const { commonOptions, value } = getTextData(v);
+        topY += (v.baseTop || 0) + textHeight;
+        const text = new fabric.Text(value, {
+          top: topY,
+          left: item.left,
+          ...commonOptions
+        });
+        textHeight = text.height || 0;
+        setTextWidth(text);
+      });
+      item.horizontal.forEach((v, i) => {
+        if (i > 0 || item.vertical.length) {
+          leftX += textWidth;
+        }
+        const { commonOptions, value } = getTextData(v);
+        const text = new fabric.Text(value, {
+          top: vitalSignsOriginY.originY,
+          left: leftX,
+          ...commonOptions
+        });
+        setTextWidth(text);
       });
-      list.push(text);
     });
+    function setTextWidth(text) {
+      if (!textWidth) {
+        textWidth = text.width || 0;
+      }
+      list.push(text);
+    }
+    function getTextData(v) {
+      return {
+        commonOptions: {
+          originX: "center",
+          textAlign: "center",
+          ...defaultStyle,
+          ...v.style || {}
+        },
+        value: String(v.value.toString().split("").join("\n"))
+      };
+    }
     const group = list.length > 0 ? new fabric.Group([...list], { ...defaultStyle }) : null;
-    group && group.sendToBack();
     group && canvas.value.add(group);
   }
   onMounted(() => {

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

@@ -24,7 +24,7 @@ function useTop(canvas, propItems) {
         topY += propItems[`${topList[index - 1].key}Height`];
       }
       if (item.key == "xScalevalue") {
-        drawDay(list, topY);
+        drawDay(item, list, topY);
         drawTime(item, list, topY);
       } else {
         propItems[`${item.key}Height`] && drawDate(item, list, topY);
@@ -35,7 +35,6 @@ function useTop(canvas, propItems) {
     group && canvas.value.add(group);
   }
   function drawTime(item, list, topY) {
-    var _a;
     const dayHeight = top.xScalevalue.show ? top.dayHeight || 0 : 0;
     const height = xScalevalueHeight - dayHeight;
     const title = drawTextGroup({
@@ -45,7 +44,7 @@ function useTop(canvas, propItems) {
     }, {
       value: top.xScalevalue.title,
       ...defaultTextStyle,
-      ...((_a = top.date) == null ? void 0 : _a.style) || {},
+      ...item.style || {},
       ...item.titleStyle || {}
     }, {
       left: iconsWidth,
@@ -57,7 +56,6 @@ function useTop(canvas, propItems) {
       timeList.push(top.xScalevalue.list);
     }
     timeList.flat().forEach((v, i) => {
-      var _a2;
       const left = originX + i * xCellWidth;
       const textGroup = drawTextGroup({
         width: xCellWidth,
@@ -65,7 +63,7 @@ function useTop(canvas, propItems) {
       }, {
         value: v,
         ...defaultTextStyle,
-        ...((_a2 = top.date) == null ? void 0 : _a2.style) || {}
+        ...item.style || {}
       }, {
         left,
         top: topY + dayHeight
@@ -73,8 +71,7 @@ function useTop(canvas, propItems) {
       list.push(textGroup);
     });
   }
-  function drawDay(list, topY) {
-    var _a;
+  function drawDay(item, list, topY) {
     if (!top.dayHeight)
       return false;
     const height = top.dayHeight;
@@ -89,7 +86,7 @@ function useTop(canvas, propItems) {
       }, {
         value,
         ...defaultTextStyle,
-        ...((_a = top.date) == null ? void 0 : _a.style) || {}
+        ...item.style || {}
       }, {
         left,
         top: topY

package/es/packages/field-set/index.d.ts

@@ -6974,7 +6974,7 @@ declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
         modelValue: unknown[];
         componentData: Record<string, any>;
     }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("onSave" | "onClose")[], "onSave" | "onClose", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("onSave" | "onClose")[], "onClose" | "onSave", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     fields: {
         type: import("vue").PropType<any[]>;
         default: () => never[];

package/es/packages/field-set/src/FieldSet.vue.d.ts

@@ -6954,7 +6954,7 @@ declare const _default: import("vue").DefineComponent<{
         modelValue: unknown[];
         componentData: Record<string, any>;
     }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("onSave" | "onClose")[], "onSave" | "onClose", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("onSave" | "onClose")[], "onClose" | "onSave", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     fields: {
         type: PropType<any[]>;
         default: () => never[];