github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-04-27 19:15:13 +00:00
Code Issues Projects Releases Wiki Activity

perf: 优化表单 (#933)

Browse Source 
* perf: 优化表单

* fix: 修复国际化

* fix: 去掉排序

* perf: 系统平台排序

* fix: 修复错误

* fix: 去掉多余的逗号

Co-authored-by: 吴小白 <296015668@qq.com>
This commit is contained in:
fit2bot 2021-07-26 17:09:28 +08:00 committed by GitHub
parent 7fda66cda4
commit 0d3029e6b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 67 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.development
View File

@ -23,4 +23,5 @@ VUE_APP_LOGOUT_PATH = '/core/auth/logout/'
# Dev server for core proxy
VUE_APP_CORE_HOST = 'http://localhost:8080'
VUE_APP_CORE_WS = 'ws://localhost:8070'
VUE_APP_ENV = 'development'

BIN
dump.rdb
View File

Binary file not shown.

9
src/components/AssetSelect/index.vue
View File

@ -94,6 +94,15 @@ export default {
prop: 'ip',
label: this.$t('assets.ipDomain'),
sortable: 'custom'
},
{
prop: 'platform',
label: this.$t('assets.Platform'),
sortable: true
},
{
prop: 'protocols',
label: this.$t('assets.Protocols')
}
],
listeners: {

3
src/views/assets/Asset/AssetCreateUpdate.vue
View File

@ -68,8 +68,7 @@ export default {
return { label: `${item.name}(${item.username})`, value: item.id }
}
}
},
rules: [rules.RequiredChange]
}
},
nodes: {
rules: [rules.RequiredChange],

10
src/views/settings/Basic.vue
View File

@ -3,6 +3,7 @@
<GenericCreateUpdateForm
:fields="fields"
:url="url"
:fields-meta="fieldsMeta"
:update-success-next-route="successUrl"
:create-success-next-route="successUrl"
:get-method="getMethod"
@ -15,6 +16,8 @@
<script>
import GenericCreateUpdateForm from '@/layout/components/GenericCreateUpdateForm'
import { IBox } from '@/components'
import rules from '@/components/DataForm/rules'
export default {
name: 'Basic',
components: {
@ -32,6 +35,13 @@ export default {
]
]
],
fieldsMeta: {
SITE_URL: {
rules: [
rules.Required
]
}
},
successUrl: { name: 'Settings', params: { activeMenu: 'Basic' }},
url: '/api/v1/settings/setting/?category=basic'
}

20
src/views/settings/Email.vue
View File

@ -3,9 +3,9 @@
<GenericCreateUpdateForm
:fields="fields"
:url="url"
:fields-meta="fieldsMeta"
:clean-form-value="cleanFormValue"
:get-method="getMethod"
:fields-meta="fieldsMeta"
:more-buttons="moreButtons"
:has-detail-in-msg="false"
/>
@ -80,6 +80,15 @@ export default {
if (value['EMAIL_HOST_PASSWORD'] === undefined) {
value['EMAIL_HOST_PASSWORD'] = ''
}
if (value['EMAIL_USE_SSL'] === undefined) {
value['EMAIL_USE_SSL'] = false
}
if (value['EMAIL_USE_TLS'] === undefined) {
value['EMAIL_USE_TLS'] = false
}
if (value['EMAIL_FROM'] === undefined) {
value['EMAIL_FROM'] = value['EMAIL_HOST_USER']
}
testEmailSetting(value).then(res => {
vm.$message.success(res['msg'])
}).catch(res => {
@ -98,6 +107,15 @@ export default {
if (!data['EMAIL_HOST_PASSWORD']) {
delete data['EMAIL_HOST_PASSWORD']
}
if (!data['EMAIL_USE_SSL']) {
data['EMAIL_USE_SSL'] = false
}
if (!data['EMAIL_USE_TLS']) {
data['EMAIL_USE_TLS'] = false
}
if (!data['EMAIL_FROM']) {
data['EMAIL_FROM'] = data['EMAIL_HOST_USER']
}
Object.keys(data).forEach(
function(key) {
if (data[key] === null) {

4
src/views/settings/EmailContent.vue
View File

@ -1,7 +1,7 @@
<template>
<IBox>
<GenericCreateUpdateForm
:fields="selectFields"
:fields="fields"
:url="url"
:fields-meta="fieldsMeta"
:get-method="getMethod"
@ -21,7 +21,7 @@ export default {
},
data() {
return {
selectFields: [
fields: [
[
this.$t('setting.createUserSetting'),
[

20
src/views/settings/Ldap/index.vue
View File

@ -1,7 +1,7 @@
<template>
<IBox>
<GenericCreateUpdateForm
:fields="selectFields"
:fields="fields"
:url="url"
:fields-meta="fieldsMeta"
:get-method="getMethod"
@ -20,6 +20,7 @@ import { testLdapSetting } from '@/api/settings'
import ImportDialog from './ImportDialog'
import TestLoginDialog from './TestLoginDialog'
import { IBox } from '@/components'
import rules from '@/components/DataForm/rules'
import { JsonRequired } from '@/components/DataForm/rules'
export default {
@ -36,7 +37,7 @@ export default {
object: {},
dialogTest: false,
dialogLdapUserImport: false,
selectFields: [
fields: [
[
this.$t('setting.LDAPServerInfo'),
[
@ -57,6 +58,21 @@ export default {
]
],
fieldsMeta: {
AUTH_LDAP_BIND_DN: {
rules: [
rules.Required
]
},
AUTH_LDAP_BIND_PASSWORD: {
rules: [
rules.Required
]
},
AUTH_LDAP_SEARCH_OU: {
rules: [
rules.Required
]
},
AUTH_LDAP_USER_ATTR_MAP: {
component: 'el-input',
el: {

6
src/views/settings/Security.vue
View File

@ -1,7 +1,7 @@
<template>
<IBox>
<GenericCreateUpdateForm
:fields="selectFields"
:fields="fields"
:url="url"
:fields-meta="fieldsMeta"
:get-method="getMethod"
@ -22,7 +22,7 @@ export default {
},
data() {
return {
selectFields: [
fields: [
[
this.$t('common.Basic'),
[
@ -52,7 +52,7 @@ export default {
]
],
fieldsMeta: {
'SECURITY_INSECURE_COMMAND_EMAIL_RECEIVER': {
SECURITY_INSECURE_COMMAND_EMAIL_RECEIVER: {
component: Link,
helpText: this.$t('setting.InsecureCommandNotifyToSubscription'),
label: this.$t('common.Receivers'),

6
src/views/settings/Terminal.vue
View File

@ -1,7 +1,7 @@
<template>
<IBox>
<GenericCreateUpdateForm
:fields="selectFields"
:fields="fields"
:url="url"
:fields-meta="fieldsMeta"
:get-method="getMethod"
@ -21,7 +21,7 @@ export default {
},
data() {
return {
selectFields: [
fields: [
[
'KoKo', [
'TERMINAL_PASSWORD_AUTH', 'TERMINAL_PUBLIC_KEY_AUTH',
@ -51,7 +51,7 @@ export default {
'TERMINAL_RDP_ADDR'
]
]
this.selectFields.splice(1, 0, xRDPFields)
this.fields.splice(1, 0, xRDPFields)
}
},
methods: {

2
vue.config.js
View File

@ -51,7 +51,7 @@ module.exports = {
changeOrigin: true
},
'/ws/': {
target: 'ws://127.0.0.1:8080',
target: process.env.VUE_APP_CORE_WS,
changeOrigin: true,
ws: true
},