@pisell/materials 6.11.8 → 6.11.10

package/lib/components/Pagination/index.less

@@ -24,7 +24,6 @@
 
   .pisell-lowcode-pagination-item {
     position: relative;
-    border: none;
     margin: 0;
     border-radius: 0;
     border: 1px solid #D0D5DD;
@@ -36,6 +35,7 @@
     margin: 0;
     border-radius: 0;
     border-right: none;
+    height: 100%;
   }
 
   .pisell-lowcode-pagination-jump-next {
@@ -45,22 +45,28 @@
     border-right: none;
   }
 
-  .pisell-lowcode-pagination-item-link:hover {
-    font-weight: 450 !important;
-    color: rgba(0, 0, 0, 0.88) !important;
+  .pisell-lowcode-pagination-item-link {
+    width: 100%;
 
-    .pisell-lowcode-pagination-item-link-icon {
+    &:hover {
       font-weight: 450 !important;
       color: rgba(0, 0, 0, 0.88) !important;
+
+      .pisell-lowcode-pagination-item-link-icon {
+        font-weight: 450 !important;
+        color: rgba(0, 0, 0, 0.88) !important;
+      }
     }
   }
 
+
   .pisell-lowcode-pagination-disabled {
     cursor: not-allowed;
-    color: rgba(0,0,0,.25);
+    color: rgba(0, 0, 0, .25);
+
     .paginator-page-btn {
       cursor: not-allowed;
-      color: rgba(0,0,0,.25);
+      color: rgba(0, 0, 0, .25);
     }
   }
 

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const PisellCards: {
     TabCard: (props: any) => import("react").JSX.Element;
     TextCard: (props: any) => import("react").JSX.Element;

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

@@ -9,6 +9,7 @@
  * <PisellFields.Number value={123} viewMode="readonly" />
  * <PisellFields.Currency value={1000} currencySymbol="$" />
  */
+/// <reference types="react" />
 declare const PisellFields: {
     SingleLineText: import("react").NamedExoticComponent<import("../pisellSingleLineText").PisellSingleLineTextProps>;
     LongText: import("react").NamedExoticComponent<import("../pisellLongText").PisellLongTextProps>;
@@ -16,8 +17,8 @@ declare const PisellFields: {
     Currency: import("react").NamedExoticComponent<import("../pisellCurrency").PisellCurrencyProps>;
     Percent: import("react").NamedExoticComponent<import("../pisellPercent").PisellPercentProps>;
     Phone: import("react").NamedExoticComponent<import("../pisellPhone").PisellPhoneProps>;
-    Email: import("react").FC<import("../pisellEmail").PisellEmailProps>;
-    Url: import("react").FC<import("../pisellUrl").PisellUrlProps>;
+    Email: import("react").NamedExoticComponent<import("../pisellEmail").PisellEmailProps>;
+    Url: import("react").NamedExoticComponent<import("../pisellUrl").PisellUrlProps>;
     Rating: import("react").NamedExoticComponent<import("../pisellRating").PisellRatingProps>;
     SingleSelect: import("react").ForwardRefExoticComponent<import("../pisellSingleSelect").PisellSingleSelectProps<string | number> & import("react").RefAttributes<import("../pisellSingleSelect").SingleSelectRef<string | number>>>;
     MultipleSelect: import("react").ForwardRefExoticComponent<import("../pisellMultipleSelect").PisellMultipleSelectProps<string | number> & import("react").RefAttributes<import("../pisellMultipleSelect").MultipleSelectRef<string | number>>>;

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

@@ -13,6 +13,7 @@
  *   <Content />
  * </PisellLayouts.ScrollView>
  */
+/// <reference types="react" />
 declare const PisellLayouts: {
     BasicGrid: <T>(props: import("../PisellBasicGrid").PisellBasicGridProps<T>) => import("react").JSX.Element;
     ScrollView: import("react").ForwardRefExoticComponent<Omit<import("../PisellScrollView").PisellScrollViewProps, "ref"> & import("react").RefAttributes<import("../PisellScrollView").PisellScrollViewRef>>;

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

@@ -13,6 +13,7 @@
  * />
  * <PisellMetrics.StatisticList data={[...]} />
  */
+/// <reference types="react" />
 declare const PisellMetrics: {
     MetricCard: import("react").FC<import("../pisellMetricCard").PisellMetricCardProps>;
     StatisticList: (props: import("../pisellStatisticList").PisellStatisticListProps) => import("react").JSX.Element;

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/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.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,10 +40,11 @@ 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;
+    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?: "custom" | "default" | "api" | undefined;
     labelField: string;
     valueField: string;
     extraParams?: Record<string, any> | undefined;

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/dataSourceShow/dataSourceQRCode/index.d.ts

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

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/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 | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
+    title: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
     pagination: {
         total: number;
         current: number;
@@ -28,7 +28,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         showSizeChanger: boolean;
     };
     columns: import("./useColumns").Column[];
-    subTitle: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
+    subTitle: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
     buttons: any[] | null;
     filter: {
         dom: any;
@@ -54,7 +54,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         width: number;
         align: "center" | "left" | "right";
         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?: {

package/lib/components/dataSourceComponents/fields/Input.Subdomain/index.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 declare const Subdomain: React.FC<import("antd").InputProps & {
     onChange: (value: string) => void;
     onBlur?: ((e: React.FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-    rootDomain: "custom" | "saas" | "xzero";
+    rootDomain: "custom" | "xzero" | "saas";
     customDomain?: string | undefined;
     value?: string | undefined;
     tenantId: string;

package/lib/components/dataSourceComponents/fields/Select/index.d.ts

@@ -1,11 +1,12 @@
 import React from 'react';
 declare const SelectWithDataSource: (props: import("antd").SelectProps<any, import("antd/es/select").DefaultOptionType> & import("../../dataSourceForm/utils").WithModeProps & import("../../dataSourceForm/utils").WithFormItemProps & {
     options?: any;
-    optionSourceType?: "default" | "custom" | "api" | undefined;
+    optionSourceType?: "custom" | "default" | "api" | undefined;
     labelField: string;
     valueField: string;
     extraParams?: Record<string, any> | undefined;
 } & {
     dataSource?: any;
+    extraParams?: Record<string, any> | undefined;
 }) => React.JSX.Element;
 export default SelectWithDataSource;

package/lib/components/dataSourceComponents/fields/Translation/BaseTranslation.js

@@ -60,7 +60,8 @@ var Translation = ({
   disabled,
   type = "text",
   // 默认为普通文本输入
-  maxLength
+  maxLength,
+  inputStyle
 }) => {
   const [open, setOpen] = (0, import_react.useState)(false);
   const getInputComponent = (0, import_react.useCallback)(() => {
@@ -94,7 +95,8 @@ var Translation = ({
       value: (value == null ? void 0 : value[key]) || "",
       onChange: handleInputChange(key),
       allowClear: true,
-      maxLength
+      maxLength,
+      style: inputStyle || {}
     }
   )))));
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "translation-wrapper" }, /* @__PURE__ */ import_react.default.createElement(
@@ -105,7 +107,8 @@ var Translation = ({
       placeholder,
       disabled,
       className: "translation-input",
-      maxLength
+      maxLength,
+      style: inputStyle || {}
     }
   ), /* @__PURE__ */ import_react.default.createElement(
     import_antd.Popover,

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const formFieldMap: {
     FormItemCheckbox: import("react").FC<{}> & {
         Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
@@ -19,7 +20,7 @@ declare const formFieldMap: {
         Subdomain: import("react").FC<import("antd").InputProps & {
             onChange: (value: string) => void;
             onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-            rootDomain: "custom" | "saas" | "xzero";
+            rootDomain: "custom" | "xzero" | "saas";
             customDomain?: string | undefined;
             value?: string | undefined;
             tenantId: string;
@@ -34,12 +35,13 @@ declare const formFieldMap: {
     };
     FormItemSelect: (props: import("antd").SelectProps<any, import("antd/es/select").DefaultOptionType> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps & {
         options?: any;
-        optionSourceType?: "default" | "custom" | "api" | undefined;
+        optionSourceType?: "custom" | "default" | "api" | undefined;
         labelField: string;
         valueField: string;
         extraParams?: Record<string, any> | undefined;
     } & {
         dataSource?: any;
+        extraParams?: Record<string, any> | undefined;
     }) => import("react").JSX.Element;
     FormItemInputNumber: import("react").FC<any>;
     FormItemPercent: import("react").FC<any>;
@@ -59,13 +61,11 @@ declare const formFieldMap: {
     FormItemTranslation: import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     FormItemIconSelect: import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 };
-declare const getFieldComponent: (fieldComponent: string) => import("react").FC<any> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | (import("react").FC<{}> & {
+declare const getFieldComponent: (fieldComponent: string) => import("react").FC<any> | import("react").FC<(import("antd").DatePickerProps & import("../dataSourceForm/utils").WithModeProps) & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<{}> & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 } & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
-}) | import("react").FC<import("./ColorPicker/type").ColorPickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<(import("antd").DatePickerProps & import("../dataSourceForm/utils").WithModeProps) & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & {
-    onChange: (value: string) => void;
-} & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Phone/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Mobile/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<import("./Input/type").InputProps> & {
+}) | import("react").FC<import("./ColorPicker/type").ColorPickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<import("./Input/type").InputProps> & {
     JSON: import("react").FC<any>;
     Password: import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     TextArea: import("react").FC<import("antd/es/input").TextAreaProps & import("react").RefAttributes<import("antd/es/input/TextArea").TextAreaRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
@@ -78,24 +78,27 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
     Subdomain: import("react").FC<import("antd").InputProps & {
         onChange: (value: string) => void;
         onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-        rootDomain: "custom" | "saas" | "xzero";
+        rootDomain: "custom" | "xzero" | "saas";
         customDomain?: string | undefined;
         value?: string | undefined;
         tenantId: string;
         name?: string | undefined;
         fieldKey?: string | undefined;
     } & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
-}) | import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps> | (import("react").FC<{}> & {
+}) | (import("react").FC<{}> & {
     Group: import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 } & {
     Group: import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 }) | ((props: import("antd").SelectProps<any, import("antd/es/select").DefaultOptionType> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps & {
     options?: any;
-    optionSourceType?: "default" | "custom" | "api" | undefined;
+    optionSourceType?: "custom" | "default" | "api" | undefined;
     labelField: string;
     valueField: string;
     extraParams?: Record<string, any> | undefined;
 } & {
     dataSource?: any;
-}) => import("react").JSX.Element) | import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+    extraParams?: Record<string, any> | undefined;
+}) => import("react").JSX.Element) | import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Phone/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Mobile/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & {
+    onChange: (value: string) => void;
+} & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 export { getFieldComponent, formFieldMap };

package/lib/components/dataSourceComponents/hooks/useActions.js

@@ -104,7 +104,8 @@ var useActions = ({
           baseUrl: baseUrlMap[dataSourceKey] || (options == null ? void 0 : options.baseUrl),
           params,
           headers,
-          body
+          body,
+          dataSourceKey
         });
         if (["pisell2-api", "mypisell-api"].includes(dataSourceKey)) {
           if ("mypisell-api" === dataSourceKey && designMode === "design") {
@@ -208,7 +209,10 @@ var useActions = ({
           return [];
         }
         const listApi = genCustomApi(actions == null ? void 0 : actions.list);
-        return formatListResult(await listApi(formatParams));
+        return formatListResult(await listApi({
+          ...formatParams,
+          ...(extraParams == null ? void 0 : extraParams.list) || {}
+        }));
       }
       if (!name) return {};
       return formatListResult(