From 7b6717bf9f54a33c42756caf45c0648b88365786 Mon Sep 17 00:00:00 2001
From: yaoyanan <794433246@qq.com>
Date: Wed, 17 Mar 2021 09:54:29 +0800
Subject: [PATCH] =?UTF-8?q?j-select-multiple=E6=94=B9=E4=B8=BA=E5=8F=AF?=
 =?UTF-8?q?=E6=A3=80=E7=B4=A2=E7=9A=84=E5=A4=9A=E9=80=89=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/jero/JSelectMultiple.vue   | 34 +++++++++++++++--
 jero-web/src/components/jero/index.js         |  2 -
 .../components/jerobiz/JSelectPosition.vue    | 37 -------------------
 jero-web/src/main.js                          |  4 --
 jero-web/src/views/jero/SelectDemo.vue        | 13 +------
 .../src/views/system/modules/UserModal.vue    |  2 -
 6 files changed, 32 insertions(+), 60 deletions(-)
 delete mode 100644 jero-web/src/components/jerobiz/JSelectPosition.vue

diff --git a/jero-web/src/components/jero/JSelectMultiple.vue b/jero-web/src/components/jero/JSelectMultiple.vue
index fddb04f2..543a0eb1 100644
--- a/jero-web/src/components/jero/JSelectMultiple.vue
+++ b/jero-web/src/components/jero/JSelectMultiple.vue
@@ -1,7 +1,14 @@
 <template>
-  <a-select :value="arrayValue" @change="onChange" mode="multiple" :placeholder="placeholder">
+  <a-select
+    mode="multiple"
+    :placeholder="placeholder"
+    :value="arrayValue"
+    @change="onChange"
+    @search="search"
+    :filterOption="false"
+  >
     <a-select-option
-      v-for="(item,index) in options"
+      v-for="(item,index) in newOptions"
       :key="index"
       :getPopupContainer="getParentContainer"
       :value="item.value">
@@ -51,7 +58,8 @@
     },
     data(){
       return {
-        arrayValue:!this.value?[]:this.value.split(this.spliter)
+        newOptions:[],
+        arrayValue:!this.value?[]:this.value.split(this.spliter) // arrayValue是已选中的数据
       }
     },
     watch:{
@@ -63,8 +71,28 @@
         }
       }
     },
+    created(){
+      this.newOptions = this.options
+    },
     methods:{
+      search(val){
+        let newArr = []
+        this.newOptions = this.options
+        if (this.options && this.options.length > 0){
+          this.options.forEach((item,index)=>{
+            if (item.text.indexOf(val) != -1){
+              newArr.push(item)
+            }
+          })
+          this.$nextTick(()=>{
+            this.newOptions = newArr
+          })
+        }else {
+          this.newOptions = this.options
+        }
+      },
       onChange (selectedValue) {
+        this.newOptions = this.options
         if(this.triggerChange){
           this.$emit('change', selectedValue.join(this.spliter));
         }else{
diff --git a/jero-web/src/components/jero/index.js b/jero-web/src/components/jero/index.js
index 1e680222..6acca5fb 100644
--- a/jero-web/src/components/jero/index.js
+++ b/jero-web/src/components/jero/index.js
@@ -30,7 +30,6 @@ import JTreeTable from './JTreeTable.vue'
 //jerobiz
 import JSelectDepart from '../jerobiz/JSelectDepart.vue'
 import JSelectMultiUser from '../jerobiz/JSelectMultiUser.vue'
-import JSelectPosition from '../jerobiz/JSelectPosition.vue'
 import JSelectRole from '../jerobiz/JSelectRole.vue'
 import JSelectUserByDep from '../jerobiz/JSelectUserByDep.vue'
 
@@ -68,7 +67,6 @@ export default {
     //jerobiz
     Vue.component('JSelectDepart', JSelectDepart)
     Vue.component('JSelectMultiUser', JSelectMultiUser)
-    Vue.component('JSelectPosition', JSelectPosition)
     Vue.component('JSelectRole', JSelectRole)
     Vue.component('JSelectUserByDep', JSelectUserByDep)
   }
diff --git a/jero-web/src/components/jerobiz/JSelectPosition.vue b/jero-web/src/components/jerobiz/JSelectPosition.vue
deleted file mode 100644
index f863f8e3..00000000
--- a/jero-web/src/components/jerobiz/JSelectPosition.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<template>
-  <j-select-biz-component :width="1000" v-bind="configs" v-on="$listeners"/>
-</template>
-
-<script>
-  import JSelectBizComponent from './JSelectBizComponent'
-
-  export default {
-    name: 'JSelectPosition',
-    components: { JSelectBizComponent },
-    props: ['value'],
-    data() {
-      return {
-        settings: {
-          name: '职务',
-          displayKey: 'name',
-          returnKeys: ['id', 'code'],
-          listUrl: '/sys/position/list',
-          queryParamCode: 'name',
-          queryParamText: '职务名称',
-          columns: [
-            { title: '职务名称', dataIndex: 'name', align: 'center', width: '30%', widthRight: '70%' },
-            { title: '职务编码', dataIndex: 'code', align: 'center', width: '35%' },
-            { title: '职级', dataIndex: 'rank_dictText', align: 'center', width: '25%' }
-          ]
-        }
-      }
-    },
-    computed: {
-      configs() {
-        return Object.assign({ value: this.value }, this.settings, this.$attrs)
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped></style>
\ No newline at end of file
diff --git a/jero-web/src/main.js b/jero-web/src/main.js
index 0c9b8fd8..e3289ba6 100644
--- a/jero-web/src/main.js
+++ b/jero-web/src/main.js
@@ -8,13 +8,9 @@ import router from './router'
 import store from './store/'
 import { VueAxios } from "@/utils/request"
 
-// require('@jeecg/antd-online-mini')
-// require('@jeecg/antd-online-mini/dist/OnlineForm.css')
-
 require('@/components/onlineForm/onlineForm')
 require('@/components/onlineForm/OnlineForm.css')
 
-
 import Antd, { version } from 'ant-design-vue'
 console.log('ant-design-vue version:', version)
 
diff --git a/jero-web/src/views/jero/SelectDemo.vue b/jero-web/src/views/jero/SelectDemo.vue
index 77a60c19..c56c2f56 100644
--- a/jero-web/src/views/jero/SelectDemo.vue
+++ b/jero-web/src/views/jero/SelectDemo.vue
@@ -127,16 +127,6 @@
           <a-col :span="12">选中值：{{ formData.selectRole}}</a-col>
         </a-row>
 
-        <!-- 职务选择 -->
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="选择职务">
-              <j-select-position  :buttons="false" v-model="formData.selectPosition" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">选中值：{{ formData.selectPosition}}</a-col>
-        </a-row>
-
         <!--  JCheckbox -->
         <a-row :gutter="24">
           <a-col :span="12">
@@ -452,7 +442,6 @@
   import JSuperQuery from '@/components/jero/JSuperQuery'
   import JUpload from '@/components/jero/JUpload'
   import JImageUpload from '@/components/jero/JImageUpload'
-  import JSelectPosition from '@comp/jerobiz/JSelectPosition'
   import JCategorySelect from '@comp/jero/JCategorySelect'
   import JMultiSelectTag from '@comp/dict/JMultiSelectTag'
   import JInput from '@comp/jero/JInput'
@@ -468,7 +457,6 @@
       JAreaLinkage,
       JInput,
       JCategorySelect,
-      JSelectPosition,
       JImageUpload,
       JUpload,
       JTreeDict,
@@ -527,6 +515,7 @@ sayHi('hello, world!')`
         jselectMultiple: {
           options: [
             { text: '字符串', value: 'String' },
+            { text: '字符串1', value: 'String1' },
             { text: '整数型', value: 'Integer' },
             { text: '浮点型', value: 'Double' },
             { text: '布尔型', value: 'Boolean' }
diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue
index d7c10161..0d0c187d 100644
--- a/jero-web/src/views/system/modules/UserModal.vue
+++ b/jero-web/src/views/system/modules/UserModal.vue
@@ -168,7 +168,6 @@
   import Vue from 'vue'
   // 引入搜索部门弹出框的组件
   import departWindow from './DepartWindow'
-  import JSelectPosition from '@/components/jerobiz/JSelectPosition'
   import { ACCESS_TOKEN } from "@/store/mutation-types"
   import { getAction } from '@/api/manage'
   import {addUser,editUser,queryUserRole,queryall } from '@/api/api'
@@ -181,7 +180,6 @@
     components: {
       JImageUpload,
       departWindow,
-      JSelectPosition
     },
     data () {
       return {