cnhis-design-vue 3.1.39-release.2 → 3.1.39

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

@@ -3,10 +3,10 @@ import { uuidGenerator } from '../../../shared/utils/index.js';
 import { useDebounceFn } from '@vueuse/core';
 import { promiseTimeout } from '@vueuse/shared';
 import { isFunction } from 'lodash-es';
-import { VxeEventListenerNameList, InjectionIhoTableEmits, InjectionIhoTableAnnotation, InjectionIhoTableUUID, InjectionIhoTableInstance, InjectionIhoTableConfig, InjectionIhoTableFieldList, InjectionIhoTableHandler } from './constants/index.js';
+import { VxeTableEventNameList, InjectionIhoTableEmits, InjectionIhoTableAnnotation, InjectionIhoTableUUID, InjectionIhoTableInstance, InjectionIhoTableConfig, InjectionIhoTableFieldList, InjectionIhoTableHandler } from './constants/index.js';
 import { createTableHooks, applyTableConfigHooks, applyTableFieldHooks, createTableEventHandlers, createDomInsertComponent, createDataTransfer } from './hooks/tapHooks/index.js';
 import { provideIhoTableEventListener } from './hooks/tapHooks/useEventHooks.js';
-import { eventListener2EventName, eventName2EventListener } from './utils/index.js';
+import { eventName2EventListener } from './utils/index.js';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
 
 const _hoisted_1 = ["id"];
@@ -23,15 +23,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     "settingClick",
     "formClick",
     "keyboard",
-    ...VxeEventListenerNameList.map(eventListener2EventName)
+    ...VxeTableEventNameList
   ],
   setup(__props, { expose, emit: __emits }) {
     var _a, _b;
     const props = __props;
+    const eventListener = provideIhoTableEventListener();
     const emits = function(eventName, ...args) {
       __emits(eventName, ...args);
       const eventHandler = unref(configRef)[eventName2EventListener(eventName)];
       isFunction(eventHandler) && eventHandler(...args);
+      eventListener.trigger(eventName, ...args);
     };
     provide(InjectionIhoTableEmits, emits);
     provide(
@@ -69,14 +71,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     const tableHandler = { updateTableDataRef, updateConfigRef, updateFieldListRef };
     provide(InjectionIhoTableHandler, tableHandler);
-    const eventListener = provideIhoTableEventListener();
     const eventHookHandler = createTableEventHandlers({
       hooks,
       config: configRef,
       $table,
       context: tableHandler,
-      emits,
-      eventListener
+      emits
     });
     const bindProperties = computed(() => ({ ...configRef.value, ...eventHookHandler }));
     watch(

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

@@ -3,7 +3,6 @@ import { MaybeRef } from '@vueuse/core';
 import { Ref } from 'vue';
 import { VxeTableInstance } from 'vxe-table';
 import { IhoTableConfig, IhoTableEmits, IhoTableFieldItem, IhoTableHandler, TableHooks } from '../../../../../../es/components/iho-table/src/types';
-import { IhoTableEventListener } from './useEventHooks';
 export declare const createTableHooks: () => Readonly<{
     configHooks: import("../../../../../../es/components/iho-table/src/types").AbstractConfigHooks;
     fieldHooks: import("../../../../../../es/components/iho-table/src/types").AbstractFieldHooks;
@@ -18,73 +17,72 @@ export declare function applyTableFieldHooks(hooks: TableHooks, fieldList: IhoTa
     $table: Ref<Nullable<VxeTableInstance>>;
     emits: IhoTableEmits;
 }): IhoTableFieldItem[];
-export declare function createTableEventHandlers({ hooks, config, $table, emits, context, eventListener }: {
+export declare function createTableEventHandlers({ hooks, config, $table, emits, context, }: {
     hooks: TableHooks;
     config: MaybeRef<IhoTableConfig>;
     $table: MaybeRef<Nullable<VxeTableInstance>>;
     emits: IhoTableEmits;
     context: IhoTableHandler;
-    eventListener: IhoTableEventListener;
 }): {
-    onCopy: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCut: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onPaste: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onKeydown: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onScroll: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onKeydownStart: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onKeydownEnd: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCurrentChange: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onRadioChange: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCheckboxChange: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCheckboxAll: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCheckboxRangeStart: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCheckboxRangeChange: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCheckboxRangeEnd: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCellClick: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCellDblclick: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCellMenu: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCellMouseenter: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCellMouseleave: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onHeaderCellClick: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onHeaderCellDblclick: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onHeaderCellMenu: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onFooterCellClick: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onFooterCellDblclick: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onFooterCellMenu: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onSortChange: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onFilterChange: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onFilterVisible: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onResizableChange: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onToggleRowExpand: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onToggleTreeExpand: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onMenuClick: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onEditClosed: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onEditActived: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onEditDisabled: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onValidError: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCustom: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onOpenFnr: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onFnrChange: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onFnrFind: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onFnrFindAll: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onFnrReplace: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onFnrReplaceAll: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCellAreaCopy: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCellAreaCut: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCellAreaPaste: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCellAreaMerge: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onClearCellAreaMerge: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onHeaderCellAreaSelection: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCellAreaSelectionStart: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCellAreaSelectionDrag: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCellAreaSelectionEnd: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCellAreaExtensionStart: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCellAreaExtensionDrag: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCellAreaExtensionEnd: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCellAreaArrowsStart: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onCellAreaArrowsEnd: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onActiveCellChangeStart: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
-    onActiveCellChangeEnd: (payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
+    onCopy: EventListenerToEventName<K>;
+    onCut: EventListenerToEventName<K>;
+    onPaste: EventListenerToEventName<K>;
+    onKeydown: EventListenerToEventName<K>;
+    onScroll: EventListenerToEventName<K>;
+    onKeydownStart: EventListenerToEventName<K>;
+    onKeydownEnd: EventListenerToEventName<K>;
+    onCurrentChange: EventListenerToEventName<K>;
+    onRadioChange: EventListenerToEventName<K>;
+    onCheckboxChange: EventListenerToEventName<K>;
+    onCheckboxAll: EventListenerToEventName<K>;
+    onCheckboxRangeStart: EventListenerToEventName<K>;
+    onCheckboxRangeChange: EventListenerToEventName<K>;
+    onCheckboxRangeEnd: EventListenerToEventName<K>;
+    onCellClick: EventListenerToEventName<K>;
+    onCellDblclick: EventListenerToEventName<K>;
+    onCellMenu: EventListenerToEventName<K>;
+    onCellMouseenter: EventListenerToEventName<K>;
+    onCellMouseleave: EventListenerToEventName<K>;
+    onHeaderCellClick: EventListenerToEventName<K>;
+    onHeaderCellDblclick: EventListenerToEventName<K>;
+    onHeaderCellMenu: EventListenerToEventName<K>;
+    onFooterCellClick: EventListenerToEventName<K>;
+    onFooterCellDblclick: EventListenerToEventName<K>;
+    onFooterCellMenu: EventListenerToEventName<K>;
+    onSortChange: EventListenerToEventName<K>;
+    onFilterChange: EventListenerToEventName<K>;
+    onFilterVisible: EventListenerToEventName<K>;
+    onResizableChange: EventListenerToEventName<K>;
+    onToggleRowExpand: EventListenerToEventName<K>;
+    onToggleTreeExpand: EventListenerToEventName<K>;
+    onMenuClick: EventListenerToEventName<K>;
+    onEditClosed: EventListenerToEventName<K>;
+    onEditActived: EventListenerToEventName<K>;
+    onEditDisabled: EventListenerToEventName<K>;
+    onValidError: EventListenerToEventName<K>;
+    onCustom: EventListenerToEventName<K>;
+    onOpenFnr: EventListenerToEventName<K>;
+    onFnrChange: EventListenerToEventName<K>;
+    onFnrFind: EventListenerToEventName<K>;
+    onFnrFindAll: EventListenerToEventName<K>;
+    onFnrReplace: EventListenerToEventName<K>;
+    onFnrReplaceAll: EventListenerToEventName<K>;
+    onCellAreaCopy: EventListenerToEventName<K>;
+    onCellAreaCut: EventListenerToEventName<K>;
+    onCellAreaPaste: EventListenerToEventName<K>;
+    onCellAreaMerge: EventListenerToEventName<K>;
+    onClearCellAreaMerge: EventListenerToEventName<K>;
+    onHeaderCellAreaSelection: EventListenerToEventName<K>;
+    onCellAreaSelectionStart: EventListenerToEventName<K>;
+    onCellAreaSelectionDrag: EventListenerToEventName<K>;
+    onCellAreaSelectionEnd: EventListenerToEventName<K>;
+    onCellAreaExtensionStart: EventListenerToEventName<K>;
+    onCellAreaExtensionDrag: EventListenerToEventName<K>;
+    onCellAreaExtensionEnd: EventListenerToEventName<K>;
+    onCellAreaArrowsStart: EventListenerToEventName<K>;
+    onCellAreaArrowsEnd: EventListenerToEventName<K>;
+    onActiveCellChangeStart: EventListenerToEventName<K>;
+    onActiveCellChangeEnd: EventListenerToEventName<K>;
 };
 export declare function createDataTransfer(hooks: TableHooks, config: MaybeRef<IhoTableConfig>, $table: MaybeRef<Nullable<VxeTableInstance>>): (data: AnyObject[]) => Promise<AnyObject[]>;
 export declare function createDomInsertComponent(hooks: TableHooks): {

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

@@ -99,8 +99,7 @@ function createTableEventHandlers({
   config,
   $table,
   emits,
-  context,
-  eventListener
+  context
 }) {
   return VxeEventListenerNameList.reduce(
     (result, eventName) => {
@@ -112,10 +111,7 @@ function createTableEventHandlers({
   function handler(eventListenerName, payload) {
     var _a;
     const eventName = eventListener2EventName(eventListenerName);
-    if (VxeEventListenerNameList.includes(eventListenerName)) {
-      emits(eventName, payload);
-      eventListener.trigger(eventName, payload);
-    }
+    emits(eventName, payload);
     (_a = hooks.eventHooks[eventListenerName]) == null ? void 0 : _a.promise(
       payload,
       unref(config),

package/es/components/iho-table/src/hooks/tapHooks/useEventHooks.d.ts

@@ -245,7 +245,7 @@ export declare function useEventHooks(): {
 export declare class IhoTableEventListener {
     eventMap: Map<"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", Set<Func<any[], any>>>;
     addEventListener<T extends IhoTableEventNameUnion>(key: T, handler: (...payload: IhoTableEmitPayload<T>) => void): void;
-    trigger<T extends IhoTableEventNameUnion>(key: T, payload: IhoTableEmitPayload<T>): void;
+    trigger<T extends IhoTableEventNameUnion>(key: T, ...payload: IhoTableEmitPayload<T>): void;
 }
 export declare function provideIhoTableEventListener(): IhoTableEventListener;
 export {};

package/es/components/iho-table/src/hooks/tapHooks/useEventHooks.js

@@ -262,10 +262,10 @@ class IhoTableEventListener {
     onMounted(() => eventSet.add(handler));
     onBeforeUnmount(() => eventSet.delete(handler));
   }
-  trigger(key, payload) {
+  trigger(key, ...payload) {
     var _a;
     (_a = this.eventMap.get(key)) == null ? void 0 : _a.forEach((handler) => {
-      handler(payload);
+      handler(...payload);
     });
   }
 }

package/es/components/iho-table/src/plugins/anchorPlugin/tableAnchor.js

@@ -39,7 +39,8 @@ var TableAnchor = defineComponent({
         "onUpdate:value": onUpdatedValue
       }, _isSlot(_slot = currentAnchorList.value.map((field) => createVNode(NTabPane, {
         "name": field.field,
-        "tab": field.title
+        "tab": field.title,
+        "key": field.field
       }, null))) ? _slot : {
         default: () => [_slot]
       }) : null;

package/es/components/iho-table/src/plugins/anchorPlugin/useAnchor.d.ts

@@ -1,9 +1,9 @@
 import { ComputedRef, Ref } from 'vue';
 import { VxeTableInstance } from 'vxe-table';
-import { IhoTableFieldItem } from '../../../../../../es/components/iho-table/src/types';
+import { IhoTableFieldItem, IhoTableEmitPayload } from '../../../../../../es/components/iho-table/src/types';
 export declare const useAnchor: (anchorList: ComputedRef<string[]>, $table: Ref<VxeTableInstance | undefined>, fieldListRef: Ref<IhoTableFieldItem[]>) => {
     updateAnchor: (field: string) => Promise<void>;
-    onScroll: (params: import("vxe-table").VxeTableDefines.ScrollEventParams) => void;
+    onScroll: ({ scrollLeft, bodyWidth }: IhoTableEmitPayload<'scroll'>[0]) => void;
     currentAnchorList: Ref<{
         field: string;
         title: string;

package/es/components/iho-table/src/plugins/anchorPlugin/useAnchor.js

@@ -1,7 +1,7 @@
 import { shallowOmit } from '../../../../../shared/utils/index.js';
 import { ref, watch, unref } from 'vue';
 import { useThrottleFn } from '@vueuse/core';
-import { cloneDeep } from 'lodash-es';
+import { cloneDeep, findLastIndex } from 'lodash-es';
 
 function flatFieldList(fieldList, _flatFieldList) {
   fieldList.forEach((field) => {
@@ -57,18 +57,18 @@ const useAnchor = (anchorList, $table, fieldListRef) => {
       setAnchorStatus = true;
     }, TIME + 100);
   }
-  function setAnchorValue({ scrollLeft }) {
-    if (currentAnchorList.value.length && setAnchorStatus) {
-      const anchorObj = currentAnchorList.value.find((fieldItem) => scrollLeft < (fieldItem == null ? void 0 : fieldItem.left));
-      if (anchorObj) {
-        anchorValue.value = anchorObj.field;
-      }
+  function setAnchorValue({ scrollLeft, bodyWidth }) {
+    if (!currentAnchorList.value.length || !setAnchorStatus)
+      return;
+    const leftLimit = scrollLeft + bodyWidth / 2;
+    const anchorIndex = findLastIndex(currentAnchorList.value, (anchorItem) => {
+      return leftLimit >= anchorItem.left;
+    });
+    if (~anchorIndex) {
+      anchorValue.value = currentAnchorList.value[anchorIndex].field;
     }
   }
-  const anchorEvent = useThrottleFn(setAnchorValue, TIME);
-  function onScroll(...params) {
-    anchorEvent(...params);
-  }
+  const onScroll = useThrottleFn(setAnchorValue, TIME);
   watch(
     [fieldListRef, anchorList],
     () => {

package/es/components/iho-table/src/plugins/lowCodeFieldAdaptorPlugin/index.js

@@ -54,6 +54,7 @@ function slotsAdaptor(fieldItem, lowCodeField) {
     default: lowCodeField.slotFn,
     header: lowCodeField.headerSlotFn,
     edit: lowCodeField.editSlotFn,
+    footer: lowCodeField.footerSlotFn,
     ...lowCodeField.slots
   };
   if (isFunction(lowCodeField.checkEditStatus)) {

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/dateRendererPlugin/index.js

@@ -22,7 +22,10 @@ function dateRendererPlugin() {
         }) => {
           return [createVNode(EditDate, mergeProps({
             "value": row[column.field],
-            "onUpdate:value": ($event) => row[column.field] = $event
+            "onUpdate:value": ($event) => row[column.field] = $event,
+            "isStartDate": fieldItem.isStartDate,
+            "isEndDate": fieldItem.isEndDate,
+            "connectField": fieldItem.connectField
           }, fieldItem.componentProps, {
             "column": column,
             "row": row,

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/numberRendererPlugin.js

@@ -1,10 +1,38 @@
-import { createVNode, mergeProps } from 'vue';
+import { defineComponent, computed, createVNode, mergeProps } from 'vue';
+import { isNumber } from 'lodash-es';
 import { NInputNumber } from 'naive-ui';
 import '../../../../index.js';
 import { EDITABLE_WIDGET_TYPE } from '../../../constants/index.js';
 import { IhoTableRenderHelper } from '../../../utils/index.js';
 import { defineTablePlugin } from '../../../hooks/useTablePlugin.js';
 
+const IhoTableInputNumber = defineComponent({
+  name: "IhoTableInputNumber",
+  props: {
+    value: [String, Number]
+  },
+  emits: ["update:value"],
+  setup(props, {
+    emit
+  }) {
+    const valueRef = computed({
+      get() {
+        if (isNumber(props.value))
+          return props.value;
+        return props.value ? isNumber(+props.value) ? +props.value : null : null;
+      },
+      set(value) {
+        emit("update:value", value);
+      }
+    });
+    return () => {
+      return createVNode(NInputNumber, {
+        "value": valueRef.value,
+        "onUpdate:value": ($event) => valueRef.value = $event
+      }, null);
+    };
+  }
+});
 function numberRendererPlugin() {
   const pluginName = "numberRendererPlugin";
   return defineTablePlugin({
@@ -23,7 +51,6 @@ function numberRendererPlugin() {
             placeholder = "\u8BF7\u8F93\u5165"
           } = fieldItem.componentProps || {};
           const config = {
-            ...fieldItem.componentProps || {},
             clearable: true,
             placeholder,
             onBlur: () => emitFormChangeWithParams({
@@ -39,10 +66,10 @@ function numberRendererPlugin() {
             },
             onClick: emitFormClick
           };
-          return [createVNode(NInputNumber, mergeProps({
+          return [createVNode(IhoTableInputNumber, mergeProps({
             "value": row[column.field],
             "onUpdate:value": ($event) => row[column.field] = $event
-          }, config), null)];
+          }, config, fieldItem.componentProps), null)];
         })
       });
     }

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/separateRendererPlugin/editSeparate.vue.d.ts

@@ -1,4 +1,4 @@
-import { AnyObject } from '../../../../../../../../es/shared/types';
+import { AnyObject, Func } from '../../../../../../../../es/shared/types';
 import { CSSProperties, PropType } from 'vue';
 import { VxeTableDefines } from 'vxe-table';
 declare const _default: import("vue").DefineComponent<{
@@ -47,23 +47,27 @@ declare const _default: import("vue").DefineComponent<{
             required: true;
         };
     }>> & {
+        onClick?: ((...args: any[]) => any) | undefined;
         "onUpdate:value"?: ((...args: any[]) => any) | undefined;
     }>>;
+    emit: (event: "click" | "update:value", ...args: any[]) => void;
     tableHandler: import("../../../../types").IhoTableHandler;
-    popoverRef: import("vue").Ref<any>;
-    editContent: import("vue").Ref<any>;
-    setEditContent: (value: any) => void;
+    popoverRef: import("vue").Ref<{
+        syncPosition: Func;
+    } | undefined>;
+    editContent: import("vue").Ref<unknown>;
+    setEditContent: (value: unknown) => void;
     show: import("vue").Ref<boolean>;
     setShow: (v: boolean) => void;
-    emit: (event: "update:value", ...args: any[]) => void;
+    onContentClick: (event: MouseEvent) => void;
+    updateShow: (show: boolean) => void;
     onShow: () => Promise<void>;
     emitFormChangeWithParams: (params?: AnyObject) => void;
     onClose: () => Promise<void>;
-    updateShow: (show: boolean) => void;
     style: import("vue").ComputedRef<CSSProperties>;
     NPopover: any;
     NInput: any;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:value"[], "update:value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("click" | "update:value")[], "click" | "update:value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     value: {};
     height: {
         type: NumberConstructor;
@@ -86,6 +90,7 @@ declare const _default: import("vue").DefineComponent<{
         required: true;
     };
 }>> & {
+    onClick?: ((...args: any[]) => any) | undefined;
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
 }, {
     height: number;

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/separateRendererPlugin/editSeparate.vue.js

@@ -5,6 +5,7 @@ import { InjectionIhoTableHandler } from '../../../../constants/index.js';
 import { useIhoTableFormEvent } from '../../../../utils/index.js';
 import _export_sfc from '../../../../../../../_virtual/plugin-vue_export-helper.js';
 
+const _hoisted_1 = ["onClick"];
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "editSeparate",
   props: {
@@ -15,7 +16,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     displayContent: { type: String, default: "" },
     rowIndex: { type: Number, required: true }
   },
-  emits: ["update:value"],
+  emits: ["update:value", "click"],
   setup(__props, { emit }) {
     const props = __props;
     const tableHandler = inject(InjectionIhoTableHandler);
@@ -28,7 +29,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function setShow(v) {
       show.value = v;
     }
+    function onContentClick(event) {
+      show.value = !show.value;
+      emit("click", event);
+    }
     watch(show, updateShow);
+    function updateShow(show2) {
+      show2 ? onShow() : onClose();
+    }
     async function onShow() {
       var _a;
       editContent.value = cloneDeep(props.value);
@@ -47,9 +55,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       emitFormChangeWithParams({ oldValue });
       tableHandler.updateTableDataRef();
     }
-    function updateShow(show2) {
-      show2 ? onShow() : onClose();
-    }
     const style = computed(() => ({
       border: "1px solid #f5f5f5",
       height: props.height - 16 + "px",
@@ -69,14 +74,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ref: popoverRef,
         trigger: "manual",
         show: show.value,
-        "onUpdate:show": _cache[2] || (_cache[2] = ($event) => show.value = $event),
+        "onUpdate:show": _cache[1] || (_cache[1] = ($event) => show.value = $event),
         "show-arrow": false
       }, {
         trigger: withCtx(() => [
           createElementVNode("div", {
-            onClick: _cache[0] || (_cache[0] = withModifiers(($event) => show.value = !show.value, ["stop"])),
+            onClick: withModifiers(onContentClick, ["stop"]),
             style: normalizeStyle(unref(style))
-          }, toDisplayString(__props.displayContent || " "), 5)
+          }, toDisplayString(__props.displayContent || " "), 13, _hoisted_1)
         ]),
         default: withCtx(() => [
           renderSlot(_ctx.$slots, "menu", {
@@ -88,7 +93,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, () => [
             createVNode(unref(NInput), {
               value: editContent.value,
-              "onUpdate:value": _cache[1] || (_cache[1] = ($event) => editContent.value = $event),
+              "onUpdate:value": _cache[0] || (_cache[0] = ($event) => editContent.value = $event),
               type: "textarea"
             }, null, 8, ["value"])
           ])

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/separateRendererPlugin/index.js

@@ -3,7 +3,7 @@ import { traverse } from '../../../../../../../shared/utils/index.js';
 import { isFunction, isObject, range } from 'lodash-es';
 import '../../../../../index.js';
 import { EDITABLE_WIDGET_TYPE, InjectionIhoTableUUID } from '../../../../constants/index.js';
-import { IhoTableRenderHelper, getRowHeight, getColumnRenderWidth } from '../../../../utils/index.js';
+import { createIhoTableClearActivedInterceptor, IhoTableRenderHelper, getRowHeight, getColumnRenderWidth } from '../../../../utils/index.js';
 import { isSeparateColumn, contentSeparate, getColumnInfoMaxLength, generateSeparateRowData } from './separateUtils.js';
 import EditSeparate from './editSeparate.vue.js';
 import { defineTablePlugin } from '../../../../hooks/useTablePlugin.js';
@@ -24,6 +24,7 @@ function separateRendererPlugins() {
   return defineTablePlugin({
     name: pluginName,
     vxe(instance) {
+      instance.interceptor.add("event.clearActived", createIhoTableClearActivedInterceptor(EDITABLE_WIDGET_TYPE.SEPARATE, (ele) => ele.classList.contains("v-binder-follower-content")));
       instance.renderer.add(EDITABLE_WIDGET_TYPE.SEPARATE, {
         renderCell(renderOpts, {
           column,
@@ -41,14 +42,15 @@ function separateRendererPlugins() {
           row,
           emitFormClick
         }) => {
-          var _a;
+          var _a, _b, _c;
           const uuid = inject(InjectionIhoTableUUID);
           const separateRow = getSeparateRowData(uuid, row);
           const height = getRowHeight();
           const slots = {};
-          if (fieldItem.separateSlot) {
-            const separate = toRaw(fieldItem.separateSlot);
-            slots.menu = isFunction(separate) ? separate : isObject(separate) ? (props) => h(separate, props) : void 0;
+          let separateSlot = (_b = (_a = fieldItem.componentProps) == null ? void 0 : _a.separateSlot) != null ? _b : fieldItem.separateSlot;
+          if (separateSlot) {
+            separateSlot = toRaw(separateSlot);
+            slots.menu = isFunction(separateSlot) ? separateSlot : isObject(separateSlot) ? (props) => h(separateSlot, props) : void 0;
           }
           return [createVNode(EditSeparate, {
             "value": row[column.field],
@@ -57,7 +59,7 @@ function separateRendererPlugins() {
             "height": height,
             "column": column,
             "row": row,
-            "display-content": (_a = separateRow == null ? void 0 : separateRow.separateData) == null ? void 0 : _a[column.field],
+            "display-content": (_c = separateRow == null ? void 0 : separateRow.separateData) == null ? void 0 : _c[column.field],
             "onClick": emitFormClick
           }, slots)];
         })

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/timeRendererPlugin.js

@@ -25,7 +25,6 @@ function timeRendererPlugin() {
             valueFormat = "HH:mm"
           } = fieldItem.componentProps || {};
           const config = {
-            ...fieldItem.componentProps || {},
             placeholder,
             valueFormat,
             format: valueFormat || "yyyy-MM-dd HH:mm:ss",
@@ -41,7 +40,7 @@ function timeRendererPlugin() {
           return [createVNode(NTimePicker, mergeProps({
             "formattedValue": row[column.field],
             "onUpdate:formattedValue": ($event) => row[column.field] = $event
-          }, config), null)];
+          }, config, fieldItem.componentProps), null)];
         })
       });
     }

package/es/components/iho-table/src/types/index.d.ts

@@ -1,7 +1,7 @@
 import { AnyObject, MaybeString, TupleToUnion } from '../../../../../es/shared/types';
 import { VxeTableProps, VxeTableDefines, VxeTableInstance, VxeColumnPropTypes } from 'vxe-table';
-import { VxeTableEventProps } from 'vxe-table/types/table';
-import { IHO_TABLE_STRING_STATUS, IhoTableCustomEventNameTuple, IhoTableEventNameTuple, IhoTableRowGroupSequence } from '../../../../../es/components/iho-table/src/constants';
+import { VxeTableListeners } from 'vxe-table/types/table';
+import { IHO_TABLE_STRING_STATUS, IhoTableEventNameTuple, IhoTableRowGroupSequence } from '../../../../../es/components/iho-table/src/constants';
 import { FilterState } from '../../../../../es/components/iho-table/src/plugins/filterPlugin/types';
 export * from './pluginType';
 export interface IhoTableRowGroupItem {
@@ -65,11 +65,16 @@ export declare type LowCodeTableFieldItem = {
     formType: string;
     fieldSetting: string;
     componentProps: AnyObject;
-    options: AnyObject[];
+    options: {
+        label?: string;
+        value: string;
+        disabled?: boolean;
+    }[];
     annotation: boolean;
     slotFn: NonNullable<IhoTableFieldItem['slots']>['default'];
     headerSlotFn: NonNullable<IhoTableFieldItem['slots']>['header'];
     editSlotFn: NonNullable<IhoTableFieldItem['slots']>['edit'];
+    footerSlotFn: NonNullable<IhoTableFieldItem['slots']>['footer'];
     filterDefaultValue: Partial<{
         checked: string[];
         sortStatus: null | 'asc' | 'desc';
@@ -96,7 +101,7 @@ export declare type IhoTableEventNameUnion = TupleToUnion<typeof IhoTableEventNa
 export declare type IHoTableKeyboardPayload = IhoTableFormChangePayload & {
     key: string;
 };
-export declare type IhoTableEmitPayload<T extends typeof IhoTableEventNameTuple[number]> = T extends 'formChange' | 'formClick' ? [IhoTableFormChangePayload] : T extends 'keyboard' ? [IHoTableKeyboardPayload] : T extends 'settingClick' ? [] : Parameters<NonNullable<VxeTableEventProps[EventNameToEventListener<Exclude<T, typeof IhoTableCustomEventNameTuple[number]>>]>>;
+export declare type IhoTableEmitPayload<T extends typeof IhoTableEventNameTuple[number]> = T extends 'formChange' | 'formClick' ? [IhoTableFormChangePayload] : T extends 'keyboard' ? [IHoTableKeyboardPayload] : T extends 'settingClick' ? [] : T extends keyof VxeTableListeners ? Parameters<NonNullable<VxeTableListeners[T]>> : [];
 export declare type IhoTableAnchorItem = {
     field: string;
     title: string;