cnhis-design-vue 3.1.15-beta.7 → 3.1.16-beta.0

package/es/packages/big-table/src/hooks/useAnnotation.js

@@ -1,11 +1,10 @@
 import { createVNode } from 'vue';
 import { isObject } from '@vue/shared';
-import { isBoolean } from 'lodash-es';
 import Annotation from '../../../annotation-edit/index.js';
 
 function useAnnotation(props) {
   function renderAnnotation(columnConfig) {
-    if (!isObject(props.annotation) || isBoolean(columnConfig.annotation) && !columnConfig.annotation)
+    if (!isObject(props.annotation) || columnConfig.annotation === false)
       return null;
     return createVNode("section", {
       "class": "big-table__annotationWrapper"

package/es/packages/big-table/src/hooks/useColumnConfigAdaptor.js

@@ -79,12 +79,17 @@ function useColumnConfigAdaptor() {
         ...["open", "close"].map((key) => [key, switchOptionHandler]),
         ["is_edit", { property: "isEdit", valueMap: isEditValueMap }],
         ["html_type", { property: "formType", valueMap: htmlTypeValueMap }],
-        ["option", { property: "options", fieldMap: /* @__PURE__ */ new Map([["text", "label"]]) }]
+        ["option", { property: "options", fieldMap: /* @__PURE__ */ new Map([["text", "label"]]) }],
+        [
+          "alias",
+          (value, result, fieldItem) => {
+            result.title = `${value}${fieldItem.suffix ? `(${fieldItem.suffix})` : ""}`;
+          }
+        ]
       ]);
       const fieldMap = /* @__PURE__ */ new Map([
         ["sum", "isSum"],
         ["show", "isShow"],
-        ["name", "title"],
         ["elementId", "columnName"],
         ["columnWidth", "colWidth"],
         ["fixedWayEnum", { property: "isFixed", valueMap: fixedWayEnumValueMap }],

package/es/packages/big-table/src/hooks/useEdit.js

@@ -106,20 +106,28 @@ const useEdit = (props, state, emit, xGrid) => {
     emit("formChange", { value, row, column, index, oldValue });
   };
   const getDefaultValue = (params, item) => {
-    var _a, _b, _c;
+    var _a;
     const value = params.row[item.columnName];
     if (item.formType === "select") {
+      if (Array.isArray(value)) {
+        return (_a = value.map((v) => getValue(v))) == null ? void 0 : _a.join(",");
+      }
+      return getValue(value);
+    }
+    return value;
+    function getValue(value2) {
+      const findValue = (options) => {
+        var _a2;
+        return ((_a2 = options == null ? void 0 : options.find((v) => v.value == value2)) == null ? void 0 : _a2.label) || value2 || "";
+      };
       if (item.formatMap) {
         return params.row[item.formatMap.label];
       }
-      if (item.options) {
-        return ((_a = item.options.find((v) => v.value == value)) == null ? void 0 : _a.label) || value || "";
-      }
-      if (item.queryOptions) {
-        return ((_c = (_b = params.row[`${item.columnName}_options`]) == null ? void 0 : _b.find((v) => v.value === value)) == null ? void 0 : _c.label) || value || "";
-      }
+      if (item.options)
+        return findValue(item.options);
+      if (item.queryOptions)
+        return findValue(params.row[`${item.columnName}_options`]);
     }
-    return value;
   };
   return {
     initEditTable,

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

@@ -53,6 +53,7 @@ function drawTextGroup(rectStyle, fontStyle, groupStyle) {
     } : {}
   });
   return new fabric.Group([rect, texts], {
+    ...defaultStyle,
     ...groupStyle
   });
 }

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

@@ -55,8 +55,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
       height: painHeight,
       ...defaultRectStyle
     }, {
-      value: `${item.title.slice(0, 2)}
-${item.title.slice(-2)}`,
+      value: `${item.title}`,
       ...defaultTextStyle,
       ...item.style || {}
     }, {