cnhis-design-vue 3.1.13-beta.1 → 3.1.13-beta.2

package/es/packages/big-table/src/BigTable.vue.d.ts

@@ -1115,14 +1115,6 @@ declare const _default: import("vue").DefineComponent<{
                 textColorTextDisabledWarning: string;
                 textColorGhostWarning: string;
                 textColorGhostHoverWarning: string;
-                /**
-                 * 初始化props
-                 * @param {*} unionItem
-                 * @param {*} row
-                 * @param {*} column
-                 * @param {*} $rowIndex
-                 * @returns
-                 */
                 textColorGhostPressedWarning: string;
                 textColorGhostFocusWarning: string;
                 textColorGhostDisabledWarning: string;
@@ -1181,7 +1173,10 @@ declare const _default: import("vue").DefineComponent<{
             }, any>>;
             readonly themeOverrides: import("vue").PropType<import("naive-ui/es/_mixins/use-theme").ExtractThemeOverrides<import("naive-ui/es/_mixins").Theme<"Button", {
                 heightTiny: string;
-                heightSmall: string;
+                heightSmall: string; /**
+                 * 单个form提交失败
+                 * @param {*} obj
+                 */
                 heightMedium: string;
                 heightLarge: string;
                 borderRadiusTiny: string;
@@ -1192,10 +1187,7 @@ declare const _default: import("vue").DefineComponent<{
                 fontSizeSmall: string;
                 fontSizeMedium: string;
                 fontSizeLarge: string;
-                opacityDisabled: string; /**
-                 * 避免每次点击都查询
-                 * 初始化查一次 行编辑 表单search用
-                 */
+                opacityDisabled: string;
                 colorOpacitySecondary: string;
                 colorOpacitySecondaryHover: string;
                 colorOpacitySecondaryPressed: string;
@@ -1218,9 +1210,7 @@ declare const _default: import("vue").DefineComponent<{
                 textColorHover: string;
                 textColorPressed: string;
                 textColorFocus: string;
-                textColorDisabled: string; /**
-                 * tsx渲染表格
-                 */
+                textColorDisabled: string;
                 textColorText: string;
                 textColorTextHover: string;
                 textColorTextPressed: string;

package/es/packages/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.js

@@ -349,7 +349,7 @@ var script = /* @__PURE__ */ defineComponent({
         state.editConfig = Object.assign(state.editConfig, editConfig);
         state.rowConfig.height = 48;
       }
-      state.rowConfig.height = Object.assign(state.rowConfig.height, rowConfig);
+      state.rowConfig = Object.assign(state.rowConfig, rowConfig);
       state.rowConfig.keyField = handleRowId.value;
       if (selectType) {
         isBatchSelect = 1;

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

@@ -95,13 +95,15 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
           if (itemPrev && points1.length === 1) {
             const point = getPoint(itemPrev);
             points1.unshift(point);
-            points2.unshift(point);
           }
-          const pointNext = getPoint(itemNext);
-          const pointNext2 = itemNext2 ? getPoint(itemNext2) : null;
-          if (itemNext && pointNext2 && pointNext.x === pointNext2.x && pointNext.y === pointNext2.y) {
-            points1.push(pointNext);
-            points2.push(pointNext);
+          if (itemNext && itemNext2) {
+            const pointNext = getPoint(itemNext);
+            const pointNext2 = getPoint(itemNext2);
+            if (pointNext.x === pointNext2.x && pointNext.y === pointNext2.y) {
+              points1.push(pointNext);
+            }
+          } else {
+            data.push({ points1, points2 });
           }
         } else {
           if (points1.length && points2.length) {
@@ -116,8 +118,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       const newData = data.reduce((pre, cur) => {
         const arr1 = cur.points1.map((v) => [v.x, v.y]);
         const arr2 = cur.points2.map((v) => [v.x, v.y]);
-        const [, ...newArr2] = arr2;
-        return pre.concat([[...arr1, ...newArr2.reverse()]]);
+        return pre.concat([[...arr1, ...arr2.reverse()]]);
       }, []);
       const { createShadowLines } = useShadow();
       newData.forEach((item) => {

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

@@ -46,7 +46,11 @@ function drawTextGroup(rectStyle, fontStyle, groupStyle) {
   });
   const texts = new fabric.Text(String(fontStyle.value), {
     ...defaultTextStyle,
-    ...fontStyle
+    ...fontStyle,
+    ...fontStyle.textAlign == "left" ? {
+      originX: "left",
+      left: -(rectStyle.width / 2)
+    } : {}
   });
   return new fabric.Group([rect, texts], {
     ...groupStyle

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

@@ -35,7 +35,7 @@ function useTop(canvas, propItems) {
       }
       if (item.key == "xScalevalue") {
         drawDay(list, topY);
-        drawTime(list, topY);
+        drawTime(item, list, topY);
       } else {
         propItems[`${item.key}Height`] && drawDate(item, list, topY);
       }
@@ -44,7 +44,7 @@ function useTop(canvas, propItems) {
     group && group.sendToBack();
     group && canvas.value.add(group);
   }
-  function drawTime(list, topY) {
+  function drawTime(item, list, topY) {
     var _a;
     const dayHeight = top.xScalevalue.show ? top.dayHeight || 0 : 0;
     const height = xScalevalueHeight - dayHeight;
@@ -55,7 +55,8 @@ function useTop(canvas, propItems) {
     }, {
       value: top.xScalevalue.title,
       ...defaultTextStyle,
-      ...((_a = top.date) == null ? void 0 : _a.style) || {}
+      ...((_a = top.date) == null ? void 0 : _a.style) || {},
+      ...item.titleStyle || {}
     }, {
       left: iconsWidth,
       top: topY
@@ -115,7 +116,8 @@ function useTop(canvas, propItems) {
     }, {
       value: item.title,
       ...defaultTextStyle,
-      ...(item == null ? void 0 : item.style) || {}
+      ...(item == null ? void 0 : item.style) || {},
+      ...item.titleStyle || {}
     }, {
       left: iconsWidth,
       top: topY

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "cnhis-design-vue",
 	"private": false,
-	"version": "3.1.13-beta.1",
+	"version": "3.1.13-beta.2",
 	"license": "ISC",
 	"module": "es/packages/index.js",
 	"main": "es/packages/index.js",