ele-admin-plus 1.1.4 → 1.1.5-beta.2

package/es/ele-pro-table/util.js

@@ -1,4 +1,4 @@
-import { unref } from "vue";
+import { getValue } from "../ele-data-table/util";
 import { omit, eachTree, uuid, mapTree } from "../utils/core";
 function mergeProps(props, globalProps) {
   if (props == null) {
@@ -15,19 +15,6 @@ function mergeProps(props, globalProps) {
   }
   return { ...globalProps, ...props };
 }
-function getValue(data, field) {
-  if (typeof field === "function") {
-    return field(data);
-  }
-  if (!field) {
-    return;
-  }
-  let value = data;
-  field.split(".").forEach((f) => {
-    value = value ? value[f] : null;
-  });
-  return value;
-}
 function getTablePage(pagination, globalPagination) {
   const props = getPaginationProps(void 0, pagination, globalPagination);
   return (props == null ? void 0 : props.currentPage) ?? 1;
@@ -238,11 +225,11 @@ function getInitCacheColumns(columns, cacheKey, sortable) {
   if (!cache) {
     return getInitColumns(columns);
   }
-  return getCheckedColumns(columns, cache.data, cache.checkedIds, sortable);
+  return getCheckedColumns(columns, cache, sortable);
 }
-function getCheckedColumns(columns, cols, checkedIds, sortable) {
+function getCheckedColumns(columns, cols, sortable) {
   const data = [];
-  if (!(columns == null ? void 0 : columns.length)) {
+  if (!columns || !columns.length) {
     return data;
   }
   columns.forEach((d) => {
@@ -250,19 +237,19 @@ function getCheckedColumns(columns, cols, checkedIds, sortable) {
     if (colId == null) {
       return;
     }
-    const temp = cols.find((c) => c.uid === colId);
-    if (temp && !checkedIds.includes(colId)) {
+    let temp;
+    eachTree(cols, (t) => {
+      if (t.uid === colId) {
+        temp = t;
+      }
+    });
+    if (temp && !temp.checked) {
       return;
     }
     const fixed = (temp == null ? void 0 : temp.fixed) ?? d.fixed;
     const uid = uuid(8);
     if (d.children) {
-      const children = getCheckedColumns(
-        d.children,
-        cols,
-        checkedIds,
-        sortable
-      );
+      const children = getCheckedColumns(d.children, cols, sortable);
       if (children.length) {
         data.push({ ...d, fixed, uid, children });
       }
@@ -274,30 +261,40 @@ function getCheckedColumns(columns, cols, checkedIds, sortable) {
     return data;
   }
   data.sort((a, b) => {
-    var _a, _b;
     const aColId = getColId(a);
     const bColId = getColId(b);
-    let ai = cols.findIndex((c) => c.uid === aColId);
-    let bi = cols.findIndex((c) => c.uid === bColId);
-    if (ai === -1 && ((_a = a.children) == null ? void 0 : _a.length)) {
-      const colId = getColId(a.children[0]);
-      ai = cols.findIndex((c) => c.uid === colId);
-    }
-    if (bi === -1 && ((_b = b.children) == null ? void 0 : _b.length)) {
-      const colId = getColId(b.children[0]);
-      bi = cols.findIndex((c) => c.uid === colId);
-    }
-    if (ai === -1 && a.hideInSetting && a.fixed === "right") {
+    let i = 0;
+    let ai;
+    let bi;
+    eachTree(cols, (c) => {
+      if (c.uid === aColId) {
+        ai = i;
+      }
+      if (c.uid === bColId) {
+        bi = i;
+      }
+      if (ai != null && bi != null) {
+        return false;
+      }
+      i++;
+    });
+    if (ai == null && a.hideInSetting && a.fixed === "right") {
       ai = cols.length;
     }
+    if (ai == null) {
+      ai = -1;
+    }
     if (a.fixed === true || a.fixed === "left") {
       ai -= cols.length;
     } else if (a.fixed === "right" || a.hideInSetting && !a.fixed) {
       ai += cols.length;
     }
-    if (bi === -1 && b.hideInSetting && b.fixed === "right") {
+    if (bi == null && b.hideInSetting && b.fixed === "right") {
       bi = cols.length;
     }
+    if (bi == null) {
+      bi = -1;
+    }
     if (b.fixed === true || b.fixed === "left") {
       bi -= cols.length;
     } else if (b.fixed === "right" || b.hideInSetting && !b.fixed) {
@@ -312,72 +309,39 @@ function getSettingCols(columns, untitledText, cacheKey) {
   if (cacheResult) {
     return cacheResult;
   }
-  const hideTypes = ["selection", "index", "expand"];
-  const data = [];
-  eachTree(columns, (d) => {
-    var _a;
+  const excludes = ["selection", "index", "expand"];
+  return mapTree(columns, (d) => {
     const colId = getColId(d);
-    if (colId && !((_a = d.children) == null ? void 0 : _a.length) && !d.hideInSetting && !(d.type && hideTypes.includes(d.type))) {
-      data.push({
+    if (colId && !d.hideInSetting && !(d.type && excludes.includes(d.type))) {
+      return {
         uid: colId,
         prop: d.prop,
         columnKey: d.columnKey,
         label: d.label || untitledText,
         checked: !d.hideInTable,
         fixed: d.fixed
-      });
+      };
     }
   });
-  return getColsResult(data);
-}
-function getColsResult(cols) {
-  const ids = cols.filter((d) => d.checked).map((d) => d.uid);
-  return {
-    data: sortCols(cols),
-    checkedIds: ids,
-    isChecked: cols.length > 0 && cols.length === ids.length,
-    isIndeterminate: ids.length !== 0 && cols.length !== ids.length
-  };
-}
-function sortCols(cols) {
-  cols.sort((a, b) => {
-    let ai = cols.indexOf(a);
-    let bi = cols.indexOf(b);
-    if (a.fixed === true || a.fixed === "left") {
-      ai -= cols.length;
-    } else if (a.fixed === "right") {
-      ai += cols.length;
-    }
-    if (b.fixed === true || b.fixed === "left") {
-      bi -= cols.length;
-    } else if (b.fixed === "right") {
-      bi += cols.length;
-    }
-    return ai - bi;
-  });
-  return cols;
 }
 function getCacheCols(cacheKey) {
-  if (!cacheKey) {
-    return;
-  }
-  const temp = localStorage.getItem(getColsCacheKey(cacheKey));
-  if (!temp) {
-    return;
-  }
-  try {
-    const data = JSON.parse(temp);
-    if (!Array.isArray(data)) {
-      return;
-    }
-    data.forEach((d) => {
-      if (d.uid == null && d.id != null) {
-        d.uid = d.id;
+  if (cacheKey) {
+    const temp = localStorage.getItem(getColsCacheKey(cacheKey));
+    if (temp) {
+      try {
+        const data = JSON.parse(temp);
+        if (data && Array.isArray(data)) {
+          data.forEach((d) => {
+            if (d.uid == null && d.id != null) {
+              d.uid = d.id;
+            }
+          });
+          return data;
+        }
+      } catch (e) {
+        console.error(e);
       }
-    });
-    return getColsResult(data);
-  } catch (e) {
-    console.error(e);
+    }
   }
 }
 function getColsCacheKey(cacheKey) {
@@ -397,171 +361,12 @@ function getCacheSize(cacheKey) {
 function selectionIsChange(rows, selections) {
   return rows !== selections && (selections == null || rows.length !== selections.length || rows.some((t) => !(selections && selections.includes(t))));
 }
-function isDisableRow(row, index, columns) {
-  let disabled = false;
-  eachTree(columns, (col) => {
-    if (col.type === "selection" && typeof col.selectable === "function") {
-      disabled = !col.selectable(row, index);
-      return false;
-    }
-  });
-  return disabled;
-}
-function getTableFilter(tableRef) {
-  var _a, _b;
-  const states = (_b = (_a = unref(tableRef)) == null ? void 0 : _a.store) == null ? void 0 : _b.states;
-  const columns = unref(states == null ? void 0 : states.columns);
-  const filters = unref(states == null ? void 0 : states.filters);
-  if (!filters || !columns) {
-    return;
-  }
-  const keys = Object.keys(filters);
-  const filter = {};
-  columns.forEach((col) => {
-    if (keys.includes(col.id)) {
-      filter[col.columnKey || col.id] = filters[col.id];
-    }
-  });
-  return filter;
-}
-function getTableState(cols, data) {
-  const { sorter, filter } = data;
-  const filterKeys = filter == null ? [] : Object.keys(filter);
-  const hasSorter = sorter != null && sorter.prop != null && sorter.prop != "";
-  let hasSortCol = false;
-  const result = mapTree(cols, (col) => {
-    if (hasSorter && col.prop === sorter.prop) {
-      hasSortCol = true;
-    }
-    const t = col.columnKey && filterKeys.includes(col.columnKey);
-    const filteredValue = t ? filter[col.columnKey] : [];
-    return { ...col, filteredValue };
-  });
-  return { cols: result, sorter: hasSorter && hasSortCol ? sorter : void 0 };
-}
-function useTableMethods(getIns) {
-  return {
-    clearSelection: () => {
-      const ins = getIns();
-      ins && ins.clearSelection();
-    },
-    getSelectionRows: () => {
-      const ins = getIns();
-      if (ins) {
-        return ins.getSelectionRows();
-      }
-    },
-    toggleRowSelection: (row, selected) => {
-      const ins = getIns();
-      ins && ins.toggleRowSelection(row, selected);
-    },
-    toggleAllSelection: () => {
-      const ins = getIns();
-      ins && ins.toggleAllSelection();
-    },
-    toggleRowExpansion: (row, expanded) => {
-      const ins = getIns();
-      ins && ins.toggleRowExpansion(row, expanded);
-    },
-    setCurrentRow: (row) => {
-      const ins = getIns();
-      ins && ins.setCurrentRow(row);
-    },
-    clearSort: () => {
-      const ins = getIns();
-      ins && ins.clearSort();
-    },
-    clearFilter: (columnKeys) => {
-      const ins = getIns();
-      ins && ins.clearFilter(columnKeys);
-    },
-    doLayout: () => {
-      const ins = getIns();
-      ins && ins.doLayout();
-    },
-    sort: (prop, order) => {
-      const ins = getIns();
-      ins && ins.sort(prop, order);
-    },
-    scrollTo: (options, yCoord) => {
-      const ins = getIns();
-      ins && ins.scrollTo(options, yCoord);
-    },
-    setScrollTop: (top) => {
-      const ins = getIns();
-      ins && ins.setScrollTop(top);
-    },
-    setScrollLeft: (left) => {
-      const ins = getIns();
-      ins && ins.setScrollLeft(left);
-    }
-  };
-}
-function useTableEvents(emit) {
-  return {
-    onSelect: (selection, row) => {
-      emit("select", selection, row);
-    },
-    onSelectAll: (selection) => {
-      emit("selectAll", selection);
-    },
-    onCellMouseEnter: (row, column, cell, event) => {
-      emit("cellMouseEnter", row, column, cell, event);
-    },
-    onCellMouseLeave: (row, column, cell, event) => {
-      emit("cellMouseLeave", row, column, cell, event);
-    },
-    onCellClick: (row, column, cell, event) => {
-      emit("cellClick", row, column, cell, event);
-    },
-    onCellDblclick: (row, column, cell, event) => {
-      emit("cellDblclick", row, column, cell, event);
-    },
-    onCellContextmenu: (row, column, cell, event) => {
-      emit("cellContextmenu", row, column, cell, event);
-    },
-    onRowClick: (row, column, event) => {
-      emit("rowClick", row, column, event);
-    },
-    onRowContextmenu: (row, column, event) => {
-      emit("rowContextmenu", row, column, event);
-    },
-    onRowDblclick: (row, column, event) => {
-      emit("rowDblclick", row, column, event);
-    },
-    onHeaderClick: (column, event) => {
-      emit("headerClick", column, event);
-    },
-    onHeaderContextmenu: (column, event) => {
-      emit("headerContextmenu", column, event);
-    },
-    onHeaderDragend: (newWidth, oldWidth, column, event) => {
-      emit("headerDragend", newWidth, oldWidth, column, event);
-    },
-    onExpandChange: (row, expanded) => {
-      emit("expandChange", row, expanded);
-    },
-    onSelectionChange: (selection) => {
-      emit("selectionChange", selection);
-    },
-    onSortChange: (sorter) => {
-      emit("sortChange", sorter);
-    },
-    onFilterChange: (filter) => {
-      emit("filterChange", filter);
-    },
-    onCurrentChange: (currentRow, oldCurrentRow) => {
-      emit("currentChange", currentRow, oldCurrentRow);
-    }
-  };
-}
 export {
   getCacheCols,
   getCacheSize,
   getCheckedColumns,
   getColId,
   getColsCacheKey,
-  getColsResult,
   getDefaultFilter,
   getInitCacheColumns,
   getInitColumns,
@@ -575,19 +380,12 @@ export {
   getResponseResult,
   getSettingCols,
   getSizeCacheKey,
-  getTableFilter,
   getTableLimit,
   getTablePage,
   getTableSize,
-  getTableState,
-  getValue,
   isAutoAmend,
-  isDisableRow,
   mergeProps,
   reloadData,
   selectionIsChange,
-  sortCols,
-  sortData,
-  useTableEvents,
-  useTableMethods
+  sortData
 };

package/es/ele-qr-code/props.d.ts

@@ -4,28 +4,36 @@ import type { Level, ImageSettings } from './types';
  * 属性
  */
 export declare const qrCodeProps: {
+    /** 绑定值 */
     value: StringConstructor;
+    /** 尺寸 */
     size: {
         type: NumberConstructor;
         default: number;
     };
+    /** 容错等级 */
     level: {
         type: PropType<Level>;
         default: string;
     };
+    /** 背景色 */
     bgColor: {
         type: StringConstructor;
         default: string;
     };
+    /** 颜色 */
     fgColor: {
         type: StringConstructor;
         default: string;
     };
+    /** 外间距 */
     margin: {
         type: NumberConstructor;
         default: number;
     };
+    /** 自定义图片 */
     imageSettings: PropType<ImageSettings>;
+    /** 自定义样式 */
     customStyle: PropType<Partial<import("vue").CSSProperties>>;
 };
 export type QrCodeProps = ExtractPropTypes<typeof qrCodeProps>;
@@ -33,5 +41,6 @@ export type QrCodeProps = ExtractPropTypes<typeof qrCodeProps>;
  * 事件
  */
 export declare const qrCodeEmits: {
+    /** 渲染完成事件 */
     done: () => boolean;
 };

package/es/ele-qr-code/props.js

@@ -1,38 +1,38 @@
 const qrCodeProps = {
-  // 绑定值
+  /** 绑定值 */
   value: String,
-  // 尺寸
+  /** 尺寸 */
   size: {
     type: Number,
     default: 128
   },
-  // 容错等级
+  /** 容错等级 */
   level: {
     type: String,
     default: "L"
   },
-  // 背景色
+  /** 背景色 */
   bgColor: {
     type: String,
     default: "#FFFFFF"
   },
-  // 颜色
+  /** 颜色 */
   fgColor: {
     type: String,
     default: "#000000"
   },
-  // 外间距
+  /** 外间距 */
   margin: {
     type: Number,
     default: 0
   },
-  // 自定义图片
+  /** 自定义图片 */
   imageSettings: Object,
-  // 自定义样式
+  /** 自定义样式 */
   customStyle: Object
 };
 const qrCodeEmits = {
-  // 渲染完成事件
+  /** 渲染完成事件 */
   done: () => true
 };
 export {

package/es/ele-qr-code/qrcodegen.js

@@ -931,7 +931,7 @@ var qrcodegen;
       let bb = [];
       for (let i = 0; i < digits.length; ) {
         const n = Math.min(digits.length - i, 3);
-        appendBits(parseInt(digits.substr(i, n), 10), n * 3 + 1, bb);
+        appendBits(Number.parseInt(digits.substr(i, n), 10), n * 3 + 1, bb);
         i += n;
       }
       return new _QrSegment(_QrSegment.Mode.NUMERIC, digits.length, bb);
@@ -1023,7 +1023,7 @@ var qrcodegen;
         if (str.charAt(i) != "%")
           result.push(str.charCodeAt(i));
         else {
-          result.push(parseInt(str.substr(i + 1, 2), 16));
+          result.push(Number.parseInt(str.substr(i + 1, 2), 16));
           i += 2;
         }
       }

package/es/ele-qr-code/types/index.d.ts

@@ -6,11 +6,17 @@ export type Level = 'L' | 'M' | 'Q' | 'H';
  * 自定义图片参数
  */
 export interface ImageSettings {
+    /** 地址 */
     src?: string;
+    /** 高度 */
     height?: number;
+    /** 宽度 */
     width?: number;
+    /** x坐标 */
     x?: number;
+    /** y坐标 */
     y?: number;
+    /** 是否擦除图片区域二维码 */
     excavate?: boolean;
 }
 /**
@@ -21,8 +27,12 @@ export type Modules = boolean[][];
  * 擦除区域
  */
 export interface Excavation {
+    /** x坐标 */
     x: number;
+    /** y坐标 */
     y: number;
+    /** 宽度 */
     w: number;
+    /** 高度 */
     h: number;
 }

package/es/ele-qr-code-svg/index.d.ts

@@ -19,7 +19,7 @@ declare const _default: import("vue").DefineComponent<{
     margin: {
         type: NumberConstructor;
         default: number;
-    };
+    }; /** 前景路径 */
     imageSettings: import("vue").PropType<import("../ele-qr-code/types").ImageSettings>;
     customStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
 }, {
@@ -55,7 +55,7 @@ declare const _default: import("vue").DefineComponent<{
     margin: {
         type: NumberConstructor;
         default: number;
-    };
+    }; /** 前景路径 */
     imageSettings: import("vue").PropType<import("../ele-qr-code/types").ImageSettings>;
     customStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
 }>> & {

package/es/ele-segmented/index.d.ts

@@ -12,7 +12,7 @@ declare const _default: import("vue").DefineComponent<{
     tabRef: import("vue").Ref<ElTabsInstance>;
     onUpdateModelValue: (value: string | number) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    'update:modelValue': (_value: string | number) => boolean;
+    'update:modelValue': (_value: string | number) => boolean; /** 选中改变事件 */
     change: (_active: string | number) => boolean;
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     modelValue: (StringConstructor | NumberConstructor)[];
@@ -24,8 +24,8 @@ declare const _default: import("vue").DefineComponent<{
     };
     size: import("vue").PropType<import("./types").SegmentedSize>;
 }>> & {
-    "onUpdate:modelValue"?: ((_value: string | number) => any) | undefined;
     onChange?: ((_active: string | number) => any) | undefined;
+    "onUpdate:modelValue"?: ((_value: string | number) => any) | undefined;
 }, {
     disabled: boolean;
     block: boolean;

package/es/ele-segmented/props.d.ts

@@ -4,13 +4,18 @@ import type { SegmentedSize, SegmentedItem } from './types';
  * 属性
  */
 export declare const segmentedProps: {
+    /** 选中的值 */
     modelValue: (StringConstructor | NumberConstructor)[];
+    /** 将宽度调整为父元素宽度 */
     block: BooleanConstructor;
+    /** 是否禁用 */
     disabled: BooleanConstructor;
+    /** 数据 */
     items: {
         type: PropType<SegmentedItem[]>;
         required: boolean;
     };
+    /** 尺寸 */
     size: PropType<SegmentedSize>;
 };
 export type SegmentedProps = ExtractPropTypes<typeof segmentedProps>;
@@ -18,6 +23,8 @@ export type SegmentedProps = ExtractPropTypes<typeof segmentedProps>;
  * 事件
  */
 export declare const segmentedEmits: {
+    /** 更新绑定值 */
     'update:modelValue': (_value: string | number) => boolean;
+    /** 选中改变的事件 */
     change: (_active: string | number) => boolean;
 };

package/es/ele-segmented/props.js

@@ -1,22 +1,22 @@
 const segmentedProps = {
-  // 选中的值
+  /** 选中的值 */
   modelValue: [String, Number],
-  // 将宽度调整为父元素宽度
+  /** 将宽度调整为父元素宽度 */
   block: Boolean,
-  // 是否禁用
+  /** 是否禁用 */
   disabled: Boolean,
-  // 数据
+  /** 数据 */
   items: {
     type: Array,
     required: true
   },
-  // 尺寸
+  /** 尺寸 */
   size: String
 };
 const segmentedEmits = {
-  // 更新绑定值
+  /** 更新绑定值 */
   "update:modelValue": (_value) => true,
-  // 选中改变的事件
+  /** 选中改变的事件 */
   change: (_active) => true
 };
 export {

package/es/ele-segmented/style/css-var.scss

@@ -1,5 +1,6 @@
 @use '../../style/util.scss' as *;
 
+/* 分段器主题变量 */
 @mixin set-segmented-var($var) {
   .ele-segmented {
     @include set-ele-var('segmented', $var);