@pisell/materials 1.8.12 → 1.8.14

package/lib/components/auto-complete-number/index.d.ts

@@ -1,3 +1,4 @@
+import React from "react";
 import { AutoCompleteProps, InputNumberProps } from "antd";
 interface AutoCompleteNumberProps {
     autoCompleteProps: AutoCompleteProps;
@@ -5,5 +6,5 @@ interface AutoCompleteNumberProps {
     value?: any;
     onChange?: any;
 }
-declare const AutoCompleteNumber: (props: AutoCompleteNumberProps) => JSX.Element;
+declare const AutoCompleteNumber: (props: AutoCompleteNumberProps) => React.JSX.Element;
 export default AutoCompleteNumber;

package/lib/components/badge/index.d.ts

@@ -1,7 +1,8 @@
+import React from 'react';
 import { BadgeProps as OriginalBadgeprops } from 'antd';
 import './index.less';
 export interface Badgeprops extends OriginalBadgeprops {
     styleType: 'default' | 'warning';
 }
-declare const Badge: (props: any) => JSX.Element;
+declare const Badge: (props: any) => React.JSX.Element;
 export default Badge;

package/lib/components/batch-editor/fields/Image/index.d.ts

@@ -3,5 +3,5 @@ export interface ImageProps extends React.ComponentPropsWithoutRef<"img"> {
     value?: string;
 }
 import "./index.less";
-declare const Image: (props: ImageProps) => JSX.Element | null;
+declare const Image: (props: ImageProps) => React.JSX.Element | null;
 export default Image;

package/lib/components/batch-editor/fields/Text/index.d.ts

@@ -2,5 +2,5 @@ import React from "react";
 export interface TextProps extends React.HTMLAttributes<HTMLDivElement> {
     children: React.ReactNode;
 }
-declare const Text: (props: TextProps) => JSX.Element;
+declare const Text: (props: TextProps) => React.JSX.Element;
 export default Text;

package/lib/components/batch-editor/fields/index.d.ts

@@ -1,6 +1,6 @@
 declare const _default: {
     price: import("react").FC<import("./Price").PriceProps>;
-    image: (props: import("./Image").ImageProps) => JSX.Element | null;
-    text: (props: import("./Text").TextProps) => JSX.Element;
+    image: (props: import("./Image").ImageProps) => import("react").JSX.Element | null;
+    text: (props: import("./Text").TextProps) => import("react").JSX.Element;
 };
 export default _default;

package/lib/components/batch-editor/index.d.ts

@@ -1,3 +1,4 @@
+import React from "react";
 import "./index.less";
 interface BatchEditorProps {
     columns: any[];
@@ -6,5 +7,5 @@ interface BatchEditorProps {
     rowKey: string;
     otherTableProps: any;
 }
-declare const BatchEditor: (props: BatchEditorProps) => JSX.Element;
+declare const BatchEditor: (props: BatchEditorProps) => React.JSX.Element;
 export default BatchEditor;

package/lib/components/browserSelect/index.d.ts

@@ -17,5 +17,5 @@ interface BrowserSelectProps extends Omit<React.DetailedHTMLProps<React.SelectHT
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 16:43
  */
-declare const BrowserSelect: (props: BrowserSelectProps) => JSX.Element;
+declare const BrowserSelect: (props: BrowserSelectProps) => React.JSX.Element;
 export default BrowserSelect;

package/lib/components/calendar/index.d.ts

@@ -1,2 +1,2 @@
-declare const Calendar: (props: any) => JSX.Element;
+declare const Calendar: (props: any) => import("react").JSX.Element;
 export default Calendar;

package/lib/components/cardMetricItem/index.d.ts

@@ -11,5 +11,5 @@ export interface PisellStatisticProps {
     showCurrencySymbol?: boolean;
     style?: any;
 }
-declare const CardMetricItem: (props: PisellStatisticProps) => JSX.Element;
+declare const CardMetricItem: (props: PisellStatisticProps) => React.JSX.Element;
 export default CardMetricItem;

package/lib/components/cardPro/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
-declare const _default: (props: any) => JSX.Element;
+declare const _default: (props: any) => React.JSX.Element;
 export default _default;

package/lib/components/checkbox/index.d.ts

@@ -1,2 +1,2 @@
-declare const Checkbox: (props: any) => JSX.Element;
+declare const Checkbox: (props: any) => import("react").JSX.Element;
 export default Checkbox;

package/lib/components/classicLayout/index.d.ts

@@ -1,3 +1,4 @@
+import React from "react";
 import "./index.less";
-declare const ClassicLayout: (props: any) => JSX.Element;
+declare const ClassicLayout: (props: any) => React.JSX.Element;
 export default ClassicLayout;

package/lib/components/colorPicker/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { ColorPickerProps } from 'antd';
-declare const ColorPicker: (props: ColorPickerProps) => JSX.Element;
+declare const ColorPicker: (props: ColorPickerProps) => React.JSX.Element;
 export default ColorPicker;

package/lib/components/config-provider/index.d.ts

@@ -0,0 +1,10 @@
+import React from "react";
+import { ConfigProviderProps as OriginalConfigProviderProps } from "antd/es/config-provider";
+import "dayjs/locale/zh-cn";
+import "dayjs/locale/ja";
+import "dayjs/locale/pt";
+export interface ConfigProviderProps extends OriginalConfigProviderProps {
+    [key: string]: any;
+}
+declare const ConfigProvider: (props: ConfigProviderProps) => React.JSX.Element;
+export default ConfigProvider;

package/lib/components/customSelect/index.d.ts

@@ -13,5 +13,5 @@ export interface CustomSelectProps<T extends BaseOption> extends Omit<SelectProp
     className?: string;
     style?: React.CSSProperties;
 }
-declare const CustomSelect: <T extends BaseOption>(props: CustomSelectProps<T>) => JSX.Element;
+declare const CustomSelect: <T extends BaseOption>(props: CustomSelectProps<T>) => React.JSX.Element;
 export default CustomSelect;

package/lib/components/dataSourceComponents/dataSourceForm/BaseForm.js

@@ -44,7 +44,7 @@ var import_FormSettingProvider = __toESM(require("./provider/formSetting/FormSet
 var import_page_header = __toESM(require("../../page-header"));
 var import_utils = require("./utils");
 var import_serve = require("./serve");
-var import_urlUtils = require("./urlUtils");
+var import_useFormSettingParams = __toESM(require("../hooks/useFormSettingParams"));
 var import_index = require("./index.less");
 var import_utils2 = require("@pisell/utils");
 var BaseForm = (0, import_react.forwardRef)(
@@ -73,6 +73,7 @@ var BaseForm = (0, import_react.forwardRef)(
     const context = (0, import_useEngineContext.default)();
     const { setBeforeClose } = (0, import_useCtxActions.default)();
     const { getApp } = (_a = context.appHelper) == null ? void 0 : _a.utils;
+    const { scope, target } = (0, import_useFormSettingParams.default)();
     const formRef = (0, import_react.useRef)(null);
     const { get } = (0, import_useDataSource.default)();
     (0, import_react.useEffect)(() => {
@@ -91,9 +92,8 @@ var BaseForm = (0, import_react.forwardRef)(
       if (["edit", "view"].includes(renderMode || "") && dataSource) {
         if (dataSource == null ? void 0 : dataSource.fromSettingMeta) {
           if (props.__designMode === "design") return;
-          const { businessCode, channelCode, isBoard } = (0, import_urlUtils.getFormSettingParams)();
           const sectionCodes = Array.from(new Set((_a2 = dataSource == null ? void 0 : dataSource.fields) == null ? void 0 : _a2.map((field) => field.name.split(".").shift())));
-          (0, import_serve.getFormSettingMetaData)({ sectionCodes, businessCode, channelCode, isBoard }).then((res) => {
+          (0, import_serve.getFormSettingMetaData)({ sectionCodes, scope, target }).then((res) => {
             var _a3, _b;
             const formattedValues = formatInitialValues ? formatInitialValues(res.data) : res.data || {};
             const fieldNames = new Set(((_a3 = dataSource == null ? void 0 : dataSource.fields) == null ? void 0 : _a3.map((field) => field.name)) || []);

package/lib/components/dataSourceComponents/dataSourceForm/formItem.d.ts

@@ -1,2 +1,3 @@
-declare const FormItem: (props: any) => JSX.Element;
+import React from 'react';
+declare const FormItem: (props: any) => React.JSX.Element;
 export default FormItem;

package/lib/components/dataSourceComponents/dataSourceForm/group/index.d.ts

@@ -16,5 +16,5 @@ export interface FormGroupProps {
  * @Author: shengjie.zuo
  * @Date: 2024-11-25 17:14:25
  */
-declare const FormGroup: (props: FormGroupProps) => JSX.Element;
+declare const FormGroup: (props: FormGroupProps) => React.JSX.Element;
 export default FormGroup;

package/lib/components/dataSourceComponents/dataSourceForm/serve.d.ts

@@ -121,6 +121,7 @@ export declare const customApi: (url: string, data: Record<string, any>, options
         value: any;
     }[] | undefined;
     body?: Record<string, any> | undefined;
+    dataSourceKey?: string | undefined;
 }) => Promise<any>;
 /**
  * 更新nocobase数据
@@ -157,9 +158,8 @@ export declare const deleteNocobaseData: (key: string, id: string, headers?: any
  */
 export declare const getFormSettingMetaData: (params: {
     sectionCodes: string[];
-    businessCode?: string | undefined;
-    channelCode?: string | undefined;
-    isBoard?: boolean | undefined;
+    scope: string;
+    target?: string | undefined;
 }) => Promise<any>;
 /**
  * 更新租户设置数据
@@ -171,9 +171,8 @@ export declare const getFormSettingMetaData: (params: {
  * @returns Promise<any> 返回更新结果
  */
 export declare const updateTenantSetting: (params: {
-    business_code?: string | undefined;
-    channel_code?: string | undefined;
-    board_code?: string | undefined;
+    scope: string;
+    target?: string | undefined;
     data: Record<string, any>;
 }) => Promise<any>;
 export {};

package/lib/components/dataSourceComponents/dataSourceForm/serve.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/components/dataSourceComponents/dataSourceForm/serve.ts
@@ -33,6 +43,8 @@ __export(serve_exports, {
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../table/utils");
+var import_locales = require("../../../locales");
+var import_pisellToast = __toESM(require("../../pisellToast"));
 var getNocobaseDataSource = async () => {
   return import_utils.request.getRequest().post(
     "/dataSources:listEnabled?paginate=false&appends%5B%5D=collections",
@@ -103,7 +115,7 @@ var formatRequestUrl = (url, baseUrl, queryString) => {
   return queryString ? `${baseRequestUrl}${baseRequestUrl.includes("?") ? "&" : "?"}${queryString}` : baseRequestUrl;
 };
 var customApi = async (url, data, options) => {
-  const { method, baseUrl, headers = [], params = [], body = {} } = options;
+  const { method, baseUrl, headers = [], params = [], body = {}, dataSourceKey } = options;
   const requestHeaders = formatHeaders(headers);
   const queryString = formatQueryString(params);
   const requestUrl = formatRequestUrl(url, baseUrl, queryString);
@@ -111,7 +123,8 @@ var customApi = async (url, data, options) => {
   const requestMethod = methodMap[method];
   return import_utils.request.getRequest()[requestMethod](requestUrl, requestData, {
     headers: requestHeaders,
-    isCustomApi: true
+    isCustomApi: true,
+    isShopApi: dataSourceKey === "mypisell-api"
   });
 };
 var updateNocobaseData = async (params) => {
@@ -141,22 +154,20 @@ var deleteNocobaseData = async (key, id, headers) => {
 };
 var getFormSettingMetaData = async (params) => {
   console.log("getFormSettingMetaData", params);
-  const { sectionCodes, businessCode, channelCode, isBoard } = params;
-  const queryParams = new URLSearchParams();
-  sectionCodes.forEach((code) => {
-    queryParams.append("section_code[]", code);
-  });
-  if (businessCode) {
-    queryParams.append("business_code", businessCode);
-  }
-  if (channelCode) {
-    queryParams.append("channel_code", channelCode);
-  }
-  if (isBoard && businessCode && channelCode) {
-    queryParams.append("board_code", `${businessCode}+${channelCode}`);
+  const { sectionCodes, scope, target } = params;
+  const url = `/tenant/setting`;
+  if (!scope) {
+    (0, import_pisellToast.default)({
+      content: (0, import_locales.getText)("pisell-data-source-form-scope-message")
+    });
+    return {};
   }
-  const url = `/tenant/setting?${queryParams.toString()}`;
-  return import_utils.request.getRequest().get(url, {}, {
+  const payload = {
+    scope,
+    section_code: sectionCodes,
+    target
+  };
+  return import_utils.request.getRequest().post(url, payload, {
     headers: {
       "Content-Type": "application/json"
     }
@@ -164,15 +175,20 @@ var getFormSettingMetaData = async (params) => {
 };
 var updateTenantSetting = async (params) => {
   console.log("updateTenantSetting", params);
-  const { business_code, channel_code, board_code, data } = params;
+  const { scope, target, data } = params;
   const requestBody = {
-    business_code,
-    channel_code,
-    board_code,
+    scope,
+    target,
     data
   };
+  if (!scope) {
+    (0, import_pisellToast.default)({
+      content: (0, import_locales.getText)("pisell-data-source-form-scope-message")
+    });
+    return {};
+  }
   const url = "/tenant/setting";
-  return import_utils.request.getRequest().post(url, requestBody, {
+  return import_utils.request.getRequest().put(url, requestBody, {
     headers: {
       "Content-Type": "application/json"
     }

package/lib/components/dataSourceComponents/dataSourceForm/submitButton/index.d.ts

@@ -35,5 +35,5 @@ export interface SubmitButtonProps extends ButtonProps {
         placement: 'top' | 'topLeft' | 'topRight' | 'bottom' | 'bottomLeft' | 'bottomRight';
     };
 }
-declare const SubmitButton: (props: SubmitButtonProps) => JSX.Element | null;
+declare const SubmitButton: (props: SubmitButtonProps) => React.JSX.Element | null;
 export default SubmitButton;

package/lib/components/dataSourceComponents/dataSourceForm/submitButton/index.js

@@ -41,7 +41,7 @@ var import_useFormSetting = __toESM(require("../provider/hooks/useFormSetting"))
 var import_useCtxActions = __toESM(require("../../hooks/useCtxActions"));
 var import_useDataSource = __toESM(require("../../hooks/useDataSource"));
 var import_utils = require("../utils");
-var import_urlUtils = require("../urlUtils");
+var import_useFormSettingParams = __toESM(require("../../hooks/useFormSettingParams"));
 var import_index = require("./index.less");
 var import_serve = require("../serve");
 var SubmitButton = (props) => {
@@ -59,6 +59,7 @@ var SubmitButton = (props) => {
   } = props;
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [api, contextHolder] = import_antd.notification.useNotification();
+  const { scope, target } = (0, import_useFormSettingParams.default)();
   const form = import_antd.Form.useFormInstance();
   const { renderMode, onDataSourceFinish, formatSubmitValues, customSubmit, beforeSubmit } = (0, import_useFormSetting.default)();
   const { setVisible, refreshTableData } = (0, import_useCtxActions.default)();
@@ -68,14 +69,9 @@ var SubmitButton = (props) => {
     setLoading(true);
     try {
       if (dataSource == null ? void 0 : dataSource.fromSettingMeta) {
-        const urlParams = (0, import_urlUtils.getFormSettingParams)();
-        const business_code = urlParams.businessCode;
-        const channel_code = urlParams.channelCode;
-        const board_code = urlParams.isBoard && business_code && channel_code ? `${business_code}+${channel_code}` : void 0;
         return await (0, import_serve.updateTenantSetting)({
-          business_code,
-          channel_code,
-          board_code,
+          scope,
+          target,
           data: values
         });
       }

package/lib/components/dataSourceComponents/dataSourceForm/urlUtils.js

@@ -54,7 +54,7 @@ var updateTenantSettingFromUrl = async (data) => {
     data
   };
   const url = "/tenant/setting";
-  return import_utils.request.getRequest().post(url, requestBody, {
+  return import_utils.request.getRequest().put(url, requestBody, {
     headers: {
       "Content-Type": "application/json"
     }

package/lib/components/dataSourceComponents/dataSourceForm/utils.d.ts

@@ -40,16 +40,17 @@ export declare const withFormItem: <P extends object>(WrappedComponent: React.Co
 } | undefined) => React.FC<P & WithFormItemProps>;
 export declare const withDataSource: <P extends unknown>(WrappedComponent: React.ComponentType<P>) => (props: P & {
     dataSource?: any;
-}) => JSX.Element;
+    extraParams?: Record<string, any> | undefined;
+}) => React.JSX.Element;
 export declare const withOptions: <P extends unknown>(WrappedComponent: React.ComponentType<P>) => (props: P & {
     options?: any;
-    optionSourceType?: "default" | "custom" | "api" | undefined;
+    optionSourceType?: "default" | "api" | "custom" | undefined;
     labelField: string;
     valueField: string;
     extraParams?: Record<string, any> | undefined;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export declare const getNestedValue: (obj: Record<string, any>, path: string) => Record<string, any>;
-export declare const renderValueWithMap: (value: any, valueMap?: Record<string, string>, renderMode?: ModeType) => JSX.Element | null;
+export declare const renderValueWithMap: (value: any, valueMap?: Record<string, string>, renderMode?: ModeType) => React.JSX.Element | null;
 export declare function toArr(str: string | number | (string | number)[]): (string | number)[];
 export declare const filterSystemFields: (params: Record<string, any>) => Record<string, any>;
 export declare const transformFormObjToArrayWithUntouched: (obj: Record<string, any>) => any[];

package/lib/components/dataSourceComponents/dataSourceForm/utils.js

@@ -480,11 +480,12 @@ var withFormItem = (WrappedComponent, overlayProps) => {
 };
 var withDataSource = (WrappedComponent) => {
   return (props) => {
-    const { dataSource } = props;
+    const { dataSource, extraParams } = props;
     return /* @__PURE__ */ import_react.default.createElement(
       import_DataSourceProvider.default,
       {
         dataSource,
+        extraParams: { list: extraParams },
         requestOptions: {
           list: {
             cacheKey: `${dataSource == null ? void 0 : dataSource.headerDataSource}-${dataSource == null ? void 0 : dataSource.name}-${dataSource == null ? void 0 : dataSource.tableName}`

package/lib/components/dataSourceComponents/dataSourceMenu/index.d.ts

@@ -4,5 +4,5 @@ import { PisellMenuProps } from '../../pisellMenu/types';
  * @title: 数据源表单组件
  * @description: 基于数据源动态生成表单，支持编辑、查看、禁用三种模式
  */
-declare const DataSourceMenu: (props: PisellMenuProps, ref: React.Ref<any>) => JSX.Element;
+declare const DataSourceMenu: (props: PisellMenuProps, ref: React.Ref<any>) => React.JSX.Element;
 export default DataSourceMenu;

package/lib/components/dataSourceComponents/dataSourceShow/dataSourceImage/index.d.ts

@@ -1,2 +1,3 @@
-declare const DataSourceImage: (props: import("../utils").ParsedProps) => JSX.Element;
+import React from 'react';
+declare const DataSourceImage: (props: import("../utils").ParsedProps) => React.JSX.Element;
 export default DataSourceImage;

package/lib/components/dataSourceComponents/dataSourceShow/dataSourceQRCode/index.d.ts

@@ -1,2 +1,3 @@
-declare const DataSourceQRCode: (props: any) => JSX.Element;
+/// <reference types="react" />
+declare const DataSourceQRCode: (props: any) => import("react").JSX.Element;
 export default DataSourceQRCode;

package/lib/components/dataSourceComponents/dataSourceShow/dataSourceTypography/index.d.ts

@@ -4,7 +4,7 @@ interface DataSourceTypographyProps {
     children: React.ReactNode;
 }
 declare const DataSourceTypography: {
-    (props: DataSourceTypographyProps): JSX.Element;
-    Text: (props: import("../utils").ParsedProps) => JSX.Element;
+    (props: DataSourceTypographyProps): React.JSX.Element;
+    Text: (props: import("../utils").ParsedProps) => React.JSX.Element;
 };
 export default DataSourceTypography;

package/lib/components/dataSourceComponents/dataSourceShow/utils.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 export interface ParsedProps {
     [key: string]: unknown;
 }
-declare const withParseVariables: <P extends ParsedProps>(Component: React.ComponentType<P>, keys: string[]) => (props: P) => JSX.Element;
+declare const withParseVariables: <P extends ParsedProps>(Component: React.ComponentType<P>, keys: string[]) => (props: P) => React.JSX.Element;
 export default withParseVariables;

package/lib/components/dataSourceComponents/dataSourceTable/filter/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
 interface BaseFilterItem {
     name?: string;
@@ -23,5 +24,5 @@ interface FilterProps {
     };
     getInitialValues?: () => Record<string, any>;
 }
-declare const Filter: (props: FilterProps) => JSX.Element;
+declare const Filter: (props: FilterProps) => React.JSX.Element;
 export default Filter;

package/lib/components/dataSourceComponents/dataSourceTable/filter/utils.d.ts

@@ -1,7 +1,8 @@
+import React from 'react';
 import { FilterItemProps } from '../../../filter/types';
 import { DataSourceType, Field } from '../../provider/dataSource/DataSourceContext';
 export declare const genGetField: (dataSource?: DataSourceType) => (key: string) => Field;
-export declare const field2Cpt: (field: Field, item: any, otherProps?: any) => JSX.Element | null;
-export declare const genFilterItems: (list: FilterItemProps[], dataSource?: DataSourceType) => (JSX.Element | null)[];
+export declare const field2Cpt: (field: Field, item: any, otherProps?: any) => React.JSX.Element | null;
+export declare const genFilterItems: (list: FilterItemProps[], dataSource?: DataSourceType) => (React.JSX.Element | null)[];
 export declare const getStoredFilterOrder: (componentId: string) => any;
 export declare const saveFilterOrder: (componentId: string, order: any) => void;

package/lib/components/dataSourceComponents/dataSourceTable/hooks/useDataSourceKey.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const useDataSourceKey: () => {
     dataSourceKey: string | undefined;
     dataSourceKeyRef: import("react").MutableRefObject<string | undefined>;

package/lib/components/dataSourceComponents/dataSourceTable/hooks/useDrawerState.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const useDrawerState: (operationContent?: {
     [key: string]: import("react").ReactNode;
 } | undefined) => any;

package/lib/components/dataSourceComponents/dataSourceTable/hooks/useFormat.d.ts

@@ -41,8 +41,8 @@ export declare type FilterCondition = {
     [key: string]: FilterConditionValue;
 } | AndFilterValue;
 declare const useFormat: ({ dataSourceKey, fields }: UseFormatParams) => {
-    formatListResult: (res: FormatListResultParams) => ListResult;
-    formatListParams: (params: any) => any;
-    formatCreateUpdateParams: (params: any) => any;
+    formatListResult: (this: unknown, res: FormatListResultParams) => ListResult;
+    formatListParams: (this: unknown, params: any) => any;
+    formatCreateUpdateParams: (this: unknown, params: any) => any;
 };
 export default useFormat;

package/lib/components/dataSourceComponents/dataSourceTable/hooks/useFormat.js

@@ -179,22 +179,40 @@ var customApiFormatFilter = (filter) => {
 var useFormat = ({ dataSourceKey, fields }) => {
   const formatListResult = (0, import_ahooks.useMemoizedFn)(
     (res) => {
-      if (dataSourceKey === "pisell2-api" && "list" in res && "page" in res) {
-        return {
-          data: res.list,
-          count: res.count,
-          page: res.page,
-          pageSize: res.size
-        };
+      if (dataSourceKey === "pisell2-api") {
+        if (Array.isArray(res)) {
+          return {
+            data: res,
+            count: res.length,
+            page: 1,
+            pageSize: res.length
+          };
+        } else if ("list" in res && "page" in res) {
+          return {
+            data: res.list,
+            count: res.count,
+            page: res.page,
+            pageSize: res.size
+          };
+        }
       }
-      if (dataSourceKey === "mypisell-api" && "list" in res && "skip" in res) {
-        const skip = typeof res.skip === "number" ? res.skip : 1;
-        return {
-          data: res.list,
-          count: res.count,
-          page: skip - 1 || 1,
-          pageSize: res.size
-        };
+      if (dataSourceKey === "mypisell-api") {
+        if (Array.isArray(res)) {
+          return {
+            data: res,
+            count: res.length,
+            page: 1,
+            pageSize: res.length
+          };
+        } else if ("list" in res && "skip" in res) {
+          const skip = typeof res.skip === "number" ? res.skip : 1;
+          return {
+            data: res.list,
+            count: res.count,
+            page: skip - 1 || 1,
+            pageSize: res.size
+          };
+        }
       }
       if ("meta" in res) {
         return {

package/lib/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.d.ts

@@ -19,7 +19,7 @@ interface UseTablePropsProps {
  */
 declare const useTableProps: (props: UseTablePropsProps) => {
     currentComponentId: any;
-    title: number | boolean | React.ReactFragment | JSX.Element | (() => React.ReactNode) | null | undefined;
+    title: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
     pagination: {
         total: number;
         current: number;
@@ -28,13 +28,13 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         showSizeChanger: boolean;
     };
     columns: import("./useColumns").Column[];
-    subTitle: number | boolean | React.ReactFragment | JSX.Element | (() => React.ReactNode) | null | undefined;
+    subTitle: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
     buttons: any[] | null;
     filter: {
         dom: any;
         items: any;
     } | null;
-    onRow: (record: any) => any;
+    onRow: (this: unknown, record: any) => any;
     actionButtons: any[] | null;
     __id?: string | undefined;
     currentSettingKey?: string | undefined;
@@ -52,9 +52,9 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         show: boolean;
         title: string;
         width: number;
-        align: "center" | "left" | "right";
+        align: "left" | "right" | "center";
         fixed: false | "left" | "right";
-        type: "button" | "link";
+        type: "link" | "button";
         items: OperationItem[];
     } | undefined;
     operationContent?: {

package/lib/components/dataSourceComponents/dataSourceTable/hooks/useTableQuery.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { DataSourceTableProps } from '../type';
 declare type Params = {
     pagination?: {
@@ -24,10 +25,10 @@ declare const useTableQuery: (props: DataSourceTableProps, currentSettingHash: s
         filter: Record<string, any>;
         sort: string;
     }>>;
-    handleValuesChange: (params: Params, allParams: Params) => void;
-    refreshData: () => void;
-    handleFilterChange: (changedFields: any, allFields: any) => void;
-    refreshCurrentPage: () => void;
-    getInitialValues: () => Record<string, any>;
+    handleValuesChange: (this: unknown, params: Params, allParams: Params) => void;
+    refreshData: (this: unknown) => void;
+    handleFilterChange: (this: unknown, changedFields: any, allFields: any) => void;
+    refreshCurrentPage: (this: unknown) => void;
+    getInitialValues: (this: unknown) => Record<string, any>;
 };
 export default useTableQuery;

package/lib/components/dataSourceComponents/dataSourceWrapper/BaseWrapper.d.ts

@@ -3,5 +3,5 @@ interface BaseWrapperProps {
     children: React.ReactNode;
     [key: string]: any;
 }
-declare const BaseWrapper: (props: BaseWrapperProps) => JSX.Element;
+declare const BaseWrapper: (props: BaseWrapperProps) => React.JSX.Element;
 export default BaseWrapper;

package/lib/components/dataSourceComponents/dataSourceWrapper/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { DataSourceContextProps } from '../provider/dataSource/DataSourceContext';
-declare const DataSourceWrapper: (props: DataSourceContextProps) => JSX.Element;
+declare const DataSourceWrapper: (props: DataSourceContextProps) => React.JSX.Element;
 export default DataSourceWrapper;