From 4d24f09d28afb22fa43323668058d77b1cfdd451 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Thu, 1 Sep 2022 22:15:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=90=86=E9=85=8D=E7=BD=AE=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-admin/config/dev.env.js        |   2 +-
 neutrino-proxy-admin/src/api/user.js          |   7 +
 .../src/components/Dropdown/DropdownTable.vue | 181 ++++++++++++++++++
 neutrino-proxy-admin/src/router/index.js      |  48 ++---
 .../src/views/proxy/license.vue               |  17 +-
 .../src/views/proxy/portMapping.vue           |   4 +-
 .../server/controller/res/UserListRes.java    |   1 -
 7 files changed, 224 insertions(+), 36 deletions(-)
 create mode 100644 neutrino-proxy-admin/src/components/Dropdown/DropdownTable.vue

diff --git a/neutrino-proxy-admin/config/dev.env.js b/neutrino-proxy-admin/config/dev.env.js
index e89dfbb0..c2f345e9 100644
--- a/neutrino-proxy-admin/config/dev.env.js
+++ b/neutrino-proxy-admin/config/dev.env.js
@@ -1,5 +1,5 @@
 module.exports = {
 	NODE_ENV: '"development"',
 	ENV_CONFIG: '"dev"',
-	BASE_API: '"http://localhost:8080"'
+	BASE_API: '"http://192.168.0.106:8080"'
 }
diff --git a/neutrino-proxy-admin/src/api/user.js b/neutrino-proxy-admin/src/api/user.js
index f456a508..70ef71e8 100644
--- a/neutrino-proxy-admin/src/api/user.js
+++ b/neutrino-proxy-admin/src/api/user.js
@@ -8,6 +8,13 @@ export function fetchList(query) {
   })
 }
 
+export function userList() {
+  return request({
+    url: '/user/list',
+    method: 'get'
+  })
+}
+
 export function fetchUser() {
   return request({
     url: '/user/detail',
diff --git a/neutrino-proxy-admin/src/components/Dropdown/DropdownTable.vue b/neutrino-proxy-admin/src/components/Dropdown/DropdownTable.vue
new file mode 100644
index 00000000..578c63c8
--- /dev/null
+++ b/neutrino-proxy-admin/src/components/Dropdown/DropdownTable.vue
@@ -0,0 +1,181 @@
+<template>
+  <div>
+    <el-popover v-model="popVisible" width="700" trigger="click" placement="bottom">
+      <div>
+        <FBATable
+          ref="countryTableRef"
+          :data="tableData"
+          height="300"
+          :rowHeader="countryColumns"
+          @rowClick="handleRowClick"
+        ></FBATable>
+        <div class="demo-footer">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="pagination.PageIndex"
+            :page-sizes="[5, 10, 20, 50, 100]"
+            :page-size="pagination.PageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="pagination.TotalCount"
+          >
+          </el-pagination>
+        </div>
+      </div>
+      <el-input v-model="keyWords" @input="changeKey" :placeholder="placeholder" slot="reference" :CatId="CatId"> </el-input>
+    </el-popover>
+  </div>
+</template>
+<script>
+  import { delay } from '@/utils/index'
+  import { wfinFeeItemGetPageList } from '@/api/OverseasWarehouse/Cost'
+  import FBATable from '@/components/FBATable'
+  export default {
+    props: {
+      name: {
+        type: String,
+        default: ''
+      },
+      index: {
+        type: Number,
+        default: () => 0
+      },
+      placeholder: {
+        type: String,
+        default: '请选择'
+      },
+      CatId: {
+        type: Number
+      }
+    },
+    components: {
+      FBATable
+    },
+    data() {
+      return {
+        pagination: {
+          TotalCount: 0,
+          PageIndex: 1,
+          PageSize: 10
+        },
+        tableData: [],
+        countryColumns: [
+          {
+            prop: 'NameCn',
+            label: '中文名',
+            align: 'center'
+          },
+          {
+            prop: 'NameEn',
+            label: '英文名',
+            align: 'center'
+          },
+          {
+            prop: 'FeeItemCode',
+            label: '费用项编码',
+            align: 'center'
+          },
+          {
+            prop: 'FeeItemTypeStr',
+            label: '费用类型',
+            align: 'center'
+          }
+        ],
+        popVisible: false,
+        selected: [],
+        timer: null
+      }
+    },
+    created() {},
+    computed: {
+      keyWords: {
+        get() {
+          return this.name
+        },
+        set(val) {
+          this.$emit('update:name', val)
+        }
+      }
+    },
+    watch: {
+      CatId: {
+        handler(newVal, oldVal) {
+          this.getList(newVal)
+        },
+        deep: true,
+        immediate: true
+      }
+    },
+    methods: {
+      getList(CatId) {
+        const { PageSize, PageIndex } = this.pagination
+        wfinFeeItemGetPageList({
+          PageSize,
+          PageIndex,
+          NameCn: this.keyWords,
+          CatId: CatId ? CatId : 0
+        })
+          .then(res => {
+            if (res.ErrorCode === 0) {
+              this.tableData = res.Body.Items
+              this.pagination.TotalCount = res.Body.TotalCount
+            }
+          })
+          .catch(err => {
+            console.log(err)
+          })
+      },
+      handleSelectionChange(val) {
+        if (val.length >= 2) {
+          let arrays = val.splice(0, val.length - 1)
+          arrays.forEach(row => {
+            this.$refs.countryTableRef.$refs.FBATable.toggleRowSelection(row) //除了当前点击的，其他的全部取消选中
+          })
+        }
+        this.$emit('selectedData', { list: val, index: this.index })
+        this.timer = setTimeout(() => {
+          this.popVisible = false
+        }, 500)
+      },
+      handleRowClick(val) {
+        this.$emit('selectedData', { list: val, index: this.index })
+        this.timer = setTimeout(() => {
+          this.popVisible = false
+        }, 200)
+      },
+      // 搜索
+      changeKey() {
+        delay(() => {
+          this.pagination.PageIndex = 1
+          this.getList()
+        }, 200)
+      },
+      handleSizeChange(val) {
+        this.pagination.PageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.pagination.PageIndex = val
+        this.getList()
+      }
+    },
+    destroyed() {
+      clearTimeout(this.timer)
+    }
+  }
+</script>
+<style lang="scss" scoped>
+  .demo-form-inline {
+    position: relative;
+    margin: 15px 10px;
+  }
+  .demo-footer {
+    display: flex;
+    justify-content: flex-end;
+  }
+  .country-footer {
+    text-align: center;
+    position: relative;
+    margin: 10px auto;
+  }
+</style>
diff --git a/neutrino-proxy-admin/src/router/index.js b/neutrino-proxy-admin/src/router/index.js
index 0f8c45f6..dfb78116 100644
--- a/neutrino-proxy-admin/src/router/index.js
+++ b/neutrino-proxy-admin/src/router/index.js
@@ -89,29 +89,29 @@ export const asyncRouterMap = [
   //   }]
   // },
   //
-  // {
-  //   path: '/components',
-  //   component: Layout,
-  //   redirect: 'noredirect',
-  //   name: 'component-demo',
-  //   meta: {
-  //     title: 'components',
-  //     icon: 'component'
-  //   },
-  //   children: [
-  //     { path: 'tinymce', component: _import('components-demo/tinymce'), name: 'tinymce-demo', meta: { title: 'tinymce' }},
-  //     { path: 'markdown', component: _import('components-demo/markdown'), name: 'markdown-demo', meta: { title: 'markdown' }},
-  //     { path: 'json-editor', component: _import('components-demo/jsonEditor'), name: 'jsonEditor-demo', meta: { title: 'jsonEditor' }},
-  //     { path: 'dnd-list', component: _import('components-demo/dndList'), name: 'dndList-demo', meta: { title: 'dndList' }},
-  //     { path: 'splitpane', component: _import('components-demo/splitpane'), name: 'splitpane-demo', meta: { title: 'splitPane' }},
-  //     { path: 'avatar-upload', component: _import('components-demo/avatarUpload'), name: 'avatarUpload-demo', meta: { title: 'avatarUpload' }},
-  //     { path: 'dropzone', component: _import('components-demo/dropzone'), name: 'dropzone-demo', meta: { title: 'dropzone' }},
-  //     { path: 'sticky', component: _import('components-demo/sticky'), name: 'sticky-demo', meta: { title: 'sticky' }},
-  //     { path: 'count-to', component: _import('components-demo/countTo'), name: 'countTo-demo', meta: { title: 'countTo' }},
-  //     { path: 'mixin', component: _import('components-demo/mixin'), name: 'componentMixin-demo', meta: { title: 'componentMixin' }},
-  //     { path: 'back-to-top', component: _import('components-demo/backToTop'), name: 'backToTop-demo', meta: { title: 'backToTop' }}
-  //   ]
-  // },
+  {
+    path: '/components',
+    component: Layout,
+    redirect: 'noredirect',
+    name: 'component-demo',
+    meta: {
+      title: 'components',
+      icon: 'component'
+    },
+    children: [
+      { path: 'tinymce', component: _import('components-demo/tinymce'), name: 'tinymce-demo', meta: { title: 'tinymce' }},
+      { path: 'markdown', component: _import('components-demo/markdown'), name: 'markdown-demo', meta: { title: 'markdown' }},
+      { path: 'json-editor', component: _import('components-demo/jsonEditor'), name: 'jsonEditor-demo', meta: { title: 'jsonEditor' }},
+      { path: 'dnd-list', component: _import('components-demo/dndList'), name: 'dndList-demo', meta: { title: 'dndList' }},
+      { path: 'splitpane', component: _import('components-demo/splitpane'), name: 'splitpane-demo', meta: { title: 'splitPane' }},
+      { path: 'avatar-upload', component: _import('components-demo/avatarUpload'), name: 'avatarUpload-demo', meta: { title: 'avatarUpload' }},
+      { path: 'dropzone', component: _import('components-demo/dropzone'), name: 'dropzone-demo', meta: { title: 'dropzone' }},
+      { path: 'sticky', component: _import('components-demo/sticky'), name: 'sticky-demo', meta: { title: 'sticky' }},
+      { path: 'count-to', component: _import('components-demo/countTo'), name: 'countTo-demo', meta: { title: 'countTo' }},
+      { path: 'mixin', component: _import('components-demo/mixin'), name: 'componentMixin-demo', meta: { title: 'componentMixin' }},
+      { path: 'back-to-top', component: _import('components-demo/backToTop'), name: 'backToTop-demo', meta: { title: 'backToTop' }}
+    ]
+  },
   //
   // {
   //   path: '/charts',
@@ -158,7 +158,7 @@ export const asyncRouterMap = [
   //     { path: 'tab/index', icon: 'tab', component: _import('example/tab/index'), name: 'tab', meta: { title: 'tab' }}
   //   ]
   // },
-
+  //
   // {
   //   path: '/form',
   //   component: Layout,
diff --git a/neutrino-proxy-admin/src/views/proxy/license.vue b/neutrino-proxy-admin/src/views/proxy/license.vue
index d6a900e4..fdc4102f 100644
--- a/neutrino-proxy-admin/src/views/proxy/license.vue
+++ b/neutrino-proxy-admin/src/views/proxy/license.vue
@@ -67,7 +67,7 @@
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
       <el-form :rules="rules" ref="dataForm" :model="temp" label-position="left" label-width="120px" style='width: 400px; margin-left:50px;'>
         <el-form-item :label="$t('用户')" prop="userId">
-          <el-select class="filter-item" v-model="temp.userId" placeholder="Please select" :disabled="dialogStatus=='update'">
+          <el-select style="width: 280px" class="filter-item" v-model="temp.userId" placeholder="请选择" :disabled="dialogStatus=='update'">
             <el-option v-for="item in  userList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
@@ -98,6 +98,7 @@
 
 <script>
   import { fetchList, createLicense, updateLicense, updateEnableStatus, deleteLicense } from '@/api/license'
+  import { userList } from '@/api/user'
   import waves from '@/directive/waves' // 水波纹指令
   import { parseTime } from '@/utils'
   import ButtonPopover from '../../components/Button/buttonPopover'
@@ -138,10 +139,7 @@
         },
         importanceOptions: [1, 2, 3],
         calendarTypeOptions,
-        userList: [
-          { id: 1, name: '管理员' },
-          { id: 2, name: '游客' }
-        ],
+        userList: [],
         sortOptions: [{ label: 'ID Ascending', key: '+id' }, { label: 'ID Descending', key: '-id' }],
         statusOptions: ['published', 'draft', 'deleted'],
         showReviewer: false,
@@ -197,11 +195,9 @@
     },
     created() {
       this.getList()
+      this.getUserList()
     },
     methods: {
-      getUserList() {
-        console.log('获取用户列表')
-      },
       getList() {
         this.listLoading = true
         fetchList(this.listQuery).then(response => {
@@ -210,6 +206,11 @@
           this.listLoading = false
         })
       },
+      getUserList() {
+        userList().then(response => {
+          this.userList = response.data.data
+        })
+      },
       handleFilter() {
         this.listQuery.currentPage = 1
         this.getList()
diff --git a/neutrino-proxy-admin/src/views/proxy/portMapping.vue b/neutrino-proxy-admin/src/views/proxy/portMapping.vue
index 6cdb066b..d6429a0b 100644
--- a/neutrino-proxy-admin/src/views/proxy/portMapping.vue
+++ b/neutrino-proxy-admin/src/views/proxy/portMapping.vue
@@ -72,13 +72,13 @@
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
       <el-form :rules="rules" ref="dataForm" :model="temp" label-position="left" label-width="120px" style='width: 400px; margin-left:50px;'>
         <el-form-item :label="$t('License')" prop="licenseId">
-          <el-select class="filter-item" v-model="temp.licenseId" placeholder="请选择" :disabled="dialogStatus=='update'">
+          <el-select style="width: 280px;" class="filter-item" v-model="temp.licenseId" placeholder="请选择" :disabled="dialogStatus=='update'">
             <el-option v-for="item in licenseList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('服务端端口')" prop="serverPort">
-          <el-select class="filter-item" v-model="temp.serverPort" placeholder="请选择">
+          <el-select style="width: 280px;" class="filter-item" v-model="temp.serverPort" placeholder="请选择">
             <el-option v-for="item in serverPortList" :key="item" :label="item" :value="item">
             </el-option>
           </el-select>
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserListRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserListRes.java
index ae1ea8fd..52090db9 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserListRes.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/UserListRes.java
@@ -21,7 +21,6 @@
  */
 package fun.asgc.neutrino.proxy.server.controller.res;
 
-import fun.asgc.neutrino.core.db.annotation.Id;
 import lombok.Data;
 
 import java.util.Date;