i18n and format code

oceanbase · Jun 17, 2024 · 79bb399 · 79bb399
1 parent 15d726b
commit 79bb399
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 12 deletions.
diff --git a/ui/.prettierrc b/ui/.prettierrc
@@ -2,6 +2,7 @@
   "printWidth": 80,
   "singleQuote": true,
   "trailingComma": "all",
+  "tabWidth": 2,
   "proseWrap": "never",
   "overrides": [{ "files": ".prettierrc", "options": { "parser": "json" } }],
   "plugins": ["prettier-plugin-organize-imports", "prettier-plugin-packagejson"]

diff --git a/ui/package.json b/ui/package.json
@@ -9,7 +9,7 @@
     "postinstall": "max setup",
     "lint": "eslint src",
     "oic:clear": "oic --configPath ./must.cjs --clear",
-    "oic:extract": "oic --configPath ./must.cjs --extract --translate",
+    "oic:extract": "oic --configPath ./must.cjs --extract",
     "prepare": "cd .. && husky ui/.husky",
     "setup": "max setup",
     "start": "npm run dev"

diff --git a/ui/src/i18n/strings/zh-CN.json b/ui/src/i18n/strings/zh-CN.json
@@ -1021,5 +1021,11 @@
   "src.pages.OBProxy.Detail.Overview.D537DD35": "参数设置",
   "src.pages.OBProxy.Detail.Overview.8A75D872": "请选择",
   "src.pages.OBProxy.Detail.Overview.8E87D135": "添加",
-  "src.components.CustomFormItem.2C6315A1": "请输入"
+  "src.components.CustomFormItem.2C6315A1": "请输入",
+  "src.pages.OBProxy.New.2C466A93": "基本信息",
+  "src.pages.OBProxy.New.0AE478F2": "请选择",
+  "src.pages.OBProxy.Detail.Overview.A9BB34D6": "操作成功！",
+  "src.pages.OBProxy.Detail.Overview.FEBB24FF": "删除列表中的参数并不会将原来已经设置的参数复原，如果需要参数立即生效，请覆盖参数为原值或者重启集群",
+  "src.pages.OBProxy.Detail.Overview.A6701513": "请输入",
+  "src.pages.OBProxy.Detail.Overview.4AB0B6DC": "基本信息"
 }
diff --git a/ui/src/pages/Cluster/Detail/Monitor/index.tsx b/ui/src/pages/Cluster/Detail/Monitor/index.tsx
@@ -3,12 +3,11 @@ import { getClusterDetailReq } from '@/services';
 import { PageContainer } from '@ant-design/pro-components';
 import { useParams } from '@umijs/max';
 import { useRequest } from 'ahooks';
-import { useEffect,useState } from 'react';
+import { useEffect, useState } from 'react';
 import BasicInfo from '../Overview/BasicInfo';
 
 import { getFilterData } from '@/components/MonitorDetail/helper';
 
-
 export default function Monitor() {
   const { ns, name, clusterName } = useParams();
   const [filterData, setFilterData] = useState<Monitor.FilterDataType>({
@@ -35,7 +34,7 @@ export default function Monitor() {
   );
 
   useEffect(() => {
-    getClusterDetail({ ns:ns!, name:name! });
+    getClusterDetail({ ns: ns!, name: name! });
   }, []);
   return (
     <PageContainer>

diff --git a/ui/src/pages/OBProxy/Detail/Overview/BasicInfo.tsx b/ui/src/pages/OBProxy/Detail/Overview/BasicInfo.tsx
@@ -26,7 +26,17 @@ export default function BasicInfo({
   style,
 }: BasicInfoProps) {
   return (
-    <Card style={style} title={<h2 style={{ marginBottom: 0 }}>基本信息</h2>}>
+    <Card
+      style={style}
+      title={
+        <h2 style={{ marginBottom: 0 }}>
+          {intl.formatMessage({
+            id: 'src.pages.OBProxy.Detail.Overview.4AB0B6DC',
+            defaultMessage: '基本信息',
+          })}
+        </h2>
+      }
+    >
       <Descriptions column={3}>
         <Descriptions.Item
           label={intl.formatMessage({

diff --git a/ui/src/pages/OBProxy/Detail/Overview/ConfigDrawer.tsx b/ui/src/pages/OBProxy/Detail/Overview/ConfigDrawer.tsx
@@ -67,7 +67,12 @@ export default function ConfigDrawer({
     }
     const res = await obproxy.patchOBProxy(namespace!, name!, values);
     if (res.successful) {
-      message.success('操作成功！');
+      message.success(
+        intl.formatMessage({
+          id: 'src.pages.OBProxy.Detail.Overview.A9BB34D6',
+          defaultMessage: '操作成功！',
+        }),
+      );
       submitCallback && submitCallback();
       onClose();
     }
@@ -203,7 +208,11 @@ export default function ConfigDrawer({
         </CustomFormItem>
         <p style={titleStyle}>
           <IconTip
-            tip="删除列表中的参数并不会将原来已经设置的参数复原，如果需要参数立即生效，请覆盖参数为原值或者重启集群"
+            tip={intl.formatMessage({
+              id: 'src.pages.OBProxy.Detail.Overview.FEBB24FF',
+              defaultMessage:
+                '删除列表中的参数并不会将原来已经设置的参数复原，如果需要参数立即生效，请覆盖参数为原值或者重启集群',
+            })}
             content={intl.formatMessage({
               id: 'src.pages.OBProxy.Detail.Overview.D537DD35',
               defaultMessage: '参数设置',
@@ -249,7 +258,12 @@ export default function ConfigDrawer({
                   </Col>
                   <Col span={11}>
                     <CustomFormItem name={[name, 'value']}>
-                      <Input placeholder="请输入" />
+                      <Input
+                        placeholder={intl.formatMessage({
+                          id: 'src.pages.OBProxy.Detail.Overview.A6701513',
+                          defaultMessage: '请输入',
+                        })}
+                      />
                     </CustomFormItem>
                   </Col>
                   <Col

diff --git a/ui/src/pages/OBProxy/New/BasicConfig.tsx b/ui/src/pages/OBProxy/New/BasicConfig.tsx
@@ -25,14 +25,19 @@ export default function BasicConfig({ form }: BasicConfigProps) {
     if (selectCluster && !form.getFieldValue('namespace')) {
       try {
         form.setFieldValue('namespace', JSON.parse(selectCluster).namespace);
-        form.validateFields(['namespace'])
+        form.validateFields(['namespace']);
       } catch (err) {
         console.error('err:', err);
       }
     }
   }, [selectCluster]);
   return (
-    <Card title={'基本信息'}>
+    <Card
+      title={intl.formatMessage({
+        id: 'src.pages.OBProxy.New.2C466A93',
+        defaultMessage: '基本信息',
+      })}
+    >
       <Row gutter={[16, 32]}>
         <Col span={8}>
           <TooltipPretty
@@ -117,7 +122,13 @@ export default function BasicConfig({ form }: BasicConfigProps) {
               },
             ]}
           >
-            <Select placeholder="请选择" options={clisterList} />
+            <Select
+              placeholder={intl.formatMessage({
+                id: 'src.pages.OBProxy.New.0AE478F2',
+                defaultMessage: '请选择',
+              })}
+              options={clisterList}
+            />
           </Form.Item>
         </Col>
         <Col span={8}>