npm - cnhis-design-vue - Versions diffs - 3.1.33-beta.9 → 3.1.33 - Mend

cnhis-design-vue 3.1.33-beta.9 → 3.1.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (99) hide show

package/es/components/fabric-chart/src/hooks/useLeft.js CHANGED Viewed

@@ -1,13 +1,16 @@
 import { onMounted, nextTick } from 'vue';
 import { fabric } from '../utils/index.js';
 import { defaultBorderStyle, defaultTextStyle, defaultStyle, defaultRectStyle, drawPoint, drawTextGroup } from './useDraw.js';
+import useCommmon from './useCommon.js';
-function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, getYValue, getEqualXTypes, isAddPoint, updateData) {
+function useLeft(canvas, propItems, emits, setPopup, pointTipProps, cumputedX, cumputedY, getXValue, getYValue, isAddPoint, updateData) {
+  const { getEqualXTypes, repeatTip } = useCommmon(canvas);
   const {
     originY,
     endY,
     originX,
     endX,
+    xCellWidth,
     yCellHeight,
     left,
     vitalSignsOriginY,
@@ -19,8 +22,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
     right,
     canvasWidth,
     canvasHeight,
-    getRightInfo,
-    hospitalizationDate
+    getRightInfo
   } = propItems;
   const mainScaleWidth = 9;
   const subScaleWidth = 5;
@@ -230,7 +232,8 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
           unit: item.unit,
           type: item.bigType,
           dataIndex: item.dataIndex,
-          key: item.key
+          key: item.key,
+          isMenu: true
         },
         originLeft: leftX,
         originTop: topY - (text.height || 30) / 2 - 1,
@@ -270,7 +273,11 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
       pointTipProps.show = false;
       if (event.e.button === 0) {
         if (isLimit(point)) {
-          if (!getEqualXTypes(point.left).includes(point.origin.type) && isAddPoint(point.left)) {
+          const isRepeat = getEqualXTypes(point.left, "type", xCellWidth).includes(point.origin.type);
+          const isLimitAdd = isAddPoint(point.left);
+          if (!isLimitAdd || isRepeat) {
+            isRepeat && isLimitAdd && repeatTip();
+          } else {
             const params = {
               data: {
                 time: getXValue(point.left),
@@ -281,8 +288,6 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
             };
             emits("add", params);
             updateData(params);
-          } else {
-            console.log("\u5F53\u524D\u65F6\u95F4\u6BB5\u5185\u65E0\u53EF\u65B0\u589E\u8282\u70B9");
           }
         }
       }

package/es/components/fabric-chart/src/interface.d.ts CHANGED Viewed

@@ -147,4 +147,5 @@ export interface IBirthProcessData {
     xAxis: IBirthProcessXAxis;
     scaleValues: AnyObject[];
 }
+export declare type IObject = fabric.Object & AnyObject;
 export {};

package/es/components/fabric-chart/src/utils/utils.d.ts ADDED Viewed

@@ -0,0 +1,11 @@
+import { IPoint } from '../interface';
+import { AnyObject } from '../../../../../es/shared/types';
+export declare function isEffectiveNode(node: IPoint): string | number | boolean;
+/**
+ * @description: 根据断点分割数组
+ * @param {any} arr
+ * @return {[number, number][][]}
+ */
+export declare function getPointArr(arr: AnyObject[]): AnyObject;
+export declare function deleteProperty(data: AnyObject, list: AnyObject[]): void;
+export declare function getIndex(time: string, list: AnyObject[]): number;

package/es/components/fabric-chart/src/utils/utils.js ADDED Viewed

@@ -0,0 +1,27 @@
+function isEffectiveNode(node) {
+  return (node == null ? void 0 : node.time) && ((node == null ? void 0 : node.value) || (node == null ? void 0 : node.value) === 0);
+}
+function getPointArr(arr) {
+  let _arr = [];
+  return arr.reduce((pre, cur, index) => {
+    var _a, _b;
+    _arr.push([cur.left, cur.top]);
+    if (((_b = (_a = cur.origin) == null ? void 0 : _a.data) == null ? void 0 : _b.breakpoint) || arr.length - 1 === index) {
+      pre.push(_arr);
+      _arr = [];
+    }
+    return pre;
+  }, []);
+}
+function deleteProperty(data, list) {
+  list.map((v) => v.type).forEach((key) => {
+    if (Reflect.has(data, key))
+      Reflect.deleteProperty(data, key);
+  });
+}
+function getIndex(time, list) {
+  const index = list.findIndex((v) => new Date(v.time).getTime() > new Date(time).getTime());
+  return !~index ? list.length : index;
+}
+export { deleteProperty, getIndex, getPointArr, isEffectiveNode };

package/es/components/iho-table/index.d.ts CHANGED Viewed

@@ -101,7 +101,7 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
         onFormClick?: ((...args: any[]) => any) | undefined;
         onKeyboard?: ((...args: any[]) => any) | undefined;
     }>>;
-    emits: (event: "toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "formChange" | "settingClick" | "formClick" | "sortChange" | "keyboard" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd", ...args: any[]) => void;
+    emits: (event: "toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "formChange" | "settingClick" | "formClick" | "keyboard" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "sortChange" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd", ...args: any[]) => void;
     uuid: string;
     $table: import("vue").Ref<import("vxe-table").VxeTableInstance | undefined>;
     hooks: Readonly<{
@@ -2041,7 +2041,7 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
         onFooterCellClick?: ((params: import("vxe-table").VxeTableDefines.FooterCellClickEventParams) => void) | undefined;
         onFooterCellDblclick?: ((params: import("vxe-table").VxeTableDefines.FooterCellDblclickEventParams) => void) | undefined;
         onFooterCellMenu?: ((params: import("vxe-table").VxeTableDefines.FooterCellMenuEventParams) => void) | undefined;
-        onSortChange?: ((payload_0: import("../../../es/components/iho-table/src/types").IhoTableFilterPayload) => void) | undefined;
+        onSortChange?: ((params: import("vxe-table").VxeTableDefines.SortChangeEventParams) => void) | undefined;
         onFilterChange?: ((params: import("vxe-table").VxeTableDefines.FilterChangeEventParams) => void) | undefined;
         onFilterVisible?: ((params: import("vxe-table").VxeTableDefines.FilterVisibleEventParams) => void) | undefined;
         onResizableChange?: ((params: import("vxe-table").VxeTableDefines.ResizableChangeEventParams) => void) | undefined;
@@ -2431,6 +2431,7 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
         }>[]) | undefined;
         getTitle?: (() => string) | undefined;
         getKey?: (() => string) | undefined;
+        annotation?: boolean | undefined;
     }[]>;
     updateFieldListRef: () => void;
     _updateFieldListRef: () => void;
@@ -4538,7 +4539,7 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
             type: import("vue").PropType<import("../../../es/shared/types").AnyObject>;
         };
     }>>, {}>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "formChange" | "settingClick" | "formClick" | "sortChange" | "keyboard" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd")[], "toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "formChange" | "settingClick" | "formClick" | "sortChange" | "keyboard" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "formChange" | "settingClick" | "formClick" | "keyboard" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "sortChange" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd")[], "toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "formChange" | "settingClick" | "formClick" | "keyboard" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "sortChange" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     tableConfig: {
         type: import("vue").PropType<import("../../../es/components/iho-table/src/types").IhoTableConfig>;
         default: () => {};

package/es/components/iho-table/src/IhoTable.vue.d.ts CHANGED Viewed

@@ -100,7 +100,7 @@ declare const _default: import("vue").DefineComponent<{
         onFormClick?: ((...args: any[]) => any) | undefined;
         onKeyboard?: ((...args: any[]) => any) | undefined;
     }>>;
-    emits: (event: "toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "formChange" | "settingClick" | "formClick" | "sortChange" | "keyboard" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd", ...args: any[]) => void;
+    emits: (event: "toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "formChange" | "settingClick" | "formClick" | "keyboard" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "sortChange" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd", ...args: any[]) => void;
     uuid: string;
     $table: import("vue").Ref<VxeTableInstance | undefined>;
     hooks: Readonly<{
@@ -2040,7 +2040,7 @@ declare const _default: import("vue").DefineComponent<{
         onFooterCellClick?: ((params: import("vxe-table").VxeTableDefines.FooterCellClickEventParams) => void) | undefined;
         onFooterCellDblclick?: ((params: import("vxe-table").VxeTableDefines.FooterCellDblclickEventParams) => void) | undefined;
         onFooterCellMenu?: ((params: import("vxe-table").VxeTableDefines.FooterCellMenuEventParams) => void) | undefined;
-        onSortChange?: ((payload_0: import("../../../../es/components/iho-table/src/types").IhoTableFilterPayload) => void) | undefined;
+        onSortChange?: ((params: import("vxe-table").VxeTableDefines.SortChangeEventParams) => void) | undefined;
         onFilterChange?: ((params: import("vxe-table").VxeTableDefines.FilterChangeEventParams) => void) | undefined;
         onFilterVisible?: ((params: import("vxe-table").VxeTableDefines.FilterVisibleEventParams) => void) | undefined;
         onResizableChange?: ((params: import("vxe-table").VxeTableDefines.ResizableChangeEventParams) => void) | undefined;
@@ -2430,6 +2430,7 @@ declare const _default: import("vue").DefineComponent<{
         }>[]) | undefined;
         getTitle?: (() => string) | undefined;
         getKey?: (() => string) | undefined;
+        annotation?: boolean | undefined;
     }[]>;
     updateFieldListRef: () => void;
     _updateFieldListRef: () => void;
@@ -4537,7 +4538,7 @@ declare const _default: import("vue").DefineComponent<{
             type: PropType<AnyObject>;
         };
     }>>, {}>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "formChange" | "settingClick" | "formClick" | "sortChange" | "keyboard" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd")[], "toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "formChange" | "settingClick" | "formClick" | "sortChange" | "keyboard" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "formChange" | "settingClick" | "formClick" | "keyboard" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "sortChange" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd")[], "toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "formChange" | "settingClick" | "formClick" | "keyboard" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "sortChange" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     tableConfig: {
         type: PropType<IhoTableConfig>;
         default: () => {};

package/es/components/iho-table/src/IhoTable.vue.js CHANGED Viewed

@@ -22,7 +22,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     "formChange",
     "settingClick",
     "formClick",
-    "sortChange",
     "keyboard",
     ...VxeEventListenerNameList.map(getEventName)
   ],
@@ -46,7 +45,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     provide(InjectionIhoTableFieldList, fieldListRef);
     const updateFieldListRef = useDebounceFn(_updateFieldListRef, 10);
     function _updateFieldListRef() {
-      fieldListRef.value = applyTableFieldHooks(hooks, props.fieldList, configRef.value);
+      fieldListRef.value = applyTableFieldHooks(hooks, props.fieldList, configRef.value, {
+        $table,
+        emits
+      });
     }
     const dataTransfer = createDataTransfer(hooks, configRef, $table);
     const tableDataRef = ref([]);
@@ -92,10 +94,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const { header, footer } = createDomInsertComponent(hooks);
     expose({
       $table,
-      setFilter(fieldName, value) {
+      setFilterState(fieldName, value) {
         return { fieldName, value };
       },
-      ...hooks.exposeHooks.expose.call({}, configRef)
+      ...hooks.exposeHooks.expose.call({}, configRef, { $table, emits })
     });
     hooks.setupHooks.setup.call(configRef, fieldListRef);
     return (_ctx, _cache) => {

package/es/components/iho-table/src/components/IhoTableColumn.js CHANGED Viewed

@@ -45,7 +45,7 @@ const ColumnComponent = defineComponent({
       const result = {
         ...field.slots
       };
-      if (((_a = getLowCodeFieldFromField(props.field)) == null ? void 0 : _a.annotation) !== false) {
+      if (!field.type && ((_a = getLowCodeFieldFromField(props.field)) == null ? void 0 : _a.annotation) !== false) {
         result.header = (payload) => {
           var _a2;
           return renderHeader(payload, (_a2 = field.slots) == null ? void 0 : _a2.header);

package/es/components/iho-table/src/constants/index.d.ts CHANGED Viewed

@@ -38,7 +38,7 @@ export declare enum WIDGET_TYPE {
     SEQUENCE = "SEQUENCE"
 }
 export declare const VxeEventListenerNameList: Readonly<UnionToTuple<keyof VxeTableEventProps>>;
-export declare const VxeTableEventNameList: ("toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "sortChange" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd")[];
+export declare const VxeTableEventNameList: ("toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "sortChange" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd")[];
 export declare const IhoTableRowGroupSequence: readonly ["firstRowGroup", "secondRowGroup", "thirdRowGroup", "fourthRowGroup", "fifthRowGroup", "sixthRowGroup", "seventhRowGroup", "eighthRowGroup", "ninthRowGroup", "tenthRowGroup"];
 export declare const HIGHEST_PRIORITY: number;
 export declare enum EDITABLE_WIDGET_TYPE {
@@ -57,8 +57,8 @@ export declare enum IHO_TABLE_STRING_STATUS {
     NEGATIVE = "0",
     POSITIVE = "1"
 }
-export declare const IhoTableCustomEventNameTuple: readonly ["formChange", "settingClick", "formClick", "sortChange", "keyboard"];
-export declare const IhoTableEventNameTuple: readonly ["formChange", "settingClick", "formClick", "sortChange", "keyboard", ...("toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "sortChange" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd")[]];
+export declare const IhoTableCustomEventNameTuple: readonly ["formChange", "settingClick", "formClick", "keyboard"];
+export declare const IhoTableEventNameTuple: readonly ["formChange", "settingClick", "formClick", "keyboard", ...("toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "sortChange" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd")[]];
 export declare const InjectionIhoTableConfig: InjectionKey<Ref<IhoTableConfig>>;
 export declare const InjectionIhoTableFieldList: InjectionKey<Ref<IhoTableFieldItem[]>>;
 export declare const InjectionIhoTableEmits: InjectionKey<IhoTableEmits>;

package/es/components/iho-table/src/constants/index.js CHANGED Viewed

@@ -132,7 +132,6 @@ const IhoTableCustomEventNameTuple = [
   "formChange",
   "settingClick",
   "formClick",
-  "sortChange",
   "keyboard"
 ];
 const IhoTableEventNameTuple = [...IhoTableCustomEventNameTuple, ...VxeTableEventNameList];

package/es/components/iho-table/src/hooks/tapHooks/index.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import { AnyObject, Nullable } from '../../../../../../es/shared/types';
 import { MaybeRef } from '@vueuse/core';
+import { Ref } from 'vue';
 import { VxeTableInstance } from 'vxe-table';
 import { IhoTableEventListener } from '../../../../../../es/components/iho-table/src/hooks/tapHooks/useEventHooks';
 import { IhoTableConfig, IhoTableEmits, IhoTableFieldItem, IhoTableHandler, TableHooks } from '../../../../../../es/components/iho-table/src/types';
@@ -13,7 +14,10 @@ export declare const createTableHooks: () => Readonly<{
     exposeHooks: import("../../../../../../es/components/iho-table/src/types").AbstractExposeHooks;
 }>;
 export declare function applyTableConfigHooks(hooks: TableHooks, config: IhoTableConfig): IhoTableConfig;
-export declare function applyTableFieldHooks(hooks: TableHooks, fieldList: IhoTableFieldItem[], config: IhoTableConfig): IhoTableFieldItem[];
+export declare function applyTableFieldHooks(hooks: TableHooks, fieldList: IhoTableFieldItem[], config: IhoTableConfig, context: {
+    $table: Ref<Nullable<VxeTableInstance>>;
+    emits: IhoTableEmits;
+}): IhoTableFieldItem[];
 export declare function createTableEventHandlers({ hooks, config, $table, emits, context, eventListener }: {
     hooks: TableHooks;
     config: MaybeRef<IhoTableConfig>;

package/es/components/iho-table/src/hooks/tapHooks/index.js CHANGED Viewed

@@ -54,11 +54,11 @@ function applyTableConfigHooks(hooks, config) {
   });
   return result;
 }
-function applyTableFieldHooks(hooks, fieldList, config) {
-  hooks.fieldHooks.fieldStart.promise(config);
+function applyTableFieldHooks(hooks, fieldList, config, context) {
+  hooks.fieldHooks.fieldStart.promise(config, context);
   let result = traverseFieldList(cloneDeep(fieldList));
-  result = hooks.fieldHooks.fieldList.call(result, config);
-  hooks.fieldHooks.fieldEnd.promise(config);
+  result = hooks.fieldHooks.fieldList.call(result, config, context);
+  hooks.fieldHooks.fieldEnd.promise(config, context);
   return result;
   function traverseFieldList(fieldList2) {
     return fieldList2.reduce((finFieldList, field, index) => {
@@ -79,7 +79,8 @@ function applyTableFieldHooks(hooks, fieldList, config) {
             before.push(...arrayed(field2));
           }
         },
-        config
+        config,
+        context
       );
       finFieldList.push(...before);
       if (!removed) {
@@ -119,8 +120,8 @@ function createTableEventHandlers({
     isFunction(configEvent) && configEvent(payload);
     (_a = hooks.eventHooks[eventListenerName]) == null ? void 0 : _a.promise(
       payload,
-      { $table: unref($table), emits, ...context },
-      unref(config)
+      unref(config),
+      { $table: unref($table), emits, ...context }
     );
   }
 }
@@ -131,6 +132,7 @@ function createDataTransfer(hooks, config, $table) {
     let removed = false;
     await hooks.dataHooks.data.promise(
       rowData,
+      unref(config),
       {
         index,
         $table,
@@ -143,8 +145,7 @@ function createDataTransfer(hooks, config, $table) {
         remove() {
           removed = true;
         }
-      },
-      unref(config)
+      }
     );
     const nextRes = await res;
     nextRes.push(...before);

package/es/components/iho-table/src/hooks/tapHooks/useDataHooks.d.ts CHANGED Viewed

@@ -2,13 +2,13 @@ import { AnyObject } from '../../../../../../es/shared/types';
 import { AsyncSeriesHook } from '../../../../../../es/shared/utils/tapable';
 import { AbstractDataHooks } from '../../../../../../es/components/iho-table/src/types';
 declare class TableDataHooks extends AbstractDataHooks {
-    readonly data: AsyncSeriesHook<[AnyObject, {
+    readonly data: AsyncSeriesHook<[AnyObject, import("../../../../../../es/components/iho-table/src/types").IhoTableConfig, {
         remove(): void;
         $table: import("@vueuse/shared").MaybeRef<import("../../../../../../es/shared/types").Nullable<import("vxe-table").VxeTableInstance>>;
         index: number;
         insertBefore(data: import("../../../../../../es/shared/types").ArrayAble<AnyObject>): void;
         insertAfter(data: import("../../../../../../es/shared/types").ArrayAble<AnyObject>): void;
-    }, import("../../../../../../es/components/iho-table/src/types").IhoTableConfig], import("../../../../../../es/shared/utils/tapable").UnsetAdditionalOptions>;
+    }], import("../../../../../../es/shared/utils/tapable").UnsetAdditionalOptions>;
 }
 export declare function useDataHooks(): {
     create: () => TableDataHooks;