From 7d652ca31668abb2626461d8298bd68a2763ff52 Mon Sep 17 00:00:00 2001
From: Jerry <707344974@qq.com>
Date: Tue, 10 Sep 2024 17:15:43 +0800
Subject: [PATCH] =?UTF-8?q?commit=EF=BC=9Abug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/online/editOnlinePage/basic/index.vue        | 4 ++--
 .../src/pages/online/editOnlinePage/index.vue              | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/OrangeFormsOpen-VUE3/src/pages/online/editOnlinePage/basic/index.vue b/OrangeFormsOpen-VUE3/src/pages/online/editOnlinePage/basic/index.vue
index 968ed22c..2a7164b4 100644
--- a/OrangeFormsOpen-VUE3/src/pages/online/editOnlinePage/basic/index.vue
+++ b/OrangeFormsOpen-VUE3/src/pages/online/editOnlinePage/basic/index.vue
@@ -7,7 +7,7 @@
       :model="formPageData"
       :rules="formRules"
       label-position="right"
-      label-width="80px"
+      label-width="90px"
       @submit.prevent
     >
       <el-col :span="24">
@@ -89,7 +89,7 @@ watch(
   () => props.modelValue,
   (newVal, oldVal) => {
     if (newVal != oldVal) {
-      formPageData.value = { ...newVal };
+      formPageData.value = { ...formPageData.value, ...newVal };
     }
   },
   {
diff --git a/OrangeFormsOpen-VUE3/src/pages/online/editOnlinePage/index.vue b/OrangeFormsOpen-VUE3/src/pages/online/editOnlinePage/index.vue
index c33d50b3..c2ca4e3d 100644
--- a/OrangeFormsOpen-VUE3/src/pages/online/editOnlinePage/index.vue
+++ b/OrangeFormsOpen-VUE3/src/pages/online/editOnlinePage/index.vue
@@ -440,6 +440,9 @@ const initPageInfo = () => {
     published: false,
     pageType: SysOnlinePageType.BIZ,
     status: SysOnlinePageStatus.BASIC,
+    extraJson: {
+      extendClass: undefined,
+    },
   };
   activeStep.value = SysOnlinePageSettingStep.BASIC;
   let pageId = props.pageId || thirdParams.value.pageId;
@@ -718,8 +721,12 @@ onMounted(() => {
       return initPageInfo();
     })
     .then(res => {
+      let extraJson = JSON.parse((res.data.extraJson as string) || '{}');
       formPageData.value = {
         ...res.data,
+        extraJson: {
+          extendClass: extraJson.extendClass,
+        },
       };
     })
     .catch(e => {