@pisell/materials 6.11.8 → 6.11.9

package/es/components/DragSortList/index.d.ts

@@ -18,7 +18,7 @@ export interface Props<T> {
         attributes: DraggableAttributes;
     }) => React.ReactElement<HTMLElement>;
 }
-export default function Sortable<T extends Record<string, any>>({ list, onChange, rowKey, children, activationConstraint, }: Props<T>): React.JSX.Element;
+export default function Sortable<T extends Record<string, any>>({ list, onChange, rowKey, children, activationConstraint, }: Props<T>): JSX.Element;
 export interface SortableItemProps<T> {
     id: number;
     index: number;

package/es/components/MultipleContainersSortList/index.d.ts

@@ -22,5 +22,5 @@ interface DefaultRenderContainerProps {
     }) => React.ReactElement;
     children: any;
 }
-declare const MultipleContainersSortList: <T extends Record<string, any>>(props: MultipleContainersSortListProps<T>) => React.JSX.Element;
+declare const MultipleContainersSortList: <T extends Record<string, any>>(props: MultipleContainersSortListProps<T>) => JSX.Element;
 export default MultipleContainersSortList;

package/es/components/Pagination/index.d.ts

@@ -1,14 +1,12 @@
-import React from "react";
-import { PaginationProps } from "antd";
-import "./index.less";
+import { PaginationProps } from 'antd';
+import './index.less';
+declare const Pagination: (props: PaginationProps) => JSX.Element | null;
 export declare const paginationConfig: {
     className: string;
     defaultCurrent: number;
     showTotal: (total: number, range: [number, number]) => string;
-    itemRender: (page: number, type: "next" | "page" | "prev" | "jump-prev" | "jump-next", element: React.ReactNode) => React.ReactNode;
     responsive: boolean;
     size: string;
 };
-declare const Pagination: (props: PaginationProps) => React.JSX.Element | null;
 export default Pagination;
-export declare const FormPagination: ({ value, onChange, page, pageSize, ...other }: any) => React.JSX.Element;
+export declare const FormPagination: ({ value, onChange, page, pageSize, ...other }: any) => JSX.Element;

package/es/components/Pagination/index.js

@@ -8,74 +8,86 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-import React, { useEffect, useMemo, useState } from "react";
+import React, { useEffect, useMemo, useState } from 'react';
 // import { ArrowLeft, ArrowRight } from "@pisell/icon/es";
-import ArrowRight from "@pisell/icon/es/ArrowRight";
-import ArrowLeft from "@pisell/icon/es/ArrowLeft";
-import { Pagination as OriginPagination } from "antd";
-import classNames from "classnames";
+import ArrowRight from '@pisell/icon/es/ArrowRight';
+import ArrowLeft from '@pisell/icon/es/ArrowLeft';
+import { Pagination as OriginPagination } from 'antd';
+import classNames from 'classnames';
 import "./index.less";
+import { locales as utilsLocales } from '@pisell/utils';
 import { getText } from "../../locales";
 import useIsMobileTable from "../table/hooks/useIsMobileTable";
-
-/**
- * @title: 自定义渲染
- * @description:
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2023-07-20 17:01
- */
-var itemRender = function itemRender(_, type, originalElement) {
-  if (type === "prev") {
-    return /*#__PURE__*/React.createElement("div", {
-      className: classNames("paginator-page-btn", "left")
-    }, /*#__PURE__*/React.createElement(ArrowLeft, {
-      className: "paginator-page-btn-left-icon"
-    }), /*#__PURE__*/React.createElement("span", {
-      className: "paginator-page-btn-text"
-    }, getText("table-pagination-previous")));
-  }
-  if (type === "next") {
-    return /*#__PURE__*/React.createElement("div", {
-      className: classNames("paginator-page-btn", "right")
-    }, /*#__PURE__*/React.createElement("span", {
-      className: "paginator-page-btn-text"
-    }, getText("table-pagination-next")), /*#__PURE__*/React.createElement(ArrowRight, {
-      className: "paginator-page-btn-right-icon"
-    }));
-  }
-  return originalElement;
-};
-
-// 分页配置
-export var paginationConfig = {
-  className: "materials-grid-paginator",
-  defaultCurrent: 1,
-  showTotal: function showTotal(total, range) {
-    return "Page ".concat(range[0], " of ").concat(range[1]);
-  },
-  itemRender: itemRender,
-  responsive: true,
-  size: "small"
-};
+/** 优先 @pisell/utils locales（pisell2.salesManagement.pagination.*），无则回退 materials getText */
+function getPaginationText(key) {
+  var _utilsLocales$getText;
+  return (_utilsLocales$getText = utilsLocales.getText("pisell2.salesManagement.pagination.".concat(key))) !== null && _utilsLocales$getText !== void 0 ? _utilsLocales$getText : getText("table-pagination-".concat(key));
+}
 var Pagination = function Pagination(props) {
   var show = useMemo(function () {
     return Object.keys(props).length;
   }, [props]);
   var isMiniPagination = useIsMobileTable();
+  var effectiveConfig = useMemo(function () {
+    var prevText = getPaginationText('previous');
+    var nextText = getPaginationText('next');
+    var showTotalFn = getPaginationText('showTotal');
+    var itemRenderFn = function itemRenderFn(_, type, originalElement) {
+      if (type === 'prev') {
+        return /*#__PURE__*/React.createElement("div", {
+          className: classNames('paginator-page-btn', 'left')
+        }, /*#__PURE__*/React.createElement(ArrowLeft, {
+          className: 'paginator-page-btn-left-icon'
+        }), /*#__PURE__*/React.createElement("span", {
+          className: 'paginator-page-btn-text'
+        }, prevText));
+      }
+      if (type === 'next') {
+        return /*#__PURE__*/React.createElement("div", {
+          className: classNames('paginator-page-btn', 'right')
+        }, /*#__PURE__*/React.createElement("span", {
+          className: 'paginator-page-btn-text'
+        }, nextText), /*#__PURE__*/React.createElement(ArrowRight, {
+          className: 'paginator-page-btn-right-icon'
+        }));
+      }
+      return originalElement;
+    };
+    var showTotal = typeof showTotalFn === 'function' ? function (total, range) {
+      return showTotalFn(range[0], range[1]);
+    } : function (total, range) {
+      return "Page ".concat(range[0], " of ").concat(range[1]);
+    };
+    return {
+      className: 'materials-grid-paginator',
+      defaultCurrent: 1,
+      showTotal: showTotal,
+      itemRender: itemRenderFn,
+      responsive: true,
+      size: 'small'
+    };
+  }, []);
   var content = useMemo(function () {
     if (!show) {
       return null;
     }
     var Com = OriginPagination;
-    // 移动端使用简单分页
     if (isMiniPagination) {
       Com = MiniPagination;
     }
-    return /*#__PURE__*/React.createElement(Com, _extends({}, paginationConfig, props));
-  }, [show, paginationConfig, props, isMiniPagination]);
+    return /*#__PURE__*/React.createElement(Com, _extends({}, effectiveConfig, props));
+  }, [show, effectiveConfig, props, isMiniPagination]);
   return content;
 };
+export var paginationConfig = {
+  className: 'materials-grid-paginator',
+  defaultCurrent: 1,
+  showTotal: function showTotal(total, range) {
+    return "Page ".concat(range[0], " of ").concat(range[1]);
+  },
+  responsive: true,
+  size: 'small'
+};
 export default Pagination;
 var MiniPagination = function MiniPagination(props) {
   var _props$current = props.current,
@@ -105,44 +117,47 @@ var MiniPagination = function MiniPagination(props) {
    */
   var onChange = function onChange(type) {
     var currentPage = current;
-    if (type === "prev") {
+    if (type === 'prev') {
       currentPage = current - 1;
     }
-    if (type === "next") {
+    if (type === 'next') {
       currentPage = current + 1;
     }
     props.onChange && props.onChange(currentPage, pageSize || 10);
   };
   return /*#__PURE__*/React.createElement("div", {
-    className: "materials-grid-paginator materials-grid-paginator-mini"
+    className: "materials-grid-paginator"
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode-pagination-prev",
     onClick: function onClick() {
       if (current <= MIN) {
         return;
       }
-      onChange("prev");
+      onChange('prev');
     }
   }, /*#__PURE__*/React.createElement("div", {
-    className: classNames("paginator-page-btn", "left")
+    className: classNames('paginator-page-btn', 'left')
   }, /*#__PURE__*/React.createElement(ArrowLeft, {
-    className: "paginator-page-btn-left-icon"
+    className: 'paginator-page-btn-left-icon'
   }))), /*#__PURE__*/React.createElement("div", {
     className: "materials-grid-paginator-center"
   }, /*#__PURE__*/React.createElement("span", {
     className: "materials-grid-paginator-center-text"
-  }, getText("table-pagination-total")(current, MAX))), /*#__PURE__*/React.createElement("div", {
+  }, function () {
+    var totalFn = getPaginationText('total');
+    return typeof totalFn === 'function' ? totalFn(current, MAX) : "".concat(current, " / ").concat(MAX);
+  }())), /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode-pagination-next",
     onClick: function onClick() {
       if (current >= MAX) {
         return;
       }
-      onChange("next");
+      onChange('next');
     }
   }, /*#__PURE__*/React.createElement("div", {
-    className: classNames("paginator-page-btn", "right")
+    className: classNames('paginator-page-btn', 'right')
   }, /*#__PURE__*/React.createElement(ArrowRight, {
-    className: "paginator-page-btn-right-icon"
+    className: 'paginator-page-btn-right-icon'
   }))));
 };
 export var FormPagination = function FormPagination(_ref) {

package/es/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/es/components/PisellCards/components/GraphicTextCard/GraphicTextCard.d.ts

@@ -1,9 +1,9 @@
-import React from 'react';
+/// <reference types="react" />
 import { GraphicTextCardProps } from './types';
 import './GraphicTextCard.less';
 /**
  * Provider 包装器
  * 兼容 PisellCards 系统的 props 传递方式
  */
-declare const Provider: (props: GraphicTextCardProps) => React.JSX.Element;
+declare const Provider: (props: GraphicTextCardProps) => JSX.Element;
 export default Provider;

package/es/components/PisellCards/components/PisellImageCard/PisellImageCard.d.ts

@@ -1,9 +1,8 @@
-import React from 'react';
 import { PisellImageCardProps } from './types';
 import './PisellImageCard.less';
 /**
  * Provider 包装器
  * 兼容 PisellCards 系统的 props 传递方式
  */
-declare const Provider: (props: PisellImageCardProps) => React.JSX.Element;
+declare const Provider: (props: PisellImageCardProps) => JSX.Element;
 export default Provider;

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

@@ -1,9 +1,10 @@
+/// <reference types="react" />
 declare const PisellCards: {
-    TabCard: (props: any) => import("react").JSX.Element;
-    TextCard: (props: any) => import("react").JSX.Element;
-    GraphicTextCard: (props: import("./components/GraphicTextCard").GraphicTextCardProps) => import("react").JSX.Element;
-    MultilevelCard: (props: any) => import("react").JSX.Element;
-    PisellImageCard: (props: import("./components/PisellImageCard").PisellImageCardProps) => import("react").JSX.Element;
+    TabCard: (props: any) => JSX.Element;
+    TextCard: (props: any) => JSX.Element;
+    GraphicTextCard: (props: import("./components/GraphicTextCard").GraphicTextCardProps) => JSX.Element;
+    MultilevelCard: (props: any) => JSX.Element;
+    PisellImageCard: (props: import("./components/PisellImageCard").PisellImageCardProps) => JSX.Element;
 };
 export default PisellCards;
 export type { PisellBasicCardProps } from './types';

package/es/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/es/components/PisellLayouts/index.d.ts

@@ -13,8 +13,9 @@
  *   <Content />
  * </PisellLayouts.ScrollView>
  */
+/// <reference types="react" />
 declare const PisellLayouts: {
-    BasicGrid: <T>(props: import("../PisellBasicGrid").PisellBasicGridProps<T>) => import("react").JSX.Element;
+    BasicGrid: <T>(props: import("../PisellBasicGrid").PisellBasicGridProps<T>) => JSX.Element;
     ScrollView: import("react").ForwardRefExoticComponent<Omit<import("../PisellScrollView").PisellScrollViewProps, "ref"> & import("react").RefAttributes<import("../PisellScrollView").PisellScrollViewRef>>;
     Layout: import("../pisellLayout").CompoundedComponent;
     Content: import("react").FC<import("../pisellLayout/content").PisellContentProps>;
@@ -22,7 +23,7 @@ declare const PisellLayouts: {
     Header: import("react").FC<import("../pisellLayout/header").PisellHeaderProps>;
     Sider: import("react").FC<import("../pisellLayout/sider").PisellSiderProps>;
     Container: <T_1 extends import("../pisellContainer").RenderType>(props: import("../pisellContainer").PisellContainerProps<T_1>) => any;
-    Row: (props: import("../pisellRow").PisellRowProps) => import("react").JSX.Element;
+    Row: (props: import("../pisellRow").PisellRowProps) => JSX.Element;
     ViewGrid: import("react").FC<import("../pisellViewGrid").PisellViewGridProps>;
 };
 export default PisellLayouts;

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

@@ -13,10 +13,11 @@
  * />
  * <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;
-    MetricItem: (props: import("../cardMetricItem").PisellStatisticProps) => import("react").JSX.Element;
+    StatisticList: (props: import("../pisellStatisticList").PisellStatisticListProps) => JSX.Element;
+    MetricItem: (props: import("../cardMetricItem").PisellStatisticProps) => JSX.Element;
 };
 export default PisellMetrics;
 export type { PisellMetricCardProps } from '../pisellMetricCard';

package/es/components/appVersionControl/index.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
+/// <reference types="react" />
 import { AppVersionControlProps } from './types';
 import './index.less';
-declare const AppVersionControl: (props: AppVersionControlProps) => React.JSX.Element;
+declare const AppVersionControl: (props: AppVersionControlProps) => JSX.Element;
 export default AppVersionControl;

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

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

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

@@ -1,8 +1,7 @@
-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) => React.JSX.Element;
+declare const Badge: (props: any) => JSX.Element;
 export default Badge;

package/es/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) => React.JSX.Element | null;
+declare const Image: (props: ImageProps) => JSX.Element | null;
 export default Image;

package/es/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) => React.JSX.Element;
+declare const Text: (props: TextProps) => JSX.Element;
 export default Text;

package/es/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) => import("react").JSX.Element | null;
-    text: (props: import("./Text").TextProps) => import("react").JSX.Element;
+    image: (props: import("./Image").ImageProps) => JSX.Element | null;
+    text: (props: import("./Text").TextProps) => JSX.Element;
 };
 export default _default;

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

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

package/es/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) => React.JSX.Element;
+declare const BrowserSelect: (props: BrowserSelectProps) => JSX.Element;
 export default BrowserSelect;

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

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

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

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

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

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

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

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

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

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

package/es/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>) => React.JSX.Element;
+declare const CustomSelect: <T extends BaseOption>(props: CustomSelectProps<T>) => JSX.Element;
 export default CustomSelect;

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

@@ -23,7 +23,7 @@ import FormSettingProvider from "./provider/formSetting/FormSettingProvider";
 import PageHeader from "../../page-header";
 import { transformFormObjToArrayWithUntouched } from "./utils";
 import { getFormSettingMetaData } from "./serve";
-import { getFormSettingParams } from "./urlUtils";
+import useFormSettingParams from "../hooks/useFormSettingParams";
 import "./index.less";
 import { isArr } from "@pisell/utils";
 /**
@@ -55,6 +55,9 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
     setBeforeClose = _useCtxActions.setBeforeClose;
   var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
     getApp = _context$appHelper$ut.getApp;
+  var _useFormSettingParams = useFormSettingParams(),
+    scope = _useFormSettingParams.scope,
+    target = _useFormSettingParams.target;
   var formRef = useRef(null);
   var _useDataSource = useDataSource(),
     get = _useDataSource.get;
@@ -77,10 +80,6 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
         var _dataSource$fields;
         if (props.__designMode === 'design') return;
         // 从URL获取参数
-        var _getFormSettingParams = getFormSettingParams(),
-          businessCode = _getFormSettingParams.businessCode,
-          channelCode = _getFormSettingParams.channelCode,
-          isBoard = _getFormSettingParams.isBoard;
         var sectionCodes = Array.from(new Set(dataSource === null || dataSource === void 0 || (_dataSource$fields = dataSource.fields) === null || _dataSource$fields === void 0 ? void 0 : _dataSource$fields.map(function (field) {
           return field.name.split('.').shift();
         })));
@@ -88,9 +87,8 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
         // 使用API方法获取formSettingMeta数据（必须传入参数）
         getFormSettingMetaData({
           sectionCodes: sectionCodes,
-          businessCode: businessCode,
-          channelCode: channelCode,
-          isBoard: isBoard
+          scope: scope,
+          target: target
         }).then(function (res) {
           var _dataSource$fields2, _formRef$current2;
           var formattedValues = formatInitialValues ? formatInitialValues(res.data) : res.data || {};

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

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

package/es/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) => React.JSX.Element;
+declare const FormGroup: (props: FormGroupProps) => JSX.Element;
 export default FormGroup;

package/es/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 {};