diff --git a/apps/web-antd/src/views/mp/menu/modules/types.ts b/apps/web-antd/src/views/mp/menu/modules/types.ts index effd21657..ae0edbd21 100644 --- a/apps/web-antd/src/views/mp/menu/modules/types.ts +++ b/apps/web-antd/src/views/mp/menu/modules/types.ts @@ -113,4 +113,4 @@ export const menuOptions = [ value: 'location_select', label: '选择地理位置', }, -] as const; +]; diff --git a/apps/web-ele/src/api/mp/menu/index.ts b/apps/web-ele/src/api/mp/menu/index.ts index a8ae0833b..65715898b 100644 --- a/apps/web-ele/src/api/mp/menu/index.ts +++ b/apps/web-ele/src/api/mp/menu/index.ts @@ -1,6 +1,7 @@ import { requestClient } from '#/api/request'; /** 菜单类型枚举 */ +// TODO @hw:这里还有枚举 export enum MenuType { CLICK = 'click', // 点击推事件 LOCATION_SELECT = 'location_select', // 发送位置 diff --git a/apps/web-ele/src/views/mp/menu/index.vue b/apps/web-ele/src/views/mp/menu/index.vue index 53c2bd87c..5ef16b321 100644 --- a/apps/web-ele/src/views/mp/menu/index.vue +++ b/apps/web-ele/src/views/mp/menu/index.vue @@ -291,6 +291,7 @@ function menuToBackend(menu: any) { result.replyHqMusicUrl = menu.reply.hqMusicUrl; return result; } +// TODO @hw:antd 和 ele 版本,基本没用自定义组件,他们的 tindwind 需要进一步对齐么?(主要还是考虑维护性哈。) - - -
-import { computed, nextTick, ref, watch } from 'vue'; +import { computed, ref } from 'vue'; import { IconifyIcon } from '@vben/icons'; @@ -14,6 +14,7 @@ import { ElSelect, } from 'element-plus'; +// TODO @hw:import { WxMaterialSelect, WxNews, WxReply } from '#/views/mp/components'; import MaterialSelect from '#/views/mp/components/wx-material-select/wx-material-select.vue'; import News from '#/views/mp/components/wx-news/wx-news.vue'; import ReplySelect from '#/views/mp/components/wx-reply/wx-reply.vue'; @@ -40,17 +41,8 @@ const menu = computed({ }, }); const showNewsDialog = ref(false); -// TODO @hw:这个 reset 还有用么? -const hackResetWxReplySelect = ref(false); const isLeave = computed(() => !(menu.value.children?.length > 0)); -watch(menu, () => { - hackResetWxReplySelect.value = false; // 销毁组件 - nextTick(() => { - hackResetWxReplySelect.value = true; // 重建组件 - }); -}); - // ======================== 菜单编辑(素材选择) ======================== /** 选择素材 */ diff --git a/apps/web-ele/src/views/mp/menu/modules/previewer.vue b/apps/web-ele/src/views/mp/menu/modules/previewer.vue index fc087d649..631a5c3ad 100644 --- a/apps/web-ele/src/views/mp/menu/modules/previewer.vue +++ b/apps/web-ele/src/views/mp/menu/modules/previewer.vue @@ -140,6 +140,7 @@ function onChildDragEnd({ newIndex }: { newIndex: number }) { " @click="menuClicked(parent, x)" > + {{ parent.name }}
@@ -179,6 +180,7 @@ function onChildDragEnd({ newIndex }: { newIndex: number }) { v-if="!parent.children || parent.children.length < 5" @click="addSubMenu(x, parent)" > + @@ -192,9 +194,11 @@ function onChildDragEnd({ newIndex }: { newIndex: number }) { v-if="menuList.length < 3" @click="addMenu" > + +