react-toolkits 2.13.26 → 2.13.28

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # react-toolkits
 
+## 2.13.28
+
+### Patch Changes
+
+- 61478c7: fix: change getTotal and getDataSource default value in QueryList
+
+## 2.13.27
+
+### Patch Changes
+
+- 40e6d81: fix: the return of getTotal and getDataSource are not right
+
 ## 2.13.26
 
 ### Patch Changes

package/lib/index.d.ts

@@ -190,10 +190,6 @@ interface PermissionButtonProps extends ButtonProps {
 }
 declare const PermissionButton: FC<PropsWithChildren<PermissionButtonProps>>;
 
-interface ListResponse<T = any> {
-    list: T[];
-    total: number;
-}
 interface QueryListPayload<Values = any> {
     page?: number;
     size?: number;
@@ -232,7 +228,7 @@ interface QueryListProps<Item extends AnyObject = AnyObject, Values = AnyObject,
     getDataSource?: (data: Data | undefined, form: FormInstance<Values>) => Item[] | undefined;
     footer?: (data: Data | undefined) => ReactNode;
 }
-declare const QueryList: <Item extends AnyObject = AnyObject, Values extends object | undefined = undefined, Data = ListResponse<Item>>(props: QueryListProps<Item, Values, Data> & {
+declare const QueryList: <Item extends AnyObject = AnyObject, Values extends object | undefined = undefined, Data = any>(props: QueryListProps<Item, Values, Data> & {
     ref?: Ref<QueryListRef<Item, Values, Data>>;
 }) => ReactElement;
 

package/lib/index.js

@@ -1288,8 +1288,8 @@ var init_QueryList = __esm({
         method: "GET",
         defaultSize: 10,
         refreshInterval: 0,
-        getTotal: (data2) => data2?.total,
-        getDataSource: (data2) => data2?.list,
+        getTotal: (data2) => data2?.data?.total,
+        getDataSource: (data2) => data2?.data?.list,
         ...props
       };
       const {
@@ -1319,7 +1319,6 @@ var init_QueryList = __esm({
       const { t } = useTranslation();
       const [_form] = Form.useForm(form);
       const action = useRef(3 /* Init */);
-      const _headers = typeof headers === "function" ? headers(_form) : headers;
       const { data: accessible, isLoading: isChecking } = usePermission(code);
       const [isValid, setIsValid] = useState(false);
       const { keyMap, getPayload, refetch } = useQueryListStore();
@@ -1335,6 +1334,7 @@ var init_QueryList = __esm({
         page: !onePage ? page : void 0,
         size: !onePage ? size : void 0
       } : void 0 : params;
+      const _headers = typeof headers === "function" ? headers(_form) : headers;
       const shouldPoll = useRef(false);
       const requestConfig = {
         url: url4,
@@ -2715,8 +2715,8 @@ var init_userList = __esm({
                 url: url2,
                 rowKey: "id",
                 columns,
-                getTotal: (response) => response?.Total,
-                getDataSource: (response) => response?.List,
+                getTotal: (data) => data?.data.Total,
+                getDataSource: (data) => data?.data.List,
                 renderForm: (form) => /* @__PURE__ */ jsx(Form, { form, children: /* @__PURE__ */ jsx(Form.Item, { label: "\u540D\u79F0", name: "name", children: /* @__PURE__ */ jsx(Input, {}) }) })
               }
             )
@@ -2999,8 +2999,8 @@ var init_roleList = __esm({
                 columns,
                 code: "200001",
                 url: url3,
-                getTotal: (response) => response?.Total,
-                getDataSource: (response) => response?.List
+                getTotal: (data) => data?.data.Total,
+                getDataSource: (data) => data?.data.List
               }
             )
           }
@@ -3542,8 +3542,8 @@ var OperationLogList = () => {
       columns,
       tableLayout: "fixed",
       url: "/api/usystem/log/list",
-      getTotal: (response) => response?.Total,
-      getDataSource: (response) => response?.List,
+      getTotal: (data) => data?.data.Total,
+      getDataSource: (data) => data?.data.List,
       renderForm: (form) => /* @__PURE__ */ jsxs(Form, { form, layout: "inline", children: [
         /* @__PURE__ */ jsx(Form.Item, { label: t("global.username"), name: "uname", children: /* @__PURE__ */ jsx(Input, { allowClear: true }) }),
         /* @__PURE__ */ jsx(Form.Item, { label: t("global.route"), name: "route", children: /* @__PURE__ */ jsx(Input, { allowClear: true }) }),