Skip to content

Commit cb754b4

Browse files
gys-gitgys-git
committed
V3.6.0
2 parents 1edc1a5 + b7f1b19 commit cb754b4

File tree

3 files changed

+45
-46
lines changed

3 files changed

+45
-46
lines changed

‎web/src/component/CreateTenantDrawer/index.tsx‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,13 +1275,13 @@ export default function CreatTenantDrawer({
12751275
<div style={{ fontSize: '14px', fontWeight: 500 }}>
12761276
{installStatus === 'SUCCESSFUL'
12771277
? intl.formatMessage({
1278-
id: 'OBD.Obdeploy.CreateTenantDrawer.4BC7690D',
1279-
defaultMessage: '业务租户创建成功',
1280-
})
1278+
id: 'OBD.Obdeploy.CreateTenantDrawer.4BC7690D',
1279+
defaultMessage: '业务租户创建成功',
1280+
})
12811281
: intl.formatMessage({
1282-
id: 'OBD.Obdeploy.CreateTenantDrawer.6C92D589',
1283-
defaultMessage: '业务租户创建失败',
1284-
})}
1282+
id: 'OBD.Obdeploy.CreateTenantDrawer.6C92D589',
1283+
defaultMessage: '业务租户创建失败',
1284+
})}
12851285
</div>
12861286
}
12871287
/>
@@ -1290,9 +1290,9 @@ export default function CreatTenantDrawer({
12901290
style={
12911291
installStatus !== 'RUNNING' && statusData?.result !== 'FAILED'
12921292
? {
1293-
backgroundColor: token.colorFillAlter,
1294-
padding: '16px 24px',
1295-
}
1293+
backgroundColor: token.colorFillAlter,
1294+
padding: '16px 24px',
1295+
}
12961296
: {}
12971297
}
12981298
>
@@ -1327,7 +1327,9 @@ export default function CreatTenantDrawer({
13271327
defaultMessage: '租户模式',
13281328
})}
13291329
>
1330-
{paramsData?.mode || '-'}
1330+
{
1331+
paramsData?.mode === 'mysql' ? 'MySQL' : 'Oracle'
1332+
}
13311333
</Descriptions.Item>
13321334
<Descriptions.Item
13331335
label={intl.formatMessage({
@@ -1353,14 +1355,14 @@ export default function CreatTenantDrawer({
13531355
text:
13541356
paramsData?.mode !== 'oracle'
13551357
? statusData?.message &&
1356-
insertPwd(statusData?.message, paramsData?.password)
1358+
insertPwd(statusData?.message, paramsData?.password)
13571359
: obConnectInfo,
13581360
}}
13591361
style={{ color: '#006aff' }}
13601362
>
13611363
{paramsData?.mode !== 'oracle'
13621364
? statusData?.message &&
1363-
insertPwd(statusData?.message, paramsData?.password)
1365+
insertPwd(statusData?.message, paramsData?.password)
13641366
: obConnectInfo}
13651367
</Text>
13661368
</Descriptions.Item>
@@ -1379,15 +1381,15 @@ export default function CreatTenantDrawer({
13791381
defaultMessage: '租户规格',
13801382
})}
13811383
>
1382-
{`${paramsData?.cpu_size}vCPUs ${paramsData?.memory_size}Gi ${paramsData?.log_disk_size} GiB`}
1384+
{`${paramsData?.cpu_size}vCPUs ${paramsData?.memory_size}GiB ${paramsData?.log_disk_size} GiB`}
13831385
</Descriptions.Item>
13841386
<Descriptions.Item
13851387
label={intl.formatMessage({
13861388
id: 'OBD.Obdeploy.CreateTenantDrawer.0CFF5A55',
13871389
defaultMessage: '业务负载类型',
13881390
})}
13891391
>
1390-
{paramsData?.optimize || '-'}
1392+
{paramsData?.optimize?.toUpperCase() || '-'}
13911393
</Descriptions.Item>
13921394
<Descriptions.Item
13931395
label={intl.formatMessage({
@@ -1434,9 +1436,9 @@ export default function CreatTenantDrawer({
14341436
{paramsData?.ip !== 'all'
14351437
? paramsData?.ob_tcp_invited_nodes?.join(',')
14361438
: intl.formatMessage({
1437-
id: 'OBD.Obdeploy.CreateTenantDrawer.5E904F23',
1438-
defaultMessage: '所有 IP 都可以访问',
1439-
})}
1439+
id: 'OBD.Obdeploy.CreateTenantDrawer.5E904F23',
1440+
defaultMessage: '所有 IP 都可以访问',
1441+
})}
14401442
</Descriptions.Item>
14411443
</Descriptions>
14421444
) : (

‎web/src/pages/ComponentDeploy/DeployConfig.tsx‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { Button, Empty, Space, Spin, Table, Tag } from 'antd';
1414
import type { ColumnsType } from 'antd/es/table';
1515
import { useEffect, useState } from 'react';
1616
import DataEmpty from '../../.././/public/assets/data-empty.svg';
17-
import { alertManagerComponent, componentVersionTypeToComponent, grafanaComponent, obagentComponent, prometheusComponent } from '../constants';
17+
import { alertManagerComponent, componentVersionTypeToComponent, configServerComponent, grafanaComponent, obagentComponent, prometheusComponent } from '../constants';
1818
import EnStyles from './indexEn.less';
1919
import ZhStyles from './indexZh.less';
2020
const locale = getLocale();
@@ -67,10 +67,8 @@ export default function DeployConfig({ clusterList }: DeployConfigProps) {
6767
const undeployedComponents = data?.component_list
6868
.filter((item) => !item.deployed)
6969
.map((item) => item.component_name);
70-
// 切换集群 全选
71-
// 组件挂载 如果有选择的组件就不重新选 如果没有选择的组件全选
72-
if (undeployedComponents && !selectedConfig?.length)
73-
setSelectedConfig(undeployedComponents);
70+
// 切换集群时不清空已选择的组件，也不自动全选
71+
// 让用户手动选择需要的组件
7472
}
7573
},
7674
});
@@ -218,14 +216,17 @@ export default function DeployConfig({ clusterList }: DeployConfigProps) {
218216
// 取消勾选obagent，grafana和prometheus也取消掉
219217
componentsToRemove = [obagentComponent, grafanaComponent, prometheusComponent];
220218
} else if (record.component_name === prometheusComponent) {
221-
// 取消勾选prometheus，grafana和alertmanager也取消掉
222-
componentsToRemove = [prometheusComponent, grafanaComponent, alertManagerComponent];
219+
// 取消勾选prometheus，grafana也取消掉，但alertmanager可以独立存在
220+
componentsToRemove = [prometheusComponent, grafanaComponent];
223221
} else if (record.component_name === alertManagerComponent) {
224222
// 取消勾选alertmanager，只取消掉自己
225223
componentsToRemove = [alertManagerComponent];
226224
} else if (record.component_name === grafanaComponent) {
227225
// 取消勾选grafana，只取消掉自己
228226
componentsToRemove = [grafanaComponent];
227+
} else if (record.component_name === configServerComponent) {
228+
// 取消勾选obconfigserver，只取消掉自己
229+
componentsToRemove = [configServerComponent];
229230
}
230231

231232
// 保留不在取消列表中的组件
@@ -253,13 +254,9 @@ export default function DeployConfig({ clusterList }: DeployConfigProps) {
253254
componentsToAdd.push(prometheusComponent);
254255
}
255256
} else if (record.component_name === alertManagerComponent) {
256-
// 如果选择alertmanager，则OBAgent和prometheus自动选择
257-
if (!selectedConfig.includes(obagentComponent)) {
258-
componentsToAdd.push(obagentComponent);
259-
}
260-
if (!selectedConfig.includes(prometheusComponent)) {
261-
componentsToAdd.push(prometheusComponent);
262-
}
257+
// 如果选择alertmanager，只选择自己，不自动选择其他组件
258+
// 用户可以根据需要手动选择 Prometheus 和 OBAgent
259+
// componentsToAdd 已经包含了 record.component_name，无需额外处理
263260
}
264261

265262
// 添加新选择的组件和依赖组件

‎web/src/pages/Obdeploy/ClusterConfig/index.tsx‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ export default function ClusterConfig() {
127127
const [obRootPwd, setRootPwd] = useState<string>(
128128
oceanbase?.root_password || '',
129129
);
130-
130+
131131
const [obPwdMsgInfo, setObPwdMsgInfo] = useState<MsgInfoType>();
132132
const { run: getMoreParamsters } = useRequest(queryComponentParameters);
133133

@@ -614,13 +614,13 @@ export default function ClusterConfig() {
614614
defaultMessage: '数据目录',
615615
})}
616616
name={['oceanbase', 'data_dir']}
617-
rules={[
618-
{
619-
required: true,
620-
message:'请输入数据目录'
621-
},
622-
pathRule
623-
]}
617+
// rules={[
618+
// {
619+
// required: true,
620+
// message:'请输入数据目录'
621+
// },
622+
// pathRule
623+
// ]}
624624
>
625625
<TooltipInput
626626
fieldProps={{ style: commonInputStyle }}
@@ -634,13 +634,13 @@ export default function ClusterConfig() {
634634
defaultMessage: '日志目录',
635635
})}
636636
name={['oceanbase', 'redo_dir']}
637-
rules={[
638-
{
639-
required: true,
640-
message:'请输入日志目录'
641-
},
642-
pathRule
643-
]}
637+
// rules={[
638+
// {
639+
// required: true,
640+
// message:'请输入日志目录'
641+
// },
642+
// pathRule
643+
// ]}
644644
>
645645
<TooltipInput
646646
fieldProps={{ style: commonInputStyle }}

0 commit comments

Comments
 (0)