Skip to content

Commit c47cc18

Browse files
YunaiVgitee-org
authored andcommitted
!147 refactor: mp/autoReply 拆分ReplyForm组件
Merge pull request !147 from dhb52/dev
2 parents e92361e + be49c38 commit c47cc18

File tree

2 files changed

+98
-52
lines changed

2 files changed

+98
-52
lines changed
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<template>
2+
<div>
3+
<el-form ref="formRef" :model="replyForm" :rules="rules" label-width="80px">
4+
<el-form-item label="消息类型" prop="requestMessageType" v-if="msgType === MsgType.Message">
5+
<el-select v-model="replyForm.requestMessageType" placeholder="请选择">
6+
<template v-for="dict in getDictOptions(DICT_TYPE.MP_MESSAGE_TYPE)" :key="dict.value">
7+
<el-option
8+
v-if="RequestMessageTypes.includes(dict.value)"
9+
:label="dict.label"
10+
:value="dict.value"
11+
/>
12+
</template>
13+
</el-select>
14+
</el-form-item>
15+
<el-form-item label="匹配类型" prop="requestMatch" v-if="msgType === MsgType.Keyword">
16+
<el-select v-model="replyForm.requestMatch" placeholder="请选择匹配类型" clearable>
17+
<el-option
18+
v-for="dict in getIntDictOptions(DICT_TYPE.MP_AUTO_REPLY_REQUEST_MATCH)"
19+
:key="dict.value"
20+
:label="dict.label"
21+
:value="dict.value"
22+
/>
23+
</el-select>
24+
</el-form-item>
25+
<el-form-item label="关键词" prop="requestKeyword" v-if="msgType === MsgType.Keyword">
26+
<el-input v-model="replyForm.requestKeyword" placeholder="请输入内容" clearable />
27+
</el-form-item>
28+
<el-form-item label="回复消息">
29+
<WxReplySelect v-model="reply" />
30+
</el-form-item>
31+
</el-form>
32+
</div>
33+
</template>
34+
35+
<script setup lang="ts" name="ReplyForm">
36+
import WxReplySelect, { type Reply } from '@/views/mp/components/wx-reply'
37+
import type { FormInstance } from 'element-plus'
38+
import { MsgType } from './types'
39+
import { DICT_TYPE, getDictOptions, getIntDictOptions } from '@/utils/dict'
40+
41+
const props = defineProps<{
42+
modelValue: any
43+
reply: Reply
44+
msgType: MsgType
45+
}>()
46+
47+
const emit = defineEmits<{
48+
(e: 'update:reply', v: Reply)
49+
(e: 'update:modelValue', v: any)
50+
}>()
51+
52+
const reply = computed<Reply>({
53+
get: () => props.reply,
54+
set: (val) => emit('update:reply', val)
55+
})
56+
57+
const replyForm = computed<any>({
58+
get: () => props.modelValue,
59+
set: (val) => emit('update:modelValue', val)
60+
})
61+
62+
const formRef = ref<FormInstance | null>(null) // 表单 ref
63+
64+
const RequestMessageTypes = ['text', 'image', 'voice', 'video', 'shortvideo', 'location', 'link'] // 允许选择的请求消息类型
65+
66+
// 表单校验
67+
const rules = {
68+
requestKeyword: [{ required: true, message: '请求的关键字不能为空', trigger: 'blur' }],
69+
requestMatch: [{ required: true, message: '请求的关键字的匹配不能为空', trigger: 'blur' }]
70+
}
71+
72+
defineExpose({
73+
resetFields: () => formRef.value?.resetFields(),
74+
validate: async () => formRef.value?.validate()
75+
})
76+
</script>
77+
78+
<style scoped></style>

src/views/mp/autoReply/index.vue

Lines changed: 20 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -53,38 +53,13 @@
5353
@on-delete="onDelete"
5454
/>
5555

56-
<!-- 添加或修改自动回复的对话框 -->
57-
<!-- TODO @Dhb52 -->
58-
<el-dialog :title="dialogTitle" v-model="showFormDialog" width="800px" destroy-on-close>
59-
<el-form ref="formRef" :model="replyForm" :rules="rules" label-width="80px">
60-
<el-form-item label="消息类型" prop="requestMessageType" v-if="msgType === MsgType.Message">
61-
<el-select v-model="replyForm.requestMessageType" placeholder="请选择">
62-
<template v-for="dict in getDictOptions(DICT_TYPE.MP_MESSAGE_TYPE)" :key="dict.value">
63-
<el-option
64-
v-if="RequestMessageTypes.includes(dict.value)"
65-
:label="dict.label"
66-
:value="dict.value"
67-
/>
68-
</template>
69-
</el-select>
70-
</el-form-item>
71-
<el-form-item label="匹配类型" prop="requestMatch" v-if="msgType === MsgType.Keyword">
72-
<el-select v-model="replyForm.requestMatch" placeholder="请选择匹配类型" clearable>
73-
<el-option
74-
v-for="dict in getIntDictOptions(DICT_TYPE.MP_AUTO_REPLY_REQUEST_MATCH)"
75-
:key="dict.value"
76-
:label="dict.label"
77-
:value="dict.value"
78-
/>
79-
</el-select>
80-
</el-form-item>
81-
<el-form-item label="关键词" prop="requestKeyword" v-if="msgType === MsgType.Keyword">
82-
<el-input v-model="replyForm.requestKeyword" placeholder="请输入内容" clearable />
83-
</el-form-item>
84-
<el-form-item label="回复消息">
85-
<WxReplySelect v-model="reply" />
86-
</el-form-item>
87-
</el-form>
56+
<el-dialog
57+
:title="isCreating ? '新增自动回复' : '修改自动回复'"
58+
v-model="showDialog"
59+
width="800px"
60+
destroy-on-close
61+
>
62+
<ReplyForm v-model="replyForm" v-model:reply="reply" :msg-type="msgType" ref="formRef" />
8863
<template #footer>
8964
<el-button @click="cancel">取 消</el-button>
9065
<el-button type="primary" @click="onSubmit">确 定</el-button>
@@ -93,43 +68,37 @@
9368
</ContentWrap>
9469
</template>
9570
<script setup lang="ts" name="MpAutoReply">
96-
import WxReplySelect, { type Reply, ReplyType } from '@/views/mp/components/wx-reply'
71+
import ReplyForm from '@/views/mp/autoReply/components/ReplyForm.vue'
72+
import { type Reply, ReplyType } from '@/views/mp/components/wx-reply'
9773
import WxAccountSelect from '@/views/mp/components/wx-account-select'
9874
import * as MpAutoReplyApi from '@/api/mp/autoReply'
99-
import { DICT_TYPE, getDictOptions, getIntDictOptions } from '@/utils/dict'
10075
import { ContentWrap } from '@/components/ContentWrap'
101-
import type { FormInstance, TabPaneName } from 'element-plus'
76+
import type { TabPaneName } from 'element-plus'
10277
import ReplyTable from './components/ReplyTable.vue'
10378
import { MsgType } from './components/types'
10479
const message = useMessage() // 消息
10580
10681
const accountId = ref(-1) // 公众号ID
10782
const msgType = ref<MsgType>(MsgType.Keyword) // 消息类型
108-
const RequestMessageTypes = ['text', 'image', 'voice', 'video', 'shortvideo', 'location', 'link'] // 允许选择的请求消息类型
10983
const loading = ref(true) // 遮罩层
11084
const total = ref(0) // 总条数
11185
const list = ref<any[]>([]) // 自动回复列表
112-
const formRef = ref<FormInstance | null>(null) // 表单 ref
86+
const formRef = ref<InstanceType<typeof ReplyForm> | null>(null) // 表单 ref
11387
// 查询参数
11488
const queryParams = reactive({
11589
pageNo: 1,
11690
pageSize: 10,
11791
accountId: accountId
11892
})
11993
120-
const dialogTitle = ref('') // 弹出层标题
121-
const showFormDialog = ref(false) // 是否显示弹出层
94+
const isCreating = ref(false) // 是否新建(否则编辑)
95+
const showDialog = ref(false) // 是否显示弹出层
12296
const replyForm = ref<any>({}) // 表单参数
12397
// 回复消息
12498
const reply = ref<Reply>({
12599
type: ReplyType.Text,
126100
accountId: -1
127101
})
128-
// 表单校验
129-
const rules = {
130-
requestKeyword: [{ required: true, message: '请求的关键字不能为空', trigger: 'blur' }],
131-
requestMatch: [{ required: true, message: '请求的关键字的匹配不能为空', trigger: 'blur' }]
132-
}
133102
134103
/** 侦听账号变化 */
135104
const onAccountChanged = (id: number) => {
@@ -174,8 +143,8 @@ const onCreate = () => {
174143
accountId: queryParams.accountId
175144
}
176145
177-
dialogTitle.value = '新增自动回复'
178-
showFormDialog.value = true
146+
isCreating.value = true
147+
showDialog.value = true
179148
}
180149
181150
/** 修改按钮操作 */
@@ -207,8 +176,8 @@ const onUpdate = async (id: number) => {
207176
}
208177
209178
// 打开表单
210-
dialogTitle.value = '修改自动回复'
211-
showFormDialog.value = true
179+
isCreating.value = false
180+
showDialog.value = true
212181
}
213182
214183
/** 删除按钮操作 */
@@ -220,8 +189,7 @@ const onDelete = async (id: number) => {
220189
}
221190
222191
const onSubmit = async () => {
223-
const valid = await formRef.value?.validate()
224-
if (!valid) return
192+
await formRef.value?.validate()
225193
226194
// 处理回复消息
227195
const submitForm: any = { ...replyForm.value }
@@ -245,7 +213,7 @@ const onSubmit = async () => {
245213
message.success('新增成功')
246214
}
247215
248-
showFormDialog.value = false
216+
showDialog.value = false
249217
await getList()
250218
}
251219
@@ -264,7 +232,7 @@ const reset = () => {
264232
265233
// 取消按钮
266234
const cancel = () => {
267-
showFormDialog.value = false
235+
showDialog.value = false
268236
reset()
269237
}
270238
</script>

0 commit comments

Comments
 (0)