cnhis-design-vue 3.1.30-beta.5 → 3.1.30-beta.6

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

@@ -101,7 +101,6 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
     }>>;
     emits: (event: "toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "formChange" | "settingClick" | "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;
-    uuidRef: import("vue").Ref<string>;
     $table: import("vue").Ref<import("vxe-table").VxeTableInstance | undefined>;
     hooks: Readonly<{
         configHooks: import("../../../es/components/iho-table/src/types").AbstractConfigHooks;
@@ -2130,6 +2129,7 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
         anchorList?: string[] | undefined;
     }>;
     updateConfigRef: () => void;
+    _updateConfigRef: () => void;
     fieldListRef: import("vue").Ref<{
         [x: string]: unknown;
         property?: string | undefined;
@@ -2431,9 +2431,11 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
         annotation?: boolean | undefined;
     }[]>;
     updateFieldListRef: () => void;
+    _updateFieldListRef: () => void;
     dataTransfer: (data: import("../../../es/shared/types").AnyObject[]) => Promise<import("../../../es/shared/types").AnyObject[]>;
     tableDataRef: import("vue").Ref<import("../../../es/shared/types").AnyObject[]>;
     updateTableDataRef: () => Promise<void>;
+    _updateTableDataRef: () => Promise<void>;
     tableHandler: import("../../../es/components/iho-table/src/types").IhoTableHandler;
     eventListener: import("./src/hooks/tapHooks/useEventHooks").IhoTableEventListener;
     eventHookHandler: Record<keyof import("vxe-table").VxeTableEventProps, any>;

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

@@ -1,4 +1,4 @@
-import { defineComponent, provide, ref, computed, watch, resolveComponent, openBlock, createElementBlock, createBlock, resolveDynamicComponent, unref, createVNode, mergeProps, withCtx, Fragment, renderList } from 'vue';
+import { defineComponent, provide, ref, computed, watch, resolveComponent, openBlock, createElementBlock, createBlock, resolveDynamicComponent, unref, createVNode, mergeProps, createSlots, withCtx, Fragment, renderList, renderSlot } from 'vue';
 import { uuidGenerator } from '../../../shared/utils/index.js';
 import { useDebounceFn } from '@vueuse/core';
 import { VxeEventListenerNameList, InjectionIhoTableEmits, InjectionIhoTableUUID, InjectionIhoTableInstance, InjectionIhoTableConfig, InjectionIhoTableFieldList, InjectionIhoTableHandler } from './constants/index.js';
@@ -24,36 +24,35 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     ...VxeEventListenerNameList.map(getEventName)
   ],
   setup(__props, { expose, emit: emits }) {
-    var _a, _b, _c;
+    var _a, _b;
     const props = __props;
     provide(InjectionIhoTableEmits, emits);
     const uuid = uuidGenerator();
-    const uuidRef = ref(uuid);
-    provide(InjectionIhoTableUUID, uuidRef);
+    provide(InjectionIhoTableUUID, uuid);
     const $table = ref();
     provide(InjectionIhoTableInstance, $table);
     const hooks = createTableHooks();
-    const configRef = ref({
-      uuid: (_b = (_a = props.tableConfig) == null ? void 0 : _a.uuid) != null ? _b : uuid,
-      menuConfig: (_c = props.tableConfig) == null ? void 0 : _c.menuConfig
-    });
+    const configRef = ref({ uuid: (_b = (_a = props.tableConfig) == null ? void 0 : _a.uuid) != null ? _b : uuid });
     provide(InjectionIhoTableConfig, configRef);
-    const updateConfigRef = useDebounceFn(() => {
+    const updateConfigRef = useDebounceFn(_updateConfigRef, 10);
+    function _updateConfigRef() {
       configRef.value = applyTableConfigHooks(hooks, props.tableConfig);
-      configRef.value.uuid = uuidRef.value;
-    }, 10);
+      configRef.value.uuid = uuid;
+    }
     const fieldListRef = ref([]);
     provide(InjectionIhoTableFieldList, fieldListRef);
-    const updateFieldListRef = useDebounceFn(() => {
+    const updateFieldListRef = useDebounceFn(_updateFieldListRef, 10);
+    function _updateFieldListRef() {
       fieldListRef.value = applyTableFieldHooks(hooks, props.fieldList, configRef.value);
-    }, 10);
+    }
     const dataTransfer = createDataTransfer(hooks, configRef, $table);
     const tableDataRef = ref([]);
-    const updateTableDataRef = useDebounceFn(async () => {
+    const updateTableDataRef = useDebounceFn(_updateTableDataRef, 10);
+    async function _updateTableDataRef() {
       var _a2;
       tableDataRef.value = await dataTransfer(props.tableData);
       (_a2 = $table.value) == null ? void 0 : _a2.recalculate(true);
-    }, 10);
+    }
     const tableHandler = { updateTableDataRef, updateConfigRef, updateFieldListRef };
     provide(InjectionIhoTableHandler, tableHandler);
     const eventListener = provideIhoTableEventListener();
@@ -73,7 +72,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         updateFieldListRef();
         updateTableDataRef();
       },
-      { immediate: true, deep: true }
+      { deep: true }
     );
     watch(
       () => props.fieldList,
@@ -81,9 +80,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         updateFieldListRef();
         updateTableDataRef();
       },
-      { immediate: true, deep: true }
+      { deep: true }
     );
-    watch(() => props.tableData, updateTableDataRef, { immediate: true });
+    watch(() => props.tableData, updateTableDataRef);
+    _updateConfigRef();
+    _updateFieldListRef();
+    _updateTableDataRef();
     const { header, footer } = createDomInsertComponent(hooks);
     expose({ $table });
     hooks.setupHooks.setup.call(configRef, fieldListRef);
@@ -94,7 +96,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         createVNode(_component_vxe_table, mergeProps({
           ref_key: "$table",
           ref: $table
-        }, unref(bindProperties), { data: tableDataRef.value }), {
+        }, unref(bindProperties), { data: tableDataRef.value }), createSlots({
           default: withCtx(() => [
             (openBlock(true), createElementBlock(Fragment, null, renderList(fieldListRef.value, (field) => {
               return openBlock(), createBlock(unref(ColumnComponent), {
@@ -104,8 +106,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               }, null, 8, ["field", "annotation"]);
             }), 128))
           ]),
-          _: 1
-        }, 16, ["data"]),
+          _: 2
+        }, [
+          renderList(_ctx.$slots, (k, v) => {
+            return {
+              name: v,
+              fn: withCtx(() => [
+                renderSlot(_ctx.$slots, v)
+              ])
+            };
+          })
+        ]), 1040, ["data"]),
         (openBlock(), createBlock(resolveDynamicComponent(unref(footer))))
       ]);
     };

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

@@ -100,7 +100,6 @@ declare const _default: import("vue").DefineComponent<{
     }>>;
     emits: (event: "toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "formChange" | "settingClick" | "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;
-    uuidRef: import("vue").Ref<string>;
     $table: import("vue").Ref<VxeTableInstance | undefined>;
     hooks: Readonly<{
         configHooks: import("../../../../es/components/iho-table/src/types").AbstractConfigHooks;
@@ -2129,6 +2128,7 @@ declare const _default: import("vue").DefineComponent<{
         anchorList?: string[] | undefined;
     }>;
     updateConfigRef: () => void;
+    _updateConfigRef: () => void;
     fieldListRef: import("vue").Ref<{
         [x: string]: unknown;
         property?: string | undefined;
@@ -2430,9 +2430,11 @@ declare const _default: import("vue").DefineComponent<{
         annotation?: boolean | undefined;
     }[]>;
     updateFieldListRef: () => void;
+    _updateFieldListRef: () => void;
     dataTransfer: (data: AnyObject[]) => Promise<AnyObject[]>;
     tableDataRef: import("vue").Ref<AnyObject[]>;
     updateTableDataRef: () => Promise<void>;
+    _updateTableDataRef: () => Promise<void>;
     tableHandler: IhoTableHandler;
     eventListener: import("../../../../es/components/iho-table/src/hooks/tapHooks/useEventHooks").IhoTableEventListener;
     eventHookHandler: Record<keyof import("vxe-table").VxeTableEventProps, any>;

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

@@ -60,7 +60,7 @@ export declare const IhoTableEventNameTuple: readonly ["formChange", "settingCli
 export declare const InjectionIhoTableConfig: InjectionKey<Ref<IhoTableConfig>>;
 export declare const InjectionIhoTableFieldList: InjectionKey<Ref<IhoTableFieldItem[]>>;
 export declare const InjectionIhoTableEmits: InjectionKey<(<T extends typeof IhoTableEventNameTuple[number]>(event: T, ...args: IhoTableEmitPayload<T>) => void)>;
-export declare const InjectionIhoTableUUID: InjectionKey<Ref<string>>;
+export declare const InjectionIhoTableUUID: InjectionKey<string>;
 export declare const InjectionIhoTableInstance: InjectionKey<Ref<UndefinedAble<VxeTableInstance>>>;
 export declare const InjectionIhoTableHandler: InjectionKey<IhoTableHandler>;
 export declare const InjectionIhoTableEventListener: InjectionKey<IhoTableEventListener>;

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

@@ -5,5 +5,5 @@ export declare function useTableContext(): {
     tableEmit: <T extends "toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "formChange" | "settingClick" | "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">(event: T, ...args: import("../types").IhoTableEmitPayload<T>) => void;
     eventListener: import("./tapHooks/useEventHooks").IhoTableEventListener;
     $table: import("vue").Ref<import("../../../../shared/types").UndefinedAble<import("vxe-table").VxeTableInstance>>;
-    uuid: import("vue").Ref<string>;
+    uuid: string;
 };

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

@@ -11,12 +11,12 @@ function lowCodeFieldAdaptorPlugin() {
       hooks.fieldHooks.field.tap({ name: pluginName, stage: HIGHEST_PRIORITY }, (field) => {
         const _field = field;
         const result = {
+          className: _field.bold ? "iho-table__boldCell" : "",
           field: _field.columnName,
-          width: _field.colWidth,
-          showOverflow: "tooltip",
+          showOverflow: Reflect.has(_field, "showOverflow") ? _field.showOverflow : "tooltip",
           visible: _field.isShow !== IHO_TABLE_NUMBER_STATUS.NEGATIVE,
-          className: _field.bold ? "iho-table__boldCell" : "",
-          ...pick(_field, ["title", "treeNode", "bold"])
+          width: _field.colWidth,
+          ...pick(_field, ["title", "treeNode", "resizable"])
         };
         settingObjAdaptor(result, _field);
         return result;

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

@@ -1,4 +1,4 @@
-import { createVNode, inject } from 'vue';
+import { createVNode, inject, mergeProps } from 'vue';
 import { NInput } from 'naive-ui';
 import '../../../../index.js';
 import { EDITABLE_WIDGET_TYPE, InjectionIhoTableEmits } from '../../../constants/index.js';
@@ -16,7 +16,9 @@ function inputRendererPlugin() {
         }) {
           return [createVNode("span", null, [row[column.field]])];
         },
-        renderEdit(renderOpts, {
+        renderEdit({
+          props
+        }, {
           row,
           column,
           $rowIndex
@@ -30,11 +32,11 @@ function inputRendererPlugin() {
               index: $rowIndex
             });
           }
-          return [createVNode(NInput, {
+          return [createVNode(NInput, mergeProps({
             "value": row[column.field],
             "onUpdate:value": ($event) => row[column.field] = $event,
             "onBlur": onBlur
-          }, null)];
+          }, props == null ? void 0 : props.componentProps), null)];
         }
       });
     }

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

@@ -1,4 +1,4 @@
-import { reactive, inject, unref, createVNode, onBeforeUnmount } from 'vue';
+import { reactive, inject, createVNode, toRaw, onBeforeUnmount } from 'vue';
 import { traverse } from '../../../../../../../shared/utils/index.js';
 import { isFunction } from 'lodash-es';
 import '../../../../../index.js';
@@ -31,7 +31,7 @@ function separateRendererPlugins() {
         }) {
           var _a;
           const uuid = inject(InjectionIhoTableUUID);
-          const separateRow = getSeparateRowData(unref(uuid), row);
+          const separateRow = getSeparateRowData(uuid, row);
           return createVNode("section", null, [(_a = separateRow == null ? void 0 : separateRow.separateData) == null ? void 0 : _a[column.field]]);
         },
         renderEdit(renderOpts, {
@@ -40,7 +40,7 @@ function separateRendererPlugins() {
         }) {
           var _a, _b;
           const uuid = inject(InjectionIhoTableUUID);
-          const separateRow = getSeparateRowData(unref(uuid), row);
+          const separateRow = getSeparateRowData(uuid, row);
           const height = getRowHeight();
           const slots = {};
           if (isFunction((_a = renderOpts.props) == null ? void 0 : _a.separateSlot)) {
@@ -67,7 +67,7 @@ function separateRendererPlugins() {
         function getSeparateColumn(fieldList2) {
           return fieldList2.reduce((res, field) => {
             traverse(field, (item) => {
-              isSeparateColumn(item) && res.push(item);
+              isSeparateColumn(item) && res.push(toRaw(item));
             });
             return res;
           }, []);
@@ -144,10 +144,6 @@ function separateRendererPlugins() {
         };
       }
       hooks.setupHooks.setup.tap(pluginName, (config) => {
-        if (config.value.uuid) {
-          separateRowMap.set(config.value.uuid, /* @__PURE__ */ new WeakMap());
-          separateColumnMap.set(config.value.uuid, []);
-        }
         onBeforeUnmount(() => {
           if (config.value.uuid) {
             separateRowMap.delete(config.value.uuid);

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

@@ -36,11 +36,13 @@ export declare type LowCodeTableFieldItem = {
 } & Partial<{
     id: number | string;
     title: string;
-    colWidth: string | number;
+    colWidth: VxeTableDefines.ColumnInfo['width'];
     settingObj: LowCodeTableSettingObj;
     treeNode: boolean;
     isShow: 0 | 1;
-}>;
+    componentProps: AnyObject;
+    showOverflow: VxeTableDefines.ColumnInfo['showOverflow'];
+}> & Partial<Pick<VxeTableDefines.ColumnInfo, 'resizable'>>;
 export declare type IhoFormChangePayload = {
     column: IhoTableFieldItem;
     row: AnyObject;