Merge remote-tracking branch 'origin/main'

web/src/components/PersonalSetting.js

@@ -595,7 +595,7 @@ const PersonalSetting = () => {
                   onCancel={() => setShowWeChatBindModal(false)}
                   // onOpen={() => setShowWeChatBindModal(true)}
                   visible={showWeChatBindModal}
-                  size={'mini'}
+                  size={'small'}
                 >
                   <Image src={status.wechat_qrcode} />
                   <div style={{ textAlign: 'center' }}>
@@ -645,7 +645,7 @@ const PersonalSetting = () => {
                   onClick={sendVerificationCode}
                   disabled={disableButton || loading}
                 >
-                  {disableButton ? `重新发送(${countdown})` : '获取验证码'}
+                  {disableButton ? `重新发送 (${countdown})` : '获取验证码'}
                 </Button>
               </div>
               <div style={{ marginTop: 10 }}>

web/src/components/SystemSetting.js

@@ -42,7 +42,7 @@ const SystemSetting = () => {
     TurnstileSecretKey: '',
     RegisterEnabled: '',
     EmailDomainRestrictionEnabled: '',
-    EmailDomainWhitelist: '',
+    EmailDomainWhitelist: [],
     // telegram login
     TelegramOAuthEnabled: '',
     TelegramBotToken: '',
@@ -85,6 +85,7 @@ const SystemSetting = () => {
   useEffect(() => {
     getOptions().then();
   }, []);
+  useEffect(() => {}, [inputs.EmailDomainWhitelist]);
 
   const updateOption = async (key, value) => {
     setLoading(true);

web/src/pages/Setting/index.js

@@ -39,7 +39,7 @@ const Setting = () => {
         <Layout.Content>
           <Tabs type='line' defaultActiveKey='1'>
             {panes.map((pane) => (
-              <TabPane itemKey={pane.itemKey} tab={pane.tab}>
+              <TabPane itemKey={pane.itemKey} tab={pane.tab} key={pane.itemKey}>
                 {pane.content}
               </TabPane>
             ))}