clickvisual · kl7sn · Mar 18, 2022 · Mar 18, 2022 · Mar 18, 2022 · Mar 18, 2022
diff --git a/ui/src/locales/en-US.ts b/ui/src/locales/en-US.ts
@@ -448,4 +448,15 @@ export default {
     "Deleting notification channel {channelName}...",
   "alarm.notify.deleted.success":
     "Delete the notification channel {channelName} success",
+
+  // install
+  "install.init.text.databaseInit":
+    "To initialize the database, click the install button below",
+
+  "install.init.btn.databaseInit": "Database initialization",
+
+  "install.init.model.databaseInit.successTitle": "Initialization completed",
+  "install.init.model.databaseInit.successContent":
+    "When the database is initialized, click 'OK' to jump to the login page",
+  "install.init.model.databaseInit.successOkText": "OK",
 };
diff --git a/ui/src/locales/zh-CN.ts b/ui/src/locales/zh-CN.ts
@@ -418,4 +418,14 @@ export default {
   "alarm.notify.modal.content": "确定删除通知方式：{channelName} 吗？",
   "alarm.notify.deleted.loading": "正在删除通知方式 {channelName}...",
   "alarm.notify.deleted.success": "删除通知方式 {channelName} 成功",
+
+  // install
+  "install.init.text.databaseInit": "需要进行数据库初始化，请点击下方安装按钮",
+
+  "install.init.btn.databaseInit": "数据库初始化",
+
+  "install.init.model.databaseInit.successTitle": "初始化完成",
+  "install.init.model.databaseInit.successContent":
+    "数据库初始化完成，点击'确定'按钮跳转到登录页面",
+  "install.init.model.databaseInit.successOkText": "确定",
 };
diff --git a/ui/src/pages/DataLogs/components/DataSourceMenu/LogLibraryList/LogLibraryInfoDraw/index.tsx b/ui/src/pages/DataLogs/components/DataSourceMenu/LogLibraryList/LogLibraryInfoDraw/index.tsx
@@ -64,6 +64,32 @@ const LogLibraryInfoDraw = (props: LogLibraryInfoDrawProps) => {
        => onChangeLogLibraryInfoDrawVisible(false)}
     >
       <div className={infoStyles.infoMain}>
+        <div className={infoStyles.firstLine}>
+          <div>
+            <span className={classNames(infoStyles.title)}>
+              {i18n.formatMessage({
+                id: "datasource.logLibrary.from.creationMode",
+              })}
+            </span>
+            <span>:&nbsp;</span>
+            <span>
+              {i18n.formatMessage({
+                id: `datasource.logLibrary.from.creationMode.option.${
+                  logLibrary.createType === 0 ? "newLogLibrary" : "logLibrary"
+                }`,
+              })}
+            </span>
+          </div>
+          <div>
+            <span className={classNames(infoStyles.title)}>
+              {i18n.formatMessage({
+                id: "datasource.logLibrary.from.newLogLibrary.timeResolutionField",
+              })}
+            </span>
+            <span>:&nbsp;</span>
+            <span>{libraryInfo.timeField}</span>
+          </div>
+        </div>
         <div className={infoStyles.firstLine}>
           <div>
             <span className={classNames(infoStyles.title)}>

diff --git a/ui/src/pages/DataLogs/components/DataSourceMenu/LogLibraryList/LogLibraryItem/index.tsx b/ui/src/pages/DataLogs/components/DataSourceMenu/LogLibraryList/LogLibraryItem/index.tsx
@@ -159,7 +159,7 @@ const LogLibraryItem = (props: LogLibraryItemProps) => {
         mouseEnter && logLibraryListStyles.LogLibraryHover
       )}
     >
-      <Tooltip title={logLibrary.tableName} placement={"right"}>
+      <Tooltip title={logLibrary.tableName}>
         <span
            => {
             if (currentLogLibrary?.id === logLibrary.id) return;

diff --git a/ui/src/pages/DataLogs/components/DataSourceMenu/ModalCreatedLogLibrary/LocalTable/index.tsx b/ui/src/pages/DataLogs/components/DataSourceMenu/ModalCreatedLogLibrary/LocalTable/index.tsx
@@ -37,6 +37,14 @@ const LocalTable = ({ formRef }: LocalTableProps) => {
       <Form.Item
         label={i18n.formatMessage({ id: "datasource.draw.table.instance" })}
         name={"instance"}
+        rules={[
+          {
+            required: true,
+            message: i18n.formatMessage({
+              id: "datasource.draw.selected",
+            }),
+          },
+        ]}
       >
         <Select
           placeholder={`${i18n.formatMessage({
@@ -75,6 +83,14 @@ const LocalTable = ({ formRef }: LocalTableProps) => {
                   id: "alarm.rules.inspectionFrequency.selectOption.logLibrary",
                 })}`}
                 name={"localTables"}
+                rules={[
+                  {
+                    required: true,
+                    message: i18n.formatMessage({
+                      id: "alarm.rules.selected.placeholder.database",
+                    }),
+                  },
+                ]}
               >
                 <Cascader
                   showSearch
@@ -130,11 +146,19 @@ const LocalTable = ({ formRef }: LocalTableProps) => {
                   id: "datasource.logLibrary.from.newLogLibrary.timeResolutionField",
                 })}
                 name={"timeField"}
+                rules={[
+                  {
+                    required: true,
+                    message: i18n.formatMessage({
+                      id: "datasource.logLibrary.from.newLogLibrary.timeResolutionField.placeholder",
+                    }),
+                  },
+                ]}
               >
                 <Select
-                  placeholder={i18n.formatMessage({
+                  placeholder={`${i18n.formatMessage({
                     id: "datasource.logLibrary.from.newLogLibrary.timeResolutionField.placeholder",
-                  })}
+                  })}`}
                 >
                   {conformToStandard.map((item) => (
                     <Option key={item.name} value={item.name}>

diff --git a/ui/src/pages/Install/Init/index.tsx b/ui/src/pages/Install/Init/index.tsx
@@ -17,9 +17,15 @@ const Init = () => {
       doInstall.run().then((res) => {
         if (res?.code !== 0) return;
         Modal.success({
-          title: "初始化完成",
-          content: "数据库初始化完成，点击'确定'按钮跳转到登录页面",
-          okText: "确定",
+          title: i18n.formatMessage({
+            id: "install.init.model.databaseInit.successTitle",
+          }),
+          content: i18n.formatMessage({
+            id: "install.init.model.databaseInit.successContent",
+          }),
+          okText: i18n.formatMessage({
+            id: "nstall.init.model.databaseInit.successOkText",
+          }),
           closable: true,
           onOk: () => {
             history.push(LOGIN_PATH);
@@ -32,7 +38,9 @@ const Init = () => {
   return (
     <div className={classNames(initStyles.installMain)}>
       <div className={initStyles.installTip}>
-        <span>需要进行数据库初始化，请点击下方安装按钮</span>
+        <span>
+          {i18n.formatMessage({ id: "install.init.text.databaseInit" })}
+        </span>
       </div>
       <div className={initStyles.installBtnBox}>
         <Button
@@ -43,7 +51,7 @@ const Init = () => {
           size={"large"}
           >
         >
-          数据库初始化
+          {i18n.formatMessage({ id: "install.init.btn.databaseInit" })}
         </Button>
       </div>
     </div>