From bf8c7c4a9c3ec0a0ce81e41a3747f45807229da5 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Thu, 5 Sep 2024 18:23:59 +0800
Subject: [PATCH] =?UTF-8?q?refactor(diy):=20=E6=9B=B4=E6=96=B0`diyData`?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E9=80=BB=E8=BE=91=E4=BB=A5=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更改内容：
- 在`diyData`接口中，将`config`属性类型从字符串扩展为支持`diyConfig`或字符串类型。
- 在`index.vue`中，更新`form_data_transfor_diy_data`方法，以正确处理`config`作为`diyConfig`对象或字符串。
- 导入`is_obj`工具函数以检查`config`是否为对象，以确定处理方式。

BREAKING CHANGE: `diyData`接口的变更可能会影响依赖于`config`属性的现有代码。确保适配处理`config`作为`diyConfig`对象的逻辑。
---
 src/api/diy.ts             | 13 +++++++++-
 src/views/layout/index.vue | 51 ++++++++++++--------------------------
 2 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/src/api/diy.ts b/src/api/diy.ts
index f0ddfeaa..c6b507b4 100644
--- a/src/api/diy.ts
+++ b/src/api/diy.ts
@@ -45,11 +45,22 @@ interface diy {
     /** 主键 */
     id: string;
 }
+export interface headerAndFooter {
+    name: string;
+    show_tabs: string;
+    key: string;
+    com_data: any;
+}
+export interface diyConfig {
+    diy_data: Array<any>;
+    footer: headerAndFooter;
+    header: headerAndFooter;
+}
 export interface diyData {
     id: string;
     logo: string;
     name: string;
     describe: string;
-    config: string;
+    config: diyConfig | string;
     is_enable: string;
 }
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index f86f4a75..3ba41e80 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -14,20 +14,15 @@
 </template>
 
 <script setup lang="ts">
-import type { UploadFile, UploadFiles } from 'element-plus';
+import type { UploadFile } from 'element-plus';
+import { is_obj } from '@/utils';
 import { Navbar, Settings, AppMain } from './components/index';
 import defaultSettings from './components/main/index';
 import { cloneDeep } from 'lodash';
-import DiyAPI, { diyData } from '@/api/diy';
+import DiyAPI, { diyData, headerAndFooter, diyConfig } from '@/api/diy';
 import CommonAPI from '@/api/common';
 import { commonStore } from '@/store';
 const common_store = commonStore();
-interface headerAndFooter {
-    name: string;
-    show_tabs: string;
-    key: string;
-    com_data: any;
-}
 interface diy_data_item {
     id: string;
     model: {
@@ -212,33 +207,19 @@ const diy_data_transfor_form_data = (clone_form: diy_data_item) => {
     };
 };
 const form_data_transfor_diy_data = (clone_form: diyData) => {
-    try {
-        return {
-            id: clone_form.id,
-            model: {
-                logo: clone_form.logo,
-                name: clone_form.name,
-                is_enable: clone_form.is_enable,
-                describe: clone_form.describe,
-            },
-            header: JSON.parse(clone_form.config).header,
-            footer: JSON.parse(clone_form.config).footer,
-            diy_data: JSON.parse(clone_form.config).diy_data,
-        };
-    } catch (error) {
-        return {
-            id: clone_form.id,
-            model: {
-                logo: clone_form.logo,
-                name: clone_form.name,
-                is_enable: clone_form.is_enable,
-                describe: clone_form.describe,
-            },
-            header: form.value.header,
-            footer: form.value.footer,
-            diy_data: form.value.diy_data,
-        };
-    }
+    let temp_config = clone_form.config;
+    return {
+        id: clone_form.id,
+        model: {
+            logo: clone_form.logo,
+            name: clone_form.name,
+            is_enable: clone_form.is_enable,
+            describe: clone_form.describe,
+        },
+        header: is_obj(temp_config) ? (temp_config as diyConfig).header : JSON.parse(temp_config as string).header,
+        footer: is_obj(temp_config) ? (temp_config as diyConfig).footer : JSON.parse(temp_config as string).footer,
+        diy_data: is_obj(temp_config) ? (temp_config as diyConfig).diy_data : JSON.parse(temp_config as string).diy_data,
+    };
 };
 
 // 截取document.location.search字符串内id/后面的所有字段