cnhis-design-vue 3.1.16-beta.6 → 3.1.16-beta.9

package/es/packages/big-table/index.d.ts

@@ -2868,7 +2868,7 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
     loadExpandMethod: ({ row, rowIndex }: any) => Promise<void>;
     nestHandleClickRow: (table: any, data: any) => void;
     initAnchor: () => void;
-    updateAnchor: (field: string) => void;
+    updateAnchor: (field: string) => Promise<void>;
     anchorEvent: ({ scrollLeft }: {
         scrollLeft: number;
     }) => void;

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

@@ -1127,12 +1127,6 @@ declare const _default: import("vue").DefineComponent<{
                 textColorGhostPressedWarning: string;
                 textColorGhostFocusWarning: string;
                 textColorGhostDisabledWarning: string;
-                /**
-                 * 判断是否渲染EditForm
-                 * @param {*} row
-                 * @param {*} column
-                 * @returns
-                 */
                 borderWarning: string;
                 borderHoverWarning: string;
                 borderPressedWarning: string;
@@ -1684,22 +1678,7 @@ declare const _default: import("vue").DefineComponent<{
             onClick: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: MouseEvent) => void>>;
             onChange: import("vue").PropType<import("naive-ui/es/input/src/interface").OnUpdateValue>;
             onClear: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: MouseEvent) => void>>;
-            status: import("vue").PropType<import("naive-ui/es/form/src/interface").FormValidationStatus>; /**
-             * 针对 bigTable 的设置列
-             * type: 列的类型
-             * field: 列字段名（注：属性层级越深，渲染性能将直线下降）
-             * title: 列标题（支持开启国际化）
-             * width: 列宽度（如果为空则均匀分配剩余宽度，如果全部列固定了，可能会存在宽屏下不会铺满，可以配合 "%" 或者 "min-width" 布局）
-             * minWidth: 最小列宽度；会自动将剩余空间按比例分配
-             * resizable: 列是否允许拖动列宽调整大小
-             * visible: 列是否显示
-             * fixed: 将列固定在左侧或者右侧（注意：固定列应该放在左右两侧的位置）
-             * align: 列对齐方式
-             * headerAlign: 表头列的对齐方式
-             * footerAlign: 表尾列的对齐方式
-             * formatter: 格式化显示内容 Function({cellValue, row, column})
-             * sortable: 是否允许列排序
-             */
+            status: import("vue").PropType<import("naive-ui/es/form/src/interface").FormValidationStatus>;
             'onUpdate:value': import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<import("naive-ui/es/input/src/interface").OnUpdateValue>>;
             onUpdateValue: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<import("naive-ui/es/input/src/interface").OnUpdateValue>>;
             textDecoration: import("vue").PropType<string | [string, string]>;
@@ -2888,7 +2867,7 @@ declare const _default: import("vue").DefineComponent<{
     loadExpandMethod: ({ row, rowIndex }: any) => Promise<void>;
     nestHandleClickRow: (table: any, data: any) => void;
     initAnchor: () => void;
-    updateAnchor: (field: string) => void;
+    updateAnchor: (field: string) => Promise<void>;
     anchorEvent: ({ scrollLeft }: {
         scrollLeft: number;
     }) => void;

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, reactive, useAttrs, computed, onMounted, onUnmounted, onActivated, createVNode, h, resolveComponent, Teleport, createTextVNode, nextTick, watch, openBlock, createElementBlock, Fragment, createBlock, unref, withCtx, renderList, createCommentVNode, createElementVNode, normalizeClass, normalizeStyle, mergeProps, renderSlot, toDisplayString, withDirectives, vShow, isVNode } from 'vue';
+import { defineComponent, ref, reactive, useAttrs, computed, onMounted, onUnmounted, onActivated, nextTick, createVNode, h, resolveComponent, Teleport, createTextVNode, watch, openBlock, createElementBlock, Fragment, createBlock, unref, withCtx, renderList, createCommentVNode, createElementVNode, normalizeClass, normalizeStyle, mergeProps, renderSlot, toDisplayString, withDirectives, vShow, isVNode } from 'vue';
 import { isArray, isFunction } from 'lodash-es';
 import bigTableState from './bigTableState.js';
 import bigTableProps from './bigTableProps.js';
@@ -243,7 +243,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       let columns = formatColumns(config);
       columns = handleGroupColums(columns, props);
       xGrid.value && xGrid.value.reloadColumn(columns);
-      initAnchor();
+      nextTick(() => {
+        initAnchor();
+      });
       setGroupTreeExpand();
       resetTableInlineEditStatus();
     };

package/es/packages/big-table/src/hooks/useAnchor.d.ts

@@ -1,6 +1,6 @@
 export declare const useAnchor: (props: any, state: any, emit: any, xGrid: any) => {
     initAnchor: () => void;
-    updateAnchor: (field: string) => void;
+    updateAnchor: (field: string) => Promise<void>;
     anchorEvent: ({ scrollLeft }: {
         scrollLeft: number;
     }) => void;

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

@@ -1,29 +1,37 @@
 import { useThrottleFn } from '@vueuse/core';
 
 const useAnchor = (props, state, emit, xGrid) => {
+  let setAnchorStatus = true;
   function initAnchor() {
-    var _a;
+    var _a, _b, _c;
     if ((_a = props.anchor) == null ? void 0 : _a.length) {
       const columns = xGrid.value.getColumns();
       let left = 0;
       columns.forEach((column) => {
-        const { field, minWidth, width } = column;
+        const { field, minWidth, width, fixed } = column;
         const colWidth = +(minWidth || width);
-        left += colWidth;
-        const anchorObj = props.anchor.find((v) => v.field === field);
-        anchorObj && state.anchorList.push({
-          ...anchorObj,
-          left: left - colWidth
-        });
+        if (fixed == "left") ; else {
+          left += colWidth;
+          const anchorObj = props.anchor.find((v) => v.field === field);
+          anchorObj && state.anchorList.push({
+            ...anchorObj,
+            left: left - colWidth
+          });
+        }
       });
-      state.anchorValue = state.anchorList[0].field;
+      state.anchorValue = ((_c = (_b = state.anchorList) == null ? void 0 : _b[0]) == null ? void 0 : _c.field) || "";
     }
   }
-  function updateAnchor(field) {
-    xGrid.value.scrollToColumn(field);
+  async function updateAnchor(field) {
+    setAnchorStatus = false;
+    const anchorObj = state.anchorList.find((v) => v.field === field);
+    await xGrid.value.scrollTo(anchorObj.left);
+    setTimeout(() => {
+      setAnchorStatus = true;
+    });
   }
   function setAnchorValue({ scrollLeft }) {
-    if (state.anchorList.length) {
+    if (state.anchorList.length && setAnchorStatus) {
       const anchorObj = state.anchorList.find((v) => scrollLeft < v.left);
       if (anchorObj) {
         state.anchorValue = anchorObj.field;

package/es/packages/button-print/src/ButtonPrint.vue_vue_type_script_setup_true_lang.js

@@ -228,7 +228,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           templateId: getTemplateIdByFormatId(state.currentFormatId),
           print: {
             print: "1",
-            type: "1"
+            type: "1",
+            callback: "1"
           },
           params
         };

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

@@ -7,12 +7,12 @@ const TEMPERATURE_MENU = [
   {
     label: "\u836F\u7269\u964D\u6E29",
     value: void 0,
-    type: "drugCooling"
+    type: "drugReduce"
   },
   {
     label: "\u7269\u7406\u964D\u6E29",
     value: void 0,
-    type: "physicalCooling"
+    type: "physicsReduce"
   },
   {
     label: "\u4E0D\u5347",
@@ -24,12 +24,12 @@ const PAIN_MENU = [
   {
     label: "\u836F\u7269\u964D\u75DB",
     value: void 0,
-    type: "drugReducePain"
+    type: "drugReduce"
   },
   {
     label: "\u7269\u7406\u964D\u75DB",
     value: void 0,
-    type: "physicalReducePain"
+    type: "physicsReduce"
   }
 ];
 

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

@@ -234,19 +234,19 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       lineAttr = {},
       noRiseStyle = {},
       verifiedStyle = {},
-      coolingStyle = {},
+      reduceStyle = {},
       type = "circle"
     } = item;
     const pointList = [];
     const lineList = [];
     const otherList = [];
     item.list.forEach((v, index) => {
-      var _a;
+      var _a, _b;
       const points = getPointer(v, scaleValue);
       const nextV = item.list[index + 1];
       const nextPoint = getPointer(nextV, scaleValue);
-      let coolLine, coolPoint, noRiseText, arrowGroup, verifiedText;
-      if (points && scaleValue.type === "temperature") {
+      let reduceLine, reducePoint, noRiseText, arrowGroup, verifiedText;
+      if ((points == null ? void 0 : points.length) && (scaleValue.type === "temperature" || scaleValue.type === "pain")) {
         if (v.noRise) {
           if (typeof v.noRise === "string") {
             noRiseText = drawText([points[0], points[1] + 5], {
@@ -285,24 +285,21 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
           });
           otherList.push(verifiedText);
         }
-        if (v.physicalCooling || v.drugCooling) {
-          const coolingLineStyle = {
+        if (v.physicsReduce || v.drugReduce) {
+          const reduceY = cumputedY(scaleValue.type, scaleValue.list, v.physicsReduce || v.drugReduce);
+          reduceLine = drawLine([...points, points[0], reduceY], {
             ...lineAttr,
-            stroke: coolingStyle.stroke,
-            strokeDashArray: [3, 3]
-          };
-          const coolY = cumputedY(scaleValue.type, scaleValue.list, v.physicalCooling || v.drugCooling);
-          coolLine = drawLine([...points, points[0], coolY], {
-            ...coolingLineStyle
+            ...reduceStyle.line,
+            ...defaultStyle
           });
-          coolPoint = drawPoint("circle", {
+          reducePoint = drawPoint(((_a = reduceStyle == null ? void 0 : reduceStyle.point) == null ? void 0 : _a.type) || "circle", {
             left: points[0],
-            top: coolY,
-            ...coolingStyle,
+            top: reduceY,
+            ...reduceStyle.point,
             ...defaultStyle
           });
-          coolLine && otherList.push(coolLine);
-          coolPoint && otherList.push(coolPoint);
+          reduceLine && otherList.push(reduceLine);
+          reducePoint && otherList.push(reducePoint);
         }
       }
       let point;
@@ -312,7 +309,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
           ...lineAttr
         });
       } else if (points && !nextPoint && !v.breakpoint && scaleValue.type === "temperature" && dataIndex < scaleValue.dataList.length - 1 && index === item.list.length - 1) {
-        const nextV2 = (_a = scaleValue.dataList[dataIndex + 1].list) == null ? void 0 : _a[0];
+        const nextV2 = (_b = scaleValue.dataList[dataIndex + 1].list) == null ? void 0 : _b[0];
         const nextLinePoint = getPointer(nextV2, scaleValue);
         line = nextLinePoint ? drawLine([...points, ...nextLinePoint], {
           ...lineAttr
@@ -338,8 +335,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         verifiedText,
         leftLine: previousLine,
         rightLine: line,
-        coolLine,
-        coolPoint,
+        reduceLine,
+        reducePoint,
         lockMovementX: true,
         ...pointAttr,
         ...propItems.event
@@ -456,9 +453,9 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       point.rightLine.setCoords();
       point.rightLine.set({ x1: point.left, y1: point.top });
     }
-    if (point.coolLine) {
-      point.coolLine.setCoords();
-      point.coolLine.set({ x1: point.left, y1: point.top });
+    if (point.reduceLine) {
+      point.reduceLine.setCoords();
+      point.reduceLine.set({ x1: point.left, y1: point.top });
     }
     if (point.noRiseText) {
       point.noRiseText.setCoords();

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

@@ -44,12 +44,19 @@ function drawTextGroup(rectStyle, fontStyle, groupStyle) {
     ...defaultRectStyle,
     ...rectStyle
   });
-  const texts = new fabric.Text(String(fontStyle.value), {
+  const { value = "\u6807\u9898", textAlign = "center", verticalAlign = "center" } = fontStyle;
+  const textLeft = rectStyle.width / 2;
+  const textTop = rectStyle.height / 2;
+  const texts = new fabric.Text(String(value), {
     ...defaultTextStyle,
     ...fontStyle,
-    ...fontStyle.textAlign == "left" ? {
-      originX: "left",
-      left: -(rectStyle.width / 2)
+    ...textAlign == "left" || textAlign == "right" ? {
+      originX: textAlign,
+      left: textAlign == "left" ? -textLeft : textLeft
+    } : {},
+    ...verticalAlign == "top" || verticalAlign == "bottom" ? {
+      originY: verticalAlign,
+      top: verticalAlign == "top" ? -textTop : textTop
     } : {}
   });
   return new fabric.Group([rect, texts], {

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

@@ -47,12 +47,20 @@ function useCanvasEvent(canvas, propItems, emits) {
       if (index > 0) {
         topY += propItems[`${topList[index - 1].key}Height`];
       }
-      selections2.push(drawRect({
-        left: iconsWidth,
+      const commonOptions = {
         top: topY + 1,
-        width: endX - iconsWidth,
         height: propItems[`${item.key}Height`] - 1
+      };
+      selections2.push(drawRect({
+        left: iconsWidth,
+        width: originX - iconsWidth,
+        ...commonOptions
       }, item.key));
+      selections2.push(drawRect({
+        left: originX,
+        width: endX - originX,
+        ...commonOptions
+      }, item.key + "Title"));
     });
     selections2.push(drawRect({
       left: originX,

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