@pisell/materials 3.3.67 → 3.3.69

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

@@ -138,11 +138,10 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
     var renderComponent = useMemo(function () {
       var _overlayProps$innerPr;
       // 使用renderMode属性，避免和组件mode冲突
-      return /*#__PURE__*/React.createElement(WrappedComponent, _extends({}, otherProps, {
+      return /*#__PURE__*/React.createElement(WrappedComponent, _extends({}, overlayProps === null || overlayProps === void 0 ? void 0 : overlayProps.innerProps, otherProps, {
         mode: propsMode,
-        renderMode: effectiveMode
-      }, overlayProps === null || overlayProps === void 0 ? void 0 : overlayProps.innerProps, {
-        style: _objectSpread(_objectSpread({}, innerStyle || {}), (overlayProps === null || overlayProps === void 0 || (_overlayProps$innerPr = overlayProps.innerProps) === null || _overlayProps$innerPr === void 0 ? void 0 : _overlayProps$innerPr.style) || {}),
+        renderMode: effectiveMode,
+        style: _objectSpread(_objectSpread({}, (overlayProps === null || overlayProps === void 0 || (_overlayProps$innerPr = overlayProps.innerProps) === null || _overlayProps$innerPr === void 0 ? void 0 : _overlayProps$innerPr.style) || {}), innerStyle || {}),
         fieldKey: name,
         isVerification: typeobj === null || typeobj === void 0 ? void 0 : typeobj.enabled,
         size: size

package/es/components/dataSourceComponents/dataSourceTable/BaseTable.js

@@ -89,6 +89,7 @@ var BaseTable = function BaseTable(props, ref) {
   }, [dataSourceKey]);
   useEffect(function () {
     if (dataSourceKeyRef.current) {
+      if (dataSource !== null && dataSource !== void 0 && dataSource.fromSettingMeta) return;
       list === null || list === void 0 || list.run(queryPageConfig);
     } else {
       list === null || list === void 0 || list.mutate([]);

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

@@ -19,7 +19,7 @@ interface UseTablePropsProps {
  */
 declare const useTableProps: (props: UseTablePropsProps) => {
     currentComponentId: any;
-    title: number | boolean | JSX.Element | React.ReactFragment | (() => React.ReactNode) | null | undefined;
+    title: number | boolean | React.ReactFragment | JSX.Element | (() => 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 | JSX.Element | React.ReactFragment | (() => React.ReactNode) | null | undefined;
+    subTitle: number | boolean | React.ReactFragment | JSX.Element | (() => 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: "link" | "button";
+        type: "button" | "link";
         items: OperationItem[];
     } | undefined;
     operationContent?: {

package/es/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" | "xzero" | "saas";
+    rootDomain: "custom" | "saas" | "xzero";
     customDomain?: string | undefined;
     value?: string | undefined;
     tenantId: string;

package/es/components/dataSourceComponents/fields/Switch/ReadPretty.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import { SwitchProps } from './type';
+import './ReadPretty.less';
+declare const SwitchReadPretty: React.FC<SwitchProps>;
+export default SwitchReadPretty;

package/es/components/dataSourceComponents/fields/Switch/ReadPretty.js

@@ -0,0 +1,16 @@
+import React from 'react';
+import Iconfont from "../../../iconfont";
+import "./ReadPretty.less";
+var SwitchReadPretty = function SwitchReadPretty(props) {
+  var value = props.value,
+    checked = props.checked;
+  var isChecked = value !== undefined ? value : checked;
+  return isChecked ? /*#__PURE__*/React.createElement(Iconfont, {
+    type: "pisell2-check",
+    style: {
+      color: 'var(--theme-color)',
+      fontSize: 20
+    }
+  }) : null;
+};
+export default SwitchReadPretty;

package/es/components/dataSourceComponents/fields/Switch/ReadPretty.less

@@ -0,0 +1,2 @@
+// Switch ReadPretty styles
+

package/es/components/dataSourceComponents/fields/Switch/WithMode.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const SwitchWithMode: import("react").FC<import("antd").SwitchProps & import("react").RefAttributes<HTMLElement> & import("../../dataSourceForm/utils").WithModeProps>;
+export default SwitchWithMode;

package/es/components/dataSourceComponents/fields/Switch/WithMode.js

@@ -0,0 +1,5 @@
+import { withMode } from "../../dataSourceForm/utils";
+import { Switch } from 'antd';
+import ReadPretty from "./ReadPretty";
+var SwitchWithMode = withMode(Switch, ReadPretty);
+export default SwitchWithMode;

package/es/components/dataSourceComponents/fields/Switch/index.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const Switch: React.FC<import("antd").SwitchProps & React.RefAttributes<HTMLElement> & import("../../dataSourceForm/utils").WithModeProps & import("../../dataSourceForm/utils").WithFormItemProps>;
+export default Switch;

package/es/components/dataSourceComponents/fields/Switch/index.js

@@ -0,0 +1,8 @@
+import SwitchWithMode from "./WithMode";
+import { withFormItem } from "../../dataSourceForm/utils";
+var Switch = withFormItem(SwitchWithMode, {
+  otherFormItemProps: {
+    valuePropName: 'checked'
+  }
+});
+export default Switch;

package/es/components/dataSourceComponents/fields/Switch/type.d.ts

@@ -0,0 +1,16 @@
+/// <reference types="react" />
+export interface SwitchProps {
+    value?: boolean;
+    checked?: boolean;
+    defaultChecked?: boolean;
+    disabled?: boolean;
+    loading?: boolean;
+    size?: 'default' | 'small';
+    checkedChildren?: React.ReactNode;
+    unCheckedChildren?: React.ReactNode;
+    autoFocus?: boolean;
+    onChange?: (checked: boolean, event: React.MouseEvent<HTMLButtonElement>) => void;
+    onClick?: (checked: boolean, event: React.MouseEvent<HTMLButtonElement>) => void;
+    renderMode?: 'view' | 'edit' | 'disabled' | 'hidden';
+    [key: string]: any;
+}

package/es/components/dataSourceComponents/fields/Switch/type.js

@@ -0,0 +1 @@
+export {};

package/es/components/dataSourceComponents/fields/Upload/utils.d.ts

@@ -15,4 +15,4 @@ export declare const getFileMetadataParams: (file: RcFile & {
     metadata?: MediaMetadata;
 }) => Record<string, any>;
 export declare const isValueEqual: (value: any, fileListValue: any) => boolean;
-export declare const getBaseTime: (size: number) => 1000 | 2000 | 4000 | 8000;
+export declare const getBaseTime: (size: number) => 2000 | 1000 | 4000 | 8000;

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

@@ -19,7 +19,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" | "xzero" | "saas";
+            rootDomain: "custom" | "saas" | "xzero";
             customDomain?: string | undefined;
             value?: string | undefined;
             tenantId: string;
@@ -59,7 +59,13 @@ 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<import("./Input/type").InputProps> & {
+declare const getFieldComponent: (fieldComponent: string) => import("react").FC<any> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | (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> & {
     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>;
@@ -72,18 +78,14 @@ 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" | "xzero" | "saas";
+        rootDomain: "custom" | "saas" | "xzero";
         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<any> | (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("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps> | (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>;
@@ -95,7 +97,5 @@ declare const getFieldComponent: (fieldComponent: string) => (import("react").FC
     extraParams?: Record<string, any> | undefined;
 } & {
     dataSource?: any;
-}) => 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>;
+}) => 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>;
 export { getFieldComponent, formFieldMap };

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

@@ -258,32 +258,38 @@ var useActions = function useActions() {
             designModeToast();
             return _context4.abrupt("return", Promise.reject());
           case 3:
+            if (!(currentDataSource !== null && currentDataSource !== void 0 && currentDataSource.fromSettingMeta)) {
+              _context4.next = 5;
+              break;
+            }
+            return _context4.abrupt("return", Promise.reject());
+          case 5:
             if (!isCustomApi) {
-              _context4.next = 11;
+              _context4.next = 13;
               break;
             }
             actions = getParsedActions();
             if (actions.update) {
-              _context4.next = 7;
+              _context4.next = 9;
               break;
             }
             return _context4.abrupt("return", {});
-          case 7:
+          case 9:
             updateApi = genCustomApi(actions === null || actions === void 0 ? void 0 : actions.update);
             return _context4.abrupt("return", updateApi(formatCreateUpdateParams(values)));
-          case 11:
+          case 13:
             id = (extraParams === null || extraParams === void 0 ? void 0 : extraParams.filterByTk) || (values === null || values === void 0 ? void 0 : values.id);
             if (!(!id || !name)) {
-              _context4.next = 15;
+              _context4.next = 17;
               break;
             }
             PisellToast({
               content: getText('pisell-action-get-data')
             });
             return _context4.abrupt("return", Promise.reject());
-          case 15:
-            _context4.prev = 15;
-            _context4.next = 18;
+          case 17:
+            _context4.prev = 17;
+            _context4.next = 20;
             return updateNocobaseData({
               key: name,
               data: formatCreateUpdateParams(values),
@@ -292,18 +298,18 @@ var useActions = function useActions() {
                 filterByTk: id
               }, extraParams === null || extraParams === void 0 ? void 0 : extraParams.update)
             });
-          case 18:
+          case 20:
             res = _context4.sent;
             return _context4.abrupt("return", res);
-          case 22:
-            _context4.prev = 22;
-            _context4.t0 = _context4["catch"](15);
+          case 24:
+            _context4.prev = 24;
+            _context4.t0 = _context4["catch"](17);
             return _context4.abrupt("return", Promise.reject());
-          case 25:
+          case 27:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, null, [[15, 22]]);
+      }, _callee4, null, [[17, 24]]);
     }));
     return function (_x3) {
       return _ref12.apply(this, arguments);

package/es/components/dataSourceComponents/provider/dataSource/DataSourceContext.d.ts

@@ -44,6 +44,7 @@ interface Style {
 }
 export declare type ActionTypes = 'list' | 'get' | 'update' | 'create' | 'destroy';
 export declare type DataSourceType = {
+    fromSettingMeta: boolean;
     actions: {
         get: ActionsItem;
         update: ActionsItem;

package/es/components/productCard/components/Packages/utils.d.ts

@@ -17,4 +17,4 @@ export declare const minusSign: (item: any, type?: string) => "" | "-";
  * @Author: WangHan
  * @Date: 2024-11-22 10:58
  */
-export declare const _formatAmount: (price?: number, amountSymbol?: string, digit?: number) => any;
+export declare const _formatAmount: (price?: number, amountSymbol?: string, digit?: number) => string | number;

package/es/components/table/Table/fields/index.d.ts

@@ -197,12 +197,12 @@ export declare const fieldList: ({
     field_icon: string;
     field_name: string;
     field_type: string;
-    default_value: boolean;
+    default_value: string;
 } | {
     field_icon: string;
     field_name: string;
     field_type: string;
-    default_value: string;
+    default_value: boolean;
 } | {
     field_icon: string;
     field_name: string;

package/es/components/table/Table/index.js

@@ -57,11 +57,14 @@ var GridViewTable = function GridViewTable(_ref) {
       payload: newData
     });
   });
-  var handleResize = function handleResize(index) {
+  var handleResize = function handleResize(index, record) {
     return function (e, _ref2) {
       var size = _ref2.size;
-      var nextColumns = _toConsumableArray(columns);
-      nextColumns[index] = _objectSpread(_objectSpread({}, nextColumns[index]), {}, {
+      var findIndex = column_setting.findIndex(function (item) {
+        return item.dataIndex === record.dataIndex;
+      });
+      var nextColumns = _toConsumableArray(column_setting);
+      nextColumns[findIndex] = _objectSpread(_objectSpread({}, nextColumns[findIndex]), {}, {
         width: size.width
       });
       form.setFieldValue('column_setting', nextColumns);
@@ -97,6 +100,7 @@ var GridViewTable = function GridViewTable(_ref) {
   var components = useGenTableComponents({
     form: form
   });
+  console.log(columns, 'columns12');
   var showTotal = useCallback(function (total, range, pageSize) {
     var start = range[0] - 1;
     var _current = start / pageSize + 1;

package/es/components/table/Table/utils.d.ts

@@ -155,7 +155,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("filters" | "view_mode" | "filter_setting" | "group_by" | "order_by" | "column_setting" | "gallery_setting")[];
+}) => ("filters" | "filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

package/es/components/table/hooks/useTransColumns.d.ts

@@ -4,7 +4,7 @@ declare type UseTransColumnsProps = {
     form: FormInstance;
     localPagination: boolean;
     handleSave?: (row: Record<string, any>) => void;
-    handleResize?: (index: number) => (e: any, p2: any) => void;
+    handleResize?: (index: number, record: Record<string, any>) => (e: any, p2: any) => void;
     dragSort: boolean;
     bordered: boolean;
 };

package/es/components/table/hooks/useTransColumns.js

@@ -186,7 +186,7 @@ var useTransColumns = function useTransColumns(params) {
           return _objectSpread(_objectSpread({
             record: record
           }, item), {}, {
-            onResize: handleResize === null || handleResize === void 0 ? void 0 : handleResize(index),
+            onResize: handleResize === null || handleResize === void 0 ? void 0 : handleResize(index, record),
             position: position
           });
         }

package/es/components/table/index.js

@@ -252,7 +252,9 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
         try {
           if (!tableId) return {};
           var setting = getTableSettingByCurrentViewMode(tableId, currentViewMode);
-          return (setting === null || setting === void 0 ? void 0 : setting.filters) || {};
+          var filters = (setting === null || setting === void 0 ? void 0 : setting.filters) || {};
+          filters.order_by = (setting === null || setting === void 0 ? void 0 : setting.order_by) || '';
+          return filters;
         } catch (e) {
           return {};
         }

package/es/index.d.ts

@@ -26,6 +26,7 @@ export { default as DataSourceTypography } from './components/dataSourceComponen
 export { default as DataSourceTable } from './components/dataSourceComponents/dataSourceTable';
 export { default as DataSourceWrapper } from './components/dataSourceComponents/dataSourceWrapper';
 export { default as FormItemCheckbox } from './components/dataSourceComponents/fields/Checkbox';
+export { default as FormItemSwitch } from './components/dataSourceComponents/fields/Switch';
 export { default as FormItemColorPicker } from './components/dataSourceComponents/fields/ColorPicker';
 export { default as FormItemDatePicker } from './components/dataSourceComponents/fields/DatePicker';
 export { default as FormItemInput } from './components/dataSourceComponents/fields/Input';

package/es/index.js

@@ -28,6 +28,7 @@ export { default as DataSourceTypography } from "./components/dataSourceComponen
 export { default as DataSourceTable } from "./components/dataSourceComponents/dataSourceTable";
 export { default as DataSourceWrapper } from "./components/dataSourceComponents/dataSourceWrapper";
 export { default as FormItemCheckbox } from "./components/dataSourceComponents/fields/Checkbox";
+export { default as FormItemSwitch } from "./components/dataSourceComponents/fields/Switch";
 export { default as FormItemColorPicker } from "./components/dataSourceComponents/fields/ColorPicker";
 export { default as FormItemDatePicker } from "./components/dataSourceComponents/fields/DatePicker";
 export { default as FormItemInput } from "./components/dataSourceComponents/fields/Input";

package/es/utils/platform.d.ts

@@ -1 +1 @@
-export declare const isMobile: () => any;
+export declare const isMobile: () => boolean;

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

@@ -43,6 +43,8 @@ var import_form = __toESM(require("../../form"));
 var import_FormSettingProvider = __toESM(require("./provider/formSetting/FormSettingProvider"));
 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_index = require("./index.less");
 var BaseForm = (0, import_react.forwardRef)(
   (props, ref) => {
@@ -63,6 +65,7 @@ var BaseForm = (0, import_react.forwardRef)(
       formatSubmitValues,
       formatInitialValues,
       customSubmit,
+      beforeSubmit,
       leaveConfirmConfig,
       ...others
     } = props;
@@ -83,11 +86,41 @@ var BaseForm = (0, import_react.forwardRef)(
     }, []);
     (0, import_react.useImperativeHandle)(ref, () => formRef.current);
     (0, import_react.useEffect)(() => {
+      var _a2;
       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) => {
+            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)) || []);
+            const filteredValues = Object.keys(formattedValues).reduce((acc, key) => {
+              if (fieldNames.has(key)) {
+                acc[key] = formattedValues[key];
+              }
+              return acc;
+            }, {});
+            (_b = formRef.current) == null ? void 0 : _b.setFields((0, import_utils.transformFormObjToArrayWithUntouched)({
+              ...filteredValues
+            }));
+          }).catch((error) => {
+            console.error("获取formSettingMeta数据失败:", error);
+          });
+          return;
+        }
         get == null ? void 0 : get.runAsync().then((res) => {
-          var _a2;
+          var _a3, _b;
           const formattedValues = formatInitialValues ? formatInitialValues(res) : res;
-          (_a2 = formRef.current) == null ? void 0 : _a2.setFields((0, import_utils.transformFormObjToArrayWithUntouched)(formattedValues));
+          const fieldNames = new Set(((_a3 = dataSource == null ? void 0 : dataSource.fields) == null ? void 0 : _a3.map((field) => field.name)) || []);
+          const filteredValues = Object.keys(formattedValues).reduce((acc, key) => {
+            if (fieldNames.has(key)) {
+              acc[key] = formattedValues[key];
+            }
+            return acc;
+          }, {});
+          (_b = formRef.current) == null ? void 0 : _b.setFields((0, import_utils.transformFormObjToArrayWithUntouched)(filteredValues));
         });
       }
     }, [renderMode, dataSource]);
@@ -164,7 +197,8 @@ var BaseForm = (0, import_react.forwardRef)(
         onDataSourceFinish,
         formatSubmitValues,
         formatInitialValues,
-        customSubmit
+        customSubmit,
+        beforeSubmit
       },
       /* @__PURE__ */ import_react.default.createElement(
         import_form.default,

package/lib/components/dataSourceComponents/dataSourceForm/provider/formSetting/FormSettingContext.d.ts

@@ -10,6 +10,7 @@ export interface FormSettingContextType {
     formatSubmitValues?: (values: Record<string, any>) => Record<string, any>;
     formatInitialValues?: (values: Record<string, any>) => Record<string, any>;
     customSubmit?: (values: Record<string, any>) => Promise<any>;
+    beforeSubmit?: (values: Record<string, any>) => Promise<boolean> | boolean;
 }
 export declare const FormSettingContext: import("react").Context<FormSettingContextType>;
 export default FormSettingContext;

package/lib/components/dataSourceComponents/dataSourceForm/provider/formSetting/FormSettingProvider.js

@@ -44,7 +44,8 @@ var FormSettingProvider = (props) => {
     onDataSourceFinish,
     formatSubmitValues,
     formatInitialValues,
-    customSubmit
+    customSubmit,
+    beforeSubmit
   } = props;
   const value = import_react.default.useMemo(() => {
     return {
@@ -55,9 +56,10 @@ var FormSettingProvider = (props) => {
       onDataSourceFinish,
       formatSubmitValues,
       formatInitialValues,
-      customSubmit
+      customSubmit,
+      beforeSubmit
     };
-  }, [renderMode, groupInfoPosition, currentValue, size]);
+  }, [renderMode, groupInfoPosition, currentValue, size, beforeSubmit]);
   return /* @__PURE__ */ import_react.default.createElement(
     import_FormSettingContext.default.Provider,
     {

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

@@ -146,4 +146,34 @@ export declare const getNocobaseDataList: (allParams: {
  * 删除nocobase数据
  */
 export declare const deleteNocobaseData: (key: string, id: string, headers?: any) => Promise<any>;
+/**
+ * 获取formSettingMeta数据
+ * @param params 请求参数
+ * @param params.sectionCodes 配置段代码数组，如 ['payment']
+ * @param params.businessCode 业务代码
+ * @param params.channelCode 渠道代码
+ * @param params.isBoard 是否包含board_code参数
+ * @returns Promise<any> 返回设置元数据
+ */
+export declare const getFormSettingMetaData: (params: {
+    sectionCodes: string[];
+    businessCode?: string | undefined;
+    channelCode?: string | undefined;
+    isBoard?: boolean | undefined;
+}) => Promise<any>;
+/**
+ * 更新租户设置数据
+ * @param params 请求参数
+ * @param params.businessCode 业务代码
+ * @param params.channelCode 渠道代码
+ * @param params.boardCode 板块代码
+ * @param params.data 要更新的数据对象，如 {"order.prefix":"","order.suffix":"","payment.number":""}
+ * @returns Promise<any> 返回更新结果
+ */
+export declare const updateTenantSetting: (params: {
+    business_code?: string | undefined;
+    channel_code?: string | undefined;
+    board_code?: string | undefined;
+    data: Record<string, any>;
+}) => Promise<any>;
 export {};

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

@@ -22,12 +22,14 @@ __export(serve_exports, {
   createNocobaseData: () => createNocobaseData,
   customApi: () => customApi,
   deleteNocobaseData: () => deleteNocobaseData,
+  getFormSettingMetaData: () => getFormSettingMetaData,
   getNocobaseData: () => getNocobaseData,
   getNocobaseDataList: () => getNocobaseDataList,
   getNocobaseDataSource: () => getNocobaseDataSource,
   getNocobaseDataSourceOptions: () => getNocobaseDataSourceOptions,
   getNocobaseMainDataSource: () => getNocobaseMainDataSource,
-  updateNocobaseData: () => updateNocobaseData
+  updateNocobaseData: () => updateNocobaseData,
+  updateTenantSetting: () => updateTenantSetting
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../table/utils");
@@ -137,15 +139,56 @@ 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 url = `/tenant/setting?${queryParams.toString()}`;
+  return import_utils.request.getRequest().get(url, {}, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+};
+var updateTenantSetting = async (params) => {
+  console.log("updateTenantSetting", params);
+  const { business_code, channel_code, board_code, data } = params;
+  const requestBody = {
+    business_code,
+    channel_code,
+    board_code,
+    data
+  };
+  const url = "/tenant/setting";
+  return import_utils.request.getRequest().post(url, requestBody, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createNocobaseData,
   customApi,
   deleteNocobaseData,
+  getFormSettingMetaData,
   getNocobaseData,
   getNocobaseDataList,
   getNocobaseDataSource,
   getNocobaseDataSourceOptions,
   getNocobaseMainDataSource,
-  updateNocobaseData
+  updateNocobaseData,
+  updateTenantSetting
 });