diff --git a/apps/web-ele/src/components/diy-editor/components/ComponentContainerProperty.vue b/apps/web-ele/src/components/diy-editor/components/component-container-property.vue similarity index 99% rename from apps/web-ele/src/components/diy-editor/components/ComponentContainerProperty.vue rename to apps/web-ele/src/components/diy-editor/components/component-container-property.vue index 2ebcccccf..24062a191 100644 --- a/apps/web-ele/src/components/diy-editor/components/ComponentContainerProperty.vue +++ b/apps/web-ele/src/components/diy-editor/components/component-container-property.vue @@ -166,7 +166,7 @@ const handleSliderChange = (prop: string) => { :label="data.label" :prop="data.prop" :label-width="node.level === 1 ? '80px' : '62px'" - class="m-b-0! w-full" + class="mb-0 w-full" > - + @@ -133,17 +135,17 @@ const handleDeleteComponent = () => { :disabled="!canMoveDown" @click.stop="handleMoveComponent(1)" > - + - + - + diff --git a/apps/web-ele/src/components/diy-editor/components/ComponentLibrary.vue b/apps/web-ele/src/components/diy-editor/components/component-library.vue similarity index 97% rename from apps/web-ele/src/components/diy-editor/components/ComponentLibrary.vue rename to apps/web-ele/src/components/diy-editor/components/component-library.vue index fa8e41389..628c1c559 100644 --- a/apps/web-ele/src/components/diy-editor/components/ComponentLibrary.vue +++ b/apps/web-ele/src/components/diy-editor/components/component-library.vue @@ -12,7 +12,7 @@ import { cloneDeep } from '@vben/utils'; import { ElAside, ElCollapse, ElCollapseItem, ElScrollbar } from 'element-plus'; import draggable from 'vuedraggable'; -import { componentConfigs } from '../components/mobile/index'; +import { componentConfigs } from './mobile/index'; /** 组件库:目前左侧的【基础组件】、【图文组件】部分 */ defineOptions({ name: 'ComponentLibrary' }); @@ -90,7 +90,7 @@ const handleCloneComponent = (component: DiyComponent) => {
组件放置区域
- {{ element.name }} + {{ element.name }}
diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/Carousel/property.vue b/apps/web-ele/src/components/diy-editor/components/mobile/Carousel/property.vue index 145230231..21da40439 100644 --- a/apps/web-ele/src/components/diy-editor/components/mobile/Carousel/property.vue +++ b/apps/web-ele/src/components/diy-editor/components/mobile/Carousel/property.vue @@ -17,7 +17,7 @@ import { } from 'element-plus'; import AppLinkInput from '#/components/app-link-input/index.vue'; -import ComponentContainerProperty from '#/components/diy-editor/components/ComponentContainerProperty.vue'; +import ComponentContainerProperty from '#/components/diy-editor/components/component-container-property.vue'; import Draggable from '#/components/draggable/index.vue'; import UploadFile from '#/components/upload/file-upload.vue'; import UploadImg from '#/components/upload/image-upload.vue'; @@ -76,7 +76,7 @@ const formData = useVModel(props, 'modelValue', emit); @@ -86,7 +86,7 @@ const formData = useVModel(props, 'modelValue', emit); @@ -95,32 +95,32 @@ const formData = useVModel(props, 'modelValue', emit); draggable="false" height="80px" width="100%" - class="min-w-80px" + class="min-w-[80px]" :show-description="false" /> - + diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/CouponCard/component.tsx b/apps/web-ele/src/components/diy-editor/components/mobile/CouponCard/component.tsx deleted file mode 100644 index 26aca2399..000000000 --- a/apps/web-ele/src/components/diy-editor/components/mobile/CouponCard/component.tsx +++ /dev/null @@ -1,4 +0,0 @@ -// 导出所有优惠券相关组件 -export { CouponDiscount } from './CouponDiscount'; -export { CouponDiscountDesc } from './CouponDiscountDesc'; -export { CouponValidTerm } from './CouponValidTerm'; diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/Divider/property.vue b/apps/web-ele/src/components/diy-editor/components/mobile/Divider/property.vue index 84daffae5..b3ad9f4fb 100644 --- a/apps/web-ele/src/components/diy-editor/components/mobile/Divider/property.vue +++ b/apps/web-ele/src/components/diy-editor/components/mobile/Divider/property.vue @@ -2,6 +2,18 @@ import type { DividerProperty } from './config'; import { useVModel } from '@vueuse/core'; +import { + ElForm, + ElFormItem, + ElRadioButton, + ElRadioGroup, + ElSlider, + ElTooltip, +} from 'element-plus'; +import { IconifyIcon } from '@vben/icons'; + +import ColorInput from '#/components/input-with-color/index.vue'; + // 导航栏属性面板 defineOptions({ name: 'DividerProperty' }); const props = defineProps<{ modelValue: DividerProperty }>(); @@ -34,60 +46,60 @@ const BORDER_TYPES = [ diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/MenuList/index.vue b/apps/web-ele/src/components/diy-editor/components/mobile/MenuList/index.vue deleted file mode 100644 index faec56f51..000000000 --- a/apps/web-ele/src/components/diy-editor/components/mobile/MenuList/index.vue +++ /dev/null @@ -1,40 +0,0 @@ - - - - - diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/MenuSwiper/property.vue b/apps/web-ele/src/components/diy-editor/components/mobile/MenuSwiper/property.vue deleted file mode 100644 index 219e97e13..000000000 --- a/apps/web-ele/src/components/diy-editor/components/mobile/MenuSwiper/property.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - - - diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/NoticeBar/index.vue b/apps/web-ele/src/components/diy-editor/components/mobile/NoticeBar/index.vue deleted file mode 100644 index a7258056c..000000000 --- a/apps/web-ele/src/components/diy-editor/components/mobile/NoticeBar/index.vue +++ /dev/null @@ -1,34 +0,0 @@ - - - - - diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/Popover/index.vue b/apps/web-ele/src/components/diy-editor/components/mobile/Popover/index.vue index 8bcd7eeae..26031e938 100644 --- a/apps/web-ele/src/components/diy-editor/components/mobile/Popover/index.vue +++ b/apps/web-ele/src/components/diy-editor/components/mobile/Popover/index.vue @@ -1,6 +1,10 @@ diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/ProductList/property.vue b/apps/web-ele/src/components/diy-editor/components/mobile/ProductList/property.vue deleted file mode 100644 index 8b7a98595..000000000 --- a/apps/web-ele/src/components/diy-editor/components/mobile/ProductList/property.vue +++ /dev/null @@ -1,110 +0,0 @@ - - - - - diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/TitleBar/property.vue b/apps/web-ele/src/components/diy-editor/components/mobile/TitleBar/property.vue deleted file mode 100644 index 2fded6e29..000000000 --- a/apps/web-ele/src/components/diy-editor/components/mobile/TitleBar/property.vue +++ /dev/null @@ -1,150 +0,0 @@ - - - - diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/UserCard/index.vue b/apps/web-ele/src/components/diy-editor/components/mobile/UserCard/index.vue deleted file mode 100644 index 174d29392..000000000 --- a/apps/web-ele/src/components/diy-editor/components/mobile/UserCard/index.vue +++ /dev/null @@ -1,31 +0,0 @@ - - - - diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/coupon-card/component.tsx b/apps/web-ele/src/components/diy-editor/components/mobile/coupon-card/component.tsx new file mode 100644 index 000000000..d4dbfee44 --- /dev/null +++ b/apps/web-ele/src/components/diy-editor/components/mobile/coupon-card/component.tsx @@ -0,0 +1,4 @@ +// 导出所有优惠券相关组件 +export { CouponDiscount } from './coupon-discount'; +export { CouponDiscountDesc } from './coupon-discount-desc'; +export { CouponValidTerm } from './coupon-validTerm'; diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/CouponCard/config.ts b/apps/web-ele/src/components/diy-editor/components/mobile/coupon-card/config.ts similarity index 100% rename from apps/web-ele/src/components/diy-editor/components/mobile/CouponCard/config.ts rename to apps/web-ele/src/components/diy-editor/components/mobile/coupon-card/config.ts diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/CouponCard/CouponDiscountDesc.tsx b/apps/web-ele/src/components/diy-editor/components/mobile/coupon-card/coupon-discount-desc.tsx similarity index 100% rename from apps/web-ele/src/components/diy-editor/components/mobile/CouponCard/CouponDiscountDesc.tsx rename to apps/web-ele/src/components/diy-editor/components/mobile/coupon-card/coupon-discount-desc.tsx diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/CouponCard/CouponDiscount.tsx b/apps/web-ele/src/components/diy-editor/components/mobile/coupon-card/coupon-discount.tsx similarity index 100% rename from apps/web-ele/src/components/diy-editor/components/mobile/CouponCard/CouponDiscount.tsx rename to apps/web-ele/src/components/diy-editor/components/mobile/coupon-card/coupon-discount.tsx diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/CouponCard/CouponValidTerm.tsx b/apps/web-ele/src/components/diy-editor/components/mobile/coupon-card/coupon-validTerm.tsx similarity index 100% rename from apps/web-ele/src/components/diy-editor/components/mobile/CouponCard/CouponValidTerm.tsx rename to apps/web-ele/src/components/diy-editor/components/mobile/coupon-card/coupon-validTerm.tsx diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/CouponCard/index.vue b/apps/web-ele/src/components/diy-editor/components/mobile/coupon-card/index.vue similarity index 100% rename from apps/web-ele/src/components/diy-editor/components/mobile/CouponCard/index.vue rename to apps/web-ele/src/components/diy-editor/components/mobile/coupon-card/index.vue diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/CouponCard/property.vue b/apps/web-ele/src/components/diy-editor/components/mobile/coupon-card/property.vue similarity index 95% rename from apps/web-ele/src/components/diy-editor/components/mobile/CouponCard/property.vue rename to apps/web-ele/src/components/diy-editor/components/mobile/coupon-card/property.vue index 39dfd6b35..fc19dad7c 100644 --- a/apps/web-ele/src/components/diy-editor/components/mobile/CouponCard/property.vue +++ b/apps/web-ele/src/components/diy-editor/components/mobile/coupon-card/property.vue @@ -22,6 +22,7 @@ import { import * as CouponTemplateApi from '#/api/mall/promotion/coupon/couponTemplate'; import ColorInput from '#/components/color-input/index.vue'; import UploadImg from '#/components/upload/image-upload.vue'; +import ComponentContainerProperty from '#/components/diy-editor/components/component-container-property.vue'; import { CouponTemplateTakeTypeEnum, PromotionDiscountTypeEnum, @@ -91,9 +92,9 @@ watch( @click="handleAddCoupon" type="primary" plain - class="m-t-8px w-full" + class="mt-2 w-full" > - 添加 + 添加 @@ -122,7 +123,7 @@ watch( v-model="formData.bgImg" height="80px" width="100%" - class="min-w-160px" + class="min-w-[160px]" :show-description="false" /> diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/FloatingActionButton/config.ts b/apps/web-ele/src/components/diy-editor/components/mobile/floating-action-button/config.ts similarity index 100% rename from apps/web-ele/src/components/diy-editor/components/mobile/FloatingActionButton/config.ts rename to apps/web-ele/src/components/diy-editor/components/mobile/floating-action-button/config.ts diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/FloatingActionButton/index.vue b/apps/web-ele/src/components/diy-editor/components/mobile/floating-action-button/index.vue similarity index 100% rename from apps/web-ele/src/components/diy-editor/components/mobile/FloatingActionButton/index.vue rename to apps/web-ele/src/components/diy-editor/components/mobile/floating-action-button/index.vue diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/FloatingActionButton/property.vue b/apps/web-ele/src/components/diy-editor/components/mobile/floating-action-button/property.vue similarity index 100% rename from apps/web-ele/src/components/diy-editor/components/mobile/FloatingActionButton/property.vue rename to apps/web-ele/src/components/diy-editor/components/mobile/floating-action-button/property.vue diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/HotZone/components/HotZoneEditDialog/controller.ts b/apps/web-ele/src/components/diy-editor/components/mobile/hot-zone/components/hot-zone-edit-dialog/controller.ts similarity index 100% rename from apps/web-ele/src/components/diy-editor/components/mobile/HotZone/components/HotZoneEditDialog/controller.ts rename to apps/web-ele/src/components/diy-editor/components/mobile/hot-zone/components/hot-zone-edit-dialog/controller.ts diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/HotZone/components/HotZoneEditDialog/index.vue b/apps/web-ele/src/components/diy-editor/components/mobile/hot-zone/components/hot-zone-edit-dialog/index.vue similarity index 100% rename from apps/web-ele/src/components/diy-editor/components/mobile/HotZone/components/HotZoneEditDialog/index.vue rename to apps/web-ele/src/components/diy-editor/components/mobile/hot-zone/components/hot-zone-edit-dialog/index.vue diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/HotZone/config.ts b/apps/web-ele/src/components/diy-editor/components/mobile/hot-zone/config.ts similarity index 100% rename from apps/web-ele/src/components/diy-editor/components/mobile/HotZone/config.ts rename to apps/web-ele/src/components/diy-editor/components/mobile/hot-zone/config.ts diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/HotZone/index.vue b/apps/web-ele/src/components/diy-editor/components/mobile/hot-zone/index.vue similarity index 94% rename from apps/web-ele/src/components/diy-editor/components/mobile/HotZone/index.vue rename to apps/web-ele/src/components/diy-editor/components/mobile/hot-zone/index.vue index abaf9f3c2..dd36b550f 100644 --- a/apps/web-ele/src/components/diy-editor/components/mobile/HotZone/index.vue +++ b/apps/web-ele/src/components/diy-editor/components/mobile/hot-zone/index.vue @@ -1,6 +1,8 @@ + + + + diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/MenuList/property.vue b/apps/web-ele/src/components/diy-editor/components/mobile/menu-list/property.vue similarity index 59% rename from apps/web-ele/src/components/diy-editor/components/mobile/MenuList/property.vue rename to apps/web-ele/src/components/diy-editor/components/mobile/menu-list/property.vue index c2349f372..3c4dbc1dc 100644 --- a/apps/web-ele/src/components/diy-editor/components/mobile/MenuList/property.vue +++ b/apps/web-ele/src/components/diy-editor/components/mobile/menu-list/property.vue @@ -2,8 +2,14 @@ import type { MenuListProperty } from './config'; import { useVModel } from '@vueuse/core'; +import { ElForm, ElFormItem, ElText } from 'element-plus'; import { EMPTY_MENU_LIST_ITEM_PROPERTY } from './config'; +import ComponentContainerProperty from '#/components/diy-editor/components/component-container-property.vue'; +import Draggable from '#/components/draggable/index.vue'; +import UploadImg from '#/components/upload/image-upload.vue'; +import InputWithColor from '#/components/input-with-color/index.vue'; +import AppLinkInput from '#/components/app-link-input/index.vue'; /** 列表导航属性面板 */ defineOptions({ name: 'MenuListProperty' }); @@ -15,17 +21,17 @@ const formData = useVModel(props, 'modelValue', emit); diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/MenuSwiper/config.ts b/apps/web-ele/src/components/diy-editor/components/mobile/menu-swiper/config.ts similarity index 100% rename from apps/web-ele/src/components/diy-editor/components/mobile/MenuSwiper/config.ts rename to apps/web-ele/src/components/diy-editor/components/mobile/menu-swiper/config.ts diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/MenuSwiper/index.vue b/apps/web-ele/src/components/diy-editor/components/mobile/menu-swiper/index.vue similarity index 90% rename from apps/web-ele/src/components/diy-editor/components/mobile/MenuSwiper/index.vue rename to apps/web-ele/src/components/diy-editor/components/mobile/menu-swiper/index.vue index 0f64d0457..a6dd6f928 100644 --- a/apps/web-ele/src/components/diy-editor/components/mobile/MenuSwiper/index.vue +++ b/apps/web-ele/src/components/diy-editor/components/mobile/menu-swiper/index.vue @@ -1,6 +1,7 @@