ele-admin-plus 1.1.6-beta.2 → 1.1.6-beta.4

package/lib/ele-data-table/types/index.d.ts

@@ -10,8 +10,10 @@ export type DataKey = string | number;
 export interface DataItem extends Record<keyof any, any> {
     /** 子级数据 */
     children?: DataItem[];
+    /** 是否为模拟数据 */
+    _isMock?: boolean;
     /** 行唯一值 */
-    _rowKey?: DataKey;
+    _rowKey?: DataKey | null;
     /** 行索引 */
     _rowIndex?: number;
     /** 行是否禁用 */
@@ -67,6 +69,35 @@ export type FilterValue = string[] | undefined;
  * 排序方式值
  */
 export type OrderValue = Exclude<Sorter['order'], undefined>;
+/**
+ * 表格状态
+ */
+export interface TableState {
+    /** 当前排序参数 */
+    sorter?: Sorter;
+    /** 当前筛选参数 */
+    filter?: Filter;
+    /** 单选选中值 */
+    key: DataKey | null;
+    /** 单选选中数据 */
+    row?: DataItem;
+    /** 单选上次选中数据 */
+    oldRow?: DataItem;
+    /** 多选选中值 */
+    checkedKeys: DataKey[];
+    /** 多选选中数据 */
+    checked: DataItem[];
+    /** 多选选中是否保留不存在的数据 */
+    reserveChecked: boolean;
+}
+/**
+ * 多选时行点击选中
+ */
+export type RowClickChecked = boolean | 'smart';
+/**
+ * 表格空组件属性
+ */
+export type TableEmptyProps = boolean | ElEmptyProps;
 /**
  * 获取表格实例
  */
@@ -88,25 +119,31 @@ export interface TableMethods {
     scrollTo: (options: number | ScrollToOptions, yCoord?: number) => void;
     setScrollTop: (top?: number) => void;
     setScrollLeft: (left?: number) => void;
-    /** 设置选中数据 */
+    /** 设置单选选中值 */
+    setCurrentRowKey: (key?: DataKey | null) => void;
+    /** 获取单选选中数据 */
+    getCurrentRow: () => DataItem | undefined;
+    /** 设置多选选中数据 */
     setSelectedRows: (rows?: DataItem[]) => void;
-    /** 设置选中数据 */
-    setSelectedRowKeys: (keys?: string[] | number[]) => void;
-    /** 切换所有行的展开状态 */
+    /** 设置多选选中值 */
+    setSelectedRowKeys: (keys?: DataKey[], rows?: DataItem[]) => void;
+    /** 切换所有行展开状态 */
     toggleRowExpansionAll: (expanded?: boolean) => void;
+    /** 更新单选和多选选中 */
+    updateSelectedAndChecked: () => void;
 }
 /**
  * 表格尺寸
  */
 export type TableSize = ElTableProps<DataItem>['size'];
-/**
- * 树表格懒加载回调
- */
-export type ResolveFunction = (data: DataItem[]) => void;
 /**
  * 树表格懒加载方法
  */
 export type TableLoad = ElTableProps<DataItem>['load'];
+/**
+ * 树表格懒加载回调
+ */
+export type ResolveFunction = (data: DataItem[]) => void;
 /**
  * 嵌套数据配置项
  */
@@ -114,17 +151,6 @@ export interface TreeProps {
     hasChildren?: string;
     children?: string;
 }
-/**
- * 表格当前排序和筛选数据
- */
-export interface TableState {
-    /** 当前排序值 */
-    sorter?: Sorter;
-    /** 当前筛选值 */
-    filter?: Filter;
-    /** 是否不触发多选改变事件 */
-    selectionNoChange?: boolean;
-}
 /**
  * 溢出提示组件属性
  */
@@ -181,11 +207,3 @@ export type RowKey = ElTableProps<DataItem>['rowKey'];
  * 控制行是否可选中的方法
  */
 export type RowSelectable = Column['selectable'];
-/**
- * 表格空组件属性
- */
-export type TableEmptyProps = boolean | ElEmptyProps;
-/**
- * 多选时行点击选中
- */
-export type RowClickChecked = boolean | 'smart';

package/lib/ele-data-table/util.d.ts

@@ -1,13 +1,13 @@
 import type { Slots, VNode } from 'vue';
 import type { Emitter, ElEmptyProps, ElTableInstance } from '../ele-app/types';
-import type { DataItem, Column, Columns, Sorter, Filter, GetInstance, TableMethods, ShowOverflowTooltip, TooltipEffect, TooltipOptions, RowClass, TableState } from './types';
 import type { dataTableEmits } from './props';
+import type { DataKey, DataItem, Column, Columns, Sorter, Filter, GetInstance, TableMethods, ShowOverflowTooltip, TooltipEffect, TooltipOptions, RowClass, RowKey } from './types';
 /**
  * 获取数据某字段值
  * @param data 数据
  * @param field 字段, 可嵌套 a.b.c
  */
-export declare function getValue<T, K>(data: K, field?: string | ((d: K) => T)): T | undefined;
+export declare function getValue<T, K>(data?: K, field?: string | ((d: K) => T)): T | undefined | null;
 /**
  * 递归获取表格列节点
  * @param cols 列配置
@@ -38,12 +38,6 @@ export declare function getBodyRowClass(rowClass: RowClass | undefined, param: P
  * @param ellipsis 是否单行省略
  */
 export declare function getHeadRowClass(rowClass: RowClass | undefined, param: Parameters<Exclude<RowClass, string | undefined>>[0], ellipsis: boolean): string;
-/**
- * 合并提示组件相关属性
- * @param props showOverflowTooltip
- * @param globalProps tableOverflowTooltip
- */
-export declare function mergeTooltipProps(props?: ShowOverflowTooltip, globalProps?: ShowOverflowTooltip): Exclude<ShowOverflowTooltip, true>;
 /**
  * 获取全局溢出提示组件属性
  * @param showOverflowTooltip 溢出提示组件属性
@@ -51,6 +45,12 @@ export declare function mergeTooltipProps(props?: ShowOverflowTooltip, globalPro
  * @param tooltipOptions 溢出提示组件配置
  */
 export declare function getGlobalTooltipProps(showOverflowTooltip?: ShowOverflowTooltip, tooltipEffect?: TooltipEffect, tooltipOptions?: TooltipOptions): ShowOverflowTooltip;
+/**
+ * 合并提示组件相关属性
+ * @param props 单元格提示组件属性
+ * @param globalProps 表格提示组件属性
+ */
+export declare function mergeTooltipProps(props?: ShowOverflowTooltip, globalProps?: ShowOverflowTooltip): Exclude<ShowOverflowTooltip, true>;
 /**
  * 获取单元格提示组件属性
  * @param props 单元格提示组件属性
@@ -58,18 +58,18 @@ export declare function getGlobalTooltipProps(showOverflowTooltip?: ShowOverflow
  */
 export declare function getTooltipProps(props?: ShowOverflowTooltip, globalProps?: ShowOverflowTooltip): ShowOverflowTooltip;
 /**
- * 渲染插槽
+ * 获取插槽
  * @param slots 插槽对象
  * @param name 插槽名称
- * @param props 插槽数据
  */
-export declare function renderSlot(slots: Slots, name?: string, props?: any): VNode[] | undefined;
+export declare function getSlot(slots: Slots, name?: string): import("vue").Slot<any> | undefined;
 /**
- * 获取插槽
+ * 渲染插槽
  * @param slots 插槽对象
  * @param name 插槽名称
+ * @param props 插槽数据
  */
-export declare function getSlot(slots: Slots, name?: string): import("vue").Slot<any> | undefined;
+export declare function renderSlot(slots: Slots, name?: string, props?: any): VNode[] | undefined;
 /**
  * 获取空组件属性
  * @param emptyProps 空组件属性
@@ -101,6 +101,9 @@ export declare function getTableFilter(tableRef?: ElTableInstance): Filter | und
  * @param filter 当前筛选状态
  */
 export declare function getStateCols(cols: Columns, sorter?: Sorter, filter?: Filter): {
+    cols: Columns;
+    sorter?: undefined;
+} | {
     cols: Columns;
     sorter: Sorter | undefined;
 };
@@ -108,7 +111,7 @@ export declare function getStateCols(cols: Columns, sorter?: Sorter, filter?: Fi
  * 获取判断多选是否可选择的方法
  * @param columns 列配置
  */
-export declare function getSelectableFunc(columns?: Columns): ((row: any, index: number) => boolean) | null | undefined;
+export declare function getSelectableFunction(columns?: Columns): ((row: any, index: number) => boolean) | null | undefined;
 /**
  * 判断行是否禁止多选
  * @param row 行数据
@@ -120,30 +123,52 @@ export declare function isDisableRow(row: DataItem, index: number, columns?: Col
  * 判断是否保存不存在的选中数据
  * @param columns 列配置
  */
-export declare function isReserveSelected(columns?: Columns): boolean;
+export declare function isReserveChecked(columns?: Columns): boolean;
 /**
  * 用于根据列的固定值排序
  * @param fixed 固定值
  */
 export declare function getColFixedNumber(fixed?: boolean | string): 0 | 1 | 2;
 /**
- * 表格状态数据
+ * 获取数据值
+ * @param rows 数据
+ * @param rowKey 值键名
  */
-export declare function useState(defaultSort: TableState['sorter']): {
-    getSorter: () => Sorter | undefined;
-    setSorter: (value: Sorter) => void;
-    getFilter: () => Filter | undefined;
-    setFilter: (value: Filter) => void;
-    getSelectionNoChange: (value?: boolean) => boolean;
-    setSelectionNoChange: (value?: boolean) => boolean;
-};
+export declare function getRowKeys(rows: DataItem[] | undefined, rowKey: RowKey): DataKey[];
+/**
+ * 获取值对应的数据
+ * @param key 值
+ * @param data 全部数据
+ * @param rowKey 值键名
+ * @param childrenField 子级数据键名
+ */
+export declare function getRowByKey(key: DataKey, data?: DataItem[], rowKey?: RowKey, childrenField?: string): DataItem | undefined;
+/**
+ * 获取平铺后的数据值和数据
+ * @param data 表格数据
+ * @param rowKey 数据值字段名
+ * @param childrenField 子级字段名
+ */
+export declare function getKeysAndList(data?: DataItem[], rowKey?: RowKey, childrenField?: string): [DataKey[], DataItem[]];
+/**
+ * 判断值是否改变
+ * @param value1 值
+ * @param value2 新值
+ */
+export declare function valueIsChanged<T>(value1?: T | null, value2?: T | null): boolean;
+/**
+ * 判断数组数据是否改变
+ * @param list1 数组
+ * @param list2 新数组
+ */
+export declare function arrayIsChanged<T>(list1?: T[] | null, list2?: T[] | null): boolean;
 /**
- * 表格实例方法
+ * 表格实例方法统一处理
  * @param getInstance 获取表格实例方法
  */
 export declare function useMethods(getInstance: GetInstance): TableMethods;
 /**
- * 表格事件
+ * 表格事件统一处理
  * @param emit 事件触发器
  */
 export declare function useEmits(emit: Emitter<typeof dataTableEmits>): {
@@ -165,4 +190,7 @@ export declare function useEmits(emit: Emitter<typeof dataTableEmits>): {
     onSortChange: (sorter: Sorter) => void;
     onFilterChange: (filter: Filter) => void;
     onCurrentChange: (currentRow?: DataItem | null, oldCurrentRow?: DataItem | null) => void;
+    /** 新增的事件 */
+    'onUpdate:currentRowKey': (currentRowKey?: DataKey) => void;
+    'onUpdate:selectedRowKeys': (selectedRowKeys: DataKey[]) => void;
 };

package/lib/ele-data-table/util.js

@@ -4,6 +4,9 @@ const vue = require("vue");
 const elementPlus = require("element-plus");
 const core = require("../utils/core");
 function getValue(data, field) {
+  if (data == null) {
+    return;
+  }
   if (typeof field === "function") {
     return field(data);
   }
@@ -101,15 +104,6 @@ function getHeadRowClass(rowClass, param, ellipsis) {
   }
   return classes.join(" ");
 }
-function mergeTooltipProps(props, globalProps) {
-  if (props === false || props == null && !globalProps) {
-    return false;
-  }
-  return {
-    ...!globalProps || globalProps === true ? {} : globalProps,
-    ...!props || props === true ? {} : props
-  };
-}
 function getGlobalTooltipProps(showOverflowTooltip, tooltipEffect, tooltipOptions) {
   if (!showOverflowTooltip) {
     return false;
@@ -120,6 +114,15 @@ function getGlobalTooltipProps(showOverflowTooltip, tooltipEffect, tooltipOption
     ...showOverflowTooltip === true ? {} : showOverflowTooltip
   };
 }
+function mergeTooltipProps(props, globalProps) {
+  if (props === false || props == null && !globalProps) {
+    return false;
+  }
+  return {
+    ...!globalProps || globalProps === true ? {} : globalProps,
+    ...!props || props === true ? {} : props
+  };
+}
 function getTooltipProps(props, globalProps) {
   const opt = mergeTooltipProps(props, globalProps);
   if (!opt) {
@@ -132,17 +135,17 @@ function getTooltipProps(props, globalProps) {
   opt.popperClass = classes.join(" ");
   return opt;
 }
+function getSlot(slots, name) {
+  if (name && slots[name] != null && typeof slots[name] === "function") {
+    return slots[name];
+  }
+}
 function renderSlot(slots, name, props) {
   const slot = getSlot(slots, name);
   if (slot != null) {
     return slot(props || {});
   }
 }
-function getSlot(slots, name) {
-  if (name && slots[name] != null && typeof slots[name] === "function") {
-    return slots[name];
-  }
-}
 function getEmptyProps(emptyProps, emptyText, errorText) {
   if (emptyProps === false) {
     return {};
@@ -187,7 +190,7 @@ function getTableFilter(tableRef) {
 }
 function getStateCols(cols, sorter, filter) {
   if (!sorter && !filter) {
-    return { cols, sorter: void 0 };
+    return { cols };
   }
   const filterKeys = filter == null ? [] : Object.keys(filter);
   const hasSorter = sorter != null && sorter.prop != null && sorter.prop != "";
@@ -197,13 +200,13 @@ function getStateCols(cols, sorter, filter) {
       hasSortCol = true;
     }
     const filterProp = col.columnKey ?? col.prop;
-    const t = filterProp && filterKeys.includes(filterProp);
-    const filtered = t && filter ? filter[filterProp] : void 0;
+    const flag = filterProp ? filterKeys.includes(filterProp) : false;
+    const filtered = flag && filter ? filter[filterProp] : void 0;
     return { ...col, filteredValue: filtered ?? col.filteredValue };
   });
   return { cols: result, sorter: hasSorter && hasSortCol ? sorter : void 0 };
 }
-function getSelectableFunc(columns) {
+function getSelectableFunction(columns) {
   let selectable;
   core.eachTree(columns, (col) => {
     if (col.type === "selection") {
@@ -214,13 +217,13 @@ function getSelectableFunc(columns) {
   return selectable;
 }
 function isDisableRow(row, index, columns) {
-  const selectable = getSelectableFunc(columns);
+  const selectable = getSelectableFunction(columns);
   if (typeof selectable === "undefined") {
     return true;
   }
   return !(selectable == null || selectable(row, index) === true);
 }
-function isReserveSelected(columns) {
+function isReserveChecked(columns) {
   let isReserve = false;
   core.eachTree(columns, (col) => {
     if (col.type === "selection") {
@@ -239,40 +242,50 @@ function getColFixedNumber(fixed) {
   }
   return 1;
 }
-function useState(defaultSort) {
-  const state = { sorter: defaultSort };
-  const getSorter = () => {
-    return state.sorter;
-  };
-  const setSorter = (value) => {
-    state.sorter = value;
-  };
-  const getFilter = () => {
-    return state.filter;
-  };
-  const setFilter = (value) => {
-    state.filter = value;
-  };
-  const getSelectionNoChange = (value) => {
-    if (value != null) {
-      state.selectionNoChange = value;
-    }
-    return !!state.selectionNoChange;
-  };
-  const setSelectionNoChange = (value) => {
-    if (value != null) {
-      state.selectionNoChange = value;
-    }
-    return !!state.selectionNoChange;
-  };
-  return {
-    getSorter,
-    setSorter,
-    getFilter,
-    setFilter,
-    getSelectionNoChange,
-    setSelectionNoChange
-  };
+function getRowKeys(rows, rowKey) {
+  const keys = [];
+  if (rows) {
+    rows.forEach((row) => {
+      const key = getValue(row, rowKey);
+      if (key != null) {
+        keys.push(key);
+      }
+    });
+  }
+  return keys;
+}
+function getRowByKey(key, data, rowKey, childrenField) {
+  return core.findTree(data, (d) => getValue(d, rowKey) === key, childrenField);
+}
+function getKeysAndList(data, rowKey, childrenField) {
+  const keys = [];
+  const list = [];
+  core.eachTree(
+    data,
+    (d) => {
+      keys.push(getValue(d, rowKey));
+      list.push(d);
+    },
+    childrenField
+  );
+  return [keys, list];
+}
+function valueIsChanged(value1, value2) {
+  return !(value1 == null && value2 == null || value1 === value2);
+}
+function arrayIsChanged(list1, list2) {
+  const isEmpty1 = list1 == null || !list1.length;
+  const isEmpty2 = list2 == null || !list2.length;
+  if (isEmpty1 && isEmpty2) {
+    return false;
+  }
+  if (isEmpty1 !== isEmpty2) {
+    return true;
+  }
+  if (list1.length !== list2.length) {
+    return true;
+  }
+  return list1.some((k) => !list2.includes(k));
 }
 function useMethods(getInstance) {
   const methods = {
@@ -330,18 +343,32 @@ function useMethods(getInstance) {
       const ins = getInstance();
       ins && ins.setScrollLeft(left);
     },
-    /** 新增的需要实现的实例方法 */
+    /** 新增的实例方法 */
+    setCurrentRowKey: (key) => {
+      const ins = getInstance();
+      ins && ins.setCurrentRowKey(key);
+    },
+    getCurrentRow: () => {
+      const ins = getInstance();
+      if (ins) {
+        return ins.getCurrentRow();
+      }
+    },
     setSelectedRows: (rows) => {
       const ins = getInstance();
       ins && ins.setSelectedRows(rows);
     },
-    setSelectedRowKeys: (keys) => {
+    setSelectedRowKeys: (keys, rows) => {
       const ins = getInstance();
-      ins && ins.setSelectedRowKeys(keys);
+      ins && ins.setSelectedRowKeys(keys, rows);
     },
     toggleRowExpansionAll: (expanded) => {
       const ins = getInstance();
       ins && ins.toggleRowExpansionAll(expanded);
+    },
+    updateSelectedAndChecked: () => {
+      const ins = getInstance();
+      ins && ins.updateSelectedAndChecked();
     }
   };
   return methods;
@@ -401,9 +428,17 @@ function useEmits(emit) {
     },
     onCurrentChange: (currentRow, oldCurrentRow) => {
       emit("currentChange", currentRow, oldCurrentRow);
+    },
+    /** 新增的事件 */
+    "onUpdate:currentRowKey": (currentRowKey) => {
+      emit("update:currentRowKey", currentRowKey);
+    },
+    "onUpdate:selectedRowKeys": (selectedRowKeys) => {
+      emit("update:selectedRowKeys", selectedRowKeys);
     }
   };
 }
+exports.arrayIsChanged = arrayIsChanged;
 exports.getBodyRowClass = getBodyRowClass;
 exports.getColFixedNumber = getColFixedNumber;
 exports.getCols = getCols;
@@ -411,17 +446,20 @@ exports.getEmptyProps = getEmptyProps;
 exports.getEmptySlot = getEmptySlot;
 exports.getGlobalTooltipProps = getGlobalTooltipProps;
 exports.getHeadRowClass = getHeadRowClass;
+exports.getKeysAndList = getKeysAndList;
+exports.getRowByKey = getRowByKey;
 exports.getRowClass = getRowClass;
-exports.getSelectableFunc = getSelectableFunc;
+exports.getRowKeys = getRowKeys;
+exports.getSelectableFunction = getSelectableFunction;
 exports.getSlot = getSlot;
 exports.getStateCols = getStateCols;
 exports.getTableFilter = getTableFilter;
 exports.getTooltipProps = getTooltipProps;
 exports.getValue = getValue;
 exports.isDisableRow = isDisableRow;
-exports.isReserveSelected = isReserveSelected;
+exports.isReserveChecked = isReserveChecked;
 exports.mergeTooltipProps = mergeTooltipProps;
 exports.renderSlot = renderSlot;
 exports.useEmits = useEmits;
 exports.useMethods = useMethods;
-exports.useState = useState;
+exports.valueIsChanged = valueIsChanged;