From 4b229b9a0f8902ff16c83a79ddb33899988a3ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Thu, 14 Nov 2024 16:48:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E7=9A=84=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/model-custom/index.vue         | 18 +++-
 .../model-custom/model-custom-content.vue     | 84 +------------------
 src/config/const/custom.ts                    | 73 +++++++++++++++-
 3 files changed, 90 insertions(+), 85 deletions(-)

diff --git a/src/components/model-custom/index.vue b/src/components/model-custom/index.vue
index e92018d2..b809c782 100644
--- a/src/components/model-custom/index.vue
+++ b/src/components/model-custom/index.vue
@@ -51,8 +51,9 @@
     </template>
 </template>
 <script setup lang="ts">
-import { isEmpty } from 'lodash';
+import { isEmpty, cloneDeep } from 'lodash';
 import { common_img_computer, common_styles_computer } from '@/utils';
+import { source_list } from '@/config/const/custom';
 
 const props = defineProps({
     value: {
@@ -74,6 +75,21 @@ const state = reactive({
 // 如果需要解构，确保使用toRefs
 const { form, new_style } = toRefs(state);
 
+onBeforeMount(() => {
+    if (!Object.keys(form.value.data_source_content).includes('data_auto_list') && !Object.keys(form.value.data_source_content).includes('data_list')) {
+        const data = cloneDeep(form.value.data_source_content);
+        const new_list = cloneDeep(source_list[form.value.data_source as keyof typeof source_list]);
+        if (!isEmpty(new_list)) {
+            form.value.data_source_content = new_list;
+        } else {
+            form.value.data_source_content = cloneDeep(source_list['common']);
+        }
+        if (!isEmpty(data)) {
+            form.value.data_source_content.data_list = [ data ];
+        }
+    }
+});
+
 const custom_height = computed(() => form.value.height * scale.value + 'px');
 const div_width = ref(0);
 const scale = ref(1);
diff --git a/src/components/model-custom/model-custom-content.vue b/src/components/model-custom/model-custom-content.vue
index 053af189..ec87794e 100644
--- a/src/components/model-custom/model-custom-content.vue
+++ b/src/components/model-custom/model-custom-content.vue
@@ -66,6 +66,7 @@ import ArticleAPI from '@/api/article';
 import BrandAPI from '@/api/brand';
 import { commonStore, DataSourceStore } from '@/store';
 import { get_math } from '@/utils';
+import { source_list } from '@/config/const/custom';
 const common_store = commonStore();
 const data_source_store = DataSourceStore();
 
@@ -111,19 +112,6 @@ const getCustominit = () => {
 };
 
 onBeforeMount(() => {
-    // 不包含新创建的数组时，将历史数据放到手动添加数组中
-    if (!Object.keys(form.data_source_content).includes('data_auto_list') && !Object.keys(form.data_source_content).includes('data_list')) {
-        const data = cloneDeep(form.data_source_content);
-        const new_list = cloneDeep(source_list[form.data_source as keyof typeof source_list]);
-        if (!isEmpty(new_list)) {
-            form.data_source_content = new_list;
-        } else {
-            form.data_source_content = cloneDeep(source_list['common']);
-        }
-        if (!isEmpty(data)) {
-            form.data_source_content.data_list = [ data ];
-        }
-    }
     if (!data_source_store.is_data_source_api) {
         data_source_store.set_is_data_source_api(true);
         getCustominit();
@@ -185,76 +173,6 @@ const accomplish = () => {
 //#region 数据源更新逻辑处理
 // 打开弹出框
 const url_value_dialog_visible = ref(false);
-const source_list = {
-    goods: {
-        // 存放手动输入的id
-        data_ids: [],
-        // 手动输入
-        data_list: [],
-        // 自动
-        data_auto_list: [],
-        // 商品类型
-        data_type: '0',
-        // 关键字
-        keyword: '',
-        // 商品分类
-        category_ids: [],
-        // 品牌
-        brand_ids: [],
-        // 显示数量
-        number: 4,
-        // 排序类型
-        order_by_type: '0',
-        // 排序规则
-        order_by_rule: '0',
-    },
-    article: {
-        // 存放手动输入的id
-        data_ids: [],
-        // 手动输入
-        data_list: [],
-        // 自动
-        data_auto_list: [],
-        data_type: '0',
-        // 关键字
-        keyword: '',
-        number: 4,
-        order_by_type: '0',
-        order_by_rule: '0',
-        // 文章封面
-        is_cover: '0',
-        // 分类id
-        category_ids: [],
-    },
-    brand: {
-        // 存放手动输入的id
-        data_ids: [],
-        // 手动输入
-        data_list: [],
-        // 自动
-        data_auto_list: [],
-        // 商品类型
-        data_type: '0',
-        // 关键字
-        keyword: '',
-        // 商品分类
-        category_ids: [],
-        // 显示数量
-        number: 4,
-        // 排序类型
-        order_by_type: '0',
-        // 排序规则
-        order_by_rule: '0',
-    },
-    common: {
-        // 存放手动输入的id
-        data_ids: [],
-        // 手动输入
-        data_list: [],
-        // 自动
-        data_auto_list: [],
-    }
-};
 const changeDataSource = (key: string) => {
     const type_data = options.value.filter((item) => item.type == key);
     processing_data(key);
diff --git a/src/config/const/custom.ts b/src/config/const/custom.ts
index dbdf5017..b50a0832 100644
--- a/src/config/const/custom.ts
+++ b/src/config/const/custom.ts
@@ -3,7 +3,8 @@ interface content {
     data_ids: Array<string>;
     data_list: Array<object>;
     data_auto_list: Array<object>;
-}interface defaultSearch {
+}
+interface defaultSearch {
     content: {
         height: number;
         data_source: string;
@@ -14,6 +15,76 @@ interface content {
         common_style: object;
     };
 }
+export const source_list = {
+    goods: {
+        // 存放手动输入的id
+        data_ids: [],
+        // 手动输入
+        data_list: [],
+        // 自动
+        data_auto_list: [],
+        // 商品类型
+        data_type: '0',
+        // 关键字
+        keyword: '',
+        // 商品分类
+        category_ids: [],
+        // 品牌
+        brand_ids: [],
+        // 显示数量
+        number: 4,
+        // 排序类型
+        order_by_type: '0',
+        // 排序规则
+        order_by_rule: '0',
+    },
+    article: {
+        // 存放手动输入的id
+        data_ids: [],
+        // 手动输入
+        data_list: [],
+        // 自动
+        data_auto_list: [],
+        data_type: '0',
+        // 关键字
+        keyword: '',
+        number: 4,
+        order_by_type: '0',
+        order_by_rule: '0',
+        // 文章封面
+        is_cover: '0',
+        // 分类id
+        category_ids: [],
+    },
+    brand: {
+        // 存放手动输入的id
+        data_ids: [],
+        // 手动输入
+        data_list: [],
+        // 自动
+        data_auto_list: [],
+        // 商品类型
+        data_type: '0',
+        // 关键字
+        keyword: '',
+        // 商品分类
+        category_ids: [],
+        // 显示数量
+        number: 4,
+        // 排序类型
+        order_by_type: '0',
+        // 排序规则
+        order_by_rule: '0',
+    },
+    common: {
+        // 存放手动输入的id
+        data_ids: [],
+        // 手动输入
+        data_list: [],
+        // 自动
+        data_auto_list: [],
+    }
+};
 const defaultSearch: defaultSearch = {
     content: {
         // 自定义内容高度