diff --git a/src/component/ExecuteSqlDetailModal/constant.tsx b/src/component/ExecuteSqlDetailModal/constant.tsx index cc4be70c2..4d7168755 100644 --- a/src/component/ExecuteSqlDetailModal/constant.tsx +++ b/src/component/ExecuteSqlDetailModal/constant.tsx @@ -110,6 +110,9 @@ export const executeViewOptionsInPlan = [ }, ]; -export const planTabLabel = '计划统计'; +export const planTabLabel = formatMessage({ + id: 'src.component.ExecuteSqlDetailModal.1882C007', + defaultMessage: '计划统计', +}); export const planTabOption = [{ value: PLAN_PAGE_TYPE.PLAN_DETAIL, label: planTabLabel }]; diff --git a/src/component/SQLConfig/index.tsx b/src/component/SQLConfig/index.tsx index d0ce8b7c0..c5852f27d 100644 --- a/src/component/SQLConfig/index.tsx +++ b/src/component/SQLConfig/index.tsx @@ -72,7 +72,10 @@ const SQLConfig: React.FC = function (props) { width: '100%', }} > - Delimiter 设置 + {formatMessage({ + id: 'src.component.SQLConfig.1D15916D', + defaultMessage: 'Delimiter 设置', + })} @@ -97,7 +100,9 @@ const SQLConfig: React.FC = function (props) { /> -

查询结果

+

+ {formatMessage({ id: 'src.component.SQLConfig.27EDBEAB', defaultMessage: '查询结果' })} +

{ @@ -295,6 +298,7 @@ const TaskApplyList: React.FC = (props) => { onOk: onReclaim, }, ], + getCheckboxProps: (record: ITablePermission) => { return { disabled: record?.status === TablePermissionStatus.EXPIRED, diff --git a/src/page/Project/User/ManageModal/Table/UserAuthList/index.tsx b/src/page/Project/User/ManageModal/Table/UserAuthList/index.tsx index ca8fa1e40..358820196 100644 --- a/src/page/Project/User/ManageModal/Table/UserAuthList/index.tsx +++ b/src/page/Project/User/ManageModal/Table/UserAuthList/index.tsx @@ -75,7 +75,10 @@ const getColumns = (params: { }, { dataIndex: 'databaseName', - title: '所属数据库', + title: formatMessage({ + id: 'src.page.Project.User.ManageModal.Table.UserAuthList.AB937C7D', + defaultMessage: '所属数据库', + }), width: 208, ellipsis: true, filterDropdown: (props) => { @@ -242,6 +245,7 @@ const UserAuthList: React.FC = (props) => { onOk: onReclaim, }, ], + getCheckboxProps: (record: ITablePermission) => { return { disabled: record?.status === TablePermissionStatus.EXPIRED, diff --git a/src/page/Workspace/SideBar/ResourceTree/DatabaseSearchModal/components/DatabaseList.tsx b/src/page/Workspace/SideBar/ResourceTree/DatabaseSearchModal/components/DatabaseList.tsx index 7ec6bbf6e..07efbcce3 100644 --- a/src/page/Workspace/SideBar/ResourceTree/DatabaseSearchModal/components/DatabaseList.tsx +++ b/src/page/Workspace/SideBar/ResourceTree/DatabaseSearchModal/components/DatabaseList.tsx @@ -94,14 +94,27 @@ const DatabaseList = ({ ); } - return 库内搜索; + return ( + + {formatMessage({ + id: 'src.page.Workspace.SideBar.ResourceTree.DatabaseSearchModal.components.6C33321C', + defaultMessage: '库内搜索', + })} + + ); }; if (database && !searchKey) { return (
openSql(e, database)}> - {`定位到数据库 "${database?.name}"`} + {formatMessage( + { + id: 'src.page.Workspace.SideBar.ResourceTree.DatabaseSearchModal.components.FA5E6855', + defaultMessage: '定位到数据库 "${database?.name}"', + }, + { databaseName: database?.name }, + )}
); diff --git a/src/page/Workspace/SideBar/ResourceTree/DatabaseSearchModal/components/ObjectList.tsx b/src/page/Workspace/SideBar/ResourceTree/DatabaseSearchModal/components/ObjectList.tsx index b872d1b02..4adce5dc6 100644 --- a/src/page/Workspace/SideBar/ResourceTree/DatabaseSearchModal/components/ObjectList.tsx +++ b/src/page/Workspace/SideBar/ResourceTree/DatabaseSearchModal/components/ObjectList.tsx @@ -108,6 +108,7 @@ const ObjectList = ({ ); + case DbObjectType.database: { const { dataSource } = item; const { name: dataSourceName, dialectType } = dataSource; @@ -145,7 +146,12 @@ const ObjectList = ({ {!objectlist?.dbColumns?.length && !objectlist?.dbObjects?.length ? (
- +
) : (
@@ -170,7 +176,10 @@ const ObjectList = ({ type="link" onClick={() => setActiveKey(i.key)} > - 全部搜索结果 + {formatMessage({ + id: 'src.page.Workspace.SideBar.ResourceTree.DatabaseSearchModal.components.5DDBC7F0', + defaultMessage: '全部搜索结果', + })} ) : null}
@@ -206,6 +215,7 @@ const ObjectList = ({ }} /> )} + {object?.name} applyDbPermission(e, object)} > - 申请库权限 + {formatMessage({ + id: 'src.page.Workspace.SideBar.ResourceTree.DatabaseSearchModal.components.DB7526F7', + defaultMessage: '申请库权限', + })} ); }; @@ -315,7 +328,10 @@ const ObjectList = ({ setSearchKey(''); }} > - 继续搜索 + {formatMessage({ + id: 'src.page.Workspace.SideBar.ResourceTree.DatabaseSearchModal.components.E74A1569', + defaultMessage: '继续搜索', + })} ); } @@ -325,7 +341,10 @@ const ObjectList = ({ style={{ padding: 0, height: 18 }} onClick={(e) => applyDbPermission(e, object)} > - 申请库权限 + {formatMessage({ + id: 'src.page.Workspace.SideBar.ResourceTree.DatabaseSearchModal.components.64F32480', + defaultMessage: '申请库权限', + })} ); }; @@ -359,7 +378,16 @@ const ObjectList = ({ -
暂无数据
如果检索不到已存在的数据库对象,请先同步元数据 +
+ {formatMessage({ + id: 'src.page.Workspace.SideBar.ResourceTree.DatabaseSearchModal.components.6656C471', + defaultMessage: '暂无数据', + })} +
+ {formatMessage({ + id: 'src.page.Workspace.SideBar.ResourceTree.DatabaseSearchModal.components.657DE57E', + defaultMessage: '如果检索不到已存在的数据库对象,请先同步元数据', + })} } /> diff --git a/src/page/Workspace/SideBar/ResourceTree/DatabaseSearchModal/components/Search.tsx b/src/page/Workspace/SideBar/ResourceTree/DatabaseSearchModal/components/Search.tsx index 1e61ddcf2..8adb6b7ae 100644 --- a/src/page/Workspace/SideBar/ResourceTree/DatabaseSearchModal/components/Search.tsx +++ b/src/page/Workspace/SideBar/ResourceTree/DatabaseSearchModal/components/Search.tsx @@ -87,7 +87,10 @@ const Search = ({ diff --git a/src/page/Workspace/components/DDLResultSet/index.tsx b/src/page/Workspace/components/DDLResultSet/index.tsx index 378fc76b0..08faf7d39 100644 --- a/src/page/Workspace/components/DDLResultSet/index.tsx +++ b/src/page/Workspace/components/DDLResultSet/index.tsx @@ -692,13 +692,23 @@ const DDLResultSet: React.FC = function (props) { })}
- 集合 SQL 的执行详情、物理执行计划、全链路诊断的多维度视图,帮助快速定位执行慢查询的根因 + {formatMessage({ + id: 'src.page.Workspace.components.DDLResultSet.6477DD60', + defaultMessage: + '集合 SQL 的执行详情、物理执行计划、全链路诊断的多维度视图,帮助快速定位执行慢查询的根因', + })}
- 我知道了 + + + {formatMessage({ + id: 'src.page.Workspace.components.DDLResultSet.90E40FCF', + defaultMessage: '我知道了', + })} + ); }; @@ -759,6 +769,7 @@ const DDLResultSet: React.FC = function (props) { /> ))} + {showTrace && (isString(obVersion) && OBCompare(obVersion, ODC_TRACE_SUPPORT_VERSION, '>=') ? ( = function (props) { ) : null} {/* } - onClick={onRefresh.bind(this, this.state.limit || 1000)} - /> */} + text={formatMessage({ id: "workspace.window.session.button.refresh" })} + icon={} + onClick={onRefresh.bind(this, this.state.limit || 1000)} + /> */}
diff --git a/src/page/Workspace/components/SQLResultSet/SQLResultLog.tsx b/src/page/Workspace/components/SQLResultSet/SQLResultLog.tsx index 18b6d8a5c..526d5e640 100644 --- a/src/page/Workspace/components/SQLResultSet/SQLResultLog.tsx +++ b/src/page/Workspace/components/SQLResultSet/SQLResultLog.tsx @@ -112,7 +112,15 @@ const runningLogPage = (
-
{`共有 ${count} 个 SQL 执行,当前正在执行第 ${currentSQLIndex + 1} 个`}
+
+ {formatMessage( + { + id: 'src.page.Workspace.components.SQLResultSet.7F598F77', + defaultMessage: '共有 ${count} 个 SQL 执行,当前正在执行第 ${currentSQLIndex + 1} 个', + }, + { count: count, BinaryExpression1: currentSQLIndex + 1 }, + )} +
{currentExecuteInfo?.traceId && ( diff --git a/src/page/Workspace/components/SQLResultSet/index.tsx b/src/page/Workspace/components/SQLResultSet/index.tsx index f0d46b899..3c47ed733 100644 --- a/src/page/Workspace/components/SQLResultSet/index.tsx +++ b/src/page/Workspace/components/SQLResultSet/index.tsx @@ -299,6 +299,7 @@ const SQLResultSet: React.FC = function (props) { ), + key: sqlLintTabKey, children: ( = function (props) { if (isLogTab) { let count = { [ISqlExecuteResultStatus.WAITING]: { - lable: '待执行', + lable: formatMessage({ + id: 'src.page.Workspace.components.SQLResultSet.6F910473', + defaultMessage: '待执行', + }), count: set?.total, }, [ISqlExecuteResultStatus.SUCCESS]: { @@ -476,6 +480,7 @@ const SQLResultSet: React.FC = function (props) { ), + key: set.uniqKey, children: (