From 31ae8cc1430869d59a80cb2e00e10d22428f702b Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Thu, 8 Sep 2022 15:33:20 +0800
Subject: [PATCH 01/23] =?UTF-8?q?=E6=9B=B4=E6=96=B0gitignore=EF=BC=8C?=
=?UTF-8?q?=E5=BF=BD=E7=95=A5=E8=BF=90=E8=A1=8C=E6=97=B6=E8=87=AA=E5=8A=A8?=
=?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
(cherry picked from commit d4e1d64f6e31f64ed8babe52dbe58386c552d154)
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index d4a4a7ba..979b4ad5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
*.class
data.db*
.neutrino-proxy.license
+lib/*
# Log file
From a91519cd3be79b5a0a9b23a5993de9d3039fd5bc Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Thu, 8 Sep 2022 22:48:41 +0800
Subject: [PATCH 02/23] =?UTF-8?q?=E6=96=B0=E5=A2=9EDropdownTable2=E7=BB=84?=
=?UTF-8?q?=E4=BB=B6=EF=BC=9A=20=E6=94=AF=E6=8C=81=E5=8D=95=E9=80=89?=
=?UTF-8?q?=E3=80=81=E5=A4=9A=E9=80=89=E3=80=81=E6=90=9C=E7=B4=A2=E3=80=81?=
=?UTF-8?q?backspace=E9=94=AE=E5=88=A0=E9=99=A4=E5=B7=B2=E9=80=89=E3=80=81?=
=?UTF-8?q?=E7=A6=81=E7=94=A8=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/Dropdown/DropdownTable2.vue | 228 ++++++++++++++++++
1 file changed, 228 insertions(+)
create mode 100644 neutrino-proxy-admin/src/components/Dropdown/DropdownTable2.vue
diff --git a/neutrino-proxy-admin/src/components/Dropdown/DropdownTable2.vue b/neutrino-proxy-admin/src/components/Dropdown/DropdownTable2.vue
new file mode 100644
index 00000000..6931399a
--- /dev/null
+++ b/neutrino-proxy-admin/src/components/Dropdown/DropdownTable2.vue
@@ -0,0 +1,228 @@
+
+
+
+
+
+
+
+
From 15ffaf2a97e7f56c8c86e3b8cf4d53ae76d451d7 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Thu, 8 Sep 2022 22:55:19 +0800
Subject: [PATCH 03/23] test
---
.../src/views/proxy/portMapping.vue | 24 ++++++++++++++-----
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/neutrino-proxy-admin/src/views/proxy/portMapping.vue b/neutrino-proxy-admin/src/views/proxy/portMapping.vue
index 9e307f8d..3730df9a 100644
--- a/neutrino-proxy-admin/src/views/proxy/portMapping.vue
+++ b/neutrino-proxy-admin/src/views/proxy/portMapping.vue
@@ -89,7 +89,16 @@
:width="280"
:disabled="dialogStatus==='update'"
/>
-
+
@@ -197,7 +206,11 @@
clientIp: [{ required: true, message: '请输入客户端IP', trigger: 'blur' }],
clientPort: [{ required: true, message: '请输入客户端端口', trigger: 'blur' }]
},
- downloadLoading: false
+ downloadLoading: false,
+ countryColumns: [
+ { prop: 'userName', label: '用户名', align: 'center' },
+ { prop: 'name', label: 'License', align: 'center' }
+ ]
}
},
filters: {
@@ -342,10 +355,9 @@
}
})
},
- selectedFeeItem(list) {
- console.log(list)
- this.temp.licenseId = list.id
- this.temp.licenseName = list.name
+ selectedFeeItem(row, list) {
+ this.temp.licenseId = row.id
+ this.temp.licenseName = row.name
},
handleDelete(row) {
this.$confirm('确定要删除吗?', '提示', {
From f98bca3dffcc57035c662bbde7153a1ed335eae9 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Thu, 8 Sep 2022 22:57:20 +0800
Subject: [PATCH 04/23] test
---
neutrino-proxy-admin/src/components/Dropdown/DropdownTable2.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/neutrino-proxy-admin/src/components/Dropdown/DropdownTable2.vue b/neutrino-proxy-admin/src/components/Dropdown/DropdownTable2.vue
index 6931399a..cd606022 100644
--- a/neutrino-proxy-admin/src/components/Dropdown/DropdownTable2.vue
+++ b/neutrino-proxy-admin/src/components/Dropdown/DropdownTable2.vue
@@ -25,7 +25,6 @@
-