cnhis-design-vue 3.1.15-beta.2 → 3.1.15-beta.3

package/es/packages/annotation-edit/src/AnnotationEdit.js

@@ -36,7 +36,8 @@ var script = defineComponent({
     });
     const isEdit = ref(false);
     let clickTimer;
-    function iconClick() {
+    function iconClick(evt) {
+      evt.stopPropagation();
       clearTimeout(clickTimer);
       if (showPopper.value && isEdit.value) {
         showPopper.value = false;

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

@@ -9,9 +9,9 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         type: NumberConstructor;
         default: number;
     };
-    checkboxBindRowClick: {
-        type: BooleanConstructor;
-        default: boolean;
+    annotation: {
+        type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
+        default: () => {};
     };
     showFooter: BooleanConstructor;
     sumData: {
@@ -2595,9 +2595,9 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
             type: NumberConstructor;
             default: number;
         };
-        checkboxBindRowClick: {
-            type: BooleanConstructor;
-            default: boolean;
+        annotation: {
+            type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
+            default: () => {};
         };
         showFooter: BooleanConstructor;
         sumData: {
@@ -2945,7 +2945,8 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
     maskUp: (e: any) => void;
     setGroupTreeExpand: () => void;
     resetTableInlineEditStatus: () => false | undefined;
-    toolTipTitle: (item: any, type: any) => any;
+    renderAnnotation: (columnConfig: import("../../../es/src/types").AnyObject) => JSX.Element | null;
+    toolTipTitle: (item: any, type: any) => any[] | (() => any[]);
     triggerExpand: (e: any, isExpand: any) => void;
     getOtherConfigInit: () => any;
     refreshTable: () => void;
@@ -4082,9 +4083,9 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         type: NumberConstructor;
         default: number;
     };
-    checkboxBindRowClick: {
-        type: BooleanConstructor;
-        default: boolean;
+    annotation: {
+        type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
+        default: () => {};
     };
     showFooter: BooleanConstructor;
     sumData: {
@@ -4281,7 +4282,7 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
     columnConfig: Record<string, any>;
     menuConfig: Record<string, any>;
     maxCheckSize: number;
-    checkboxBindRowClick: boolean;
+    annotation: import("../../../es/src/types").AnyObject;
     sumData: Record<string, any>;
     avgData: Record<string, any>;
     refreshRow: number;

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

@@ -7,9 +7,9 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: number;
     };
-    checkboxBindRowClick: {
-        type: BooleanConstructor;
-        default: boolean;
+    annotation: {
+        type: import("vue").PropType<import("../../../src/types").AnyObject>;
+        default: () => {};
     };
     showFooter: BooleanConstructor;
     sumData: {
@@ -1162,7 +1162,14 @@ declare const _default: import("vue").DefineComponent<{
                 paddingMedium: string;
                 paddingLarge: string;
                 paddingRoundTiny: string;
-                paddingRoundSmall: string;
+                paddingRoundSmall: string; /**
+                 * 初始化props
+                 * @param {*} unionItem
+                 * @param {*} row
+                 * @param {*} column
+                 * @param {*} $rowIndex
+                 * @returns
+                 */
                 paddingRoundMedium: string;
                 paddingRoundLarge: string;
                 iconMarginTiny: string;
@@ -1252,9 +1259,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverPrimary: string;
                 borderPressedPrimary: string;
                 borderFocusPrimary: string;
-                borderDisabledPrimary: string; /**
-                 * tsx渲染表格
-                 */
+                borderDisabledPrimary: string;
                 rippleColorPrimary: string;
                 colorInfo: string;
                 colorHoverInfo: string;
@@ -2595,9 +2600,9 @@ declare const _default: import("vue").DefineComponent<{
             type: NumberConstructor;
             default: number;
         };
-        checkboxBindRowClick: {
-            type: BooleanConstructor;
-            default: boolean;
+        annotation: {
+            type: import("vue").PropType<import("../../../src/types").AnyObject>;
+            default: () => {};
         };
         showFooter: BooleanConstructor;
         sumData: {
@@ -2945,7 +2950,8 @@ declare const _default: import("vue").DefineComponent<{
     maskUp: (e: any) => void;
     setGroupTreeExpand: () => void;
     resetTableInlineEditStatus: () => false | undefined;
-    toolTipTitle: (item: any, type: any) => any;
+    renderAnnotation: (columnConfig: import("../../../src/types").AnyObject) => JSX.Element | null;
+    toolTipTitle: (item: any, type: any) => any[] | (() => any[]);
     triggerExpand: (e: any, isExpand: any) => void;
     getOtherConfigInit: () => any;
     refreshTable: () => void;
@@ -3292,7 +3298,10 @@ declare const _default: import("vue").DefineComponent<{
                 buttonColor2: string;
                 buttonColor2Hover: string;
                 buttonColor2Pressed: string;
-                boxShadow1: string; /**
+                boxShadow1: string;
+                boxShadow2: string;
+                boxShadow3: string;
+                /**
                  * 针对 bigTable 的设置列
                  * type: 列的类型
                  * field: 列字段名（注：属性层级越深，渲染性能将直线下降）
@@ -3308,8 +3317,6 @@ declare const _default: import("vue").DefineComponent<{
                  * formatter: 格式化显示内容 Function({cellValue, row, column})
                  * sortable: 是否允许列排序
                  */
-                boxShadow2: string;
-                boxShadow3: string;
                 fontFamily: string;
                 fontFamilyMono: string;
                 fontWeight: string;
@@ -4061,7 +4068,9 @@ declare const _default: import("vue").DefineComponent<{
             color: string;
             opacity1Depth: string;
             opacity2Depth: string;
-            opacity3Depth: string;
+            opacity3Depth: string; /**
+             * computed
+             */
             opacity4Depth: string;
             opacity5Depth: string;
         }, any>>;
@@ -4097,9 +4106,9 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: number;
     };
-    checkboxBindRowClick: {
-        type: BooleanConstructor;
-        default: boolean;
+    annotation: {
+        type: import("vue").PropType<import("../../../src/types").AnyObject>;
+        default: () => {};
     };
     showFooter: BooleanConstructor;
     sumData: {
@@ -4296,7 +4305,7 @@ declare const _default: import("vue").DefineComponent<{
     columnConfig: Record<string, any>;
     menuConfig: Record<string, any>;
     maxCheckSize: number;
-    checkboxBindRowClick: boolean;
+    annotation: import("../../../src/types").AnyObject;
     sumData: Record<string, any>;
     avgData: Record<string, any>;
     refreshRow: number;

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

@@ -1,5 +1,6 @@
 import { defineComponent, ref, reactive, useAttrs, computed, onMounted, onUnmounted, onActivated, createVNode, h, resolveComponent, Teleport, createTextVNode, nextTick, watch, openBlock, createElementBlock, Fragment, createCommentVNode, createElementVNode, normalizeClass, normalizeStyle, unref, mergeProps, withCtx, renderSlot, createBlock, toDisplayString, withDirectives, vShow, isVNode } from 'vue';
 import { isArray, isFunction } from 'lodash-es';
+import { useAnnotation } from '../../../packages/big-table/src/hooks/useAnnotation';
 import { useSeparateRow } from '../../../packages/big-table/src/hooks/useSeparateRow';
 import bigTableState from './bigTableState.js';
 import bigTableProps from './bigTableProps.js';
@@ -950,6 +951,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         return false;
       handleClickCancelBtnByInline();
     };
+    const {
+      renderAnnotation
+    } = useAnnotation(props);
     const toolTipTitle = (item, type) => {
       var _a;
       let name = item.formTitle || item.alias || item.title;
@@ -962,11 +966,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         isAlias = !!tooltipTitle;
       }
       if (type === "format")
-        return createVNode(TextOverTooltip, {
+        return [createVNode(TextOverTooltip, {
           "tooltipTitle": tooltipTitle,
           "content": name,
           "isAlias": isAlias
-        }, null);
+        }, null), renderAnnotation(item)];
       return () => {
         return [createVNode(TextOverTooltip, {
           "tooltipTitle": tooltipTitle,
@@ -977,7 +981,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             "component": state.isExpand && state.total < 1001 ? CaretDown : CaretForward,
             "onClick": (e) => triggerExpand(e, state.isExpand)
           }, null) : ""]
-        })];
+        }), renderAnnotation(item)];
       };
     };
     const triggerExpand = (e, isExpand) => {
@@ -1341,9 +1345,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }
       isAboutNestTable.value && emit("setNestLastClickTable", table, props.isNestTable, row[handleRowId.value], row);
       emit("setNestTableClick", false);
-      if (!props.checkboxBindRowClick) {
-        return;
-      }
       if (props.isNestTable) {
         table == null ? void 0 : table.setAllCheckboxRow(false);
         nestHandleClickRow(table, data);

package/es/packages/big-table/src/bigTableProps.d.ts

@@ -1,3 +1,5 @@
+import { AnyObject } from '../../../../es/src/types';
+import { PropType } from 'vue';
 declare const bigTableProps: {
     data: {
         type: ArrayConstructor;
@@ -7,9 +9,9 @@ declare const bigTableProps: {
         type: NumberConstructor;
         default: number;
     };
-    checkboxBindRowClick: {
-        type: BooleanConstructor;
-        default: boolean;
+    annotation: {
+        type: PropType<AnyObject>;
+        default: () => {};
     };
     showFooter: BooleanConstructor;
     sumData: {

package/es/packages/big-table/src/bigTableProps.js

@@ -1,7 +1,7 @@
 const bigTableProps = {
   data: { type: Array, default: () => [] },
   maxCheckSize: { type: Number, default: 0 },
-  checkboxBindRowClick: { type: Boolean, default: true },
+  annotation: { type: Object, default: () => ({}) },
   showFooter: Boolean,
   sumData: { type: Object, default: () => ({}) },
   avgData: { type: Object, default: () => ({}) },

package/es/packages/big-table/src/components/edit-form/edit-separate.js

@@ -18,15 +18,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const props = __props;
     const popoverRef = ref();
     const show = ref(false);
+    function setShow(v) {
+      show.value = v;
+    }
     watch(show, updateShow);
     const editContent = ref();
     const { getRowData } = useSeparateMap();
-    function updateShow(show2) {
+    async function updateShow(show2) {
+      var _a;
       const target = getRowData(props.row);
       if (!target)
         return;
       if (show2) {
         editContent.value = cloneDeep(target.row[props.col.field]);
+        await new Promise((resolve) => setTimeout(resolve));
+        (_a = popoverRef.value) == null ? void 0 : _a.syncPosition();
         return;
       }
       const old = target.row[props.col.field];
@@ -73,6 +79,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             renderer: __props.col.separateSlot,
             value: editContent.value,
             "onUpdate:value": _cache[1] || (_cache[1] = ($event) => editContent.value = $event),
+            "onUpdate:show": setShow,
             col: __props.col,
             row: __props.row
           }, null, 8, ["renderer", "value", "col", "row"])) : (openBlock(), createBlock(unref(NInput), {

package/es/packages/big-table/src/components/edit-form/edit-separate.vue.d.ts

@@ -32,6 +32,7 @@ declare const _default: import("vue").DefineComponent<{
     }>>;
     popoverRef: import("vue").Ref<any>;
     show: import("vue").Ref<boolean>;
+    setShow: (v: boolean) => void;
     emit: (event: "formChange", ...args: any[]) => void;
     editContent: import("vue").Ref<any>;
     getRowData: (row: AnyObject) => {
@@ -40,7 +41,7 @@ declare const _default: import("vue").DefineComponent<{
         rawRow: AnyObject;
         row: AnyObject;
     } | undefined;
-    updateShow: (show: boolean) => void;
+    updateShow: (show: boolean) => Promise<void>;
     style: CSSProperties;
     SlotRender: import("vue").DefineComponent<{
         renderer: {

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

@@ -0,0 +1,4 @@
+import { AnyObject } from '../../../../../es/src/types';
+export declare function useAnnotation(props: AnyObject): {
+    renderAnnotation: (columnConfig: AnyObject) => JSX.Element | null;
+};

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

@@ -0,0 +1,21 @@
+import { createVNode } from 'vue';
+import { isObject } from '@vue/shared';
+import Annotation from '../../../annotation-edit/index.js';
+
+function useAnnotation(props) {
+  function renderAnnotation(columnConfig) {
+    if (!isObject(props.annotation))
+      return null;
+    return createVNode("section", {
+      "class": "big-table__annotationWrapper"
+    }, [createVNode(Annotation, {
+      "modelValue": props.annotation[columnConfig.columnName],
+      "onUpdate:modelValue": ($event) => props.annotation[columnConfig.columnName] = $event
+    }, null)]);
+  }
+  return {
+    renderAnnotation
+  };
+}
+
+export { useAnnotation };

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

@@ -224,6 +224,7 @@ export declare const comps: {
         }>>;
         popoverRef: import("vue").Ref<any>;
         show: import("vue").Ref<boolean>;
+        setShow: (v: boolean) => void;
         emit: (event: "formChange", ...args: any[]) => void;
         editContent: import("vue").Ref<any>;
         getRowData: (row: import("../../../../src/types").AnyObject) => {
@@ -232,7 +233,7 @@ export declare const comps: {
             rawRow: import("../../../../src/types").AnyObject;
             row: import("../../../../src/types").AnyObject;
         } | undefined;
-        updateShow: (show: boolean) => void;
+        updateShow: (show: boolean) => Promise<void>;
         style: import("vue").CSSProperties;
         SlotRender: import("vue").DefineComponent<{
             renderer: {

package/es/packages/big-table/style/index.css

@@ -291,7 +291,7 @@ body > .vxe-table--tooltip-wrapper {
   width: 100%;
 }
 .custom-big-table .filter-box .text-over-tooltip-components {
-  max-width: calc(100% - 20px);
+  max-width: calc(100% - 40px);
 }
 .custom-big-table .filter-box .vxe-filter--btn {
   border-top-color: #c0c4cc;
@@ -539,6 +539,21 @@ body > .vxe-table--tooltip-wrapper {
   margin-right: 6px;
   box-shadow: 0px 2px 4px 0px rgba(99, 129, 249, 0.5);
 }
+.annotation-edit {
+  cursor: pointer;
+  color: #0067ee;
+  font-size: 16px;
+  user-select: none;
+  display: inline-flex;
+  align-items: center;
+}
+.annotation-edit.is-active {
+  color: rgba(255, 152, 40);
+}
+.annotation-edit__icon {
+  display: inline-flex;
+  align-items: center;
+}
 .no-data-tip {
   display: flex;
   flex-direction: column;
@@ -601,3 +616,14 @@ body > .vxe-table--tooltip-wrapper {
   fill: currentColor;
   overflow: hidden;
 }
+.vxe-header--column [annotation-hover-show='true'] {
+  visibility: hidden;
+}
+.vxe-header--column:hover [annotation-hover-show='true'] {
+  visibility: visible;
+}
+.big-table__annotationWrapper {
+  width: 20px;
+  display: inline-flex;
+  align-items: center;
+}

package/es/packages/button-print/src/utils/print.d.ts

@@ -11,7 +11,7 @@ export declare class Print {
     _queryServicesPrint(params: AnyObject): Promise<any>;
     _callPrintWithFile(queryParams: AnyObject): Promise<any>;
     _handleResult(data: AnyObject, errorCallbackFn?: Func): false | AnyObject;
-    _handleResultTest(result: any, errorCallbackFn?: Func): boolean;
+    _handleResultTest(result: unknown, errorCallbackFn?: Func): boolean;
     _handleEventQueryPrintData(templateId: string, formatId: string, params: AnyObject, errorCallbackFn?: Func): Promise<false | {
         file: any;
         printerName: any;

package/es/packages/button-print/src/utils/print.js

@@ -29,7 +29,7 @@ class Print {
     const { resolve, reject } = handler;
     try {
       console.log(e);
-      resolve(JSON.parse(e.data.res));
+      resolve(JSON.parse(e.data).res);
     } catch (e2) {
       reject(e2);
     }

package/es/packages/fabric-chart/index.d.ts

@@ -53,6 +53,7 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
     }>;
     topList: import("vue").ComputedRef<import("./src/interface").IDate[]>;
     propItems: any;
+    computedYCell: (type: import("./src/interface").IPointType) => number;
     cumputedX: (value: string | number) => any;
     cumputedY: (type: import("./src/interface").IPointType, scaleValueList: number[], value: string | number) => number;
     getXValue: (pointX: number) => string | undefined;

package/es/packages/fabric-chart/src/FabricChart.js

@@ -130,28 +130,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return timeList.flat();
     });
     const breatheYCell = computed(() => {
-      var _a;
-      const { yScaleValue, spaceGridNumber = 5 } = props.data.left;
-      const list = (_a = yScaleValue.find((v) => v.type === "breathe")) == null ? void 0 : _a.list;
-      return list ? yCellHeight.value / ((parseInt(list[1]) - parseInt(list[0])) / spaceGridNumber) : 0;
+      return computedYCell("breathe");
     });
     const pulseYCell = computed(() => {
-      const { yScaleValue, spaceGridNumber = 5 } = props.data.left;
-      const list = yScaleValue.find((v) => v.type === "pulse").list;
-      return yCellHeight.value / ((parseInt(list[1]) - parseInt(list[0])) / spaceGridNumber);
+      return computedYCell("pulse");
     });
     const temperatureYCell = computed(() => {
-      const { yScaleValue, spaceGridNumber = 5 } = props.data.left;
-      const list = yScaleValue.find((v) => v.type === "temperature").list;
-      return yCellHeight.value / ((parseInt(list[1]) - parseInt(list[0])) / spaceGridNumber);
+      return computedYCell("temperature");
     });
     const painYCell = computed(() => {
-      const { yScaleValue, spaceGridNumber = 5 } = props.data.left;
-      const item = yScaleValue.find((v) => v.type === "pain");
-      const list = (item == null ? void 0 : item.list) || [];
-      if (!list.length)
-        return 0;
-      return yCellHeight.value / ((parseInt(list[1]) - parseInt(list[0])) / item.spaceGridNumber);
+      return computedYCell("pain");
     });
     const event = computed(() => {
       var _a;
@@ -261,6 +249,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       event: event.value,
       itemList: itemList.value
     });
+    function computedYCell(type) {
+      const { yScaleValue } = props.data.left;
+      const item = yScaleValue.find((v) => v.type === type);
+      const list = (item == null ? void 0 : item.list) || [];
+      if (!list.length)
+        return 0;
+      return yCellHeight.value / ((parseInt(list[1]) - parseInt(list[0])) / item.spaceGridNumber);
+    }
     const { cumputedX, cumputedY, getXValue, getYValue } = useCumputedPoint(propItems);
     useTop(canvas, propItems);
     const { pointTipProps, pointMenuProps, clickMenu, setPopup, getEqualXTypes } = useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, getYValue, props.addRenderItem);

package/es/packages/fabric-chart/src/FabricChart.vue.d.ts

@@ -1,4 +1,4 @@
-import { IData, IDate } from './interface';
+import { IData, IDate, IPointType } from './interface';
 declare const _default: import("vue").DefineComponent<{
     data: {
         type: null;
@@ -53,10 +53,11 @@ declare const _default: import("vue").DefineComponent<{
     }>;
     topList: import("vue").ComputedRef<IDate[]>;
     propItems: any;
+    computedYCell: (type: IPointType) => number;
     cumputedX: (value: string | number) => any;
-    cumputedY: (type: import("./interface").IPointType, scaleValueList: number[], value: string | number) => number;
+    cumputedY: (type: IPointType, scaleValueList: number[], value: string | number) => number;
     getXValue: (pointX: number) => string | undefined;
-    getYValue: (type: import("./interface").IPointType, pointY: number) => number;
+    getYValue: (type: IPointType, pointY: number) => number;
     pointTipProps: {
         show: boolean;
         point: {
@@ -79,7 +80,7 @@ declare const _default: import("vue").DefineComponent<{
         target: any;
     }) => void;
     setPopup: (point: any) => void;
-    getEqualXTypes: (pointX: number) => import("./interface").IPointType[];
+    getEqualXTypes: (pointX: number) => IPointType[];
     PopupTip: import("vue").DefineComponent<{
         show: {
             type: BooleanConstructor;

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

@@ -488,14 +488,12 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     return getTime >= minMinute && getTime <= maxMinute;
   }
   function getPointer(v, scaleValue) {
-    let points;
     const objOriginY = scaleValue.type === "pain" ? painOriginY : vitalSignsOriginY;
     if (isEffectiveNode(v) && isLimit(v.time)) {
       const x = cumputedX(v.time);
       const y = cumputedY(scaleValue.type, scaleValue.list, v.value);
-      points = [x, y < objOriginY.originY ? objOriginY.originY : y > objOriginY.endY ? objOriginY.endY : y];
+      return [x, y < objOriginY.originY ? objOriginY.originY : y > objOriginY.endY ? objOriginY.endY : y];
     }
-    return points;
   }
   function clickMenu({ item, target }) {
     if (!target) {

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

@@ -31,10 +31,12 @@ function useCumputedPoint(propItems) {
       const residueX = pointX - item.left;
       const residueTime = item.scaleCell * residueX;
       const time = item.start + residueTime;
-      let d = new Date(time);
+      const d = new Date(time);
       const month = `00${d.getMonth() + 1}`.slice(-2);
       const day = `00${d.getDate()}`.slice(-2);
-      const date = `${d.getFullYear()}-${month}-${day} ${d.getHours()}:${d.getMinutes()}`;
+      const hours = `00${d.getHours()}`.slice(-2);
+      const minutes = `00${d.getMinutes()}`.slice(-2);
+      const date = `${d.getFullYear()}-${month}-${day} ${hours}:${minutes}`;
       return date;
     }
   }

package/es/packages/form-render/src/components/renderer/cascader.js

@@ -1,6 +1,7 @@
 import { defineComponent, ref, computed, inject, watch, createVNode } from 'vue';
 import { isField } from '@formily/core';
 import { isEqual } from 'lodash-es';
+import { useCommonInjection } from '../../../../../packages/form-render/src/hooks/useCommonInjection';
 import { InjectAsyncQueue } from '../../constants/index.js';
 import { assignUpdateValue, traverseDependKey } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
@@ -123,13 +124,12 @@ const script = defineComponent({
         return (_a = target == null ? void 0 : target.depth) != null ? _a : -1;
       }
     }
-    watch(() => props.value, (n, o) => {
-      var _a, _b;
-      n != null && o == null && fetchData();
-      isField(field.value) && field.value.visited && ((_b = (_a = field.value).validate) == null ? void 0 : _b.call(_a));
-    }, {
-      immediate: true
-    });
+    const {
+      injectValueValidate,
+      injectValueWatchFromEmpty
+    } = useCommonInjection();
+    injectValueWatchFromEmpty(() => props.value, fetchData);
+    injectValueValidate(() => props.value);
     watch(() => props.urlConfig, async (config, oldConfig) => {
       if (isEqual(config, oldConfig))
         return;

package/es/packages/form-render/src/components/renderer/complex.d.ts

@@ -1,5 +1,6 @@
 import { CSSProperties, PropType } from 'vue';
 export declare const COMPLEX: import("vue").DefineComponent<{
+    onChange: {};
     span: {
         type: NumberConstructor;
         default: number;
@@ -13,6 +14,7 @@ export declare const COMPLEX: import("vue").DefineComponent<{
         default: () => {};
     };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    onChange: {};
     span: {
         type: NumberConstructor;
         default: number;

package/es/packages/form-render/src/components/renderer/complex.js

@@ -4,6 +4,7 @@ import { assignUpdateValue } from '../../utils/index.js';
 
 const script = defineComponent({
   props: {
+    onChange: {},
     span: {
       type: Number,
       default: 6
@@ -20,16 +21,12 @@ const script = defineComponent({
   setup(props, {
     slots
   }) {
-    function onChange(e) {
-      e.stopPropagation();
-    }
     return () => {
       return createVNode("section", {
         "class": "form-render__complex"
       }, [createVNode("section", {
         "class": `form-render__complexContent--${props.display}`,
-        "style": props.wrapperStyle,
-        "onChange": onChange
+        "style": props.wrapperStyle
       }, [slots.default && slots.default()])]);
     };
   }

package/es/packages/form-render/src/components/renderer/date.d.ts

@@ -1,7 +1,36 @@
+import { PropType } from 'vue';
 export declare const DATE: import("vue").DefineComponent<{
     onChange: {};
     value: {};
+    validate: {
+        type: PropType<Partial<{
+            [key: string]: any;
+            obj_type: "password" | "sex" | "age" | "email" | "birthday" | "id_card" | "age_unit" | "mobile" | "telephone" | "bank_card" | "website" | "gestational_weeks" | "gestational_stage" | "customer_name";
+            vali_obj: string;
+            max_value: string | number;
+            min_value: string | number;
+            min_length: string | number;
+            max_length: string | number;
+            decimal_length: string | number;
+            regular_expression: string | RegExp;
+            regular_error_tip: string;
+        }>>;
+    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     onChange: {};
     value: {};
+    validate: {
+        type: PropType<Partial<{
+            [key: string]: any;
+            obj_type: "password" | "sex" | "age" | "email" | "birthday" | "id_card" | "age_unit" | "mobile" | "telephone" | "bank_card" | "website" | "gestational_weeks" | "gestational_stage" | "customer_name";
+            vali_obj: string;
+            max_value: string | number;
+            min_value: string | number;
+            min_length: string | number;
+            max_length: string | number;
+            decimal_length: string | number;
+            regular_expression: string | RegExp;
+            regular_error_tip: string;
+        }>>;
+    };
 }>>, {}>;

package/es/packages/form-render/src/components/renderer/date.js

@@ -1,18 +1,75 @@
-import { defineComponent, createVNode } from 'vue';
+import { defineComponent, computed, createVNode } from 'vue';
 import { isField } from '@formily/core';
 import { connect, mapProps } from '@formily/vue';
 import { isObject } from '@vueuse/core';
 import { NDatePicker } from 'naive-ui';
+import { useCommonInjection } from '../../../../../packages/form-render/src/hooks/useCommonInjection';
 
 const script = defineComponent({
   props: {
     onChange: {},
-    value: {}
+    value: {},
+    validate: {
+      type: Object
+    }
   },
-  setup(_) {
-    return () => {
-      return createVNode(NDatePicker, null, null);
-    };
+  setup(props) {
+    useCommonInjection().injectValueValidate(() => props.value);
+    function minCurrentDate() {
+      var _a;
+      return ((_a = props.validate) == null ? void 0 : _a.min_date) === "currTime";
+    }
+    function maxCurrentDate() {
+      var _a;
+      return ((_a = props.validate) == null ? void 0 : _a.max_date) === "currTime";
+    }
+    function isDateDisabled(time) {
+      return minCurrentDate() && time < yesterday() || maxCurrentDate() && time > Date.now();
+      function yesterday() {
+        return Date.now() - 24 * 60 * 60 * 1e3;
+      }
+    }
+    function isTimeDisabled(time) {
+      const checkDate = new Date(time);
+      const currentDate = new Date();
+      return {
+        isHourDisabled,
+        isMinuteDisabled
+      };
+      function checkHour() {
+        return checkDate.getHours();
+      }
+      function currentHour() {
+        return currentDate.getHours();
+      }
+      function currentMinute() {
+        return currentDate.getMinutes();
+      }
+      function isHourDisabled(hour) {
+        return minCurrentDate() && hour < currentHour() || maxCurrentDate() && hour > currentHour();
+      }
+      function isMinuteDisabled(minute) {
+        if (checkHour() === currentHour()) {
+          return minCurrentDate() && minute < currentMinute() || maxCurrentDate() && minute > currentMinute();
+        }
+        return minCurrentDate() && checkHour() < currentHour() || maxCurrentDate() && checkHour() > currentHour();
+      }
+    }
+    const validateConfig = computed(() => {
+      const result = {};
+      if (isObject(props.validate)) {
+        const {
+          min_date,
+          max_date
+        } = props.validate;
+        if (min_date || max_date) {
+          result.isDateDisabled = isDateDisabled;
+          result.isTimeDisabled = isTimeDisabled;
+        }
+      }
+      return result;
+    });
+    return () => createVNode(NDatePicker, validateConfig.value, null);
   }
 });
 const DATE = connect(script, mapProps((props, field) => {
@@ -26,58 +83,8 @@ const DATE = connect(script, mapProps((props, field) => {
         field.setValue(v);
       }
     });
-    if (isObject(props.validate)) {
-      const {
-        min_date,
-        max_date
-      } = props.validate;
-      if (min_date || max_date) {
-        _props.isDateDisabled = isDateDisabled;
-        _props.isTimeDisabled = isTimeDisabled;
-      }
-    }
   }
   return _props;
-  function minCurrentDate() {
-    var _a;
-    return ((_a = props.validate) == null ? void 0 : _a.min_date) === "currTime";
-  }
-  function maxCurrentDate() {
-    var _a;
-    return ((_a = props.validate) == null ? void 0 : _a.max_date) === "currTime";
-  }
-  function isDateDisabled(time) {
-    return minCurrentDate() && time < yesterday() || maxCurrentDate() && time > Date.now();
-    function yesterday() {
-      return Date.now() - 24 * 60 * 60 * 1e3;
-    }
-  }
-  function isTimeDisabled(time) {
-    const checkDate = new Date(time);
-    const currentDate = new Date();
-    return {
-      isHourDisabled,
-      isMinuteDisabled
-    };
-    function checkHour() {
-      return checkDate.getHours();
-    }
-    function currentHour() {
-      return currentDate.getHours();
-    }
-    function currentMinute() {
-      return currentDate.getMinutes();
-    }
-    function isHourDisabled(hour) {
-      return minCurrentDate() && hour < currentHour() || maxCurrentDate() && hour > currentHour();
-    }
-    function isMinuteDisabled(minute) {
-      if (checkHour() === currentHour()) {
-        return minCurrentDate() && minute < currentMinute() || maxCurrentDate() && minute > currentMinute();
-      }
-      return minCurrentDate() && checkHour() < currentHour() || maxCurrentDate() && checkHour() > currentHour();
-    }
-  }
 }));
 
 export { DATE };

package/es/packages/form-render/src/components/renderer/select.js

@@ -1,6 +1,7 @@
 import { defineComponent, ref, computed, inject, watch, createVNode } from 'vue';
 import { isField } from '@formily/core';
 import { isEqual, cloneDeep } from 'lodash-es';
+import { useCommonInjection } from '../../../../../packages/form-render/src/hooks/useCommonInjection';
 import { InjectionChangeContextCollector, InjectAsyncQueue, InjectionFormItemDepsCollector } from '../../constants/index.js';
 import { assignUpdateValue, traverseDependKey } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
@@ -106,13 +107,12 @@ const script = defineComponent({
     }, {
       immediate: true
     });
-    watch(() => props.value, (n, o) => {
-      var _a, _b;
-      o == null && n != null && fetchData();
-      isField(field.value) && field.value.visited && ((_b = (_a = field.value).validate) == null ? void 0 : _b.call(_a));
-    }, {
-      immediate: true
-    });
+    const {
+      injectValueValidate,
+      injectValueWatchFromEmpty
+    } = useCommonInjection();
+    injectValueWatchFromEmpty(() => props.value, fetchData);
+    injectValueValidate(() => props.value);
     function focusDecorator(onFocus) {
       return (...args) => {
         if (isField(field.value)) {

package/es/packages/form-render/src/hooks/useCommonInjection.d.ts

@@ -0,0 +1,6 @@
+import { Func } from '../../../../../es/src/types';
+import { WatchSource } from '@vue/runtime-core';
+export declare function useCommonInjection(): {
+    injectValueValidate: (traverser: WatchSource) => void;
+    injectValueWatchFromEmpty: (traverser: WatchSource, trigger: Func) => void;
+};

package/es/packages/form-render/src/hooks/useCommonInjection.js

@@ -0,0 +1,19 @@
+import { isField } from '@formily/core';
+import { watch } from 'vue';
+import { useFormField } from '../../../../packages/form-render';
+
+function useCommonInjection() {
+  function injectValueValidate(traverser) {
+    const { field } = useFormField();
+    watch(traverser, () => {
+      var _a, _b;
+      return isField(field.value) && field.value.visited && ((_b = (_a = field.value).validate) == null ? void 0 : _b.call(_a));
+    });
+  }
+  function injectValueWatchFromEmpty(traverser, trigger) {
+    watch(traverser, (n, o) => n != null && o == null && trigger(), { immediate: true });
+  }
+  return { injectValueValidate, injectValueWatchFromEmpty };
+}
+
+export { useCommonInjection };

package/es/packages/form-render/style/index.css

@@ -25,7 +25,8 @@
 .form-render__formItem {
   grid-column: span var(--form-item-column) / span var(--form-item-column);
 }
-.form-render__formItem .n-date-picker {
+.form-render__formItem .n-date-picker,
+.form-render__formItem .n-input-number {
   width: 100%;
 }
 .form-render__formItemLabel {
@@ -42,6 +43,15 @@
   transform: translateY(-50%);
   right: calc(var(--icon-right) * 1px);
 }
+.form-render__formItem .n-form-item-label {
+  display: inline-flex;
+}
+.form-render__formItem .n-form-item-label [annotation-hover-show='true'] {
+  visibility: hidden;
+}
+.form-render__formItem .n-form-item-label:hover [annotation-hover-show='true'] {
+  visibility: visible;
+}
 .form-render__linebar {
   grid-column: span var(--column) / span var(--column);
 }
@@ -131,12 +141,3 @@
   display: flex !important;
   gap: 0 8px;
 }
-.form-render .n-form-item-label {
-  display: inline-flex;
-}
-.form-render .n-form-item-label [annotation-hover-show='true'] {
-  visibility: hidden;
-}
-.form-render .n-form-item-label:hover [annotation-hover-show='true'] {
-  visibility: visible;
-}

package/es/packages/index.css

@@ -291,7 +291,7 @@ body > .vxe-table--tooltip-wrapper {
   width: 100%;
 }
 .custom-big-table .filter-box .text-over-tooltip-components {
-  max-width: calc(100% - 20px);
+  max-width: calc(100% - 40px);
 }
 .custom-big-table .filter-box .vxe-filter--btn {
   border-top-color: #c0c4cc;
@@ -539,6 +539,21 @@ body > .vxe-table--tooltip-wrapper {
   margin-right: 6px;
   box-shadow: 0px 2px 4px 0px rgba(99, 129, 249, 0.5);
 }
+.annotation-edit {
+  cursor: pointer;
+  color: #0067ee;
+  font-size: 16px;
+  user-select: none;
+  display: inline-flex;
+  align-items: center;
+}
+.annotation-edit.is-active {
+  color: rgba(255, 152, 40);
+}
+.annotation-edit__icon {
+  display: inline-flex;
+  align-items: center;
+}
 .no-data-tip {
   display: flex;
   flex-direction: column;
@@ -601,6 +616,17 @@ body > .vxe-table--tooltip-wrapper {
   fill: currentColor;
   overflow: hidden;
 }
+.vxe-header--column [annotation-hover-show='true'] {
+  visibility: hidden;
+}
+.vxe-header--column:hover [annotation-hover-show='true'] {
+  visibility: visible;
+}
+.big-table__annotationWrapper {
+  width: 20px;
+  display: inline-flex;
+  align-items: center;
+}
 .people-tree {
   display: flex;
 }
@@ -2830,7 +2856,8 @@ body > .vxe-table--tooltip-wrapper {
 .form-render__formItem {
   grid-column: span var(--form-item-column) / span var(--form-item-column);
 }
-.form-render__formItem .n-date-picker {
+.form-render__formItem .n-date-picker,
+.form-render__formItem .n-input-number {
   width: 100%;
 }
 .form-render__formItemLabel {
@@ -2847,6 +2874,15 @@ body > .vxe-table--tooltip-wrapper {
   transform: translateY(-50%);
   right: calc(var(--icon-right) * 1px);
 }
+.form-render__formItem .n-form-item-label {
+  display: inline-flex;
+}
+.form-render__formItem .n-form-item-label [annotation-hover-show='true'] {
+  visibility: hidden;
+}
+.form-render__formItem .n-form-item-label:hover [annotation-hover-show='true'] {
+  visibility: visible;
+}
 .form-render__linebar {
   grid-column: span var(--column) / span var(--column);
 }
@@ -2936,15 +2972,6 @@ body > .vxe-table--tooltip-wrapper {
   display: flex !important;
   gap: 0 8px;
 }
-.form-render .n-form-item-label {
-  display: inline-flex;
-}
-.form-render .n-form-item-label [annotation-hover-show='true'] {
-  visibility: hidden;
-}
-.form-render .n-form-item-label:hover [annotation-hover-show='true'] {
-  visibility: visible;
-}
 .c-fabric-chart-popup-tip,
 .c-fabric-chart-popup-menu {
   position: absolute;

package/package.json

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