+
{{ property.contents?.[activeIndex]?.text }}
diff --git a/apps/web-antd/src/views/mall/promotion/point/components/point-showcase.vue b/apps/web-antd/src/views/mall/promotion/point/components/point-showcase.vue
index d32122407..3d7d206bb 100644
--- a/apps/web-antd/src/views/mall/promotion/point/components/point-showcase.vue
+++ b/apps/web-antd/src/views/mall/promotion/point/components/point-showcase.vue
@@ -1,3 +1,4 @@
+
-
diff --git a/apps/web-ele/src/views/mall/product/category/components/index.ts b/apps/web-ele/src/views/mall/product/category/components/index.ts
new file mode 100644
index 000000000..aa1424405
--- /dev/null
+++ b/apps/web-ele/src/views/mall/product/category/components/index.ts
@@ -0,0 +1 @@
+export { default as ProductCategorySelect } from './category-select.vue';
diff --git a/apps/web-ele/src/views/mall/promotion/components/app-link-input/index.vue b/apps/web-ele/src/views/mall/promotion/components/app-link-input/index.vue
index 2118dda5b..e1060efaa 100644
--- a/apps/web-ele/src/views/mall/promotion/components/app-link-input/index.vue
+++ b/apps/web-ele/src/views/mall/promotion/components/app-link-input/index.vue
@@ -1,14 +1,15 @@
-
+
- 选择
+ 选择
-
+
diff --git a/apps/web-ele/src/views/mall/promotion/components/app-link-input/app-link-select-dialog.vue b/apps/web-ele/src/views/mall/promotion/components/app-link-input/select-dialog.vue
similarity index 69%
rename from apps/web-ele/src/views/mall/promotion/components/app-link-input/app-link-select-dialog.vue
rename to apps/web-ele/src/views/mall/promotion/components/app-link-input/select-dialog.vue
index b2362962a..3ab7d7fa6 100644
--- a/apps/web-ele/src/views/mall/promotion/components/app-link-input/app-link-select-dialog.vue
+++ b/apps/web-ele/src/views/mall/promotion/components/app-link-input/select-dialog.vue
@@ -5,11 +5,18 @@ import type { AppLink } from './data';
import { nextTick, ref } from 'vue';
+import { useVbenModal } from '@vben/common-ui';
import { getUrlNumberValue } from '@vben/utils';
-import { ElScrollbar } from 'element-plus';
+import {
+ ElButton,
+ ElForm,
+ ElFormItem,
+ ElScrollbar,
+ ElTooltip,
+} from 'element-plus';
-import ProductCategorySelect from '#/views/mall/product/category/components/product-category-select.vue';
+import { ProductCategorySelect } from '#/views/mall/product/category/components/';
import { APP_LINK_GROUP_LIST, APP_LINK_TYPE_ENUM } from './data';
@@ -32,18 +39,31 @@ const groupBtnRefs = ref
([]); // 分组引用列表
const detailSelectDialog = ref<{
id?: number;
type?: APP_LINK_TYPE_ENUM;
- visible: boolean;
}>({
- visible: false,
id: undefined,
type: undefined,
}); // 详情选择对话框
+const [Modal, modalApi] = useVbenModal({
+ onConfirm() {
+ emit('change', activeAppLink.value.path);
+ emit('appLinkChange', activeAppLink.value);
+ modalApi.close();
+ },
+});
+
+const [DetailSelectModal, detailSelectModalApi] = useVbenModal({
+ onConfirm() {
+ detailSelectModalApi.close();
+ },
+});
+
+defineExpose({ open });
+
/** 打开弹窗 */
-const dialogVisible = ref(false);
-const open = (link: string) => {
+async function open(link: string) {
activeAppLink.value.path = link;
- dialogVisible.value = true;
+ modalApi.open();
// 滚动到当前的链接
const group = APP_LINK_GROUP_LIST.find((group) =>
group.links.some((linkItem) => {
@@ -56,19 +76,18 @@ const open = (link: string) => {
);
if (group) {
// 使用 nextTick 的原因：可能 Dom 还没生成，导致滚动失败
- nextTick(() => handleGroupSelected(group.name));
+ await nextTick();
+ handleGroupSelected(group.name);
}
-};
-defineExpose({ open });
+}
/** 处理 APP 链接选中 */
-const handleAppLinkSelected = (appLink: AppLink) => {
+function handleAppLinkSelected(appLink: AppLink) {
if (!isSameLink(appLink.path, activeAppLink.value.path)) {
activeAppLink.value = appLink;
}
switch (appLink.type) {
case APP_LINK_TYPE_ENUM.PRODUCT_CATEGORY_LIST: {
- detailSelectDialog.value.visible = true;
detailSelectDialog.value.type = appLink.type;
// 返显
detailSelectDialog.value.id =
@@ -76,22 +95,18 @@ const handleAppLinkSelected = (appLink: AppLink) => {
'id',
`http://127.0.0.1${activeAppLink.value.path}`,
) || undefined;
+ detailSelectModalApi.open();
break;
}
default: {
break;
}
}
-};
-
-function handleSubmit() {
- dialogVisible.value = false;
- emit('change', activeAppLink.value.path);
- emit('appLinkChange', activeAppLink.value);
}
/**
* 处理右侧链接列表滚动
+ *
* @param {object} param0 滚动事件参数
* @param {number} param0.scrollTop 滚动条的位置
*/
@@ -134,66 +149,70 @@ function scrollToGroupBtn(group: string) {
/** 是否为相同的链接（不比较参数，只比较链接） */
function isSameLink(link1: string, link2: string) {
- return link2 ? link1.split('?')[0] === link2.split('?')[0] : false;
+ return link2 ? link1?.split('?')[0] === link2.split('?')[0] : false;
}
/** 处理详情选择 */
function handleProductCategorySelected(id: number) {
- // TODO @AI：这里有点问题；activeAppLink 地址；
+ // 生成 activeAppLink
const url = new URL(activeAppLink.value.path, 'http://127.0.0.1');
- // 修改 id 参数
url.searchParams.set('id', `${id}`);
- // 排除域名
activeAppLink.value.path = `${url.pathname}${url.search}`;
- // 关闭对话框
- detailSelectDialog.value.visible = false;
- // 重置 id
+
+ // 关闭对话框，并重置 id
+ detailSelectModalApi.close();
detailSelectDialog.value.id = undefined;
}
-
+
-
-
-
+
+
- {{ group.name }}
-
-
+
+ {{ group.name }}
+
+
+
-
{{ group.name }}
+
+ {{ group.name }}
+
-
-
{{ appLink.name }}
-
-
+
+