Merge remote-tracking branch 'origin/master'

src/views/remote/contacts/contactsList.vue

@@ -8,7 +8,7 @@
                 <global-icon icon="mic" :size="14"></global-icon>
             </div>
             <div class="flex-auto text-right">
-                <a-button type="primary" shape="circle" @click.stop="handleCall"><global-icon icon="phone" :size="14" color="var(--color-bg-white)"></global-icon></a-button>
+                <a-button type="primary" shape="circle" @click.stop="changeWait(true)"><global-icon icon="phone" :size="14" color="var(--color-bg-white)"></global-icon></a-button>
             </div>
         </div>
     </template>
@@ -27,9 +27,6 @@ const ps = withDefaults(defineProps<Props>(), {
 })
 //拨打视频
 const { changeWait, setChooseUser } = useContactsStore()
-const handleCall = () => {
-    changeWait(true)
-}
 //当前联系人
 const { chooseUser } = storeToRefs(useContactsStore())
 //点击联系人

src/views/remote/contacts/contactsListChoose.vue

 <template>
-    <a-checkbox-group v-model="checkbox" @change="handleChange">
+    <a-checkbox-group v-model="checkbox" class="w-full">
         <template v-for="(item, index) in data" :key="item.id">
             <div class="item flex items-center px-4 py-3 rounded cursor-pointer">
                 <global-avatar></global-avatar>
@@ -21,11 +21,7 @@ interface Props {
 const ps = withDefaults(defineProps<Props>(), {
     data: () => []
 })
-//选择联系人
-const checkbox = ref([])
-const handleChange = () => {
-    console.log(checkbox.value)
-}
+const checkbox = defineModel()
 </script>
 <style lang="less" scoped>
 .item.active,

src/views/remote/contacts/multiCallModel.vue

@@ -3,12 +3,12 @@
         <div class="h-80 overflow-y-auto">
             <a-collapse :bordered="false">
                 <a-collapse-item :header="key + '列表'" :key="index" v-for="(value, key, index) in getUserListGroup">
-                    <contacts-list-choose :data="value"></contacts-list-choose>
+                    <contacts-list-choose :data="value" v-model="chooseUsers"></contacts-list-choose>
                 </a-collapse-item>
             </a-collapse>
         </div>
         <template #footer>
-            <a-button size="large" type="primary" @click="showModel = false" disabled>呼叫0人</a-button>
+            <a-button size="large" type="primary" @click="showModel = false" :disabled="chooseUsers.length == 0">呼叫{{ chooseUsers.length }}人</a-button>
             <a-button size="large" @click="showModel = false">取消</a-button>
         </template>
     </global-model>
@@ -21,9 +21,12 @@ import { UserItemDto } from '@/store/contacts/types'
 import contactsListChoose from './contactsListChoose.vue'
 import { cloneDeep } from 'lodash'
 
+//选中的联系人数组id
+const chooseUsers = ref([])
 const showModel = ref(false)
 const open = () => {
     showModel.value = true
+    chooseUsers.value = []
 }
 //联系人列表
 const videoGroup: { [key in UserItemDto['videoGroup']]: string } = {
@@ -45,6 +48,8 @@ const getUserListGroup = computed(() => {
             return result
         }, {})
 })
+//拨打视频
+const { changeWait } = useContactsStore()
 defineExpose({
     open
 })