@pisell/materials 1.0.545 → 1.0.547

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

@@ -1,4 +1,4 @@
-var _excluded = ["title", "description", "dataSource", "showTitle", "showDescription", "groupInfoPosition", "variables", "renderMode", "children", "currentValue", "className", "onDataSourceFinish"];
+var _excluded = ["title", "description", "dataSource", "showTitle", "showDescription", "groupInfoPosition", "variables", "renderMode", "children", "currentValue", "className", "onDataSourceFinish", "formatSubmitValues", "formatInitialValues", "customSubmit"];
 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); }
 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; }
@@ -27,6 +27,9 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
     currentValue = props.currentValue,
     className = props.className,
     onDataSourceFinish = props.onDataSourceFinish,
+    formatSubmitValues = props.formatSubmitValues,
+    formatInitialValues = props.formatInitialValues,
+    customSubmit = props.customSubmit,
     others = _objectWithoutProperties(props, _excluded);
   var formRef = useRef(null);
   var _useDataSource = useDataSource(),
@@ -45,16 +48,20 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
     if (['edit', 'view'].includes(renderMode || '') && dataSource) {
       get === null || get === void 0 ? void 0 : get.runAsync().then(function (res) {
         var _formRef$current2;
-        (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldsValue(res);
+        var formattedValues = formatInitialValues ? formatInitialValues(res) : res;
+        (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldsValue(formattedValues);
       });
     }
-  }, [renderMode, dataSource]);
+  }, [renderMode, dataSource, formatInitialValues]);
   return /*#__PURE__*/React.createElement(FormSettingProvider, {
     renderMode: renderMode,
     groupInfoPosition: groupInfoPosition,
     currentValue: currentValue,
     size: others.size,
-    onDataSourceFinish: onDataSourceFinish
+    onDataSourceFinish: onDataSourceFinish,
+    formatSubmitValues: formatSubmitValues,
+    formatInitialValues: formatInitialValues,
+    customSubmit: customSubmit
   }, /*#__PURE__*/React.createElement(Form, _extends({}, others, {
     className: classNames('pisell-lowcode-data-source-form', className),
     ref: formRef,

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

@@ -29,7 +29,7 @@ var FormItem = function FormItem(props) {
     dataSource = _useDataSource.dataSource;
   var fields = dataSource === null || dataSource === void 0 ? void 0 : dataSource.fields;
   var _useFormSetting = useFormSetting(),
-    globalMode = _useFormSetting.mode;
+    globalMode = _useFormSetting.renderMode;
   var field = fields === null || fields === void 0 ? void 0 : fields.find(function (item) {
     return item.name === name;
   });

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

@@ -7,6 +7,9 @@ export interface FormSettingContextType {
     children?: React.ReactNode;
     currentValue?: 'server' | 'local';
     size?: 'small' | 'middle' | 'large';
+    formatSubmitValues?: (values: Record<string, any>) => Record<string, any>;
+    formatInitialValues?: (values: Record<string, any>) => Record<string, any>;
+    customSubmit?: (values: Record<string, any>) => Promise<any>;
 }
 export declare const FormSettingContext: import("react").Context<FormSettingContextType>;
 export default FormSettingContext;

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

@@ -11,16 +11,22 @@ var FormSettingProvider = function FormSettingProvider(props) {
     groupInfoPosition = props.groupInfoPosition,
     currentValue = props.currentValue,
     size = props.size,
-    onDataSourceFinish = props.onDataSourceFinish;
+    onDataSourceFinish = props.onDataSourceFinish,
+    formatSubmitValues = props.formatSubmitValues,
+    formatInitialValues = props.formatInitialValues,
+    customSubmit = props.customSubmit;
   var value = React.useMemo(function () {
     return {
       renderMode: renderMode,
       groupInfoPosition: groupInfoPosition,
       currentValue: currentValue,
       size: size,
-      onDataSourceFinish: onDataSourceFinish
+      onDataSourceFinish: onDataSourceFinish,
+      formatSubmitValues: formatSubmitValues,
+      formatInitialValues: formatInitialValues,
+      customSubmit: customSubmit
     };
-  }, [renderMode, groupInfoPosition, currentValue, size, onDataSourceFinish]);
+  }, [renderMode, groupInfoPosition, currentValue, size, onDataSourceFinish, formatSubmitValues, formatInitialValues, customSubmit]);
   return /*#__PURE__*/React.createElement(FormSettingContext.Provider, {
     value: value
   }, children);

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

@@ -33,7 +33,6 @@ export interface SubmitButtonProps extends ButtonProps {
         duration: number;
         placement: 'top' | 'topLeft' | 'topRight' | 'bottom' | 'bottomLeft' | 'bottomRight';
     };
-    customSubmit?: (values: Record<string, any>) => void;
 }
 declare const SubmitButton: (props: SubmitButtonProps) => React.JSX.Element | null;
 export default SubmitButton;

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

@@ -29,8 +29,7 @@ var SubmitButton = function SubmitButton(props) {
     afterSubmitType = props.afterSubmitType,
     afterSubmitModalConfig = props.afterSubmitModalConfig,
     afterSubmitNotificationConfig = props.afterSubmitNotificationConfig,
-    childrenString = props.childrenString,
-    customSubmit = props.customSubmit;
+    childrenString = props.childrenString;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
@@ -42,7 +41,9 @@ var SubmitButton = function SubmitButton(props) {
   var form = Form.useFormInstance();
   var _useFormSetting = useFormSetting(),
     renderMode = _useFormSetting.renderMode,
-    onDataSourceFinish = _useFormSetting.onDataSourceFinish;
+    onDataSourceFinish = _useFormSetting.onDataSourceFinish,
+    formatSubmitValues = _useFormSetting.formatSubmitValues,
+    customSubmit = _useFormSetting.customSubmit;
   var _useCtxActions = useCtxActions(),
     setVisible = _useCtxActions.setVisible,
     refreshTableData = _useCtxActions.refreshTableData;
@@ -128,7 +129,7 @@ var SubmitButton = function SubmitButton(props) {
   // 验证表单并提交
   var handleValideFieldsSubmit = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(values) {
-      var allValues, result, afterSubmitFunc;
+      var allValues, filteredValues, formattedValues, result, afterSubmitFunc;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -146,13 +147,15 @@ var SubmitButton = function SubmitButton(props) {
                 content: toastConfig.title
               });
             }
-            _context2.next = 8;
-            return onSubmit(filterSystemFields(allValues));
-          case 8:
+            filteredValues = filterSystemFields(allValues); // 格式化提交数据
+            formattedValues = formatSubmitValues ? formatSubmitValues(filteredValues) : filteredValues;
+            _context2.next = 10;
+            return onSubmit(formattedValues);
+          case 10:
             result = _context2.sent;
             // 数据源提交成功
             if (onDataSourceFinish) {
-              onDataSourceFinish(filterSystemFields(allValues), result);
+              onDataSourceFinish(formattedValues, result);
             }
             if (refreshData) {
               refreshTableData === null || refreshTableData === void 0 ? void 0 : refreshTableData();
@@ -168,19 +171,19 @@ var SubmitButton = function SubmitButton(props) {
                 afterSubmitFunc();
               }
             }
-            _context2.next = 18;
+            _context2.next = 20;
             break;
-          case 15:
-            _context2.prev = 15;
+          case 17:
+            _context2.prev = 17;
             _context2.t0 = _context2["catch"](0);
             PisellToast({
               content: "".concat(_context2.t0.message)
             });
-          case 18:
+          case 20:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[0, 15]]);
+      }, _callee2, null, [[0, 17]]);
     }));
     return function handleValideFieldsSubmit(_x3) {
       return _ref2.apply(this, arguments);

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

@@ -17,4 +17,7 @@ export interface DataSourceFormProps {
     size?: 'small' | 'middle' | 'large';
     onDataSourceFinish?: (values: any, result: any) => void;
     __designMode?: string;
+    formatSubmitValues?: (values: Record<string, any>) => Record<string, any>;
+    formatInitialValues?: (values: Record<string, any>) => Record<string, any>;
+    customSubmit?: (values: Record<string, any>) => Promise<any>;
 }

package/es/components/organizationTenantSwitcher/index.less

@@ -5,7 +5,7 @@
   gap: 10px;
   padding: 6px 16px 6px 6px;
   height: 52px;
-
+  width: fit-content;
   max-width: 220px;
 
   border-radius: 8px;

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

@@ -0,0 +1,83 @@
+import React from 'react';
+import './index.less';
+import { I18nData } from '@/types';
+/**
+ * SaasLogin组件的属性接口
+ */
+export interface SaasLoginProps {
+    /** Logo相关配置 */
+    showLogo?: boolean;
+    logo?: string;
+    logoPosition?: 'left' | 'center' | 'right';
+    logoSize?: {
+        width?: number;
+        height?: number;
+    };
+    /** 标题相关配置 */
+    title?: string | I18nData;
+    showTitle?: boolean;
+    titleAlign?: 'left' | 'center' | 'right';
+    /** 副标题相关配置 */
+    subtitle?: string | I18nData;
+    showSubtitle?: boolean;
+    subtitleAlign?: 'left' | 'center' | 'right';
+    /** 登录方式配置 */
+    loginMethods?: ('email' | 'google' | 'facebook' | 'apple')[];
+    defaultLoginMethod?: 'email' | 'google' | 'facebook' | 'apple';
+    /** 表单配置 */
+    emailLabel?: string | I18nData;
+    passwordLabel?: string | I18nData;
+    emailPlaceholder?: string | I18nData;
+    passwordPlaceholder?: string | I18nData;
+    emailRules?: any[];
+    buttonText?: string | I18nData;
+    rememberMeText?: string | I18nData;
+    forgotPasswordText?: string | I18nData;
+    showRememberMe?: boolean;
+    showForgotPassword?: boolean;
+    /** 社交登录配置 */
+    socialLoginTexts?: {
+        google?: string | I18nData;
+        facebook?: string | I18nData;
+        apple?: string | I18nData;
+    };
+    /** 底部配置 */
+    showFooter?: boolean;
+    showSignUp?: boolean;
+    signUpText?: string | I18nData;
+    signUpLink?: string;
+    signUpPosition?: 'left' | 'center' | 'right';
+    otherLinks?: Array<{
+        text: string | I18nData;
+        url: string;
+    }>;
+    otherLinksPosition?: 'left' | 'center' | 'right';
+    /** 登录/注册切换配置 */
+    showTabs?: boolean;
+    loginTabText?: string | I18nData;
+    registerTabText?: string | I18nData;
+    /** 注册表单配置 */
+    registerEmailPlaceholder?: string | I18nData;
+    registerPasswordPlaceholder?: string | I18nData;
+    registerButtonText?: string | I18nData;
+    /** 事件回调 */
+    onLogin?: (values: {
+        email: string;
+        loginMethod: string;
+    }) => void;
+    onSocialLogin?: (type: 'google' | 'facebook' | 'apple') => void;
+    onSignUp?: () => void;
+    onRegister?: (values: {
+        email: string;
+        password: string;
+    }) => void;
+    /** 新增背景图片属性 */
+    backgroundImage?: string;
+}
+/**
+ * Saas登录组件
+ * @param props - 组件属性
+ * @returns React组件
+ */
+declare const SaasLogin: React.FC<SaasLoginProps>;
+export default SaasLogin;