From 86bb36fc2f13423d2a24be363e387b7ce72412c0 Mon Sep 17 00:00:00 2001 From: jinmh716 Date: Wed, 15 Jan 2025 10:22:06 +0800 Subject: [PATCH 01/28] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E3=80=91=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=EF=BC=9A?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E4=BF=AE=E6=94=B9=E6=9D=83?= =?UTF-8?q?=E9=99=90=EF=BC=8C=E5=88=99=E7=A6=81=E7=94=A8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/user/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 4f04dff5..dd8395f2 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -124,6 +124,7 @@ :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)" + :disabled="!checkPermi(['system:user:update'])" /> From e4fab335fd8df26e5c82685eab46e4b9b498b504 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 15 Jan 2025 21:10:03 +0800 Subject: [PATCH 02/28] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E3=80=91ERP=EF=BC=9A=E9=87=87=E8=B4=AD=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E4=BA=A7=E5=93=81=E5=8D=95=E4=BB=B7=E7=BC=BA?= =?UTF-8?q?=E5=B0=91=E4=B8=BA=E7=A9=BA=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/order/components/PurchaseOrderItemForm.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/erp/purchase/order/components/PurchaseOrderItemForm.vue b/src/views/erp/purchase/order/components/PurchaseOrderItemForm.vue index 265193e9..70a24331 100644 --- a/src/views/erp/purchase/order/components/PurchaseOrderItemForm.vue +++ b/src/views/erp/purchase/order/components/PurchaseOrderItemForm.vue @@ -66,7 +66,11 @@ diff --git a/src/components/DiyEditor/components/mobile/CouponCard/property.vue b/src/components/DiyEditor/components/mobile/CouponCard/property.vue index 4f69000b..5d151bf9 100644 --- a/src/components/DiyEditor/components/mobile/CouponCard/property.vue +++ b/src/components/DiyEditor/components/mobile/CouponCard/property.vue @@ -73,7 +73,7 @@ diff --git a/src/components/DiyEditor/components/mobile/HotZone/property.vue b/src/components/DiyEditor/components/mobile/HotZone/property.vue index 495cbdce..65892f85 100644 --- a/src/components/DiyEditor/components/mobile/HotZone/property.vue +++ b/src/components/DiyEditor/components/mobile/HotZone/property.vue @@ -20,7 +20,7 @@ diff --git a/src/components/DiyEditor/components/mobile/MagicCube/property.vue b/src/components/DiyEditor/components/mobile/MagicCube/property.vue index fe938e5b..dee3117b 100644 --- a/src/components/DiyEditor/components/mobile/MagicCube/property.vue +++ b/src/components/DiyEditor/components/mobile/MagicCube/property.vue @@ -56,7 +56,7 @@ diff --git a/src/components/DiyEditor/components/mobile/MenuList/property.vue b/src/components/DiyEditor/components/mobile/MenuList/property.vue index a5fb4603..b665b320 100644 --- a/src/components/DiyEditor/components/mobile/MenuList/property.vue +++ b/src/components/DiyEditor/components/mobile/MenuList/property.vue @@ -28,7 +28,7 @@ diff --git a/src/components/DiyEditor/components/mobile/MenuSwiper/property.vue b/src/components/DiyEditor/components/mobile/MenuSwiper/property.vue index fbae83c2..3dd3f7c3 100644 --- a/src/components/DiyEditor/components/mobile/MenuSwiper/property.vue +++ b/src/components/DiyEditor/components/mobile/MenuSwiper/property.vue @@ -58,7 +58,7 @@ diff --git a/src/components/DiyEditor/components/mobile/NavigationBar/components/CellProperty.vue b/src/components/DiyEditor/components/mobile/NavigationBar/components/CellProperty.vue index f6176d23..2494e069 100644 --- a/src/components/DiyEditor/components/mobile/NavigationBar/components/CellProperty.vue +++ b/src/components/DiyEditor/components/mobile/NavigationBar/components/CellProperty.vue @@ -64,7 +64,7 @@ diff --git a/src/components/DiyEditor/components/mobile/PageConfig/property.vue b/src/components/DiyEditor/components/mobile/PageConfig/property.vue index 278bc940..d8f51d26 100644 --- a/src/components/DiyEditor/components/mobile/PageConfig/property.vue +++ b/src/components/DiyEditor/components/mobile/PageConfig/property.vue @@ -20,7 +20,7 @@ diff --git a/src/components/DiyEditor/components/mobile/Popover/property.vue b/src/components/DiyEditor/components/mobile/Popover/property.vue index 2dd43519..21be46ef 100644 --- a/src/components/DiyEditor/components/mobile/Popover/property.vue +++ b/src/components/DiyEditor/components/mobile/Popover/property.vue @@ -25,14 +25,14 @@ diff --git a/src/components/DiyEditor/components/mobile/ProductCard/property.vue b/src/components/DiyEditor/components/mobile/ProductCard/property.vue index 110c8be9..91846e66 100644 --- a/src/components/DiyEditor/components/mobile/ProductCard/property.vue +++ b/src/components/DiyEditor/components/mobile/ProductCard/property.vue @@ -135,7 +135,7 @@ diff --git a/src/components/DiyEditor/components/mobile/ProductList/property.vue b/src/components/DiyEditor/components/mobile/ProductList/property.vue index 894687c2..d7a5a7cd 100644 --- a/src/components/DiyEditor/components/mobile/ProductList/property.vue +++ b/src/components/DiyEditor/components/mobile/ProductList/property.vue @@ -85,7 +85,7 @@ diff --git a/src/components/DiyEditor/components/mobile/PromotionArticle/property.vue b/src/components/DiyEditor/components/mobile/PromotionArticle/property.vue index c3bcb21b..10c5840e 100644 --- a/src/components/DiyEditor/components/mobile/PromotionArticle/property.vue +++ b/src/components/DiyEditor/components/mobile/PromotionArticle/property.vue @@ -25,7 +25,7 @@ diff --git a/src/components/DiyEditor/components/mobile/PromotionSeckill/property.vue b/src/components/DiyEditor/components/mobile/PromotionSeckill/property.vue index 61287590..594c10bc 100644 --- a/src/components/DiyEditor/components/mobile/PromotionSeckill/property.vue +++ b/src/components/DiyEditor/components/mobile/PromotionSeckill/property.vue @@ -140,7 +140,7 @@ diff --git a/src/components/DiyEditor/components/mobile/TabBar/property.vue b/src/components/DiyEditor/components/mobile/TabBar/property.vue index d1da142b..e4350121 100644 --- a/src/components/DiyEditor/components/mobile/TabBar/property.vue +++ b/src/components/DiyEditor/components/mobile/TabBar/property.vue @@ -80,13 +80,13 @@ diff --git a/src/components/DiyEditor/components/mobile/UserCoupon/property.vue b/src/components/DiyEditor/components/mobile/UserCoupon/property.vue index f902e04e..221cc90a 100644 --- a/src/components/DiyEditor/components/mobile/UserCoupon/property.vue +++ b/src/components/DiyEditor/components/mobile/UserCoupon/property.vue @@ -4,14 +4,14 @@ diff --git a/src/components/DiyEditor/components/mobile/UserOrder/property.vue b/src/components/DiyEditor/components/mobile/UserOrder/property.vue index 42df7410..d315db6a 100644 --- a/src/components/DiyEditor/components/mobile/UserOrder/property.vue +++ b/src/components/DiyEditor/components/mobile/UserOrder/property.vue @@ -4,14 +4,14 @@ diff --git a/src/components/DiyEditor/components/mobile/UserWallet/property.vue b/src/components/DiyEditor/components/mobile/UserWallet/property.vue index 549367e3..e0ac83e4 100644 --- a/src/components/DiyEditor/components/mobile/UserWallet/property.vue +++ b/src/components/DiyEditor/components/mobile/UserWallet/property.vue @@ -4,14 +4,14 @@ diff --git a/src/components/DiyEditor/components/mobile/VideoPlayer/property.vue b/src/components/DiyEditor/components/mobile/VideoPlayer/property.vue index 7598543b..1c3deec6 100644 --- a/src/components/DiyEditor/components/mobile/VideoPlayer/property.vue +++ b/src/components/DiyEditor/components/mobile/VideoPlayer/property.vue @@ -42,14 +42,14 @@ diff --git a/src/components/DiyEditor/util.ts b/src/components/DiyEditor/util.ts index fac26e75..b6febb97 100644 --- a/src/components/DiyEditor/util.ts +++ b/src/components/DiyEditor/util.ts @@ -1,4 +1,3 @@ -import { ref, Ref } from 'vue' import { PageConfigProperty } from '@/components/DiyEditor/components/mobile/PageConfig/config' import { NavigationBarProperty } from '@/components/DiyEditor/components/mobile/NavigationBar/config' import { TabBarProperty } from '@/components/DiyEditor/components/mobile/TabBar/config' @@ -78,34 +77,6 @@ export interface PageConfig { // 页面组件,只保留组件ID,组件属性 export interface PageComponent extends Pick, 'id' | 'property'> {} -// 属性表单监听 -export function usePropertyForm(modelValue: T, emit: Function): { formData: Ref } { - const formData = ref() - // 监听属性数据变动 - watch( - () => modelValue, - () => { - formData.value = modelValue - }, - { - deep: true, - immediate: true - } - ) - // 监听表单数据变动 - watch( - () => formData.value, - () => { - emit('update:modelValue', formData.value) - }, - { - deep: true - } - ) - - return { formData } as { formData: Ref } -} - // 页面组件库 export const PAGE_LIBS = [ { diff --git a/src/components/Draggable/index.vue b/src/components/Draggable/index.vue index 3d7906b9..bd153a4f 100644 --- a/src/components/Draggable/index.vue +++ b/src/components/Draggable/index.vue @@ -13,9 +13,16 @@ class="mb-4px flex flex-col gap-4px border border-gray-2 border-rounded rounded border-solid p-8px" > -
+
- + // 拖拽组件 import VueDraggable from 'vuedraggable' -import { usePropertyForm } from '@/components/DiyEditor/util' +import { useVModel } from '@vueuse/core' import { any, array } from 'vue-types' import { propTypes } from '@/utils/propTypes' import { cloneDeep } from 'lodash-es' @@ -66,7 +73,7 @@ const props = defineProps({ }) // 定义事件 const emit = defineEmits(['update:modelValue']) -const { formData } = usePropertyForm(props.modelValue, emit) +const formData = useVModel(props, 'modelValue', emit) // 处理添加 const handleAdd = () => formData.value.push(cloneDeep(props.emptyItem || {})) From 625426566c58372c911dc9da26929a34fd3c45b1 Mon Sep 17 00:00:00 2001 From: puhui999 Date: Sat, 18 Jan 2025 17:47:10 +0800 Subject: [PATCH 04/28] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91MALL:=20=E4=BF=AE=E5=A4=8D=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E8=A3=85=E4=BF=AE=E6=97=B6=E7=BB=84=E4=BB=B6=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E5=93=8D=E5=BA=94=E5=BC=8F=E4=B8=A2=E5=A4=B1=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/mobile/NavigationBar/index.vue | 6 +-- src/components/DiyEditor/index.vue | 44 +++++++++++++------ src/components/InputWithColor/index.vue | 32 ++------------ .../mall/promotion/diy/template/decorate.vue | 24 ++++++---- 4 files changed, 54 insertions(+), 52 deletions(-) diff --git a/src/components/DiyEditor/components/mobile/NavigationBar/index.vue b/src/components/DiyEditor/components/mobile/NavigationBar/index.vue index c684aee7..c5a92b31 100644 --- a/src/components/DiyEditor/components/mobile/NavigationBar/index.vue +++ b/src/components/DiyEditor/components/mobile/NavigationBar/index.vue @@ -4,7 +4,7 @@
{{ cell.text }} - +
{ } as StyleValue } // 获得搜索框属性 -const getSearchProp = (cell: NavigationBarCellProperty) => { +const getSearchProp = computed(() => (cell: NavigationBarCellProperty) => { return { height: 30, showScan: false, placeholder: cell.placeholder, borderRadius: cell.borderRadius } as SearchProperty -} +})