diff --git a/src/resources/api/deploy/application-config/application-config.js b/src/resources/api/deploy/application-config/application-config.js
index 44cb358db2d72d19d7394c88adce837b0b301b3a..0ba83abf84c629757070eec703200e2e62e74df8 100644
--- a/src/resources/api/deploy/application-config/application-config.js
+++ b/src/resources/api/deploy/application-config/application-config.js
@@ -32,6 +32,14 @@ const applicationConfig = {
// 保存应用环境autoconfig
return axios.post('/api/rest/deploy/app/config/env/auto/config/save', params);
},
+ getEnvAutoConfigAuditList(params) {
+ // 保存应用环境autoconfig
+ return axios.post('/api/rest/deploy/app/config/env/auto/config/audit/list', params);
+ },
+ fallbackEnvAutoConfig(params) {
+ // 保存应用环境autoconfig
+ return axios.post('/api/rest/deploy/app/config/env/auto/config/fallback', params);
+ },
searchAppSystemList(params) {
// 查询应用配置树
return axios.post('/api/rest/deploy/app/config/appsystem/search', params);
diff --git a/src/views/pages/deploy/application-config/config/env/env-autoconfig-audit.vue b/src/views/pages/deploy/application-config/config/env/env-autoconfig-audit.vue
new file mode 100644
index 0000000000000000000000000000000000000000..562f544b97cc1b2e0378125e2122b8c8464a18e3
--- /dev/null
+++ b/src/views/pages/deploy/application-config/config/env/env-autoconfig-audit.vue
@@ -0,0 +1,221 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/pages/deploy/application-config/config/env/env-autoconfig-edit-textarea.vue b/src/views/pages/deploy/application-config/config/env/env-autoconfig-edit-textarea.vue
index 2ae021aa016eca109647980d07b9e8d396607787..1cfef2c376c52f062710377996a3560dd965b9d7 100644
--- a/src/views/pages/deploy/application-config/config/env/env-autoconfig-edit-textarea.vue
+++ b/src/views/pages/deploy/application-config/config/env/env-autoconfig-edit-textarea.vue
@@ -73,7 +73,10 @@ export default {
if (this.tableData && this.tableData.tbodyList.length > 0) {
let tbodyList = this.$utils.deepClone(this.tableData.tbodyList);
tbodyList.forEach((item) => {
- value = value + item.type + ':' + item.key + '=' + item.value + '\n';
+ if (value) {
+ value += '\n';
+ }
+ value = value + item.type + ':' + item.key + '=' + item.value;
});
this.allTypeKeyVlaue = value;
}
@@ -85,20 +88,22 @@ export default {
typeKeyValueList.forEach((typeKeyValue) => {
if (typeKeyValue && typeKeyValue.trim() != '') {
let typeAndKeyValueList = typeKeyValue.split(':');
- let type = typeAndKeyValueList[0];
- let keyValue = typeAndKeyValueList[1];
+ let type = typeAndKeyValueList[0].trim();
+ typeAndKeyValueList.shift();
+ let keyValue = typeAndKeyValueList.join(':').trim();
let keyAndValueList = keyValue.split('=');
- let key = keyAndValueList[0];
- let value = keyAndValueList[1];
- let isEmpty = 1;
- if (value && value.trim() != '') {
- isEmpty = 0;
- }
+ let key = keyAndValueList[0].trim();
+ keyAndValueList.shift();
+ let value = keyAndValueList.join('=').trim();
+ // let isEmpty = 1;
+ // if (value && value.trim() != '') {
+ // isEmpty = 0;
+ // }
keyValueList.push({
key: key,
type: type === '' ? null : type,
value: value,
- isEmpty: isEmpty
+ isEmpty: 0
});
}
});
diff --git a/src/views/pages/deploy/application-config/config/env/env-autoconfig-list.vue b/src/views/pages/deploy/application-config/config/env/env-autoconfig-list.vue
index f7a054470c8af725ac150a50231f93a5d7ac94c6..a150787afa1698103654188d6a8b099b23078616 100644
--- a/src/views/pages/deploy/application-config/config/env/env-autoconfig-list.vue
+++ b/src/views/pages/deploy/application-config/config/env/env-autoconfig-list.vue
@@ -15,7 +15,8 @@
-
{{ '文本编辑' }}
+ {{ '文本编辑' }}
+ {{ '审计' }}
@@ -88,6 +89,12 @@
@close="closeAutoConfigEdit"
@save="saveAutoConfig"
>
+
import('./env-autoconfig-edit'),
EnvAutoconfigEditTextarea: () => import('./env-autoconfig-edit-textarea'),
+ EnvAutoconfigAudit: () => import('./env-autoconfig-audit'),
EnvAutoconfigInstanceDifferenceEdit: () => import('./env-autoconfig-instance-difference-edit'), // 添加实例差异
TsTable: () => import('@/resources/components/TsTable/TsTable.vue')
},
@@ -122,6 +130,7 @@ export default {
return {
isShowEnvEdit: false,
isShowEnvEditForTextarea: false,
+ isShowEnvAutoConfigAudit: false,
isShowEnvDifferenceEdit: false,
hasInstance: false, // 是否存在实例差异
hasAutoConfig: false,
@@ -272,6 +281,18 @@ export default {
this.closeAutoConfigEdit(true);
}
});
+ },
+ showEnvAutoConfigAudit() {
+ this.isShowEnvAutoConfigAudit = true;
+ },
+ closeAutoConfigAudit(needRefresh) {
+ this.isShowEnvAutoConfigAudit = false;
+ if (needRefresh) {
+ this.getEnvInfo();
+ }
+ },
+ saveAutoConfigAudit(needRefresh) {
+ this.isShowEnvAutoConfigAudit = false;
}
},
filter: {},