diff --git a/src/layout/components/GenericCreateUpdateForm/index.vue b/src/layout/components/GenericCreateUpdateForm/index.vue
index c7cc0b771..6326d0964 100644
--- a/src/layout/components/GenericCreateUpdateForm/index.vue
+++ b/src/layout/components/GenericCreateUpdateForm/index.vue
@@ -176,7 +176,9 @@ export default {
type: Function,
default(res, method, vm, addContinue) {
const route = this.getNextRoute(res, method)
- route['params'] = { 'id': res.id }
+ if (!(route.params && route.params.id)) {
+ route['params'] = { 'id': res.id }
+ }
this.$emit('submitSuccess', res)
this.emitPerformSuccessMsg(method, res, addContinue)
diff --git a/src/userviews/users/UserFirstLogin/PersonalInformationImprovement/PersonalInformationImprovement.vue b/src/userviews/users/UserFirstLogin/PersonalInformationImprovement/PersonalInformationImprovement.vue
index 2aa5fc905..7dfdd4464 100644
--- a/src/userviews/users/UserFirstLogin/PersonalInformationImprovement/PersonalInformationImprovement.vue
+++ b/src/userviews/users/UserFirstLogin/PersonalInformationImprovement/PersonalInformationImprovement.vue
@@ -1,16 +1,6 @@
-
+
@@ -82,24 +72,24 @@ export default {
delete value['mfa_level']
}
return value
+ },
+ performSubmit(validValues) {
+ if (!validValues.terms) {
+ this.$message.error(this.$t('common.PleaseAgreeToTheTerms'))
+ return Promise.reject()
+ }
+ return this.$axios['put'](this.url, validValues)
+ },
+ onPerformSuccess() {
+ this.$message.success(this.$t('common.updateSuccessMsg'))
+ setTimeout(() => this.$router.push({ name: 'UserGuide' }), 100)
+ },
+ getMethod() {
+ return 'put'
}
}
},
methods: {
- getMethod() {
- return 'put'
- },
- performSubmit(validValues) {
- if (!validValues.terms) {
- this.$message.error(this.$t('common.PleaseAgreeToTheTerms'))
- return Promise.reject()
- }
- return this.$axios['put'](this.url, validValues)
- },
- onPerformSuccess() {
- this.$message.success(this.$t('common.updateSuccessMsg'))
- setTimeout(() => this.$router.push({ name: 'UserGuide' }), 100)
- }
}
}
diff --git a/src/views/accounts/ChangeAuthPlan/ChangeAuthPlanCreateUpdate.vue b/src/views/accounts/ChangeAuthPlan/ChangeAuthPlanCreateUpdate.vue
index 02a1f570b..3bf371368 100644
--- a/src/views/accounts/ChangeAuthPlan/ChangeAuthPlanCreateUpdate.vue
+++ b/src/views/accounts/ChangeAuthPlan/ChangeAuthPlanCreateUpdate.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/views/acl/UserAcl/UserAclCreateUpdate.vue b/src/views/acl/UserAcl/UserAclCreateUpdate.vue
index 0fb7f8aac..951915f1c 100644
--- a/src/views/acl/UserAcl/UserAclCreateUpdate.vue
+++ b/src/views/acl/UserAcl/UserAclCreateUpdate.vue
@@ -1,9 +1,5 @@
-
-
+
diff --git a/src/views/applications/RemoteApp/RemoteAppCreateUpdate.vue b/src/views/applications/RemoteApp/RemoteAppCreateUpdate.vue
index 48feb293e..fd75a74f5 100644
--- a/src/views/applications/RemoteApp/RemoteAppCreateUpdate.vue
+++ b/src/views/applications/RemoteApp/RemoteAppCreateUpdate.vue
@@ -66,7 +66,6 @@ export default {
}
},
computed: {
-
}
}
diff --git a/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue b/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue
index 5aedf1c09..94d6bff03 100644
--- a/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue
+++ b/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue
@@ -1,13 +1,5 @@
-
+
diff --git a/src/views/sessions/CommandStorageCreateUpdate.vue b/src/views/sessions/CommandStorageCreateUpdate.vue
index 1933d9ff7..e8d429bd3 100644
--- a/src/views/sessions/CommandStorageCreateUpdate.vue
+++ b/src/views/sessions/CommandStorageCreateUpdate.vue
@@ -3,9 +3,6 @@
v-bind="$data"
:create-success-next-route="successUrl"
:update-success-next-route="successUrl"
- :has-detail-in-msg="false"
- :after-get-form-value="afterGetFormValue"
- :clean-form-value="cleanFormValue"
/>
@@ -55,23 +52,24 @@ export default {
}
return `${url}?type=${commandType}`
},
- url: '/api/v1/terminal/command-storages/'
+ url: '/api/v1/terminal/command-storages/',
+ hasDetailInMsg: false,
+ afterGetFormValue(validValues) {
+ if (!validValues?.meta?.HOSTS) {
+ return validValues
+ }
+ validValues.meta.HOSTS = validValues.meta.HOSTS.toString()
+ return validValues
+ },
+ cleanFormValue(value) {
+ value.meta.HOSTS = value.meta.HOSTS.split(',').map(item => (item.trim()))
+ return value
+ }
}
},
computed: {
},
methods: {
- afterGetFormValue(validValues) {
- if (!validValues?.meta?.HOSTS) {
- return validValues
- }
- validValues.meta.HOSTS = validValues.meta.HOSTS.toString()
- return validValues
- },
- cleanFormValue(value) {
- value.meta.HOSTS = value.meta.HOSTS.split(',').map(item => (item.trim()))
- return value
- }
}
}
diff --git a/src/views/settings/DingTalk.vue b/src/views/settings/DingTalk.vue
index 3d2097282..643621963 100644
--- a/src/views/settings/DingTalk.vue
+++ b/src/views/settings/DingTalk.vue
@@ -1,14 +1,6 @@
-
+
@@ -51,20 +43,21 @@ export default {
]
],
fieldsMeta: {
+ },
+ hasDetailInMsg: false,
+ getMethod() {
+ return 'put'
+ },
+ // 不清理的话,编辑secret,在删除提交会报错
+ cleanFormValue(data) {
+ if (!data['DINGTALK_APPSECRET']) {
+ delete data['DINGTALK_APPSECRET']
+ }
+ return data
}
}
},
methods: {
- getMethod() {
- return 'put'
- },
- // 不清理的话,编辑secret,在删除提交会报错
- cleanFormValue(data) {
- if (!data['DINGTALK_APPSECRET']) {
- delete data['DINGTALK_APPSECRET']
- }
- return data
- }
}
}
diff --git a/src/views/settings/Email.vue b/src/views/settings/Email.vue
index f99857e44..0ff51b1a6 100644
--- a/src/views/settings/Email.vue
+++ b/src/views/settings/Email.vue
@@ -1,14 +1,6 @@
-
+
@@ -72,6 +64,7 @@ export default {
]
}
},
+ hasDetailInMsg: false,
url: '/api/v1/settings/setting/?category=email',
moreButtons: [
{
@@ -87,26 +80,26 @@ export default {
})
}
}
- ]
+ ],
+ cleanFormValue(data) {
+ if (!data['EMAIL_HOST_PASSWORD']) {
+ delete data['EMAIL_HOST_PASSWORD']
+ }
+ Object.keys(data).forEach(
+ function(key) {
+ if (data[key] === null) {
+ delete data[key]
+ }
+ }
+ )
+ return data
+ },
+ getMethod() {
+ return 'put'
+ }
}
},
methods: {
- getMethod() {
- return 'put'
- },
- cleanFormValue(data) {
- if (!data['EMAIL_HOST_PASSWORD']) {
- delete data['EMAIL_HOST_PASSWORD']
- }
- Object.keys(data).forEach(
- function(key) {
- if (data[key] === null) {
- delete data[key]
- }
- }
- )
- return data
- }
}
}
diff --git a/src/views/settings/Ldap/index.vue b/src/views/settings/Ldap/index.vue
index f5f571123..f4bf30c80 100644
--- a/src/views/settings/Ldap/index.vue
+++ b/src/views/settings/Ldap/index.vue
@@ -1,15 +1,6 @@
-
+
@@ -67,6 +58,7 @@ export default {
}
},
url: '/api/v1/settings/setting/?category=ldap',
+ hasDetailInMsg: false,
moreButtons: [
{
title: this.$t('setting.ldapConnectTest'),
@@ -94,29 +86,29 @@ export default {
this.dialogLdapUserImport = true
}.bind(this)
}
- ]
+ ],
+ getMethod() {
+ return 'put'
+ },
+ afterGetFormValue(obj) {
+ obj.AUTH_LDAP_USER_ATTR_MAP = JSON.stringify(obj.AUTH_LDAP_USER_ATTR_MAP)
+ return obj
+ },
+ cleanFormValue(data) {
+ if (data['AUTH_LDAP_BIND_PASSWORD'] === '') {
+ delete data['AUTH_LDAP_BIND_PASSWORD']
+ }
+ if (data['AUTH_LDAP_USER_ATTR_MAP']) {
+ data['AUTH_LDAP_USER_ATTR_MAP'] = JSON.parse(data['AUTH_LDAP_USER_ATTR_MAP'])
+ }
+ return data
+ }
}
},
mounted() {
this.loading = false
},
methods: {
- getMethod() {
- return 'put'
- },
- changeFormValue(obj) {
- obj.AUTH_LDAP_USER_ATTR_MAP = JSON.stringify(obj.AUTH_LDAP_USER_ATTR_MAP)
- return obj
- },
- cleanFormValue(data) {
- if (data['AUTH_LDAP_BIND_PASSWORD'] === '') {
- delete data['AUTH_LDAP_BIND_PASSWORD']
- }
- if (data['AUTH_LDAP_USER_ATTR_MAP']) {
- data['AUTH_LDAP_USER_ATTR_MAP'] = JSON.parse(data['AUTH_LDAP_USER_ATTR_MAP'])
- }
- return data
- }
}
}
diff --git a/src/views/settings/Terminal.vue b/src/views/settings/Terminal.vue
index 821d72ffb..dcdf9e31c 100644
--- a/src/views/settings/Terminal.vue
+++ b/src/views/settings/Terminal.vue
@@ -1,13 +1,6 @@
-
+
diff --git a/src/views/settings/WeCom.vue b/src/views/settings/WeCom.vue
index 712269891..bc42d68e8 100644
--- a/src/views/settings/WeCom.vue
+++ b/src/views/settings/WeCom.vue
@@ -1,14 +1,6 @@
-
+
@@ -26,6 +18,7 @@ export default {
const vm = this
return {
url: '/api/v1/settings/setting/?category=wecom',
+ hasDetailInMsg: false,
moreButtons: [
{
title: this.$t('setting.weComTest'),
@@ -51,20 +44,20 @@ export default {
]
],
fieldsMeta: {
+ },
+ // 不清理的话,编辑secret,在删除提交会报错
+ cleanFormValue(data) {
+ if (!data['WECOM_SECRET']) {
+ delete data['WECOM_SECRET']
+ }
+ return data
+ },
+ getMethod() {
+ return 'put'
}
}
},
methods: {
- getMethod() {
- return 'put'
- },
- // 不清理的话,编辑secret,在删除提交会报错
- cleanFormValue(data) {
- if (!data['WECOM_SECRET']) {
- delete data['WECOM_SECRET']
- }
- return data
- }
}
}
diff --git a/src/views/users/User/UserCreateUpdate.vue b/src/views/users/User/UserCreateUpdate.vue
index 5a614c9f5..9dfc4d0f3 100644
--- a/src/views/users/User/UserCreateUpdate.vue
+++ b/src/views/users/User/UserCreateUpdate.vue
@@ -1,9 +1,5 @@
-
+