refactor: 删除WxAccountSelect

src/views/mp/components/WxMpSelect.vue

@@ -1,36 +0,0 @@
-<template>
-  <el-select v-model="account.id" placeholder="请选择公众号" class="!w-240px" @change="onChanged">
-    <el-option v-for="item in accountList" :key="item.id" :label="item.name" :value="item.id" />
-  </el-select>
-</template>
-<!-- TODO @芋艿：WxMpSelect 改成 WxAccountSelect，然后挪到现有的 wx-account-select 包下 -->
-<script lang="ts" setup name="WxMpSelect">
-import * as MpAccountApi from '@/api/mp/account'
-
-const account: MpAccountApi.AccountVO = reactive({
-  id: undefined,
-  name: ''
-})
-const accountList: Ref<MpAccountApi.AccountVO[]> = ref([])
-
-const emit = defineEmits<{
-  (e: 'change', id?: number, name?: string): void
-}>()
-
-onMounted(() => {
-  handleQuery()
-})
-
-const handleQuery = async () => {
-  accountList.value = await MpAccountApi.getSimpleAccountList()
-  // 默认选中第一个
-  if (accountList.value.length > 0) {
-    account.id = accountList.value[0].id
-    emit('change', account.id, account.name)
-  }
-}
-
-const onChanged = () => {
-  emit('change', account.id, account.name)
-}
-</script>

src/views/mp/components/wx-account-select/main.vue

@@ -1,29 +1,21 @@
 <template>
-  <el-form class="-mb-15px" ref="queryFormRef" :inline="true" label-width="68px">
+  <el-select v-model="account.id" placeholder="请选择公众号" class="!w-240px" @change="onChanged">
-    <el-form-item label="公众号" prop="accountId">
-      <!-- TODO 芋艿：需要将 el-form 和 el-select 解耦 -->
-      <el-select
-        v-model="accountId"
-        placeholder="请选择公众号"
-        class="!w-240px"
-        @change="accountChanged()"
-      >
     <el-option v-for="item in accountList" :key="item.id" :label="item.name" :value="item.id" />
   </el-select>
-    </el-form-item>
-    <el-form-item>
-      <slot name="actions"></slot>
-    </el-form-item>
-  </el-form>
 </template>
 
-<script setup name="WxAccountSelect">
+<script lang="ts" setup name="WxAccountSelect">
 import * as MpAccountApi from '@/api/mp/account'
-const accountId = ref()
-const accountList = ref([])
-const queryFormRef = ref()
 
-const emit = defineEmits(['change'])
+const account: MpAccountApi.AccountVO = reactive({
+  id: undefined,
+  name: ''
+})
+const accountList: Ref<MpAccountApi.AccountVO[]> = ref([])
+
+const emit = defineEmits<{
+  (e: 'change', id?: number, name?: string): void
+}>()
 
 onMounted(() => {
   handleQuery()
@@ -33,12 +25,12 @@ const handleQuery = async () => {
   accountList.value = await MpAccountApi.getSimpleAccountList()
   // 默认选中第一个
   if (accountList.value.length > 0) {
-    accountId.value = accountList.value[0].id
+    account.id = accountList.value[0].id
-    emit('change', accountId.value)
+    emit('change', account.id, account.name)
   }
 }
 
-const accountChanged = () => {
+const onChanged = () => {
-  emit('change', accountId.value)
+  emit('change', account.id, account.name)
 }
 </script>

src/views/mp/message/index.vue

@@ -9,7 +9,7 @@
       label-width="68px"
     >
       <el-form-item label="公众号" prop="accountId">
-        <WxMpSelect @change="onAccountChanged" />
+        <WxAccountSelect @change="onAccountChanged" />
       </el-form-item>
       <el-form-item label="消息类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择消息类型" class="!w-240px">
@@ -203,7 +203,7 @@ import WxMsg from '@/views/mp/components/wx-msg/main.vue'
 import WxLocation from '@/views/mp/components/wx-location/main.vue'
 import WxMusic from '@/views/mp/components/wx-music/main.vue'
 import WxNews from '@/views/mp/components/wx-news/main.vue'
-import WxMpSelect from '@/views/mp/components/WxMpSelect.vue'
+import WxAccountSelect from '@/views/mp/components/wx-account-select/main.vue'
 import * as MpMessageApi from '@/api/mp/message'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'