[Optimization-1180][web] Optimizate task delete and cluster manager (#1181)

Co-authored-by: wenmo <32723967+wenmo@users.noreply.github.com>

dlink-web/src/locales/en-US/global.ts

@@ -111,7 +111,7 @@ export default {
   'global.table.nickName': 'Nick Name',
   'global.table.instanceName': 'Instance Name',
   'global.table.instanceId': 'Instance Id',
-  'global.table.clusterManagement': 'Cluster Management',
+  'global.table.clusterManagement': 'Flink Instance Management',
   'global.table.create': 'Create',
   'global.table.heartbeat': 'Heartbeat',
   'global.table.recycle': 'Recycle',

dlink-web/src/locales/en-US/menu.ts

@@ -37,7 +37,7 @@ export default {
 
   'menu.registration': 'Registration Center',
   'menu.registration.cluster': 'Cluster Management',
-  'menu.registration.cluster.clusterInstance': 'Cluster Instance',
+  'menu.registration.cluster.clusterInstance': 'Flink Instance',
   'menu.registration.cluster.clusterConfiguration': 'Cluster Config',
   'menu.registration.jar': 'Jar Management',
   'menu.registration.database': 'Data Source Management',

dlink-web/src/locales/zh-CN/global.ts

@@ -110,9 +110,9 @@ export default {
   'global.table.jobManagerHaAddress': 'JobManger 高可用地址',
   'global.table.type': '类型',
   'global.table.nickName': '昵称',
-  'global.table.instanceName': '集群实例',
+  'global.table.instanceName': '实例名',
   'global.table.instanceId': '实例 Id',
-  'global.table.clusterManagement': '集群管理',
+  'global.table.clusterManagement': 'Flink 实例管理',
   'global.table.create': '创建',
   'global.table.heartbeat': '心跳',
   'global.table.recycle': '回收',

dlink-web/src/locales/zh-CN/menu.ts

@@ -36,7 +36,7 @@ export default {
 
   'menu.registration': '注册中心',
   'menu.registration.cluster': '集群管理',
-  'menu.registration.cluster.clusterInstance': '集群实例管理',
+  'menu.registration.cluster.clusterInstance': 'Flink 实例管理',
   'menu.registration.cluster.clusterConfiguration': '集群配置管理',
   'menu.registration.jar': 'Jar 管理',
   'menu.registration.database': '数据源管理',

dlink-web/src/pages/Cluster/index.tsx

@@ -66,8 +66,8 @@ const ClusterTableList: React.FC<{}> = (props: any) => {
       setFormValues(currentItem);
     } else if (key === 'delete') {
       Modal.confirm({
-        title: '删除集群',
-        content: '确定删除该集群吗？',
+        title: '删除 Flink 实例',
+        content: '确定删除该 Flink 实例吗？',
         okText: l('button.confirm'),
         cancelText: l('button.cancel'),
         onOk: async () => {
@@ -86,13 +86,13 @@ const ClusterTableList: React.FC<{}> = (props: any) => {
   const clearCluster = async () => {
 
     Modal.confirm({
-      title: '回收集群',
-      content: '确定回收所有自动创建且过期的集群吗？',
+      title: '回收 Flink 实例',
+      content: '确定回收所有自动创建且过期的 Flink 实例吗？',
       okText: l('button.confirm'),
       cancelText: l('button.cancel'),
       onOk: async () => {
-        const {datas} = await getData(url + '/clear', '回收集群', null);
-        message.success(`成功回收${datas}个集群`);
+        const {datas} = await getData(url + '/clear', '回收 Flink 实例', null);
+        message.success(`成功回收${datas}个 Flink 实例`);
         actionRef.current?.reloadAndRest?.();
       }
     });
@@ -199,7 +199,7 @@ const ClusterTableList: React.FC<{}> = (props: any) => {
       hideInTable: true,
       renderFormItem: (item, {defaultRender, ...rest}, form) => {
         return <TextArea
-          placeholder="添加 Flink 集群的 JobManager 的 RestApi 地址。当 HA 模式时，地址间用英文逗号分隔，例如：192.168.123.101:8081,192.168.123.102:8081,192.168.123.103:8081"
+          placeholder="添加 Flink 实例的 JobManager 的 RestApi 地址。当 HA 模式时，地址间用英文逗号分隔，例如：192.168.123.101:8081,192.168.123.102:8081,192.168.123.103:8081"
           allowClear autoSize={{minRows: 3, maxRows: 10}}/>;
       },
     },
@@ -337,7 +337,7 @@ const ClusterTableList: React.FC<{}> = (props: any) => {
     {
       title: l('global.table.operate'),
       dataIndex: 'option',
-      tooltip: 'FLinkWebUI连接 当集群状态为`可用`时! 支持 KUBERNETES 之外的模式',
+      tooltip: 'FLinkWebUI 链接地址',
       valueType: 'option',
       render: (_, record) => [
         <a
@@ -408,7 +408,7 @@ const ClusterTableList: React.FC<{}> = (props: any) => {
                     style={{fontWeight: 600}}>{selectedRowsState.length}</a>
                 })}  &nbsp;&nbsp;
               <span>
-                被禁用的集群共 {selectedRowsState.length - selectedRowsState.reduce((pre, item) => pre + (item.enabled ? 1 : 0), 0)} 个
+                被禁用的 Flink 实例共 {selectedRowsState.length - selectedRowsState.reduce((pre, item) => pre + (item.enabled ? 1 : 0), 0)} 个
               </span>
             </div>
           }
@@ -416,8 +416,8 @@ const ClusterTableList: React.FC<{}> = (props: any) => {
           <Button type="primary" danger
                   onClick={() => {
                     Modal.confirm({
-                      title: '删除集群',
-                      content: '确定删除选中的集群吗？',
+                      title: '删除 Flink 实例',
+                      content: '确定删除选中的 Flink 实例吗？',
                       okText: l('button.confirm'),
                       cancelText: l('button.cancel'),
                       onOk: async () => {
@@ -433,8 +433,8 @@ const ClusterTableList: React.FC<{}> = (props: any) => {
           <Button type="primary"
                   onClick={() => {
                     Modal.confirm({
-                      title: '启用集群',
-                      content: '确定启用选中的集群吗？',
+                      title: '启用 Flink 实例',
+                      content: '确定启用选中的 Flink 实例吗？',
                       okText: l('button.confirm'),
                       cancelText: l('button.cancel'),
                       onOk: async () => {
@@ -448,8 +448,8 @@ const ClusterTableList: React.FC<{}> = (props: any) => {
           <Button danger
                   onClick={() => {
                     Modal.confirm({
-                      title: '禁用集群',
-                      content: '确定禁用选中的集群吗？',
+                      title: '禁用 Flink 实例',
+                      content: '确定禁用选中的 Flink 实例吗？',
                       okText: l('button.confirm'),
                       cancelText: l('button.cancel'),
                       onOk: async () => {

dlink-web/src/pages/DataStudio/model.ts

@@ -434,10 +434,12 @@ const Model: ModelType = {
       }
       let newCurrent = undefined;
       if (newTabs.panes.length > 0) {
+        if (newTabs.activeKey == payload) {
           newCurrent = newTabs.panes[newTabs.panes.length - 1];
-      }
-      if (newCurrent && (newTabs.activeKey == payload)) {
           newTabs.activeKey = newCurrent.key;
+        } else {
+          newCurrent = state.current;
+        }
       } else {
         newTabs.activeKey = undefined;
       }