@pisell/materials 6.0.8 → 6.0.10

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

@@ -76,7 +76,7 @@ export var formItemNameReverse = function formItemNameReverse(name) {
 
 // 验证域名
 export var isValidDomain = function isValidDomain(value) {
-  return /^(?=.{1,253}$)(?!-)[A-Za-z0-9-]{1,63}(?<!-)(\.[A-Za-z]{2,})+$/.test(value);
+  return /^(?!.*--)[A-Za-z0-9][A-Za-z0-9-]{0,61}[A-Za-z0-9](\.[A-Za-z]{2,})+$/.test(value);
 };
 
 /**

package/es/components/dataSourceComponents/fields/Input.Email/WithMode.d.ts

@@ -1,4 +1,6 @@
 import React from 'react';
 import { InputProps } from 'antd';
-declare const EmailWithMode: React.FC<InputProps & import("../../dataSourceForm/utils").WithModeProps>;
+declare const EmailWithMode: React.FC<InputProps & {
+    onChange: (value: string) => void;
+} & import("../../dataSourceForm/utils").WithModeProps>;
 export default EmailWithMode;

package/es/components/dataSourceComponents/fields/Input.Email/WithMode.js

@@ -1,11 +1,24 @@
+var _excluded = ["onBlur", "onChange"];
 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 from 'react';
+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; }
+import React, { useCallback } from 'react';
 import { Input as AntInput } from 'antd';
 import Icon from "../../../icon";
 import ReadPretty from "./ReadPretty";
 import { withMode } from "../../dataSourceForm/utils";
 var Email = function Email(props) {
-  return /*#__PURE__*/React.createElement(AntInput, _extends({}, props, {
+  var propsOnBlur = props.onBlur,
+    propsOnChange = props.onChange,
+    rest = _objectWithoutProperties(props, _excluded);
+  var onBlur = useCallback(function (e) {
+    var _e$target;
+    propsOnChange === null || propsOnChange === void 0 ? void 0 : propsOnChange(((e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value) || "").trim());
+    propsOnBlur === null || propsOnBlur === void 0 ? void 0 : propsOnBlur(e);
+  }, [propsOnBlur, propsOnChange]);
+  return /*#__PURE__*/React.createElement(AntInput, _extends({}, rest, {
+    onChange: propsOnChange,
+    onBlur: onBlur,
     prefix: /*#__PURE__*/React.createElement(Icon, {
       type: "pisell2-mail-01",
       size: 18,

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

@@ -1,3 +1,5 @@
 import React from 'react';
-declare const Email: React.FC<import("antd").InputProps & import("../../dataSourceForm/utils").WithModeProps & import("../../dataSourceForm/utils").WithFormItemProps>;
+declare const Email: React.FC<import("antd").InputProps & {
+    onChange: (value: string) => void;
+} & import("../../dataSourceForm/utils").WithModeProps & import("../../dataSourceForm/utils").WithFormItemProps>;
 export default Email;

package/es/components/dataSourceComponents/fields/Input.Email/index.js

@@ -1,4 +1,8 @@
 import { withFormItem } from "../../dataSourceForm/utils";
 import EmailWithMode from "./WithMode";
-var Email = withFormItem(EmailWithMode);
+var Email = withFormItem(EmailWithMode, {
+  otherFormItemProps: {
+    validateTrigger: 'onBlur'
+  }
+});
 export default Email;

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

@@ -12,7 +12,9 @@ declare const formFieldMap: {
         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>;
         URL: import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
-        Email: import("react").FC<import("antd").InputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+        Email: import("react").FC<import("antd").InputProps & {
+            onChange: (value: string) => void;
+        } & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
         Phone: import("react").FC<import("./Input.Phone/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     };
     FormItemRadio: import("react").FC<{}> & {
@@ -33,7 +35,9 @@ declare const formFieldMap: {
     FormItemTimePicker: import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     'FormItemInput.JSON': import("react").FC<any>;
     'FormItemInput.Phone': import("react").FC<import("./Input.Phone/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
-    'FormItemInput.Email': import("react").FC<import("antd").InputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+    'FormItemInput.Email': import("react").FC<import("antd").InputProps & {
+        onChange: (value: string) => void;
+    } & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     'FormItemInput.URL': import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     'FormItemInput.Password': import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     'FormItemRadio.Group': import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
@@ -46,12 +50,16 @@ declare const getFieldComponent: (fieldComponent: string) => 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 & 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/type").InputProps> & {
+}) | 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/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>;
     URL: import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
-    Email: import("react").FC<import("antd").InputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+    Email: import("react").FC<import("antd").InputProps & {
+        onChange: (value: string) => void;
+    } & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     Phone: import("react").FC<import("./Input.Phone/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 }) | 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>;

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

@@ -22,7 +22,9 @@ import useParseActionsVariable from "./useParseActionsVariable";
 import useVariables from "./useVariables";
 import useDataSource from "./useDataSource";
 import { getText } from "../../../locales";
+import useEngineContext from "../../../hooks/useEngineContext";
 var useActions = function useActions() {
+  var _context$appHelper;
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     propsDataSource = _ref.dataSource,
     propsCurrentValue = _ref.currentValue,
@@ -32,6 +34,14 @@ var useActions = function useActions() {
   var _useDataSource = useDataSource(),
     ctxDataSource = _useDataSource.dataSource,
     ctxDesignMode = _useDataSource.__designMode;
+  var context = useEngineContext();
+  var _ref2 = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.constants) || {},
+    pisell2ApiBaseUrl = _ref2.pisell2ApiBaseUrl,
+    mypisellApiBaseUrl = _ref2.mypisellApiBaseUrl;
+  var baseUrlMap = {
+    'pisell2-api': pisell2ApiBaseUrl,
+    'mypisell-api': mypisellApiBaseUrl
+  };
   var _useVariables = useVariables(),
     parseVariable = _useVariables.parseVariable;
   var _useParseActionsVaria = useParseActionsVariable(),
@@ -39,14 +49,14 @@ var useActions = function useActions() {
   var currentDataSource = propsDataSource || ctxDataSource;
   var currentValue = propsCurrentValue || 'server';
   var designMode = __designMode || ctxDesignMode;
-  var _ref2 = currentDataSource || {},
-    isCustomApi = _ref2.isCustomApi,
-    originalActions = _ref2.actions,
-    options = _ref2.options,
-    headerDataSource = _ref2.headerDataSource,
-    name = _ref2.name,
-    dataSourceKey = _ref2.dataSourceKey,
-    fields = _ref2.fields;
+  var _ref3 = currentDataSource || {},
+    isCustomApi = _ref3.isCustomApi,
+    originalActions = _ref3.actions,
+    options = _ref3.options,
+    headerDataSource = _ref3.headerDataSource,
+    name = _ref3.name,
+    dataSourceKey = _ref3.dataSourceKey,
+    fields = _ref3.fields;
   var _useFormat = useFormat({
       dataSourceKey: dataSourceKey || '',
       fields: fields || []
@@ -60,14 +70,14 @@ var useActions = function useActions() {
     return parseVariable === null || parseVariable === void 0 ? void 0 : parseVariable(currentValue, {});
   }, [currentValue, parseVariable]);
   var extraParams = useMemo(function () {
-    return Object.entries(propsExtraParams || {}).reduce(function (acc, _ref3) {
-      var _ref4 = _slicedToArray(_ref3, 2),
-        key = _ref4[0],
-        value = _ref4[1];
-      acc[key] = Object.entries(value || {}).reduce(function (acc, _ref5) {
-        var _ref6 = _slicedToArray(_ref5, 2),
-          k = _ref6[0],
-          v = _ref6[1];
+    return Object.entries(propsExtraParams || {}).reduce(function (acc, _ref4) {
+      var _ref5 = _slicedToArray(_ref4, 2),
+        key = _ref5[0],
+        value = _ref5[1];
+      acc[key] = Object.entries(value || {}).reduce(function (acc, _ref6) {
+        var _ref7 = _slicedToArray(_ref6, 2),
+          k = _ref7[0],
+          v = _ref7[1];
         acc[k] = parseVariable === null || parseVariable === void 0 ? void 0 : parseVariable(v, {});
         return acc;
       }, {});
@@ -82,15 +92,15 @@ var useActions = function useActions() {
   });
 
   // 生成自定义 API 请求函数
-  var genCustomApi = useMemoizedFn(function (_ref7) {
-    var method = _ref7.method,
-      path = _ref7.path,
-      parsedPath = _ref7.parsedPath,
-      params = _ref7.params,
-      headers = _ref7.headers,
-      body = _ref7.body;
+  var genCustomApi = useMemoizedFn(function (_ref8) {
+    var method = _ref8.method,
+      path = _ref8.path,
+      parsedPath = _ref8.parsedPath,
+      params = _ref8.params,
+      headers = _ref8.headers,
+      body = _ref8.body;
     return /*#__PURE__*/function () {
-      var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
+      var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
         var result;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -98,7 +108,7 @@ var useActions = function useActions() {
               _context.next = 2;
               return customApi(parsedPath || path, data, {
                 method: method,
-                baseUrl: options === null || options === void 0 ? void 0 : options.baseUrl,
+                baseUrl: baseUrlMap[dataSourceKey] || (options === null || options === void 0 ? void 0 : options.baseUrl),
                 params: params,
                 headers: headers,
                 body: body
@@ -119,7 +129,7 @@ var useActions = function useActions() {
         }, _callee);
       }));
       return function (_x2) {
-        return _ref8.apply(this, arguments);
+        return _ref9.apply(this, arguments);
       };
     }();
   });
@@ -138,7 +148,7 @@ var useActions = function useActions() {
 
   // 创建数据
   var create = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(values) {
+    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(values) {
       var actions, createApi;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -176,7 +186,7 @@ var useActions = function useActions() {
       }, _callee2);
     }));
     return function (_x3) {
-      return _ref9.apply(this, arguments);
+      return _ref10.apply(this, arguments);
     };
   }());
 
@@ -230,8 +240,8 @@ var useActions = function useActions() {
 
   // 更新数据
   var update = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(values) {
-      var actions, updateApi, id;
+    var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(values) {
+      var actions, updateApi, id, res;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -266,28 +276,37 @@ var useActions = function useActions() {
             });
             return _context4.abrupt("return", Promise.reject());
           case 15:
-            return _context4.abrupt("return", updateNocobaseData({
+            _context4.prev = 15;
+            _context4.next = 18;
+            return updateNocobaseData({
               key: name,
               data: formatCreateUpdateParams(values),
               headers: getHeaders(),
               query: _objectSpread({
                 filterByTk: id
               }, extraParams === null || extraParams === void 0 ? void 0 : extraParams.update)
-            }));
-          case 16:
+            });
+          case 18:
+            res = _context4.sent;
+            return _context4.abrupt("return", res);
+          case 22:
+            _context4.prev = 22;
+            _context4.t0 = _context4["catch"](15);
+            return _context4.abrupt("return", Promise.reject());
+          case 25:
           case "end":
             return _context4.stop();
         }
-      }, _callee4);
+      }, _callee4, null, [[15, 22]]);
     }));
     return function (_x4) {
-      return _ref11.apply(this, arguments);
+      return _ref12.apply(this, arguments);
     };
   }());
 
   // 获取数据列表
   var list = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
+    var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
       var formatParams, actions, listApi;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
@@ -335,11 +354,11 @@ var useActions = function useActions() {
       }, _callee5);
     }));
     return function (_x5) {
-      return _ref12.apply(this, arguments);
+      return _ref13.apply(this, arguments);
     };
   }());
   var destroy = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(id) {
+    var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(id) {
       var actions, deleteApi;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
@@ -379,7 +398,7 @@ var useActions = function useActions() {
       }, _callee6);
     }));
     return function (_x6) {
-      return _ref13.apply(this, arguments);
+      return _ref14.apply(this, arguments);
     };
   }());
   return {

package/es/components/login-and-register/index.less

@@ -1,17 +1,20 @@
 .saas-login-container {
   // width: 100%;
+  width: 360px;
   max-width: 360px;
+  min-width: 266px;
+  margin: 0 20px;
   overflow-x: hidden;
   // margin: 0 auto;
   // padding: 24px;
-  text-align: center;
+  // text-align: center;
   // height: 100%;
   // overflow-y: auto;
   
   // Logo样式
   .saas-login-logo {
+    width: fit-content;
     height: 48px;
-    margin-bottom: 24px;
     border-radius: 8px;
 
     &.left {
@@ -38,7 +41,7 @@
     font-size: 24px;
     font-weight: 600;
     color: #101828;
-    margin-top: 0;
+    margin-top: 24px;
     margin-bottom: 12px;
   }
   

package/es/components/organizationTenantSwitcher/index.less

@@ -80,6 +80,7 @@
   width: 40px;
   height: 40px;
   border-radius: 6px;
+  object-fit: contain;
 }
 
 .organization-tenant-switcher-switch-chevron {

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

@@ -66,7 +66,9 @@ var createNocobaseData = async (params) => {
   });
 };
 var formatQueryObjString = (query = {}) => {
-  return Object.entries(query || {}).map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`).join("&");
+  return Object.entries(query || {}).map(
+    ([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`
+  ).join("&");
 };
 var getNocobaseData = async (params) => {
   const { key, query, headers } = params;
@@ -105,7 +107,10 @@ var customApi = async (url, data, options) => {
   const requestUrl = formatRequestUrl(url, baseUrl, queryString);
   const requestData = method === "GET" ? data : { ...body, ...data };
   const requestMethod = methodMap[method];
-  return import_utils.request.getRequest()[requestMethod](requestUrl, requestData, { headers: requestHeaders, isCustomApi: true });
+  return import_utils.request.getRequest()[requestMethod](requestUrl, requestData, {
+    headers: requestHeaders,
+    isCustomApi: true
+  });
 };
 var updateNocobaseData = async (params) => {
   const { key, data, headers, query } = params;

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

@@ -88,7 +88,7 @@ var formItemNameReverse = (name) => {
   return name.replace(new RegExp(FORM_ITEM_SPLIT_CHAR, "g"), ".");
 };
 var isValidDomain = (value) => {
-  return /^(?=.{1,253}$)(?!-)[A-Za-z0-9-]{1,63}(?<!-)(\.[A-Za-z]{2,})+$/.test(value);
+  return /^(?!.*--)[A-Za-z0-9][A-Za-z0-9-]{0,61}[A-Za-z0-9](\.[A-Za-z]{2,})+$/.test(value);
 };
 var withFormItem = (WrappedComponent, overlayProps) => {
   return ({

package/lib/components/dataSourceComponents/fields/Input.Email/WithMode.d.ts

@@ -1,4 +1,6 @@
 import React from 'react';
 import { InputProps } from 'antd';
-declare const EmailWithMode: React.FC<InputProps & import("../../dataSourceForm/utils").WithModeProps>;
+declare const EmailWithMode: React.FC<InputProps & {
+    onChange: (value: string) => void;
+} & import("../../dataSourceForm/utils").WithModeProps>;
 export default EmailWithMode;

package/lib/components/dataSourceComponents/fields/Input.Email/WithMode.js

@@ -38,10 +38,18 @@ var import_icon = __toESM(require("../../../icon"));
 var import_ReadPretty = __toESM(require("./ReadPretty"));
 var import_utils = require("../../dataSourceForm/utils");
 var Email = (props) => {
+  const { onBlur: propsOnBlur, onChange: propsOnChange, ...rest } = props;
+  const onBlur = (0, import_react.useCallback)((e) => {
+    var _a;
+    propsOnChange == null ? void 0 : propsOnChange((((_a = e == null ? void 0 : e.target) == null ? void 0 : _a.value) || "").trim());
+    propsOnBlur == null ? void 0 : propsOnBlur(e);
+  }, [propsOnBlur, propsOnChange]);
   return /* @__PURE__ */ import_react.default.createElement(
     import_antd.Input,
     {
-      ...props,
+      ...rest,
+      onChange: propsOnChange,
+      onBlur,
       prefix: /* @__PURE__ */ import_react.default.createElement(
         import_icon.default,
         {

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

@@ -1,3 +1,5 @@
 import React from 'react';
-declare const Email: React.FC<import("antd").InputProps & import("../../dataSourceForm/utils").WithModeProps & import("../../dataSourceForm/utils").WithFormItemProps>;
+declare const Email: React.FC<import("antd").InputProps & {
+    onChange: (value: string) => void;
+} & import("../../dataSourceForm/utils").WithModeProps & import("../../dataSourceForm/utils").WithFormItemProps>;
 export default Email;

package/lib/components/dataSourceComponents/fields/Input.Email/index.js

@@ -34,5 +34,9 @@ __export(Input_exports, {
 module.exports = __toCommonJS(Input_exports);
 var import_utils = require("../../dataSourceForm/utils");
 var import_WithMode = __toESM(require("./WithMode"));
-var Email = (0, import_utils.withFormItem)(import_WithMode.default);
+var Email = (0, import_utils.withFormItem)(import_WithMode.default, {
+  otherFormItemProps: {
+    validateTrigger: "onBlur"
+  }
+});
 var Input_default = Email;

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

@@ -12,7 +12,9 @@ declare const formFieldMap: {
         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>;
         URL: import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
-        Email: import("react").FC<import("antd").InputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+        Email: import("react").FC<import("antd").InputProps & {
+            onChange: (value: string) => void;
+        } & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
         Phone: import("react").FC<import("./Input.Phone/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     };
     FormItemRadio: import("react").FC<{}> & {
@@ -33,7 +35,9 @@ declare const formFieldMap: {
     FormItemTimePicker: import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     'FormItemInput.JSON': import("react").FC<any>;
     'FormItemInput.Phone': import("react").FC<import("./Input.Phone/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
-    'FormItemInput.Email': import("react").FC<import("antd").InputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+    'FormItemInput.Email': import("react").FC<import("antd").InputProps & {
+        onChange: (value: string) => void;
+    } & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     'FormItemInput.URL': import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     'FormItemInput.Password': import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     'FormItemRadio.Group': import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
@@ -46,12 +50,16 @@ declare const getFieldComponent: (fieldComponent: string) => 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 & 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/type").InputProps> & {
+}) | 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/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>;
     URL: import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
-    Email: import("react").FC<import("antd").InputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+    Email: import("react").FC<import("antd").InputProps & {
+        onChange: (value: string) => void;
+    } & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     Phone: import("react").FC<import("./Input.Phone/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 }) | 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>;

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

@@ -41,13 +41,21 @@ var import_useParseActionsVariable = __toESM(require("./useParseActionsVariable"
 var import_useVariables = __toESM(require("./useVariables"));
 var import_useDataSource = __toESM(require("./useDataSource"));
 var import_locales = require("../../../locales");
+var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
 var useActions = ({
   dataSource: propsDataSource,
   currentValue: propsCurrentValue,
   __designMode,
   extraParams: propsExtraParams
 } = {}) => {
+  var _a;
   const { dataSource: ctxDataSource, __designMode: ctxDesignMode } = (0, import_useDataSource.default)();
+  const context = (0, import_useEngineContext.default)();
+  const { pisell2ApiBaseUrl, mypisellApiBaseUrl } = ((_a = context.appHelper) == null ? void 0 : _a.constants) || {};
+  const baseUrlMap = {
+    "pisell2-api": pisell2ApiBaseUrl,
+    "mypisell-api": mypisellApiBaseUrl
+  };
   const { parseVariable } = (0, import_useVariables.default)();
   const { parseActions } = (0, import_useParseActionsVariable.default)();
   const currentDataSource = propsDataSource || ctxDataSource;
@@ -93,7 +101,7 @@ var useActions = ({
       return async (data) => {
         const result = await (0, import_serve.customApi)(parsedPath || path, data, {
           method,
-          baseUrl: options == null ? void 0 : options.baseUrl,
+          baseUrl: baseUrlMap[dataSourceKey] || (options == null ? void 0 : options.baseUrl),
           params,
           headers,
           body
@@ -173,12 +181,17 @@ var useActions = ({
         });
         return Promise.reject();
       }
-      return (0, import_serve.updateNocobaseData)({
-        key: name,
-        data: formatCreateUpdateParams(values),
-        headers: getHeaders(),
-        query: { filterByTk: id, ...extraParams == null ? void 0 : extraParams.update }
-      });
+      try {
+        const res = await (0, import_serve.updateNocobaseData)({
+          key: name,
+          data: formatCreateUpdateParams(values),
+          headers: getHeaders(),
+          query: { filterByTk: id, ...extraParams == null ? void 0 : extraParams.update }
+        });
+        return res;
+      } catch (error) {
+        return Promise.reject();
+      }
     }
   });
   const list = (0, import_ahooks.useMemoizedFn)(

package/lib/components/login-and-register/index.less

@@ -1,17 +1,20 @@
 .saas-login-container {
   // width: 100%;
+  width: 360px;
   max-width: 360px;
+  min-width: 266px;
+  margin: 0 20px;
   overflow-x: hidden;
   // margin: 0 auto;
   // padding: 24px;
-  text-align: center;
+  // text-align: center;
   // height: 100%;
   // overflow-y: auto;
   
   // Logo样式
   .saas-login-logo {
+    width: fit-content;
     height: 48px;
-    margin-bottom: 24px;
     border-radius: 8px;
 
     &.left {
@@ -38,7 +41,7 @@
     font-size: 24px;
     font-weight: 600;
     color: #101828;
-    margin-top: 0;
+    margin-top: 24px;
     margin-bottom: 12px;
   }
   

package/lib/components/organizationTenantSwitcher/index.less

@@ -80,6 +80,7 @@
   width: 40px;
   height: 40px;
   border-radius: 6px;
+  object-fit: contain;
 }
 
 .organization-tenant-switcher-switch-chevron {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "6.0.8",
+  "version": "6.0.10",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -66,8 +66,8 @@
     "crypto-js": "^4.2.0",
     "@zxing/library": "0.21.2",
     "@pisell/utils": "1.0.42",
-    "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "1.0.100"
+    "@pisell/date-picker": "1.0.100",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",