yuang-framework-ui-pc 1.1.3 → 1.1.5

package/lib/ele-pro-table/types.d.ts

@@ -1,48 +1,23 @@
-import type {
-  EleDataTableInstance,
-  EleVirtualTableInstance,
-  ElePaginationProps,
-  EleModalProps,
-  ElePrinterProps,
-  EleTableProps
-} from '../ele-app/plus';
+import type { EleDataTableInstance, EleVirtualTableInstance, ElePaginationProps, EleModalProps, ElePrinterProps, EleTableProps } from '../ele-app/plus';
 import type { PaginationTotal } from '../ele-pagination/types';
-import type {
-  DataItem,
-  Column,
-  Columns,
-  Sorter,
-  Filter,
-  TableColumn,
-  TableSize,
-  ResolveFunction
-} from '../ele-data-table/types';
+import type { DataItem, Column, Columns, Sorter, Filter, TableColumn, TableSize, ResolveFunction } from '../ele-data-table/types';
 import type { BodyColumns } from '../ele-virtual-table/types';
-export type {
-  DataItem,
-  Column,
-  Columns,
-  Sorter,
-  Filter,
-  TableColumn,
-  TableSize,
-  ResolveFunction
-};
+export type { DataItem, Column, Columns, Sorter, Filter, TableColumn, TableSize, ResolveFunction };
 
 /**
  * 分页参数
  */
-export type Pages = Record<string, number>;
+export type PageParam = Record<string, number>;
 
 /**
  * 搜索参数
  */
-export type Where = Record<keyof any, any>;
+export type QueryParam = Record<keyof any, any>;
 
 /**
- * 排序参数
+ * 排序参数列表
  */
-export type Orders = Record<string, OrderValue>;
+export type OrderParamList = [Record<string, OrderValue>];
 
 /**
  * 筛选参数
@@ -54,15 +29,15 @@ export type Filters = Record<string, any>;
  */
 export interface DatasourceParams {
   /** 页码 */
-  page?: number;
+  currentPage?: number;
   /** 每页显示数量 */
-  limit?: number;
+  pageSize?: number;
   /** 分页参数 */
-  pages: Pages;
+  pageParam: PageParam;
   /** 搜索参数 */
-  where: Where;
+  queryParam: QueryParam;
   /** 排序参数 */
-  orders: Orders;
+  orderParamList: OrderParamList;
   /** 筛选参数 */
   filters: Filters;
   /** 排序方式 */
@@ -82,9 +57,7 @@ export type DatasourceResult = DataItem[] | Record<string, any> | undefined;
  * 数据源方法
  * @param params 参数
  */
-export type DatasourceFunction = (
-  params: DatasourceParams
-) => Promise<DatasourceResult>;
+export type DatasourceFunction = (params: DatasourceParams) => Promise<DatasourceResult>;
 
 /**
  * 数据源
@@ -95,12 +68,12 @@ export type Datasource = DataItem[] | DatasourceFunction;
  * 刷新方法参数
  */
 export interface ReloadParams {
-  /** 页码 */
-  page?: number;
+  /** 当前页码 */
+  currentPage?: number;
   /** 每页数量 */
-  limit?: number;
+  pageSize?: number;
   /** 搜索参数 */
-  where?: Where;
+  queryParam?: QueryParam;
   /** 排序方式 */
   sorter?: Sorter;
   /** 筛选条件 */
@@ -113,11 +86,7 @@ export interface ReloadParams {
  * @param parent 树表格父级数据
  * @param resolve 树表格懒加载方法
  */
-export type ReloadFunction = (
-  option?: ReloadParams,
-  parent?: DataItem,
-  resolve?: ResolveFunction
-) => void;
+export type ReloadFunction = (option?: ReloadParams, parent?: DataItem, resolve?: ResolveFunction) => void;
 
 /**
  * 排序的值
@@ -129,13 +98,13 @@ export type OrderValue = string | number | boolean | null | undefined;
  */
 export interface RequestOption {
   /** 页码参数名称 */
-  pageName?: string;
+  currentPageKey?: string;
   /** 每页数量参数名称 */
-  limitName?: string;
+  pageSizeKey?: string;
   /** 排序字段参数名称 */
-  sortName?: string;
+  orderPropertyKey?: string;
   /** 排序方式参数名称 */
-  orderName?: string;
+  orderDirectionKey?: string;
   /** 升序的排序值 */
   ascValue?: OrderValue;
   /** 降序的排序值 */
@@ -147,9 +116,9 @@ export interface RequestOption {
  */
 export interface ResponseOption {
   /** 数据列表字段名称 */
-  dataName?: string;
+  recordsKey?: string;
   /** 数据总数字段名称 */
-  countName?: string;
+  totalCountKey?: string;
 }
 
 /**
@@ -204,14 +173,7 @@ export interface TablePagination extends ElePaginationProps {
 /**
  * 内置工具按钮
  */
-export type TableTool =
-  | 'reload'
-  | 'size'
-  | 'columns'
-  | 'maximized'
-  | 'export'
-  | 'print'
-  | string;
+export type TableTool = 'reload' | 'size' | 'columns' | 'maximized' | 'export' | 'print' | string;
 
 /**
  * 列配置
@@ -248,11 +210,11 @@ export type FetchFunction = (callback: FetchCallback) => void;
  */
 export interface ReloadDataResult {
   /** 当前数据 */
-  data: DataItem[];
+  records: DataItem[];
   /** 当前页码 */
-  page: number;
+  currentPage: number;
   /** 总数量 */
-  total: number;
+  totalCount: number;
 }
 
 /**
@@ -260,9 +222,9 @@ export interface ReloadDataResult {
  */
 export interface ResponseResult {
   /** 当前数据 */
-  data?: DataItem[];
+  records?: DataItem[];
   /** 总数量 */
-  total?: number;
+  totalCount?: number;
 }
 
 /**
@@ -279,16 +241,13 @@ export interface TableState {
   /** 当前筛选参数 */
   filter: Filter;
   /** 当前搜索参数 */
-  where: Where;
+  queryParam: QueryParam;
 }
 
 /**
  * 表格组件实例
  */
-export type TableViewInstance =
-  | EleDataTableInstance
-  | EleVirtualTableInstance
-  | null;
+export type TableViewInstance = EleDataTableInstance | EleVirtualTableInstance | null;
 
 /**
  * 导出的数据来源类型

package/lib/ele-pro-table/util.cjs

@@ -68,10 +68,10 @@ function getDefaultFilter(columns) {
 }
 function getRequestName(globalRequest, request) {
   const defaultRequest = {
-    pageName: "page",
-    limitName: "limit",
-    sortName: "sort",
-    orderName: "order",
+    currentPageKey: "currentPage",
+    pageSizeKey: "pageSize",
+    orderPropertyKey: "orderProperty",
+    orderDirectionKey: "orderDirection",
     ascValue: "asc",
     descValue: "desc"
   };
@@ -79,16 +79,16 @@ function getRequestName(globalRequest, request) {
 }
 function getResponseName(globalResponse, response) {
   const defaultResponse = {
-    dataName: "list",
-    countName: "count"
+    recordsKey: "records",
+    totalCountKey: "totalCount"
   };
   return Object.assign(defaultResponse, globalResponse, response);
 }
 function getOrderItems(sorter) {
   var _a, _b;
-  const orders = [];
+  const orderParamList = [];
   if (!sorter || !sorter.order) {
-    return orders;
+    return orderParamList;
   }
   const descend = sorter.order === "descending";
   const sortMethod = (_a = sorter.column) == null ? void 0 : _a.sortMethod;
@@ -96,34 +96,33 @@ function getOrderItems(sorter) {
   if (Array.isArray(sortBy) && sortBy.length) {
     sortBy.forEach((field) => {
       if (typeof field === "string" && field.length) {
-        orders.push({ field, descend, sortMethod });
+        orderParamList.push({ field, descend, sortMethod });
       }
     });
   } else {
     const field = typeof sortBy === "string" && sortBy ? sortBy : sorter.prop;
     if (field) {
-      orders.push({ field, descend, sortMethod });
+      orderParamList.push({ field, descend, sortMethod });
     }
   }
-  return orders;
+  return orderParamList;
 }
-function getRequestOrders(sorter, request, globalRequest) {
-  const orders = {};
-  const { sortName, orderName, ascValue, descValue } = getRequestName(
-    globalRequest,
-    request
-  );
-  if (!sortName || !orderName) {
-    return orders;
+function getRequestOrderParamList(sorter, request, globalRequest) {
+  const orderParamList = [];
+  const { orderPropertyKey, orderDirectionKey, ascValue, descValue } = getRequestName(globalRequest, request);
+  if (!orderPropertyKey || !orderDirectionKey) {
+    return orderParamList;
   }
   const items = getOrderItems(sorter);
   if (items.length === 1) {
-    orders[sortName] = items[0].field;
-    orders[orderName] = items[0].descend ? descValue : ascValue;
+    const orderParam = {};
+    orderParam[orderPropertyKey] = items[0].field;
+    orderParam[orderDirectionKey] = items[0].descend ? descValue : ascValue;
+    orderParamList.push(orderParam);
   } else if (items.length) {
-    orders[sortName] = items.map((d) => [d.field, d.descend ? descValue : ascValue].join(" ")).join(",");
+    orderParamList[orderPropertyKey] = items.map((d) => [d.field, d.descend ? descValue : ascValue].join(" ")).join(",");
   }
-  return orders;
+  return orderParamList;
 }
 function getRequestFilters(filter) {
   const filters = {};
@@ -148,27 +147,27 @@ function getRequestFilters(filter) {
   }
   return filters;
 }
-function getRequestPages(page, limit, request, globalRequest) {
-  const pages = {};
-  const { pageName, limitName } = getRequestName(globalRequest, request);
-  if (!pageName || !limitName) {
-    return pages;
+function getRequestPageParam(currentPage, pageSize, request, globalRequest) {
+  const pageParam = {};
+  const { currentPageKey, pageSizeKey } = getRequestName(globalRequest, request);
+  if (!currentPageKey || !pageSizeKey) {
+    return pageParam;
   }
-  pages[pageName] = page;
-  pages[limitName] = limit;
-  return pages;
+  pageParam[currentPageKey] = currentPage;
+  pageParam[pageSizeKey] = pageSize;
+  return pageParam;
 }
 function getResponseResult(data, response, globalResponse, lazy, treeOpt) {
   if (!data || Array.isArray(data)) {
-    return { data: getResponseData(data, lazy, treeOpt) };
+    return { records: getResponseData(data, lazy, treeOpt) };
   }
-  const { dataName, countName } = getResponseName(globalResponse, response);
-  if (!dataName) {
+  const { recordsKey, totalCountKey } = getResponseName(globalResponse, response);
+  if (!recordsKey) {
     return {};
   }
   return {
-    data: getResponseData(core.getValue(data, dataName), lazy, treeOpt),
-    total: (countName ? core.getValue(data, countName) : void 0) ?? 0
+    records: getResponseData(core.getValue(data, recordsKey), lazy, treeOpt),
+    totalCount: (totalCountKey ? core.getValue(data, totalCountKey) : void 0) ?? 0
   };
 }
 function getResponseData(data, lazy, treeProps) {
@@ -204,20 +203,21 @@ function sortData(datasource, sorter) {
   });
   return data;
 }
-function reloadData(datasource, sorter, page, limit) {
-  const data = sortData(datasource, sorter);
-  const total = data.length;
-  if (!page || !limit) {
-    return { page: 1, data, total };
+function reloadData(datasource, sorter, currentPage, pageSize) {
+  debugger;
+  const records = sortData(datasource, sorter);
+  const totalCount = records.length;
+  if (!currentPage || !pageSize) {
+    return { currentPage: 1, records, totalCount };
   }
-  const maxPage = Math.ceil(total / limit);
-  if (maxPage && page > maxPage) {
-    page = maxPage;
+  const maxPage = Math.ceil(totalCount / pageSize);
+  if (maxPage && currentPage > maxPage) {
+    currentPage = maxPage;
   }
-  const start = (page - 1) * limit;
-  const end = start + limit;
-  const list = data.slice(start, end > total ? total : end);
-  return { page, data: list, total };
+  const start = (currentPage - 1) * pageSize;
+  const end = start + pageSize;
+  const list = records.slice(start, end > totalCount ? totalCount : end);
+  return { currentPage, records: list, totalCount };
 }
 function getColId(column) {
   if (column.columnKey == null || column.columnKey === "") {
@@ -248,15 +248,7 @@ function getInitCacheColumns(columns, cacheKey, sortable) {
   if (!cacheCols) {
     return getInitColumns(columns, getCacheColsWidth(cacheKey));
   }
-  return getCheckedColumns(
-    columns,
-    cacheCols,
-    sortable,
-    (item) => item.hideInSetting,
-    void 0,
-    false,
-    getCacheColsWidth(cacheKey)
-  );
+  return getCheckedColumns(columns, cacheCols, sortable, (item) => item.hideInSetting, void 0, false, getCacheColsWidth(cacheKey));
 }
 function getCheckedColumns(columns, cols, sortable, isHideInCol, filter, reserveUnchecked, cacheColsWidth) {
   const data = [];
@@ -277,15 +269,7 @@ function getCheckedColumns(columns, cols, sortable, isHideInCol, filter, reserve
     const fixed = (temp == null ? void 0 : temp.fixed) ?? d.fixed;
     const uid = core.uuid(8);
     if (d.children && d.children.length) {
-      const children = getCheckedColumns(
-        d.children,
-        cols,
-        sortable,
-        isHideInCol,
-        filter,
-        reserveUnchecked,
-        cacheColsWidth
-      );
+      const children = getCheckedColumns(d.children, cols, sortable, isHideInCol, filter, reserveUnchecked, cacheColsWidth);
       if (children.length) {
         data.push({ ...d, width, fixed, hideInTable, children, uid });
       }
@@ -340,9 +324,7 @@ function getCheckedColumns(columns, cols, sortable, isHideInCol, filter, reserve
 function getColItems(columns, locale, filter, cacheCols, sortFixed, cancelFixed, cacheColsWidth) {
   const temp = columns == null ? [] : [...columns];
   if (sortFixed) {
-    temp.sort(
-      (a, b) => util.getColFixedNumber(a.fixed) - util.getColFixedNumber(b.fixed)
-    );
+    temp.sort((a, b) => util.getColFixedNumber(a.fixed) - util.getColFixedNumber(b.fixed));
   }
   const cols = core.mapTree(temp, (d, _i, parent) => {
     const colId = getColId(d);
@@ -472,10 +454,7 @@ function cacheColWidth(width, column, cacheKey) {
       } else {
         old.width = width;
       }
-      localStorage.setItem(
-        getColsWidthCacheKey(cacheKey),
-        JSON.stringify(colsWidth)
-      );
+      localStorage.setItem(getColsWidthCacheKey(cacheKey), JSON.stringify(colsWidth));
     }
   }
 }
@@ -520,12 +499,7 @@ function getExportBodyNode(data, childrenField = "children", level = 0, parents
     });
     const children = row[childrenField];
     if (children && children.length) {
-      const { depth, nodes } = getExportBodyNode(
-        children,
-        childrenField,
-        level + 1,
-        [...parents, node]
-      );
+      const { depth, nodes } = getExportBodyNode(children, childrenField, level + 1, [...parents, node]);
       maxDepth = Math.max(maxDepth, depth);
       nodes.forEach((n) => {
         bodyDodes.push(n);
@@ -544,12 +518,10 @@ function getExportData(data, columns, spanMethod, pageIndex, showSummary, sumTex
   if (depth <= 1 || showExpandIndex) {
     showTreeIndex = false;
   }
-  const treeIconIndex = showTreeIndex ? void 0 : bodyCols.findIndex(
-    (c) => {
-      var _a;
-      return !((_a = c.originalCol) == null ? void 0 : _a.type) || !["index", "expand", "selection"].includes(c.originalCol.type);
-    }
-  );
+  const treeIconIndex = showTreeIndex ? void 0 : bodyCols.findIndex((c) => {
+    var _a;
+    return !((_a = c.originalCol) == null ? void 0 : _a.type) || !["index", "expand", "selection"].includes(c.originalCol.type);
+  });
   const bodyData = [];
   nodes.forEach((node, index) => {
     const row = node.row;
@@ -558,10 +530,7 @@ function getExportData(data, columns, spanMethod, pageIndex, showSummary, sumTex
     bodyCols.forEach((col, columnIndex) => {
       const { key: colKey, originalCol: column } = col;
       const key = `${index}-${columnIndex}-${colKey}`;
-      const { colspan, rowspan } = util$1.getCellSpan(
-        { column, columnIndex, row, rowIndex: index },
-        spanMethod
-      );
+      const { colspan, rowspan } = util$1.getCellSpan({ column, columnIndex, row, rowIndex: index }, spanMethod);
       const isNone = colspan == 0 || rowspan == 0;
       const text = isNone ? "" : getCellText(column, row, index, pageIndex);
       const dataItem = {
@@ -745,8 +714,8 @@ exports.getOrderItems = getOrderItems;
 exports.getPaginationProps = getPaginationProps;
 exports.getRequestFilters = getRequestFilters;
 exports.getRequestName = getRequestName;
-exports.getRequestOrders = getRequestOrders;
-exports.getRequestPages = getRequestPages;
+exports.getRequestOrderParamList = getRequestOrderParamList;
+exports.getRequestPageParam = getRequestPageParam;
 exports.getResponseData = getResponseData;
 exports.getResponseName = getResponseName;
 exports.getResponseResult = getResponseResult;

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

@@ -1,6 +1,6 @@
 import { ElePaginationProps } from '../ele-app/plus';
 import { DataItem, Column, Columns, Sorter, Filter, TableSize, TreeProps, RowKey, SpanMethod, SummaryMethod } from '../ele-data-table/types';
-import { Pages, Orders, Filters, OrderItem, RequestOption, ResponseOption, TablePagination, DatasourceResult, ResponseResult, ReloadDataResult, ColItem, ProProps, ExportBodyNode, ExportDataItem, ExportDataResult, CacheKey, TableLocale } from './types';
+import { PageParam, OrderParamList, Filters, OrderItem, RequestOption, ResponseOption, TablePagination, DatasourceResult, ResponseResult, ReloadDataResult, ColItem, ProProps, ExportBodyNode, ExportDataItem, ExportDataResult, CacheKey, TableLocale } from './types';
 
 /**
  * 合并复合属性
@@ -64,12 +64,12 @@ export declare function getResponseName(globalResponse?: ResponseOption, respons
  */
 export declare function getOrderItems(sorter?: Sorter): OrderItem[];
 /**
- * 生成请求的排序参数
+ * 生成请求的排序参数列表
  * @param sorter 排序方式
  * @param request 请求参数配置
  * @param globalRequest 全局请求参数配置
  */
-export declare function getRequestOrders(sorter?: Sorter, request?: RequestOption, globalRequest?: RequestOption): Orders;
+export declare function getRequestOrderParamList(sorter?: Sorter, request?: RequestOption, globalRequest?: RequestOption): OrderParamList;
 /**
  * 生成请求的筛选参数
  * @param filter 筛选条件
@@ -77,12 +77,12 @@ export declare function getRequestOrders(sorter?: Sorter, request?: RequestOptio
 export declare function getRequestFilters(filter?: Filter): Filters;
 /**
  * 生成请求的分页参数
- * @param page 页码
- * @param limit 每页数量
+ * @param currentPage 页码
+ * @param pageSize 每页数量
  * @param request 请求参数配置
  * @param globalRequest 全局请求参数配置
  */
-export declare function getRequestPages(page: number, limit: number, request?: RequestOption, globalRequest?: RequestOption): Pages;
+export declare function getRequestPageParam(currentPage: number, pageSize: number, request?: RequestOption, globalRequest?: RequestOption): PageParam;
 /**
  * 获取数据源请求结果
  * @param data 数据源请求的原始数据
@@ -109,10 +109,10 @@ export declare function sortData(datasource?: DataItem[], sorter?: Sorter): Data
  * 前端分页排序
  * @param datasource 数据源
  * @param sorter 排序方式
- * @param page 页码
- * @param limit 每页数量
+ * @param currentPage 当前页码
+ * @param pageSize 每页数量
  */
-export declare function reloadData(datasource?: DataItem[], sorter?: Sorter, page?: number, limit?: number): ReloadDataResult;
+export declare function reloadData(datasource?: DataItem[], sorter?: Sorter, currentPage?: number, pageSize?: number): ReloadDataResult;
 /**
  * 获取列配置标识
  * @param column 列数据

package/lib/ele-split-panel/index.d.ts

@@ -56,8 +56,8 @@ declare const _default: import('vue').DefineComponent<{
     vertical: boolean;
     collapse: boolean;
     resizable: boolean;
-    responsive: boolean;
     flexTable: boolean;
+    responsive: boolean;
     allowCollapse: boolean;
 }, {}>;
 export default _default;