@pisell/materials 3.2.8 → 3.2.10

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

@@ -16,6 +16,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useEffect } from 'react';
 import { Input, Button, Space, Form, Checkbox } from 'antd';
 import { GoogleOutlined, AppleOutlined, FacebookOutlined } from '@ant-design/icons';
+import { getText } from "../../locales/index";
 import "./index.less";
 /**
  * loginAndRegister组件的属性接口
@@ -38,13 +39,13 @@ var loginAndRegister = function loginAndRegister(_ref) {
       height: 48
     } : _ref$logoSize,
     _ref$title = _ref.title,
-    title = _ref$title === void 0 ? 'Log in to your account' : _ref$title,
+    title = _ref$title === void 0 ? getText('Log in to your account') : _ref$title,
     _ref$showTitle = _ref.showTitle,
     showTitle = _ref$showTitle === void 0 ? false : _ref$showTitle,
     _ref$titleAlign = _ref.titleAlign,
     titleAlign = _ref$titleAlign === void 0 ? 'center' : _ref$titleAlign,
     _ref$subtitle = _ref.subtitle,
-    subtitle = _ref$subtitle === void 0 ? 'Welcome back! Please enter your details.' : _ref$subtitle,
+    subtitle = _ref$subtitle === void 0 ? getText('pisell-login-and-register-subtit') : _ref$subtitle,
     _ref$showSubtitle = _ref.showSubtitle,
     showSubtitle = _ref$showSubtitle === void 0 ? false : _ref$showSubtitle,
     _ref$subtitleAlign = _ref.subtitleAlign,
@@ -54,35 +55,35 @@ var loginAndRegister = function loginAndRegister(_ref) {
     _ref$defaultLoginMeth = _ref.defaultLoginMethod,
     defaultLoginMethod = _ref$defaultLoginMeth === void 0 ? 'email' : _ref$defaultLoginMeth,
     _ref$emailLabel = _ref.emailLabel,
-    emailLabel = _ref$emailLabel === void 0 ? 'Email' : _ref$emailLabel,
+    emailLabel = _ref$emailLabel === void 0 ? getText('pisell-login-and-register-email-label') : _ref$emailLabel,
     _ref$passwordLabel = _ref.passwordLabel,
-    passwordLabel = _ref$passwordLabel === void 0 ? 'Password' : _ref$passwordLabel,
+    passwordLabel = _ref$passwordLabel === void 0 ? getText('pisell-login-and-register-password-label') : _ref$passwordLabel,
     _ref$emailPlaceholder = _ref.emailPlaceholder,
-    emailPlaceholder = _ref$emailPlaceholder === void 0 ? 'Enter your email' : _ref$emailPlaceholder,
+    emailPlaceholder = _ref$emailPlaceholder === void 0 ? getText('pisell-login-and-register-email-placeholder') : _ref$emailPlaceholder,
     _ref$passwordPlacehol = _ref.passwordPlaceholder,
-    passwordPlaceholder = _ref$passwordPlacehol === void 0 ? 'Enter your password' : _ref$passwordPlacehol,
+    passwordPlaceholder = _ref$passwordPlacehol === void 0 ? getText('pisell-login-and-register-password-placeholder') : _ref$passwordPlacehol,
     _ref$emailRules = _ref.emailRules,
     emailRules = _ref$emailRules === void 0 ? [{
       required: true,
-      message: 'Please input your email!'
+      message: getText('pisell-login-and-register-email-error')
     }, {
       type: 'email',
-      message: 'Please enter a valid email!'
+      message: getText('pisell-login-and-register-email-error-valid')
     }] : _ref$emailRules,
     _ref$buttonText = _ref.buttonText,
-    buttonText = _ref$buttonText === void 0 ? 'Log in' : _ref$buttonText,
+    buttonText = _ref$buttonText === void 0 ? getText('Log in') : _ref$buttonText,
     _ref$socialLoginTexts = _ref.socialLoginTexts,
     socialLoginTexts = _ref$socialLoginTexts === void 0 ? {
-      google: 'Continue with Google',
-      facebook: 'Continue with Facebook',
-      apple: 'Continue with Apple'
+      google: getText('pisell-login-and-register-google'),
+      facebook: getText('pisell-login-and-register-facebook'),
+      apple: getText('pisell-login-and-register-apple')
     } : _ref$socialLoginTexts,
     _ref$showFooter = _ref.showFooter,
     showFooter = _ref$showFooter === void 0 ? true : _ref$showFooter,
     _ref$showSignUp = _ref.showSignUp,
     showSignUp = _ref$showSignUp === void 0 ? true : _ref$showSignUp,
     _ref$signUpText = _ref.signUpText,
-    signUpText = _ref$signUpText === void 0 ? "Don't have an account? Sign up" : _ref$signUpText,
+    signUpText = _ref$signUpText === void 0 ? getText('pisell-login-and-register-sign-up') : _ref$signUpText,
     _ref$signUpLink = _ref.signUpLink,
     signUpLink = _ref$signUpLink === void 0 ? '' : _ref$signUpLink,
     _ref$signUpPosition = _ref.signUpPosition,
@@ -94,19 +95,19 @@ var loginAndRegister = function loginAndRegister(_ref) {
     _ref$showTabs = _ref.showTabs,
     showTabs = _ref$showTabs === void 0 ? true : _ref$showTabs,
     _ref$loginTabText = _ref.loginTabText,
-    loginTabText = _ref$loginTabText === void 0 ? 'Login' : _ref$loginTabText,
+    loginTabText = _ref$loginTabText === void 0 ? getText('pisell-login-and-register-login-tab') : _ref$loginTabText,
     _ref$registerTabText = _ref.registerTabText,
-    registerTabText = _ref$registerTabText === void 0 ? 'Register' : _ref$registerTabText,
+    registerTabText = _ref$registerTabText === void 0 ? getText('pisell-login-and-register-register-tab') : _ref$registerTabText,
     _ref$registerEmailPla = _ref.registerEmailPlaceholder,
-    registerEmailPlaceholder = _ref$registerEmailPla === void 0 ? 'Enter your email' : _ref$registerEmailPla,
+    registerEmailPlaceholder = _ref$registerEmailPla === void 0 ? getText('pisell-login-and-register-register-email-placeholder') : _ref$registerEmailPla,
     _ref$registerPassword = _ref.registerPasswordPlaceholder,
-    registerPasswordPlaceholder = _ref$registerPassword === void 0 ? 'Create a password' : _ref$registerPassword,
+    registerPasswordPlaceholder = _ref$registerPassword === void 0 ? getText('pisell-login-and-register-register-password-placeholder') : _ref$registerPassword,
     _ref$registerButtonTe = _ref.registerButtonText,
-    registerButtonText = _ref$registerButtonTe === void 0 ? 'Create account' : _ref$registerButtonTe,
+    registerButtonText = _ref$registerButtonTe === void 0 ? getText('pisell-login-and-register-register-button-text') : _ref$registerButtonTe,
     _ref$rememberMeText = _ref.rememberMeText,
-    rememberMeText = _ref$rememberMeText === void 0 ? 'Remember me' : _ref$rememberMeText,
+    rememberMeText = _ref$rememberMeText === void 0 ? getText('pisell-login-and-register-remember-me') : _ref$rememberMeText,
     _ref$forgotPasswordTe = _ref.forgotPasswordText,
-    forgotPasswordText = _ref$forgotPasswordTe === void 0 ? 'Forgot password?' : _ref$forgotPasswordTe,
+    forgotPasswordText = _ref$forgotPasswordTe === void 0 ? getText('pisell-login-and-register-forgot-password') : _ref$forgotPasswordTe,
     _ref$showRememberMe = _ref.showRememberMe,
     showRememberMe = _ref$showRememberMe === void 0 ? false : _ref$showRememberMe,
     _ref$showForgotPasswo = _ref.showForgotPassword,
@@ -218,6 +219,7 @@ var loginAndRegister = function loginAndRegister(_ref) {
       return _ref3.apply(this, arguments);
     };
   }();
+  console.log(registerButtonText, 'registerButtonText');
   return /*#__PURE__*/React.createElement("div", {
     className: "saas-login-main"
   }, /*#__PURE__*/React.createElement("div", {
@@ -285,7 +287,7 @@ var loginAndRegister = function loginAndRegister(_ref) {
     loading: loading,
     onClick: handleEmailLogin,
     className: "saas-login-button"
-  }, "Log in")) : /*#__PURE__*/React.createElement(Form, {
+  }, getText('pisell-login-and-register-login'))) : /*#__PURE__*/React.createElement(Form, {
     form: form
   }, /*#__PURE__*/React.createElement(Form.Item, {
     name: "email",

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

@@ -67,7 +67,7 @@
       position: relative;
       
       &.active {
-        color: #7F56D9;
+        color: var(--theme-color);
         
         &:after {
           content: '';
@@ -76,7 +76,7 @@
           left: 0;
           right: 0;
           height: 2px;
-          background: #7F56D9;
+          background: var(--theme-color);
         }
       }
       
@@ -105,11 +105,11 @@
       background: #FFF;
       
       &:hover {
-        border-color: #7F56D9;
+        border-color: var(--theme-color);
       }
       
       &:focus {
-        border-color: #7F56D9;
+        border-color: var(--theme-color);
         box-shadow: 0 0 0 4px rgba(127, 86, 217, 0.1);
       }
 
@@ -126,7 +126,7 @@
     .saas-login-button {
       height: 44px;
       border-radius: 8px;
-      background: #7F56D9;
+      background: var(--theme-color);
       border: none;
       font-weight: 500;
       
@@ -135,7 +135,7 @@
       }
       
       &:focus {
-        background: #7F56D9;
+        background: var(--theme-color);
         box-shadow: 0 0 0 4px rgba(127, 86, 217, 0.1);
       }
     }
@@ -185,7 +185,7 @@
       margin-bottom: 16px;
       
       a {
-        color: #7F56D9;
+        //color: #7F56D9;
         margin-left: 4px;
         cursor: pointer;
         

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ConfigProviderProps } from '../config-provider';
 interface PageProps extends ConfigProviderProps {
 }

package/es/components/page/index.js

@@ -63,7 +63,7 @@ var Page = function Page(props) {
         // cssVar: { key: 'app' },
         token: _objectSpread(_objectSpread({}, props.theme.token), {}, {
           // 外部透传主题时，如果没有传入colorPrimary 默认使用主项目内主题色
-          colorPrimary: (props === null || props === void 0 || (_props$theme = props.theme) === null || _props$theme === void 0 || (_props$theme = _props$theme.token) === null || _props$theme === void 0 ? void 0 : _props$theme.colorPrimary) || themeColor || '#7F56D9'
+          colorPrimary: (props === null || props === void 0 || (_props$theme = props.theme) === null || _props$theme === void 0 || (_props$theme = _props$theme.token) === null || _props$theme === void 0 ? void 0 : _props$theme.colorPrimary) || themeColor || '#5D3F9F'
         })
       });
     }
@@ -100,10 +100,10 @@ var Page = function Page(props) {
           colorErrorBg: '#FEF3F2',
           colorErrorBorderHover: '#FDA29B',
           colorErrorOutline: 'rgba(217, 45, 32, 0.06)',
-          colorLink: '#175CD3',
-          colorLinkActive: '#194185',
-          colorLinkHover: '#1849A9',
-          // colorPrimaryActive: '#7f56d9',
+          colorLink: '#7F56DA',
+          colorLinkActive: '#5F3DA8',
+          colorLinkHover: '#6D48C4',
+          // colorPrimaryActive: '#5D3F9F',
           // colorPrimaryBorder: '#E9D7FE',
           colorText: '#344054',
           colorTextDisabled: '#D0D5DD',
@@ -150,59 +150,25 @@ var Page = function Page(props) {
         Select: {
           fontSizeIcon: 16
           // "lineHeight": 1
+        },
+        Menu: {
+          subMenuItemSelectedColor: "#9976e3"
         }
       },
       token: {
-        colorPrimary: themeColor || '#7F56D9',
-        // colorPrimaryBg: '#F9F5FF',
-        // colorPrimaryBgHover: '#F4EBFF',
-        // colorPrimaryBorder: '#E9D7FE',
-        // colorPrimaryBorderHover: '#D6BBFB',
-        // colorPrimaryHover: '#6941C6',
-        // colorPrimaryActive: '#53389E',
-        // colorPrimaryTextHover: '#53389E',
-        // colorPrimaryText: '#6941C6',
-        // colorPrimaryTextActive: '#42307D',
-        colorSuccess: '#079455',
-        colorSuccessBg: '#ECFDF3',
-        colorSuccessBgHover: '#DCFAE6',
-        colorSuccessBorder: '#ABEFC6',
-        colorSuccessBorderHover: '#75E0A7',
-        colorSuccessHover: '#067647',
-        colorSuccessText: '#067647',
-        colorSuccessActive: '#085D3A',
-        colorSuccessTextHover: '#085D3A',
-        colorSuccessTextActive: '#074D31',
-        colorWarning: '#dc6803',
-        colorWarningBg: '#FFFAEB',
-        colorWarningBgHover: '#FEF0C7',
-        colorWarningBorder: '#FEDF89',
-        colorWarningBorderHover: '#FEC84B',
-        colorWarningHover: '#B54708',
-        colorWarningText: '#B54708',
-        colorWarningActive: '#93370D',
-        colorWarningTextHover: '#93370D',
-        colorWarningTextActive: '#7A2E0E',
-        colorError: '#d92d20',
-        colorErrorBg: '#FEF3F2',
-        colorErrorBgHover: '#FEE4E2',
-        colorErrorBorder: '#FECDCA',
-        colorErrorBorderHover: '#FDA29B',
-        colorErrorHover: '#B42318',
-        colorErrorText: '#B42318',
-        colorErrorActive: '#912018',
-        colorErrorTextHover: '#912018',
-        colorErrorTextActive: '#7A271A',
-        colorInfo: '#1570ef',
-        colorInfoBg: '#EFF8FF',
-        colorInfoBgHover: '#D1E9FF',
-        colorInfoBorder: '#B2DDFF',
-        colorInfoBorderHover: '#84CAFF',
-        colorInfoHover: '#175CD3',
-        colorInfoText: '#175CD3',
-        colorInfoActive: '#1849A9',
-        colorInfoTextHover: '#1849A9',
-        colorInfoTextActive: '#194185',
+        colorPrimary: themeColor || '#5D3F9F',
+        colorPrimaryBg: '#eee5ff',
+        colorPrimaryBgHover: '#e4d9fc',
+        colorPrimaryBorder: '#d4c3f7',
+        colorSuccess: '#5f9e3f',
+        colorInfo: '#5d3f9f',
+        colorError: '#f5222d',
+        colorSuccessBg: '#e5fcd9',
+        colorSuccessBgHover: '#d5f7c3',
+        // 链接色
+        colorLink: '#7F56DA',
+        colorLinkActive: '#5F3DA8',
+        colorLinkHover: '#6D48C4',
         colorText: '#101828',
         colorTextSecondary: '#475467',
         colorTextTertiary: '#667085',
@@ -226,7 +192,7 @@ var Page = function Page(props) {
     return createTheme({
       palette: {
         primary: {
-          main: ((_theme$token = theme.token) === null || _theme$token === void 0 ? void 0 : _theme$token.colorPrimary) || '#7F56D9'
+          main: ((_theme$token = theme.token) === null || _theme$token === void 0 ? void 0 : _theme$token.colorPrimary) || '#5D3F9F'
         }
       }
     });
@@ -255,7 +221,7 @@ var Page = function Page(props) {
     variables: ((_context$engine2 = context.engine) === null || _context$engine2 === void 0 || (_context$engine2 = _context$engine2.props) === null || _context$engine2 === void 0 ? void 0 : _context$engine2.variables) || {}
   }, /*#__PURE__*/React.createElement("div", {
     style: _objectSpread(_objectSpread({}, style), {}, {
-      '--theme-color': themeColor || '#7F56D9'
+      '--theme-color': themeColor || '#5D3F9F'
     }),
     className: className
   }, children))))))));

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

@@ -19,5 +19,5 @@ export interface PisellAnchorProps {
      */
     platform?: 'pc' | 'h5';
 }
-declare const PisellAnchor: React.ForwardRefExoticComponent<PisellAnchorProps & React.RefAttributes<any>>;
+declare const PisellAnchor: React.FC<PisellAnchorProps>;
 export default PisellAnchor;