@dt-frames/ui 1.0.54 → 1.0.55

package/es/components/source/src/types/source.type.d.ts

@@ -22,6 +22,7 @@ export declare type SourceType = {
     baseUrl?: string;
     exportName?: string | ComputedRef;
     clearKeys?: Function;
+    defaultSize?: number;
     api: ApiObjType;
 };
 export declare type BaseDataType = {

package/es/components/table/src/index.d.ts

@@ -144,6 +144,9 @@ declare const _default: import("vue").DefineComponent<{
         }>>>;
         default: {};
     };
+    pageSize: {
+        type: NumberConstructor;
+    };
     loading: {
         type: BooleanConstructor;
         default: boolean;
@@ -394,6 +397,7 @@ declare const _default: import("vue").DefineComponent<{
         indexColumnProps: import("./types/table.type").BasicColumn[];
         isTreeTable: boolean;
         toolbar?: import("@dt-frames/core").ButtonProps[];
+        pageSize?: number;
         minWidth?: number;
         maxWidth?: number;
         defSort?: any;
@@ -605,6 +609,9 @@ declare const _default: import("vue").DefineComponent<{
         }>>>;
         default: {};
     };
+    pageSize: {
+        type: NumberConstructor;
+    };
     loading: {
         type: BooleanConstructor;
         default: boolean;

package/es/components/table/src/props.d.ts

@@ -147,6 +147,9 @@ export declare const TableProps: {
         }>>>;
         default: {};
     };
+    pageSize: {
+        type: NumberConstructor;
+    };
     loading: {
         type: BooleanConstructor;
         default: boolean;

package/es/index.js

@@ -4962,6 +4962,9 @@ const TableProps = {
     type: [Object, Boolean],
     default: {}
   },
+  pageSize: {
+    type: Number
+  },
   loading: { type: Boolean, default: false },
   rowClassName: { type: Function },
   scroll: {
@@ -5059,7 +5062,7 @@ function usePagination(props) {
     }
   });
   const getPaginationInfo = computed(() => {
-    const { pagination } = unref(props);
+    const { pagination, pageSize: tPageSize } = unref(props);
     if (!unref(show) || isBoolean(pagination) && !pagination) {
       return false;
     }
@@ -5067,8 +5070,8 @@ function usePagination(props) {
     const { defaultPageSize, pageSizeOptions } = appConf.ui.table;
     return {
       current: 1,
-      pageSize: defaultPageSize,
-      defaultPageSize,
+      pageSize: tPageSize || defaultPageSize,
+      defaultPageSize: tPageSize || defaultPageSize,
       showTotal: (total, range) => t("TOTAL_PAGE", { total }),
       showSizeChanger: true,
       pageSizeOptions,
@@ -5130,19 +5133,19 @@ function useDataSource(propsRef, {
     return onTableChange2({
       pagination: {
         current,
-        pageSize
+        pageSize: tPageSize || pageSize
       },
       sort: sorter,
       filter: toRaw(unref(params.filterInfo)),
       showBtnLoading: false
     });
   }
-  const { defSort, onTableChange } = unref(propsRef);
+  const { defSort, onTableChange, pageSize: tPageSize } = unref(propsRef);
   const { appConf } = useAppStore();
   onTableChange({
     pagination: {
       current: 1,
-      pageSize: appConf.ui.table.defaultPageSize
+      pageSize: tPageSize || appConf.ui.table.defaultPageSize
     },
     sort: defSort,
     filter: null,
@@ -5540,7 +5543,7 @@ function sortFixedColumn(columns) {
 function handleIndexColumn(propsRef, getPaginationRef, columns) {
   const { getIsZH } = useHeader();
   const { t } = useI18n("UI");
-  const { showIndexColumn, indexColumnProps, isTreeTable } = unref(propsRef);
+  const { showIndexColumn, indexColumnProps, isTreeTable, pageSize: tPageSize } = unref(propsRef);
   let pushIndexColumns = false;
   if (unref(isTreeTable)) {
     return;
@@ -5569,7 +5572,7 @@ function handleIndexColumn(propsRef, getPaginationRef, columns) {
         return `${index2 + 1}`;
       }
       const { current = 1, pageSize = defaultPageSize } = getPagination;
-      return ((current < 1 ? 1 : current) - 1) * pageSize + index2 + 1;
+      return ((current < 1 ? 1 : current) - 1) * (tPageSize || pageSize) + index2 + 1;
     },
     ...isFixedLeft ? {
       fixed: "left"
@@ -6944,14 +6947,15 @@ function useDownload(exportUrl, exportName) {
   };
 }
 function useSource(opt) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d;
   const { t } = useI18n("UI");
   const loading = {
     onSearch: ref(false),
     onReset: ref(false)
   };
+  const { appConf } = useAppStore();
   const { baseUrl = "", api = {}, exportName = "", clearKeys = () => {
-  } } = opt;
+  }, defaultSize = (_b = (_a = appConf == null ? void 0 : appConf.ui) == null ? void 0 : _a.table) == null ? void 0 : _b.defaultPageSize } = opt;
   const { add, deletes, update, queryById, queryPage } = api;
   const { message } = useMessage();
   const apiFul = {};
@@ -6968,10 +6972,9 @@ function useSource(opt) {
     }
     apiPath[it] = isString(api[it]) ? api[it] : api[it].api;
   }
-  const { appConf } = useAppStore();
   const pagination = ref({
-    current: ((_b = (_a = appConf == null ? void 0 : appConf.ui) == null ? void 0 : _a.table) == null ? void 0 : _b.defaultPageNo) || 1,
-    pageSize: ((_d = (_c = appConf == null ? void 0 : appConf.ui) == null ? void 0 : _c.table) == null ? void 0 : _d.defaultPageSize) || 20,
+    current: ((_d = (_c = appConf == null ? void 0 : appConf.ui) == null ? void 0 : _c.table) == null ? void 0 : _d.defaultPageNo) || 1,
+    pageSize: defaultSize || 20,
     total: 0
   });
   const dataSource = ref([]);
@@ -6979,7 +6982,7 @@ function useSource(opt) {
     entityDTO: {},
     pageDTO: {
       pageNo: 0,
-      pageSize: (_f = (_e = appConf == null ? void 0 : appConf.ui) == null ? void 0 : _e.table) == null ? void 0 : _f.defaultPageSize
+      pageSize: defaultSize
     },
     orderDTOs: []
   });
@@ -7020,7 +7023,7 @@ function useSource(opt) {
     const { fetch } = useFetch(queryPage, baseUrl);
     loading.onQuerypage.value = true;
     fetch(toRaw(baseData)).then((rsp) => {
-      var _a2, _b2, _c2, _d2, _e2;
+      var _a2, _b2, _c2, _d2, _e;
       if (isArray$1(rsp)) {
         dataSource.value.splice(0, dataSource.value.length, ...rsp);
         return;
@@ -7030,7 +7033,7 @@ function useSource(opt) {
       pagination.value = {
         current: ((_a2 = pageDTO == null ? void 0 : pageDTO.pageNo) != null ? _a2 : 0) + 1,
         pageSize: (_d2 = pageDTO == null ? void 0 : pageDTO.pageSize) != null ? _d2 : (_c2 = (_b2 = appConf == null ? void 0 : appConf.ui) == null ? void 0 : _b2.table) == null ? void 0 : _c2.defaultPageSize,
-        total: (_e2 = pageDTO == null ? void 0 : pageDTO.totalCount) != null ? _e2 : 0
+        total: (_e = pageDTO == null ? void 0 : pageDTO.totalCount) != null ? _e : 0
       };
     }).finally(() => {
       loading.onSearch.value = false;
@@ -8309,15 +8312,16 @@ function getFilterMenu(filter2 = "", flag = false) {
     return _menus;
   let getTargetMenus = (menusArr) => {
     menusArr.forEach((menu) => {
+      var _a2, _b;
       if (menu.children && menu.children.length) {
         getTargetMenus(menu.children);
       } else {
         let isMatched = false;
         if (!unref(getIsZH)) {
-          if ((menu == null ? void 0 : menu.enLabel.toLowerCase().indexOf(filter2.toLowerCase())) !== -1)
+          if (((_a2 = menu.enLabel) == null ? void 0 : _a2.toLowerCase().indexOf(filter2.toLowerCase())) !== -1)
             isMatched = true;
         } else {
-          if ((menu == null ? void 0 : menu.label.indexOf(filter2)) !== -1)
+          if (((_b = menu.label) == null ? void 0 : _b.indexOf(filter2)) !== -1)
             isMatched = true;
         }
         if (isMatched || flag && !trim(filter2)) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dt-frames/ui",
-	"version": "1.0.54",
+	"version": "1.0.55",
 	"keywords": [
 		"ui",
 		"dt-ui"