Merge branch 'dev-4.2.4' into dev-4.3.0

oceanbase · May 10, 2024 · 389723b · 389723b
2 parents ce96535 + 3705554
commit 389723b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/src/component/Task/DataArchiveTask/DetailContent/index.tsx b/src/component/Task/DataArchiveTask/DetailContent/index.tsx
@@ -193,10 +193,17 @@ const DataArchiveTaskContent: React.FC<IProps> = (props) => {
           {taskExecStrategyMap[triggerConfig.triggerStrategy]}
         </Descriptions.Item>
         {triggerConfig.triggerStrategy === TaskExecStrategy.START_AT && (
-          <Descriptions.Item label="执行时间">
+          <Descriptions.Item
+            label={
+              formatMessage({
+                id: 'src.component.Task.DataArchiveTask.DetailContent.074676BE',
+              }) /*"执行时间"*/
+            }
+          >
             {getLocalFormatDateTime(triggerConfig?.startAt)}
           </Descriptions.Item>
         )}
+
         {isCycleStrategy && (
           <Descriptions.Item>
             <Collapse
@@ -227,6 +234,7 @@ const DataArchiveTaskContent: React.FC<IProps> = (props) => {
             </Collapse>
           </Descriptions.Item>
         )}
+
         <Descriptions.Item
           label={
             formatMessage({
@@ -282,6 +290,7 @@ const DataArchiveTaskContent: React.FC<IProps> = (props) => {
           marginTop: 4,
         }}
       />
+
       <Descriptions column={2}>
         <Descriptions.Item
           label={formatMessage({

diff --git a/src/component/helpDoc/doc.tsx b/src/component/helpDoc/doc.tsx
@@ -375,8 +375,8 @@ export default {
     <p>
       {
         formatMessage({
-          id: 'src.component.helpDoc.69D23502' /*超出数量后，仅保留最近若干个分区，其他分区均删除*/,
-        }) /* 超出数量后，仅保留最近若干个分区，其他分区均删除 */
+          id: 'src.component.helpDoc.3DE01124' /*仅保留最新的若干个分区，去他分区均删除。分区保留数目通常需要大于分区预创建数目，避免仅将预创建的分区保留而删除了全部的历史分区*/,
+        }) /* 仅保留最新的若干个分区，去他分区均删除。分区保留数目通常需要大于分区预创建数目，避免仅将预创建的分区保留而删除了全部的历史分区 */
       }
     </p>
   ),

diff --git a/src/locales/must/strings/en-US.json b/src/locales/must/strings/en-US.json
@@ -4621,7 +4621,6 @@
   "src.page.ExternalIntegration.SSO.NewSSODrawerButton.506C2E48": "Create Login Integration",
   "src.page.Secure.Env.components.8DBF10C0": "Failed to disable",
   "src.page.Project.User.FE2F4924": "No permissions",
-  "src.component.helpDoc.69D23502": "When exceeding the limit, only retain the most recent several partitions, and delete the rest.",
   "src.component.Task.component.PartitionPolicyTable.68E34A9C": "Suffix: ",
   "src.component.Task.component.PartitionPolicyTable.2C76F5F5": "Expression",
   "src.component.helpDoc.188E681E": "User Authorization: Permissions granted by project administrators or DBA.",
@@ -4667,5 +4666,7 @@
   "src.constant.2AC9D3B7": "Approve Schema Comparison Task",
   "src.constant.052399AE": "Create Schema Comparison Task",
   "src.page.Secure.Record.RecordPage.14735BCB": "Data Source Name",
-  "src.constant.8171D57C": "Reject Schema Comparison Task"
+  "src.constant.8171D57C": "Reject Schema Comparison Task",
+  "src.component.helpDoc.3DE01124": "Retain only the latest several partitions and delete the rest. When setting the number of partitions to retain, consider the impact of pre-creating partitions to avoid mistakenly deleting historical partitions due to pre-creation. For more information, refer to the documentation.",
+  "src.component.Task.DataArchiveTask.DetailContent.074676BE": "Execution time"
 }
diff --git a/src/locales/must/strings/zh-CN.json b/src/locales/must/strings/zh-CN.json
@@ -4528,7 +4528,6 @@
   "src.component.Task.component.PartitionPolicyTable.2C76F5F5": "表达式",
   "src.page.Project.B4D9BC23": "消息",
   "src.page.Workspace.SideBar.ResourceTree.TreeNodeMenu.config.42C44540": "导出结果集",
-  "src.component.helpDoc.69D23502": "超出数量后，仅保留最近若干个分区，其他分区均删除",
   "src.component.Task.StructureComparisonTask.DetailContent.A725ADD7": "比对结果",
   "src.page.Secure.Record.RecordPage.52BD5121": "批量删除敏感列",
   "src.page.Secure.Env.components.B398D211": "禁用成功",
@@ -4666,5 +4665,7 @@
   "src.page.Secure.Record.RecordPage.14735BCB": "数据源名称",
   "src.constant.052399AE": "创建结构比对任务",
   "src.constant.2AC9D3B7": "同意结构比对任务",
-  "src.constant.8171D57C": "拒绝结构比对任务"
+  "src.constant.8171D57C": "拒绝结构比对任务",
+  "src.component.helpDoc.3DE01124": "仅保留最新的若干个分区，其他分区均删除。分区保留数目的设置需要考虑预创建分区的影响，避免因为分区预创建而导致的历史分区误删，详细信息请查阅文档",
+  "src.component.Task.DataArchiveTask.DetailContent.074676BE": "执行时间"
 }
diff --git a/src/locales/must/strings/zh-TW.json b/src/locales/must/strings/zh-TW.json
@@ -4593,7 +4593,6 @@
   "src.page.Workspace.SideBar.ResourceTree.TreeNodeMenu.config.42C44540": "導出結果集",
   "src.page.Secure.Record.RecordPage.2D2EFDF4": "刪除自動授權規則",
   "src.component.Task.component.PartitionPolicyFormTable.RuleFormItem.13EB1436": "請輸入 SQL 表達式生成分區上界,可引用變量如 ${INTERVAL}",
-  "src.component.helpDoc.69D23502": "超出數量後,僅保留最近若干個分區,其他分區均刪除",
   "src.page.Project.Notification.components.982731E2": "請輸入",
   "src.page.Workspace.SideBar.ResourceTree.TreeNodeMenu.config.36AA3D8E": "定時任務",
   "src.page.Project.Notification.components.5909ABDC": "新建推送通道",
@@ -4668,5 +4667,7 @@
   "src.page.Secure.Record.RecordPage.A75C9FD5": "數據源類型",
   "src.constant.052399AE": "創建結構比對任務",
   "src.page.Secure.Record.RecordPage.14735BCB": "數據源名稱",
-  "src.constant.8282AA35": "執行結構比對任務"
+  "src.constant.8282AA35": "執行結構比對任務",
+  "src.component.helpDoc.3DE01124": "僅保留最新的若干個分區,其他分區均刪除。 分區保留數目的設置需要考慮預創建分區的影響,避免因為分區預創建而導致的歷史分區誤刪,詳細信息請查閱文檔",
+  "src.component.Task.DataArchiveTask.DetailContent.074676BE": "執行時間"
 }