cnhis-design-vue 3.1.40-beta.0 → 3.1.40-release.1

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 { VxeTableEventNameList, InjectionIhoTableEmits, InjectionIhoTableAnnotation, InjectionIhoTableUUID, InjectionIhoTableInstance, InjectionIhoTableConfig, InjectionIhoTableFieldList, InjectionIhoTableHandler } from './constants/index.js';
+import { VxeEventListenerNameList, 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 { eventName2EventListener } from './utils/index.js';
+import { eventListener2EventName, eventName2EventListener } from './utils/index.js';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
 
 const _hoisted_1 = ["id"];
@@ -23,17 +23,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     "settingClick",
     "formClick",
     "keyboard",
-    ...VxeTableEventNameList
+    ...VxeEventListenerNameList.map(eventListener2EventName)
   ],
   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(
@@ -71,12 +69,14 @@ 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
+      emits,
+      eventListener
     });
     const bindProperties = computed(() => ({ ...configRef.value, ...eventHookHandler }));
     watch(

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

@@ -3,6 +3,7 @@ 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;
@@ -17,72 +18,73 @@ export declare function applyTableFieldHooks(hooks: TableHooks, fieldList: IhoTa
     $table: Ref<Nullable<VxeTableInstance>>;
     emits: IhoTableEmits;
 }): IhoTableFieldItem[];
-export declare function createTableEventHandlers({ hooks, config, $table, emits, context, }: {
+export declare function createTableEventHandlers({ hooks, config, $table, emits, context, eventListener }: {
     hooks: TableHooks;
     config: MaybeRef<IhoTableConfig>;
     $table: MaybeRef<Nullable<VxeTableInstance>>;
     emits: IhoTableEmits;
     context: IhoTableHandler;
+    eventListener: IhoTableEventListener;
 }): {
-    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>;
+    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;
 };
 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,7 +99,8 @@ function createTableEventHandlers({
   config,
   $table,
   emits,
-  context
+  context,
+  eventListener
 }) {
   return VxeEventListenerNameList.reduce(
     (result, eventName) => {
@@ -111,7 +112,10 @@ function createTableEventHandlers({
   function handler(eventListenerName, payload) {
     var _a;
     const eventName = eventListener2EventName(eventListenerName);
-    emits(eventName, payload);
+    if (VxeEventListenerNameList.includes(eventListenerName)) {
+      emits(eventName, payload);
+      eventListener.trigger(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/lowCodeFieldAdaptorPlugin/index.js

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

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

@@ -69,7 +69,7 @@ function numberRendererPlugin() {
           return [createVNode(IhoTableInputNumber, mergeProps({
             "value": row[column.field],
             "onUpdate:value": ($event) => row[column.field] = $event
-          }, config, fieldItem.componentProps), null)];
+          }, fieldItem.componentProps, config), null)];
         })
       });
     }

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

@@ -42,15 +42,14 @@ function separateRendererPlugins() {
           row,
           emitFormClick
         }) => {
-          var _a, _b, _c;
+          var _a;
           const uuid = inject(InjectionIhoTableUUID);
           const separateRow = getSeparateRowData(uuid, row);
           const height = getRowHeight();
           const slots = {};
-          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;
+          if (fieldItem.separateSlot) {
+            const separate = toRaw(fieldItem.separateSlot);
+            slots.menu = isFunction(separate) ? separate : isObject(separate) ? (props) => h(separate, props) : void 0;
           }
           return [createVNode(EditSeparate, {
             "value": row[column.field],
@@ -59,7 +58,7 @@ function separateRendererPlugins() {
             "height": height,
             "column": column,
             "row": row,
-            "display-content": (_c = separateRow == null ? void 0 : separateRow.separateData) == null ? void 0 : _c[column.field],
+            "display-content": (_a = separateRow == null ? void 0 : separateRow.separateData) == null ? void 0 : _a[column.field],
             "onClick": emitFormClick
           }, slots)];
         })

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

@@ -40,7 +40,7 @@ function timeRendererPlugin() {
           return [createVNode(NTimePicker, mergeProps({
             "formattedValue": row[column.field],
             "onUpdate:formattedValue": ($event) => row[column.field] = $event
-          }, config, fieldItem.componentProps), null)];
+          }, fieldItem.componentProps, config), null)];
         })
       });
     }

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

@@ -74,7 +74,6 @@ export declare type LowCodeTableFieldItem = {
     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';