@wyfex/ivue 0.19.0 → 0.19.1

package/dist/types/UseElButton/types.d.ts

@@ -1,9 +1,9 @@
 import { ExtractPropTypes } from 'vue';
 import { default as componentProps } from './props';
 export type Props = ExtractPropTypes<typeof componentProps>;
-export interface Emits {
+export type Emits = {
     (e: 'click', value?: string | number | Record<string, unknown>): void;
-}
+};
 export interface ExtConfig {
     debounce?: {
         delay?: number;

package/dist/types/UseElConfigProvider/defaultExtConfig.d.ts

@@ -5,13 +5,8 @@ declare const _default: {
         children: string;
     };
     table: {
-        bottomOffset: number;
-        modalFooterHeight: number;
-    };
-    debug: {
-        open: false;
-        type: "primary";
-        toJson: false;
+        pageBottomOffset: number;
+        modalBottomOffset: number;
     };
 };
 export default _default;

package/dist/types/UseElConfigProvider/types.d.ts

@@ -1,18 +1,13 @@
 import { ExtractPropTypes } from 'vue';
 import { default as componentProps } from './props';
 import { DictProps } from '../../types';
-import { LogType } from '../../hooks/useLog';
 export type Props = ExtractPropTypes<typeof componentProps>;
-export interface Debug {
-    open: boolean;
-    type: LogType;
-    toJson: boolean;
-}
 export interface ExtConfig {
     dictProps?: DictProps;
     table?: {
-        bottomOffset: number;
-        modalFooterHeight?: number;
+        pageHeight?: string;
+        modalHeight?: string;
+        pageBottomOffset?: number;
+        modalBottomOffset?: number;
     };
-    debug?: Debug;
 }

package/dist/types/UseElSelect/index.vue.d.ts

@@ -1,6 +1,6 @@
 declare const __VLS_export: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     modelValue: {
-        type: (ArrayConstructor | StringConstructor | BooleanConstructor | NumberConstructor)[];
+        type: (ArrayConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[];
         default: string;
     };
     options: {
@@ -40,7 +40,7 @@ declare const __VLS_export: import('vue').DefineComponent<import('vue').ExtractP
     "update:label": (label: string | string[]) => any;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     modelValue: {
-        type: (ArrayConstructor | StringConstructor | BooleanConstructor | NumberConstructor)[];
+        type: (ArrayConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[];
         default: string;
     };
     options: {

package/dist/types/UseElSelect/props.d.ts

@@ -2,7 +2,7 @@ import { PropType } from 'vue';
 import { DictProps, RenderConfig } from '../../types';
 declare const _default: {
     modelValue: {
-        type: (ArrayConstructor | StringConstructor | BooleanConstructor | NumberConstructor)[];
+        type: (ArrayConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[];
         default: string;
     };
     options: {

package/dist/types/UseElSwitch/index.vue.d.ts

@@ -1,10 +1,10 @@
 declare const __VLS_export: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     activeValue: {
-        type: (StringConstructor | BooleanConstructor | NumberConstructor)[];
+        type: (BooleanConstructor | StringConstructor | NumberConstructor)[];
         default: number;
     };
     inactiveValue: {
-        type: (StringConstructor | BooleanConstructor | NumberConstructor)[];
+        type: (BooleanConstructor | StringConstructor | NumberConstructor)[];
         default: number;
     };
     activeText: {
@@ -21,11 +21,11 @@ declare const __VLS_export: import('vue').DefineComponent<import('vue').ExtractP
     };
 }>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     activeValue: {
-        type: (StringConstructor | BooleanConstructor | NumberConstructor)[];
+        type: (BooleanConstructor | StringConstructor | NumberConstructor)[];
         default: number;
     };
     inactiveValue: {
-        type: (StringConstructor | BooleanConstructor | NumberConstructor)[];
+        type: (BooleanConstructor | StringConstructor | NumberConstructor)[];
         default: number;
     };
     activeText: {

package/dist/types/UseElSwitch/props.d.ts

@@ -1,10 +1,10 @@
 declare const _default: {
     activeValue: {
-        type: (StringConstructor | BooleanConstructor | NumberConstructor)[];
+        type: (BooleanConstructor | StringConstructor | NumberConstructor)[];
         default: number;
     };
     inactiveValue: {
-        type: (StringConstructor | BooleanConstructor | NumberConstructor)[];
+        type: (BooleanConstructor | StringConstructor | NumberConstructor)[];
         default: number;
     };
     activeText: {

package/dist/types/UseElTable/defaultExtConfig.d.ts

@@ -5,8 +5,8 @@ declare const _default: {
             borderBottom: string;
         };
     };
-    heightAdaptive: {
-        isModal: false;
+    mode: {
+        type: "PAGE";
     };
     selection: {
         width: number;

package/dist/types/UseElTable/hooks/useElTable.d.ts

@@ -1,11 +1,14 @@
-import { ComputedRef } from 'vue';
+import { Attrs, ComputedRef } from 'vue';
 import { Emits, Props, TableColumn } from '../types';
 import { GlobalConfig } from '../../../types';
-export declare const useElTable: ({ mergedProps, emits, globalConfig }: {
+export declare const useElTable: ({ mergedProps, emits, attrs, globalConfig }: {
     mergedProps: ComputedRef<Props>;
     emits: Emits;
+    attrs: Attrs;
     globalConfig: ComputedRef<GlobalConfig>;
 }) => {
+    heightComputed: ComputedRef<string>;
+    adaptiveComputed: ComputedRef<number | false>;
     processHeaderCellClassName: ({ column }: any) => "" | "hideAllSelection";
     tableColumnsComputed: ComputedRef<TableColumn[]>;
     processDictData: (item: TableColumn) => Record<string, any>[];

package/dist/types/UseElTable/hooks/useSelection.d.ts

@@ -11,5 +11,5 @@ export declare const useSelection: ({ mergedProps, emits, attrs, etRef }: {
     selectionContent: ComputedRef<string>;
     handleSelectAll: (selection: any) => void;
     handleSelect: (selection: any, row: any) => void;
-    handleRowClick: (row: any) => void;
+    handleRowClick: (row: Record<string, any>) => void;
 };

package/dist/types/UseElTable/index.vue.d.ts

@@ -7,10 +7,6 @@ declare const __VLS_base: import('vue').DefineComponent<import('vue').ExtractPro
         type: import('vue').PropType<Record<string, unknown>[]>;
         required: boolean;
     };
-    tableHeight: {
-        type: StringConstructor;
-        default: string;
-    };
     tableLoading: {
         type: BooleanConstructor;
         default: boolean;
@@ -47,7 +43,7 @@ declare const __VLS_base: import('vue').DefineComponent<import('vue').ExtractPro
     validateRequired: (row: Record<string, any>) => boolean;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {} & {
     onDictKeys: (value?: string[] | undefined) => any;
-    "update:selectionData": (selectionData: any) => any;
+    "update:selectionData": (selectionData: any[]) => any;
     "update:currentRow": (currentRow: any) => any;
     "update:currentPage": (currentPage: number) => any;
     "update:pageSize": (pageSize: number) => any;
@@ -60,10 +56,6 @@ declare const __VLS_base: import('vue').DefineComponent<import('vue').ExtractPro
         type: import('vue').PropType<Record<string, unknown>[]>;
         required: boolean;
     };
-    tableHeight: {
-        type: StringConstructor;
-        default: string;
-    };
     tableLoading: {
         type: BooleanConstructor;
         default: boolean;
@@ -98,12 +90,11 @@ declare const __VLS_base: import('vue').DefineComponent<import('vue').ExtractPro
     };
 }>> & Readonly<{
     onOnDictKeys?: ((value?: string[] | undefined) => any) | undefined;
-    "onUpdate:selectionData"?: ((selectionData: any) => any) | undefined;
+    "onUpdate:selectionData"?: ((selectionData: any[]) => any) | undefined;
     "onUpdate:currentRow"?: ((currentRow: any) => any) | undefined;
     "onUpdate:currentPage"?: ((currentPage: number) => any) | undefined;
     "onUpdate:pageSize"?: ((pageSize: number) => any) | undefined;
 }>, {
-    tableHeight: string;
     tableLoading: boolean;
     tableColumnAlign: string;
     dictMap: import('../../types').DictMap;

package/dist/types/UseElTable/props.d.ts

@@ -10,10 +10,6 @@ declare const _default: {
         type: PropType<Record<string, unknown>[]>;
         required: boolean;
     };
-    tableHeight: {
-        type: StringConstructor;
-        default: string;
-    };
     tableLoading: {
         type: BooleanConstructor;
         default: boolean;

package/dist/types/UseElTable/types.d.ts

@@ -2,13 +2,13 @@ import { Component, ExtractPropTypes } from 'vue';
 import { EditAttrs, GlobalConfig, UseDict } from '../../types';
 import { default as componentProps } from './props';
 export type Props = ExtractPropTypes<typeof componentProps>;
-export interface Emits {
+export type Emits = {
     (e: 'onDictKeys', value?: string[]): void;
-    (e: 'update:selectionData', selectionData: any): void;
+    (e: 'update:selectionData', selectionData: any[]): void;
     (e: 'update:currentRow', currentRow: any): void;
     (e: 'update:currentPage', currentPage: number): void;
     (e: 'update:pageSize', pageSize: number): void;
-}
+};
 export interface EditableCellAndSpanVueProps {
     row: Record<string, any>;
     item: TableColumn;
@@ -48,7 +48,7 @@ export interface TableColumn {
 }
 export interface Selection {
     label?: string;
-    type?: string;
+    type?: 'CHECKBOX' | 'CHECKBOXRADIO' | 'RADIO';
     width?: number;
     key?: string;
     enableRowClick?: boolean;
@@ -62,15 +62,16 @@ export interface Selection {
 }
 export interface ExtConfig {
     extraHeader?: {
+        border?: boolean;
         class?: string;
         style?: {
             padding?: string;
             borderBottom?: string;
         };
     };
-    heightAdaptive?: {
-        isModal?: boolean;
-        modalFooterHeight?: number;
+    mode?: {
+        type?: 'PAGE' | 'MODAL';
+        height?: string;
         bottomOffset?: number;
     };
     selection?: Selection;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wyfex/ivue",
-  "version": "0.19.0",
+  "version": "0.19.1",
   "description": "万有前端 X 体系下基于 Vite8 + Vue3 + Typescript6 + ElementPlus2 构建的 iVue 组件库",
   "homepage": "https://wyfex.top/idocs/ivue",
   "type": "module",

package/src/components/UseElButton/types.ts

@@ -7,9 +7,9 @@ import componentProps from './props'
 export type Props = ExtractPropTypes<typeof componentProps>
 
 /**
- * emits接口
+ * emits类型
  */
-export interface Emits {
+export type Emits = {
   /**
    * 点击事件 默认自带防抖
    */
@@ -21,8 +21,7 @@ export interface Emits {
  */
 export interface ExtConfig {
   /**
-   * 防抖配置项
-   * 无需防抖将delay设置为0即可
+   * 防抖配置项 无需防抖将delay设置为0即可
    */
   debounce?: {
     /**

package/src/components/UseElConfigProvider/defaultExtConfig.ts

@@ -4,13 +4,6 @@ import type { ExtConfig } from './types'
  * 默认扩展配置
  */
 export default {
-  /**
-   * 字典属性配置项
-   */
   dictProps: { value: 'value', label: 'label', children: 'children' },
-  /**
-   * 表格配置项
-   */
-  table: { bottomOffset: 20, modalFooterHeight: 82 },
-  debug: { open: false, type: 'primary', toJson: false }
+  table: { pageBottomOffset: 20, modalBottomOffset: 92 }
 } satisfies ExtConfig

package/src/components/UseElConfigProvider/types.ts

@@ -1,31 +1,12 @@
 import type { ExtractPropTypes } from 'vue'
 import componentProps from './props'
 import type { DictProps } from '@/types'
-import type { LogType } from '@/hooks/useLog'
 
 /**
  * props类型
  */
 export type Props = ExtractPropTypes<typeof componentProps>
 
-/**
- * 调试接口
- */
-export interface Debug {
-  /**
-   * 是否开启调试
-   */
-  open: boolean
-  /**
-   * 调试日志类型
-   */
-  type: LogType
-  /**
-   * 是否JSON格式化打印
-   */
-  toJson: boolean
-}
-
 /**
  * extConfig接口
  */
@@ -36,10 +17,15 @@ export interface ExtConfig {
   dictProps?: DictProps
   /**
    * 表格配置项
+   * pageHeight：表格页面高度 extConfig.mode.type='PAGE'时生效，显式设置则表格自适应高度不生效，否则默认使用表格自适应高度
+   * modalHeight：表格弹窗高度 extConfig.mode.type='MODAL'时生效，显式设置则表格自适应高度不生效，否则默认使用表格自适应高度
+   * pageBottomOffset：表格页面底部预留偏移
+   * modalBottomOffset：表格弹窗底部预留偏移
    */
-  table?: { bottomOffset: number; modalFooterHeight?: number }
-  /**
-   * 调试配置项
-   */
-  debug?: Debug
+  table?: {
+    pageHeight?: string
+    modalHeight?: string
+    pageBottomOffset?: number
+    modalBottomOffset?: number
+  }
 }

package/src/components/UseElTable/defaultExtConfig.ts

@@ -4,62 +4,17 @@ import type { ExtConfig } from './types'
  * 默认扩展配置
  */
 export default {
-  /**
-   * 额外表头配置项
-   * class：额外表头类名
-   * style：额外表头样式对象
-   */
   extraHeader: {
     style: {
       padding: '10px',
       borderBottom: '1px solid var(--el-border-color-light)'
     }
   },
-  /**
-   * 高度自适应配置项
-   * isModal：是否弹窗模式，弹窗模式自动追加底部按钮预留
-   * modalFooterHeight：弹窗底部操作栏固定高度，isModal=true生效，该项由UseElConfigProvider组件统一提供默认值
-   * bottomOffset：底部预留偏移，该项由UseElConfigProvider组件统一提供默认值
-   */
-  heightAdaptive: { isModal: false },
-  /**
-   * 选择器配置项
-   * 绑定v-model:selectionData="selectionData"则开启选择器 不显式设置type则默认为CHECKBOX复选
-   * type：选择类型 可选值：CHECKBOX(复选) | CHECKBOXRADIO(复选框单选) | RADIO(单选)
-   * label：type为CHECKBOXRADIO、RADIO时表头全选复选框的文本 不设置则为空显示
-   * key：选中数据的唯一键 对应tableData中的唯一键 如id
-   * selectable：决定当前行复选框是否可以勾选 传入function，如果是简单禁用逻辑推荐优先使用disabledConfig配置项，复杂逻辑才建议使用本配置项
-   * disabledConfig：禁用配置 可传对象或对象数组
-   * enableRowClick：允许通过点击行触发单选/复选 默认否 PS：默认不高亮当前行，若需高亮当前行，只需给UseElTable组件设置highlightCurrentRow属性即可
-   * width：选择器的列宽 默认为40px
-   * align：选择器的排列方式 默认为center居中
-   * fixed：是否固定 默认为true
-   */
+  mode: { type: 'PAGE' },
   selection: { width: 40, enableRowClick: false, align: 'center', fixed: true },
-  /**
-   * 序号列配置项
-   * label：序号列表头文本 不显式设置则不显示序号列
-   * width、align、fixed同选择器配置项
-   */
   index: { width: 55, align: 'center', fixed: true },
-  /**
-   * 展开列配置项
-   */
   expand: { show: false },
-  /**
-   * 操作列配置项
-   * label：操作列文案 显式设置则开启操作列
-   * width：操作列宽度 默认为128px
-   * fixed：固定方向 默认固定在右侧
-   */
   operation: { width: 128, fixed: 'right' },
-  /**
-   * 分页器配置项
-   * total：分页总数 为-1时不显示分页器
-   * marginTop：分页器与表格的间距 默认20px
-   * func：分页方法 显式设置则在组件内部自动处理分页逻辑
-   * position：分页器位置 默认为right 可选值:left | center | right
-   */
   pagination: {
     total: -1,
     marginTop: 20,

package/src/components/UseElTable/props.ts

@@ -22,13 +22,6 @@ export default {
     type: Array as PropType<Record<string, unknown>[]>,
     required: true
   },
-  /**
-   * 表格高度 如为autoCalc则使用组件内部高度自适应逻辑，可指定具体高度值或auto
-   */
-  tableHeight: {
-    type: String,
-    default: 'autoCalc'
-  },
   /**
    * 表格loading
    */