From 0d3029e6b152f8caae08f96249b6845513748fe3 Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Mon, 26 Jul 2021 17:09:28 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E8=A1=A8=E5=8D=95=20?=
 =?UTF-8?q?(#933)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* perf: 优化表单

* fix: 修复国际化

* fix: 去掉排序

* perf: 系统平台排序

* fix: 修复错误

* fix: 去掉多余的逗号

Co-authored-by: 吴小白 <296015668@qq.com>
---
 .env.development                             |   1 +
 dump.rdb                                     | Bin 92 -> 0 bytes
 src/components/AssetSelect/index.vue         |   9 +++++++++
 src/views/assets/Asset/AssetCreateUpdate.vue |   3 +--
 src/views/settings/Basic.vue                 |  10 ++++++++++
 src/views/settings/Email.vue                 |  20 ++++++++++++++++++-
 src/views/settings/EmailContent.vue          |   4 ++--
 src/views/settings/Ldap/index.vue            |  20 +++++++++++++++++--
 src/views/settings/Security.vue              |   6 +++---
 src/views/settings/Terminal.vue              |   6 +++---
 vue.config.js                                |   2 +-
 11 files changed, 67 insertions(+), 14 deletions(-)
 delete mode 100644 dump.rdb

diff --git a/.env.development b/.env.development
index 3d7d6e496..ffa962d06 100644
--- a/.env.development
+++ b/.env.development
@@ -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'
diff --git a/dump.rdb b/dump.rdb
deleted file mode 100644
index f245254c54f14efedca45ec0886227b8d9264100..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 92
zcmWG?b@2=~Ffg$E#aWb^l3A=<mRiJWs%M~Q`HKr8kd#?ce8AxsYjR0uZt9_>>vkmk
t;wUXnP0`Iw%{_ELh@asXPhx(WZb4CMVs27S>H&uTQr4+LHPc!@0sumcB$5CC

diff --git a/src/components/AssetSelect/index.vue b/src/components/AssetSelect/index.vue
index 44ebbc32a..c89a39765 100644
--- a/src/components/AssetSelect/index.vue
+++ b/src/components/AssetSelect/index.vue
@@ -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: {
diff --git a/src/views/assets/Asset/AssetCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate.vue
index 43a79958c..eec1789ae 100644
--- a/src/views/assets/Asset/AssetCreateUpdate.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate.vue
@@ -68,8 +68,7 @@ export default {
                 return { label: `${item.name}(${item.username})`, value: item.id }
               }
             }
-          },
-          rules: [rules.RequiredChange]
+          }
         },
         nodes: {
           rules: [rules.RequiredChange],
diff --git a/src/views/settings/Basic.vue b/src/views/settings/Basic.vue
index a72e5ac40..01948502e 100644
--- a/src/views/settings/Basic.vue
+++ b/src/views/settings/Basic.vue
@@ -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'
     }
diff --git a/src/views/settings/Email.vue b/src/views/settings/Email.vue
index f99857e44..cd7869bd4 100644
--- a/src/views/settings/Email.vue
+++ b/src/views/settings/Email.vue
@@ -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) {
diff --git a/src/views/settings/EmailContent.vue b/src/views/settings/EmailContent.vue
index 51b1ef8da..167bf9878 100644
--- a/src/views/settings/EmailContent.vue
+++ b/src/views/settings/EmailContent.vue
@@ -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'),
           [
diff --git a/src/views/settings/Ldap/index.vue b/src/views/settings/Ldap/index.vue
index f5f571123..3bbb6d39c 100644
--- a/src/views/settings/Ldap/index.vue
+++ b/src/views/settings/Ldap/index.vue
@@ -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: {
diff --git a/src/views/settings/Security.vue b/src/views/settings/Security.vue
index 1dea8f0df..d890c0abc 100644
--- a/src/views/settings/Security.vue
+++ b/src/views/settings/Security.vue
@@ -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'),
diff --git a/src/views/settings/Terminal.vue b/src/views/settings/Terminal.vue
index 821d72ffb..16dc7be9a 100644
--- a/src/views/settings/Terminal.vue
+++ b/src/views/settings/Terminal.vue
@@ -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: {
diff --git a/vue.config.js b/vue.config.js
index 291df6495..b7cf4cdbe 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -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
       },