From 78c30abe26b019995c937e988f6decbaf729db69 Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Tue, 5 Mar 2024 16:12:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DesignForm/formControlAttr.vue | 3314 +++++------------ .../DesignForm/layoutPage/index.vue | 177 - 2 files changed, 978 insertions(+), 2513 deletions(-) diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue index 73a3a2dd8..ae386a073 100644 --- a/src/components/DesignForm/formControlAttr.vue +++ b/src/components/DesignForm/formControlAttr.vue @@ -1,2341 +1,987 @@ - - - - -======= - - ->>>>>>> v7_master diff --git a/src/components/DesignForm/layoutPage/index.vue b/src/components/DesignForm/layoutPage/index.vue index 718ad42aa..69ebb4487 100644 --- a/src/components/DesignForm/layoutPage/index.vue +++ b/src/components/DesignForm/layoutPage/index.vue @@ -1,5 +1,4 @@ - - - - ->>>>>>> v7_master