openGauss工具一体化平台导入bug以及遗留issue修复-openGauss-workbench-AtomGit

Mbase-ops/web-ui/src/views/monitor/operation/ClusterBackupDlg.vue+2-4

	@@ -4,7 +4,7 @@
4	:okText="$t('operation.ClusterBackupDlg.5mplmzbrmkg0')">	4	:okText="$t('operation.ClusterBackupDlg.5mplmzbrmkg0')">
5	<a-form :model="data.formData" ref="formRef" :label-col="{ style: { width: '200px' } }" :rules="data.rules">	5	<a-form :model="data.formData" ref="formRef" :label-col="{ style: { width: '200px' } }" :rules="data.rules">
6	<a-form-item :label="$t('operation.ClusterBackupDlg.5mplmzbrntg0')">	6	<a-form-item :label="$t('operation.ClusterBackupDlg.5mplmzbrntg0')">
7	- <a-input v-model="data.formData.clusterId" disabled></a-input>	7	+ <div class="label-color">{{ data.formData.clusterId }}</div>
8	</a-form-item>	8	</a-form-item>
9	<a-form-item :label="$t('operation.ClusterBackupDlg.5mplmzbrosg0')">	9	<a-form-item :label="$t('operation.ClusterBackupDlg.5mplmzbrosg0')">
10	<a-textarea v-model="data.formData.remark"	10	<a-textarea v-model="data.formData.remark"
	@@ -67,6 +67,4 @@ defineExpose({
67		67
68	</script>	68	</script>
69		69
70	-<style lang="scss" scoped>	70	+<style lang="scss" scoped></style>
71	-
72	-</style>

Mbase-ops/web-ui/src/views/ops/install/components/enterprise/InstallPrompt.vue+0-5

	@@ -58,11 +58,6 @@
58	<div class="lable-w">{{ $t('enterprise.InstallPrompt.5mpmb9e6qww0') }}</div>	58	<div class="lable-w">{{ $t('enterprise.InstallPrompt.5mpmb9e6qww0') }}</div>
59	<div>{{ itemNode.dataPath }}</div>	59	<div>{{ itemNode.dataPath }}</div>
60	</div>	60	</div>
61	- <a-divider></a-divider>
62	- <div class="flex-row">
63	- <div class="lable-w">{{ $t('enterprise.InstallPrompt.else4') }}</div>
64	- <div>{{ itemNode.xlogPath }}</div>
65	- </div>
66	<div class="full-w" v-if="data.clusterInfo.isInstallCM">	61	<div class="full-w" v-if="data.clusterInfo.isInstallCM">
67	<a-divider></a-divider>	62	<a-divider></a-divider>
68	<div class="flex-row">	63	<div class="flex-row">

Mbase-ops/web-ui/src/views/ops/install/components/enterprise/NodeConfig.vue+1-0

	@@ -444,6 +444,7 @@ const beforeConfirm = async (): Promise<boolean> => {
444	nodeConfigList: nodes	444	nodeConfigList: nodes
445	}	445	}
446	installStore.setEnterpriseConfig(param as EnterpriseInstallConfig)	446	installStore.setEnterpriseConfig(param as EnterpriseInstallConfig)
		447	+ loadingFunc.cancelLoading()
447	return true	448	return true
448	}	449	}
449	loadingFunc.cancelLoading()	450	loadingFunc.cancelLoading()

Mbase-ops/web-ui/src/views/ops/install/components/lightweight/InstallConfig.vue+5-4

	@@ -23,8 +23,8 @@
23	@popup-visible-change="hostPopupChange($event, index)">	23	@popup-visible-change="hostPopupChange($event, index)">
24	<a-option v-for="item in hostList" :key="item.hostId" :value="item.hostId">{{	24	<a-option v-for="item in hostList" :key="item.hostId" :value="item.hostId">{{
25	item.privateIp	25	item.privateIp
26	- + '(' +	26	+ + '(' +
27	- (item.publicIp ? item.publicIp : '--') + ')'	27	+ (item.publicIp ? item.publicIp : '--') + ')'
28	}}</a-option>	28	}}</a-option>
29	</a-select>	29	</a-select>
30	</a-form-item>	30	</a-form-item>
	@@ -58,8 +58,8 @@
58	<a-input v-model="formItem.databaseUsername" :placeholder="$t('lightweight.InstallConfig.5mpmkfqyb9w0')"	58	<a-input v-model="formItem.databaseUsername" :placeholder="$t('lightweight.InstallConfig.5mpmkfqyb9w0')"
59	allow-clear />	59	allow-clear />
60	</a-form-item>	60	</a-form-item>
61	- <a-form-item v-if="index === 0" field="databasePassword"	61	+ <a-form-item v-if="index === 0" field="databasePassword" :label="$t('lightweight.InstallConfig.5mpmkfqybf80')"
62	- :label="$t('lightweight.InstallConfig.5mpmkfqybf80')" validate-trigger="blur">	62	+ validate-trigger="blur">
63	<a-input-password v-model="formItem.databasePassword"	63	<a-input-password v-model="formItem.databasePassword"
64	:placeholder="$t('lightweight.InstallConfig.5mpmkfqybo00')" allow-clear />	64	:placeholder="$t('lightweight.InstallConfig.5mpmkfqybo00')" allow-clear />
65	</a-form-item>	65	</a-form-item>
	@@ -371,6 +371,7 @@ const beforeConfirm = async (): Promise<boolean> => {
371	}	371	}
372	if (validRes) {	372	if (validRes) {
373	saveStore()	373	saveStore()
		374	+ loadingFunc.cancelLoading()
374	return true	375	return true
375	}	376	}
376	loadingFunc.cancelLoading()	377	loadingFunc.cancelLoading()

Mbase-ops/web-ui/src/views/ops/install/components/simple/InstallConfig.vue+6-6

	@@ -12,8 +12,8 @@
12	:placeholder="$t('simple.InstallConfig.5mpmu0laqss0')" @popup-visible-change="hostPopupChange">	12	:placeholder="$t('simple.InstallConfig.5mpmu0laqss0')" @popup-visible-change="hostPopupChange">
13	<a-option v-for="item in hostList" :key="item.hostId" :value="item.hostId">{{	13	<a-option v-for="item in hostList" :key="item.hostId" :value="item.hostId">{{
14	item.privateIp	14	item.privateIp
15	- + '(' +	15	+ + '(' +
16	- (item.publicIp ? item.publicIp : '--') + ')'	16	+ (item.publicIp ? item.publicIp : '--') + ')'
17	}}</a-option>	17	}}</a-option>
18	</a-select>	18	</a-select>
19	</a-form-item>	19	</a-form-item>
	@@ -40,10 +40,9 @@
40	<a-input v-model="data.form.databaseUsername" :placeholder="$t('simple.InstallConfig.5mpmu0larto0')"	40	<a-input v-model="data.form.databaseUsername" :placeholder="$t('simple.InstallConfig.5mpmu0larto0')"
41	allow-clear />	41	allow-clear />
42	</a-form-item>	42	</a-form-item>
43	- <a-form-item field="databasePassword" :label="$t('simple.InstallConfig.5mpmu0larx00')"	43	+ <a-form-item field="databasePassword" :label="$t('simple.InstallConfig.5mpmu0larx00')" validate-trigger="blur">
44	- validate-trigger="blur">	44	+ <a-input-password v-model="data.form.databasePassword" :placeholder="$t('simple.InstallConfig.5mpmu0las0k0')"
45	- <a-input-password v-model="data.form.databasePassword"	45	+ allow-clear />
46	- :placeholder="$t('simple.InstallConfig.5mpmu0las0k0')" allow-clear />
47	</a-form-item>	46	</a-form-item>
48	</a-form>	47	</a-form>
49	</div>	48	</div>
	@@ -307,6 +306,7 @@ const beforeConfirm = async (): Promise<boolean> => {
307	}	306	}
308	if (validRes) {	307	if (validRes) {
309	saveStore()	308	saveStore()
		309	+ loadingFunc.cancelLoading()
310	return true	310	return true
311	}	311	}
312	loadingFunc.cancelLoading()	312	loadingFunc.cancelLoading()