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

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/big-table/style/index.css

@@ -249,6 +249,11 @@ body > .vxe-table--tooltip-wrapper {
   height: 100%;
   line-height: unset;
   width: 100%;
+  display: inline-flex;
+}
+.custom-big-table .vxe-table .vxe-table--header .col--seq .vxe-cell--title,
+.custom-big-table .vxe-table .vxe-table--header .col--checkbox .vxe-cell--title {
+  display: inline-block;
 }
 .custom-big-table .vxe-table .vxe-table--footer-wrapper.body--wrapper::-webkit-scrollbar,
 .custom-big-table .vxe-table .vxe-table--body-wrapper::-webkit-scrollbar {

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

@@ -1,6 +1,6 @@
 import { reactive, onMounted, nextTick } from 'vue';
 import { fabric } from '../utils/index.js';
-import { defaultStyle, drawLine, drawPoint, defaultTextStyle } from './useDraw.js';
+import { defaultStyle, drawPoint, drawLine, defaultTextStyle } from './useDraw.js';
 import useGrid from './useGrid.js';
 import { useShadow } from './useShadow.js';
 import { TEMPERATURE_MENU, PAIN_MENU } from './constant.js';
@@ -36,6 +36,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     target: null
   });
   const shadowLinesCache = /* @__PURE__ */ new Set();
+  const maiboPoints = /* @__PURE__ */ new Set();
+  const otherPoints = /* @__PURE__ */ new Set();
   onMounted(() => {
     nextTick(() => {
       init();
@@ -48,6 +50,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         drawPolyLine(item, dataIndex, scaleValue);
       });
     });
+    drawOverlapPoint();
     setCanvasEvent();
   }
   function drawShaDow(target) {
@@ -95,13 +98,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 +121,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) => {
@@ -180,13 +184,49 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
   }
   function getEqualXTypes(pointX) {
     const types = [];
+    const left2 = cumputedX(getXValue(pointX));
     canvas.value.forEachObject((obj) => {
-      if (obj.origin && cumputedX(getXValue(pointX)) === obj.left) {
+      if (obj.origin && left2 === obj.left) {
         types.push(obj.origin.type);
       }
     });
     return [...new Set(types)];
   }
+  function drawOverlapPoint() {
+    var _a;
+    const pulseObj = left.yScaleValue.find((item) => item.type === "pulse");
+    if (!pulseObj || !((_a = pulseObj.dataList) == null ? void 0 : _a.length))
+      return;
+    if (!pulseObj.dataList.some((item) => item.title.includes("\u8109\u640F")))
+      return;
+    const overlap = left.overlap || {};
+    maiboPoints.size && [...maiboPoints].forEach((item) => {
+      [...otherPoints].forEach((obj) => {
+        if (obj.origin && item.left === obj.left && item.top === obj.top) {
+          const key = obj.origin.key;
+          if (key) {
+            console.log(333, key);
+            const pointer = {
+              left: obj.left,
+              top: obj.top,
+              defaultStyle
+            };
+            let type = "koumai";
+            if (key === "yemai") {
+              type = key;
+            }
+            if (key === "humai") {
+              type = "circle";
+            }
+            drawPoint(type, {
+              ...overlap[key] || {},
+              ...pointer
+            });
+          }
+        }
+      });
+    });
+  }
   function drawPolyLine(item, dataIndex, scaleValue) {
     const {
       pointAttr = {},
@@ -289,6 +329,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         origin: {
           data: v,
           title: item.title,
+          key: item.key || "",
           unit: scaleValue.unit,
           type: scaleValue.type,
           dataIndex,
@@ -322,6 +363,11 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       }
       lineList.push(line);
       if (point) {
+        if (item.title.includes("\u8109\u640F")) {
+          maiboPoints.add(point);
+        } else {
+          otherPoints.add(point);
+        }
         setPointEvent(point);
         pointList.push(point);
       }

package/es/packages/fabric-chart/src/hooks/useDraw.d.ts

@@ -39,4 +39,4 @@ export declare const defaultTextStyle: {
 };
 export declare function drawLine(points: number[], style: Partial<ILineOptions>): fabric.Line;
 export declare function drawTextGroup(rectStyle: Partial<fabric.IRectOptions>, fontStyle: Partial<ITextOptions>, groupStyle: Partial<fabric.IGroupOptions>): fabric.Group;
-export declare function drawPoint(type: string | undefined, style: any): fabric.Circle | fabric.Triangle;
+export declare function drawPoint(type: string | undefined, style: any): fabric.Object;

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

@@ -46,14 +46,17 @@ 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
   });
 }
 function drawPoint(type = "circle", style) {
-  let point = null;
   const newStyle = {
     originX: "center",
     originY: "center",
@@ -61,27 +64,87 @@ function drawPoint(type = "circle", style) {
     hasBorders: false,
     ...style
   };
+  const createCircleBorder = (data) => {
+    return new fabric.Circle({
+      objectCaching: false,
+      strokeWidth: 1,
+      radius: 5,
+      scale: 1,
+      fill: "#fff",
+      ...data
+    });
+  };
   switch (type) {
     case "triangle":
-      point = new fabric.Triangle({
+      return new fabric.Triangle({
         width: 20,
         height: 20,
         strokeWidth: 1,
         scale: 1,
         ...newStyle
       });
-      break;
     case "circle":
-      point = new fabric.Circle({
+      return new fabric.Circle({
         objectCaching: false,
         strokeWidth: 1,
         radius: 5,
         scale: 1,
         ...newStyle
       });
-      break;
+    case "image":
+      if (style == null ? void 0 : style.url) ; else {
+        return new fabric.Image(style.element, {
+          ...newStyle,
+          scale: 1
+        });
+      }
+    case "yemai":
+      const createAdd = (data) => {
+        const width = (data.radius || 5) * 2;
+        const line1 = new fabric.Line([0, width / 2, width, width / 2], {
+          ...data,
+          stroke: data.strokeX,
+          strokeWidth: data.strokeWidth,
+          angle: 0
+        });
+        const line2 = new fabric.Line([width / 2, 0, width / 2, width], {
+          ...data,
+          angle: 0
+        });
+        return new fabric.Group([line1, line2], {
+          scale: 1,
+          ...data
+        });
+      };
+      return new fabric.Group([createCircleBorder(style), createAdd(style)], {
+        scale: 1,
+        ...style,
+        angle: 0
+      });
+    case "koumai":
+      const circle = new fabric.Circle({
+        objectCaching: false,
+        radius: style.radiusCircle || 2,
+        fill: style.fillCircle || "#000",
+        originX: "center",
+        originY: "center",
+        left: style.left,
+        top: style.top
+      });
+      return new fabric.Group([createCircleBorder(style), circle], {
+        scale: 1,
+        ...style
+      });
+    default:
+      style && Reflect.deleteProperty(style, "stroke");
+      return new fabric.Text(String(type), {
+        fontFamily: "\u5FAE\u8F6F\u96C5\u9ED1",
+        scale: 1,
+        fontSize: 14,
+        fill: "#000",
+        ...newStyle
+      });
   }
-  return point;
 }
 
 export { defaultBorderStyle, defaultLineStyle, defaultRectStyle, defaultStyle, defaultTextStyle, drawLine, drawPoint, drawTextGroup };

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/es/packages/fabric-chart/src/interface.d.ts

@@ -80,6 +80,7 @@ export interface ITop {
     operationDays?: IDate;
 }
 interface ILeft {
+    overlap?: any;
     spaceGridNumber?: number;
     yScaleValue: Array<any>;
     icons?: any;

package/es/packages/form-render/index.d.ts

@@ -99,6 +99,9 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
         default: () => {};
     };
+    annotation: {
+        type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
+    };
     consumer: {
         type: BooleanConstructor;
         default: boolean;
@@ -204,6 +207,9 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
             type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
             default: () => {};
         };
+        annotation: {
+            type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
+        };
         consumer: {
             type: BooleanConstructor;
             default: boolean;
@@ -1396,6 +1402,9 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
         default: () => {};
     };
+    annotation: {
+        type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
+    };
     consumer: {
         type: BooleanConstructor;
         default: boolean;

package/es/packages/form-render/src/FormRender.vue.d.ts

@@ -99,6 +99,9 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<AnyObject>;
         default: () => {};
     };
+    annotation: {
+        type: PropType<AnyObject>;
+    };
     consumer: {
         type: BooleanConstructor;
         default: boolean;
@@ -204,6 +207,9 @@ declare const _default: import("vue").DefineComponent<{
             type: PropType<AnyObject>;
             default: () => {};
         };
+        annotation: {
+            type: PropType<AnyObject>;
+        };
         consumer: {
             type: BooleanConstructor;
             default: boolean;
@@ -1396,6 +1402,9 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<AnyObject>;
         default: () => {};
     };
+    annotation: {
+        type: PropType<AnyObject>;
+    };
     consumer: {
         type: BooleanConstructor;
         default: boolean;

package/es/packages/form-render/src/FormRender.vue_vue_type_script_setup_true_lang.js

@@ -31,6 +31,7 @@ var script = /* @__PURE__ */ defineComponent({
     },
     businessFilter: { type: Function },
     scope: { type: Object, default: () => ({}) },
+    annotation: { type: Object },
     consumer: { type: Boolean, default: false },
     uuid: { type: String }
   },
@@ -104,7 +105,7 @@ var script = /* @__PURE__ */ defineComponent({
       }
     });
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(unref(NForm), null, {
+      return openBlock(), createBlock(unref(NForm), { class: "form-render" }, {
         default: withCtx(() => [
           __props.anchor ? (openBlock(), createElementBlock("section", _hoisted_1, [
             createVNode(unref(NTabs), {