Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

src/api/request.js

@@ -1,5 +1,5 @@
 import {reactive, ref, toRefs, watch} from "vue";
-import {getCookieForName} from "@/api/method";
+import {getCookieForName, throttle} from "@/api/method";
 import JSONBigInt from 'json-bigint';
 
 const JSONBigIntStr = JSONBigInt({storeAsString: true});
@@ -21,11 +21,8 @@ export function useBoeApiPage(_url, params = {}, config = {
     })
 
     function fetch() {
-        console.log('params', params)
         state.loading = true
         return request(_url, params).then(r => {
-            console.log(2222222222222)
-            console.log(r)
             state.data = config.result(r)
             state.totalPage = config.totalPage(r)
             state.total = config.total(r)
@@ -69,6 +66,41 @@ export function useBoeApi(_url, params = {}, config = {
     };
 }
 
+export function useBoeUserListPage(_url, params = {}, init = true) {
+
+    const state = reactive({
+        data: [],
+        loading: false,
+        total: 0,
+        totalPage: 0,
+        page: 1,
+        ...params
+    })
+
+    watch(() => params.keyWord, throttle(fetch, 600))
+    watch(() => params.page, fetch)
+
+    function fetch() {
+        state.loading = true
+        if (!params.keyWord) {
+            state.loading = false
+            return
+        }
+        return request(_url, params).then(r => {
+            state.data = params.page === 1 ? r.result.userInfoList : [...state.data, ...r.result.userInfoList]
+            state.totalPage = r.result.totalPage
+            state.total = r.result.totalElement
+            state.loading = false
+        })
+    }
+
+    init && fetch()
+    return {
+        ...toRefs(state),
+        fetch,
+    };
+}
+
 export function usePage(_url, params = {}, init = true) {
 
     const state = reactive({

src/components/project/ProjectManagerNew.vue

@@ -28,8 +28,8 @@
 </template>
 <script setup>
 import {computed, defineEmits, defineProps, onMounted, ref, watch} from "vue";
-import {scrollLoad, throttle} from "@/api/method";
+import {useBoeUserListPage} from "@/api/request";
-import * as api1 from "@/api/index1";
+import {USER_LIST} from "@/api/ThirdApi";
 
 const props = defineProps({
   value: {
@@ -48,8 +48,6 @@ const props = defineProps({
   mode: String
 })
 
-const options = ref([])
-
 const selectOptions = ref([])
 
 const managerArray = computed(() => props.mode === 'select' ? props.value : (props.value ? props.value.split(',') : []))
@@ -58,11 +56,17 @@ const emit = defineEmits({})
 
 const isOpen = ref(false)
 
-const memberParam = ref({keyWord: '', pageNo: 1, pageSize: 10})
+const memberParam = ref({keyWord: '', page: 1, pageSize: 20})
-const loading = ref(false)
 
+const {data: userList, loading} = useBoeUserListPage(USER_LIST, memberParam.value, false)
+
+const options = computed(() => userList.value.filter(e => !(props.value + '').includes(e.id)).map(e => ({
+  label: e.realName + e.userNo,
+  value: e.id,
+  ...e,
+  audienceList: null
+})))
 
-watch(() => memberParam.value, throttle(getMemberData, 1000))
 watch(props, init)
 
 function init() {
@@ -78,59 +82,32 @@ onMounted(() => {
 })
 
 
-function getMemberData() {
+const memberScroll = ({target: {scrollHeight, scrollTop, clientHeight}}) => {
-  if (!memberParam.value.keyWord) {
+  scrollHeight === (clientHeight + scrollTop) && memberParam.value.page++
-    return
-  }
-  if (memberParam.value.pageNo !== 1) {
-    options.value && options.value.length && (options.value = [])
-  }
-  isOpen.value = true
-  loading.value = true
-  api1.getMemberInfo(memberParam.value).then((res) => {
-    if (!res.data.data.rows || !res.data.data.rows.length) {
-      isOpen.value = false
-      return;
-    }
-    console.log(1111111111111)
-    console.log(props.value)
-    const list = res.data.data.rows.filter(e => !(props.value + '').includes(e.id)).map(e => ({
-      label: e.realName + e.userNo,
-      value: e.id,
-      deptId: e.departId,
-      departName: e.departName,
-      userNo: e.userNo,
-      name: e.realName
-    }));
-    memberParam.value.pageNo === 1 && props.value ? (options.value = list) : options.value.push(...list)
-    loading.value = false
-  });
-}
-
-const memberScroll = (e) => {
-  let num = scrollLoad(e);
-  if (num === 2) {
-    memberParam.value.pageNo++;
-  }
 };
 
 //搜索学员
 const searchMember = (keyWord) => {
   console.log('searchMember', keyWord)
   loading.value = true
-  options.value = []
   isOpen.value = true
-  keyWord && (memberParam.value = {keyWord, pageNo: 1, pageSize: 10});
+  userList.value = []
+  memberParam.value.page = 1
+  memberParam.value.keyWord = keyWord
 };
 
 function blur() {
   isOpen.value = false
+  memberParam.value.keyWord = ''
+  memberParam.value.page = 1
 }
 
 function change(e, l) {
+  memberParam.value.keyWord = ''
+  memberParam.value.page = 1
   isOpen.value = false
   Array.isArray(l) && (selectOptions.value = l)
-  Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.deptId)?.deptId, selectOptions.value.find(e => e.deptId)?.departName)
+  Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.departId)?.departId, selectOptions.value.find(e => e.departId)?.departName)
   if (Array.isArray(l)) {
     emit('update:name', l.map(t => t.label).join(','))
     emit('update:value', l.map(t => t.value).join(','))