From acc919b0e7a86c44e0665d6b6adc176da5cafd3e Mon Sep 17 00:00:00 2001 From: feng <1304903146@qq.com> Date: Thu, 24 Nov 2022 21:15:18 +0800 Subject: [PATCH 1/7] perf: gateway --- .../DomainDetail/GatewayCreateUpdate.vue | 38 +++--- .../components/ProtocolSelector/index.vue | 116 ++++++++++++++++++ 2 files changed, 138 insertions(+), 16 deletions(-) create mode 100644 src/views/assets/Domain/components/ProtocolSelector/index.vue diff --git a/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue b/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue index ede129f7a..a1a173928 100644 --- a/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue +++ b/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue @@ -6,6 +6,7 @@ import GenericCreateUpdatePage from '@/layout/components/GenericCreateUpdatePage' import { Select2, UploadKey } from '@/components' import { UpdateToken } from '@/components/FormFields' +import ProtocolSelector from '../components/ProtocolSelector' export default { name: 'GatewayCreateUpdate', @@ -13,23 +14,17 @@ export default { data() { return { initial: { - protocol: 'ssh', - port: 22, - domain: this.$route.query.domain, - is_active: true + is_active: true, + protocols: '', + domain: this.$route.query.domain }, fields: [ - [this.$t('common.Basic'), ['name', 'ip', 'port', 'protocol', 'domain']], + [this.$t('common.Basic'), ['name', 'address']], + [this.$t('assets.Network'), ['domain', 'protocols']], [this.$t('assets.Auth'), ['username', 'password', 'private_key', 'passphrase']], [this.$t('common.Other'), ['is_active', 'comment']] ], fieldsMeta: { - ip: { - type: 'input', - el: { - type: 'input' - } - }, domain: { component: Select2, el: { @@ -40,17 +35,25 @@ export default { multiple: false } }, - protocol: { - helpText: this.$t('assets.GatewayProtocolHelpText') + protocols: { + component: ProtocolSelector, + el: { + }, + hidden: (form) => { + const fieldsMeta = this.fieldsMeta + if (form['protocols']) { + fieldsMeta['protocols'].el.choices = form['protocols'] + } + } }, password: { component: UpdateToken }, - is_active: { - type: 'switch' - }, private_key: { component: UploadKey + }, + is_active: { + type: 'switch' } }, updateSuccessNextRoute: { @@ -87,6 +90,9 @@ export default { } } }, + mounted() { + console.log('---', this.object) + }, methods: { } } diff --git a/src/views/assets/Domain/components/ProtocolSelector/index.vue b/src/views/assets/Domain/components/ProtocolSelector/index.vue new file mode 100644 index 000000000..9d7216042 --- /dev/null +++ b/src/views/assets/Domain/components/ProtocolSelector/index.vue @@ -0,0 +1,116 @@ + + + + From e70b5cb2c4c9a7f13e8812bfd98ebbde336fea6c Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 25 Nov 2022 11:17:48 +0800 Subject: [PATCH 2/7] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/icons/svg/arrow-to-left.svg | 4 +--- src/icons/svg/download.svg | 2 +- src/icons/svg/upload.svg | 2 +- src/layout/components/NavLeft/Logo.vue | 8 +++----- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/icons/svg/arrow-to-left.svg b/src/icons/svg/arrow-to-left.svg index 603951565..56dfcafc5 100644 --- a/src/icons/svg/arrow-to-left.svg +++ b/src/icons/svg/arrow-to-left.svg @@ -1,3 +1 @@ - - - \ No newline at end of file + diff --git a/src/icons/svg/download.svg b/src/icons/svg/download.svg index 1b3c660c2..6a50a6873 100644 --- a/src/icons/svg/download.svg +++ b/src/icons/svg/download.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/icons/svg/upload.svg b/src/icons/svg/upload.svg index d5ee9e875..b17aa9040 100644 --- a/src/icons/svg/upload.svg +++ b/src/icons/svg/upload.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/layout/components/NavLeft/Logo.vue b/src/layout/components/NavLeft/Logo.vue index f1112d6a9..cbceb4c64 100644 --- a/src/layout/components/NavLeft/Logo.vue +++ b/src/layout/components/NavLeft/Logo.vue @@ -73,11 +73,9 @@ export default { } & .sidebar-logo-text { - width: 150px; - height: 50px; - padding: 3px 0; - vertical-align: top; - margin-right: 12px; + height: 40px; + padding: 5px 0; + vertical-align: middle; } & .sidebar-title { From adec7f4020826a622322d01cd8e49558aa01549a Mon Sep 17 00:00:00 2001 From: huailei <31801270+huailei000@users.noreply.github.com> Date: Fri, 25 Nov 2022 16:40:22 +0800 Subject: [PATCH 3/7] =?UTF-8?q?Revert=20"feat:=20=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=80=89=E6=8B=A9=E5=99=A8=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3fa33e482a8bf7bab0e630793e0e599ec2d63c09. --- .../components/NavHeader/Organization.vue | 29 ++----------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/src/layout/components/NavHeader/Organization.vue b/src/layout/components/NavHeader/Organization.vue index e8c82466b..d10584cd9 100644 --- a/src/layout/components/NavHeader/Organization.vue +++ b/src/layout/components/NavHeader/Organization.vue @@ -1,7 +1,7 @@ >> input{ - position: absolute; - } - &>>> .el-input__inner{ - margin-left: 6px; - } - &>>> .el-input__prefix{ - position: relative; - left: 0px; - box-sizing: border-box; - border: 1px solid #ffffff00; - padding: 0 30px 0 0; - height: 30px; - line-height: 30px; - .placeholder { - visibility: hidden; - } - } -} From 5f65099af5dc6fb16425a1ce3143d5ff95054a42 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 25 Nov 2022 21:19:19 +0800 Subject: [PATCH 4/7] =?UTF-8?q?pref:=20=E4=BF=AE=E6=94=B9=E4=B8=BB?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/variables.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 390bded58..9e6d20e81 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -17,13 +17,13 @@ $--color-link-highlight: #23527c; // Menu $menuText: var(--menu-text); $menuActiveLeft: var(--menu-active-left); -$menuActiveText: var(--menu-active-text); -$menuBg: var(--menu-bg); +$menuActiveText: var(--color-primary); +$menuBg: white; $menuTextWeight: 600; $menuHover: var(--menu-hover); -$subMenuBg: var(--submenu-bg); -$subMenuHover: var(--submenu-hover); -$subMenuActiveText: var(--submenu-active-text); +$subMenuBg: white; +$subMenuHover: #f4faf9; +$subMenuActiveText: var(--color-primary); $sideBarWidth: 200px; :export { From e55272180df499b97c57f57e20dcb3d6fbd9b09a Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Sat, 26 Nov 2022 02:51:02 +0800 Subject: [PATCH 5/7] =?UTF-8?q?feat:=20=E5=AE=9E=E6=97=B6=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ops/Adhoc/InstantAdhoc.vue | 203 ++++++++++++-------------- src/views/ops/Job/JobUpdateCreate.vue | 30 ++-- 2 files changed, 109 insertions(+), 124 deletions(-) diff --git a/src/views/ops/Adhoc/InstantAdhoc.vue b/src/views/ops/Adhoc/InstantAdhoc.vue index c162616f0..755e1c51d 100644 --- a/src/views/ops/Adhoc/InstantAdhoc.vue +++ b/src/views/ops/Adhoc/InstantAdhoc.vue @@ -1,21 +1,41 @@