diff --git a/src/components/AutoDataForm/index.vue b/src/components/AutoDataForm/index.vue index 5448b7577..a720ce06b 100644 --- a/src/components/AutoDataForm/index.vue +++ b/src/components/AutoDataForm/index.vue @@ -199,9 +199,9 @@ export default { error += `${parseInt(key) + 1}.${str[key][0]} ` }) } - if (field.attrs.error === error) { - error += '.' - } + // if (field.attrs.error === error) { + // error += '.' + // } field.attrs.error = error } } diff --git a/src/components/ListTable/index.vue b/src/components/ListTable/index.vue index 354b5dd6e..f7b2e4c98 100644 --- a/src/components/ListTable/index.vue +++ b/src/components/ListTable/index.vue @@ -81,10 +81,6 @@ export default { deep: true } }, - mounted() { - this.$log.debug(this.headerActions) - this.$log.debug(this.iTableConfig) - }, methods: { handleSelectionChange(val) { this.selectedRows = val diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json index ae2898669..201c5f15b 100644 --- a/src/i18n/langs/cn.json +++ b/src/i18n/langs/cn.json @@ -198,6 +198,7 @@ "BadRoleErrorMsg": "请求错误,无该操作权限", "BadConflictErrorMsg": "正在刷新中,请稍后再试", "Basic": "基本", + "PleaseAgreeToTheTerms": "请同意条款", "BasicInfo": "基本信息", "Cancel": "取消", "Close": "关闭", diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index fd43cc90e..9c17731ae 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -190,6 +190,7 @@ "actionsTips":"Clipboard's copy and paste control only support RDP/VNC protocol.", "Active": "Active", "Add": "Add", + "PleaseAgreeToTheTerms": "Please agree to the terms", "PushSelected":"Push selected", "UpdateAssetDetail": "Update more detail", "AddSuccessMsg": "Add success", diff --git a/src/userviews/users/UserFirstLogin/PersonalInformationImprovement/PersonalInformationImprovement.vue b/src/userviews/users/UserFirstLogin/PersonalInformationImprovement/PersonalInformationImprovement.vue index 2e484758a..2aa5fc905 100644 --- a/src/userviews/users/UserFirstLogin/PersonalInformationImprovement/PersonalInformationImprovement.vue +++ b/src/userviews/users/UserFirstLogin/PersonalInformationImprovement/PersonalInformationImprovement.vue @@ -9,6 +9,7 @@ :clean-form-value="cleanFormValue" :get-method="getMethod" :on-perform-success="onPerformSuccess" + :perform-submit="performSubmit" /> @@ -88,6 +89,13 @@ export default { 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/applications/DatabaseApp/DatabaseAppList.vue b/src/views/applications/DatabaseApp/DatabaseAppList.vue index 2aec06d24..b71d90871 100644 --- a/src/views/applications/DatabaseApp/DatabaseAppList.vue +++ b/src/views/applications/DatabaseApp/DatabaseAppList.vue @@ -37,6 +37,7 @@ export default { actions: { prop: '', formatterArgs: { + hasClone: true, performDelete: function({ row, col, cellValue, reload }) { this.$axios.delete( `/api/v1/applications/applications/${row.id}/` diff --git a/src/views/applications/RemoteApp/RemoteAppList.vue b/src/views/applications/RemoteApp/RemoteAppList.vue index 24df27a58..f200de486 100644 --- a/src/views/applications/RemoteApp/RemoteAppList.vue +++ b/src/views/applications/RemoteApp/RemoteAppList.vue @@ -34,6 +34,7 @@ export default { }, actions: { formatterArgs: { + hasClone: true, onUpdate: ({ row }) => { vm.$router.push({ name: 'RemoteAppUpdate', params: { id: row.id }, query: { type: row.type }}) }, diff --git a/src/views/assets/AdminUser/AdminUserList.vue b/src/views/assets/AdminUser/AdminUserList.vue index 9846f1d01..adf1bed4f 100644 --- a/src/views/assets/AdminUser/AdminUserList.vue +++ b/src/views/assets/AdminUser/AdminUserList.vue @@ -4,7 +4,6 @@