From 6043d797319c39b987c91ef92f86e1aae830d956 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Thu, 5 Sep 2024 15:13:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=96=87=E4=BB=B6=E6=9F=A5=E8=AF=A2=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=EF=BC=9A21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/upload/index.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/common/upload/index.vue b/src/components/common/upload/index.vue
index 51fbeb06..cf7500a2 100644
--- a/src/components/common/upload/index.vue
+++ b/src/components/common/upload/index.vue
@@ -134,7 +134,7 @@
                             </div>
                         </div>
                         <div class="mt-10 flex-row jc-e">
-                            <el-pagination :current-page="page" background :page-size="30" :pager-count="5" layout="prev, pager, next" :total="data_total" @current-change="current_page_change" />
+                            <el-pagination :current-page="page" background :page-size="page_size" :pager-count="5" layout="prev, pager, next" :total="data_total" @current-change="current_page_change" />
                         </div>
                     </div>
                 </div>
@@ -462,6 +462,7 @@ const remove_type_event = (node: any, data: Tree) => {
 // const page_total = ref(0);
 // 当前页
 const page = ref(1);
+const page_size = ref(21);
 // 总数量
 const data_total = ref(0);
 // 名称查询
@@ -477,6 +478,7 @@ const get_attachment_list = (type?: string) => {
     img_loading.value = true;
     const new_data = {
         page: page.value,
+        page_size: page_size.value,
         type: upload_type.value == 'img' ? 'image' : upload_type.value == 'video' ? 'video' : upload_type.value == 'file' ? 'file' : '',
         keywords: search_name.value,
         category_id: category_id.value,

From 9f00759e099c8e38bb4863923f3d3b4ceeca3e8f Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Thu, 5 Sep 2024 15:37:32 +0800
Subject: [PATCH 2/3] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=96=87=E4=BB=B6=E6=9F=A5=E8=AF=A2=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=EF=BC=9A21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/url-value/link-goods.vue     |  1 +
 .../common/url-value/url-value-dialog.vue          | 14 ++++++++++++--
 .../model-custom/model-custom-content.vue          |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/components/common/url-value/link-goods.vue b/src/components/common/url-value/link-goods.vue
index db8b5fa6..fb25811f 100644
--- a/src/components/common/url-value/link-goods.vue
+++ b/src/components/common/url-value/link-goods.vue
@@ -64,6 +64,7 @@ watch(
         }
     }
 );
+console.log(1);
 onMounted(() => {
     init();
 });
diff --git a/src/components/common/url-value/url-value-dialog.vue b/src/components/common/url-value/url-value-dialog.vue
index cc9bd2d0..83b3d48f 100644
--- a/src/components/common/url-value/url-value-dialog.vue
+++ b/src/components/common/url-value/url-value-dialog.vue
@@ -6,9 +6,9 @@
             </div>
         </template>
         <div class="url-value-content pa-20 flex-row">
-            <div v-if="type.length !== 1" class="left-content">
+            <div v-if="custom_link_type.length !== 1" class="left-content">
                 <el-menu :default-active="link_select" class="w br-none" @select="handle_select">
-                    <el-menu-item v-for="item in base_data" :key="item.type" :index="item.type" :disabled="!(custom_link_type.length == 0 || custom_link_type.includes(item.type))">
+                    <el-menu-item v-for="item in base_data" :key="item.type" :index="item.type" :disabled="!custom_link_type.includes(item.type)">
                         <span>{{ item.name }}</span>
                     </el-menu-item>
                 </el-menu>
@@ -91,6 +91,16 @@ const link_value = ref<any[]>([]);
 const reset_compontent = ref(false);
 const custom_link_type = ref(props.type);
 const base_data = ref<any[]>([]);
+watch(
+    () => props.type,
+    (new_val) => {
+        if (new_val.length > 0) {
+            link_select.value = props.type[0];
+        } else {
+            link_select.value = '';
+        }
+    }
+);
 onMounted(() => {
     nextTick(() => {
         // 定时获取common_store.common.article_category的数据，直到拿到值或者关闭页面为止
diff --git a/src/components/model-custom/model-custom-content.vue b/src/components/model-custom/model-custom-content.vue
index 3261c5df..56cedfa3 100644
--- a/src/components/model-custom/model-custom-content.vue
+++ b/src/components/model-custom/model-custom-content.vue
@@ -1,5 +1,6 @@
 <template>
     <div class="auxiliary-line">
+        {{ form.data_source }}
         <el-form :model="form" label-width="70">
             <card-container>
                 <div class="mb-20">数据源</div>

From bb65290dafd0d894d3b03135c81f7e07b5c8a5de Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Thu, 5 Sep 2024 15:38:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=96=87=E4=BB=B6=E6=9F=A5=E8=AF=A2=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=EF=BC=9A21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/url-value/link-goods.vue       | 1 -
 src/components/model-custom/model-custom-content.vue | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/components/common/url-value/link-goods.vue b/src/components/common/url-value/link-goods.vue
index fb25811f..db8b5fa6 100644
--- a/src/components/common/url-value/link-goods.vue
+++ b/src/components/common/url-value/link-goods.vue
@@ -64,7 +64,6 @@ watch(
         }
     }
 );
-console.log(1);
 onMounted(() => {
     init();
 });
diff --git a/src/components/model-custom/model-custom-content.vue b/src/components/model-custom/model-custom-content.vue
index 56cedfa3..3261c5df 100644
--- a/src/components/model-custom/model-custom-content.vue
+++ b/src/components/model-custom/model-custom-content.vue
@@ -1,6 +1,5 @@
 <template>
     <div class="auxiliary-line">
-        {{ form.data_source }}
         <el-form :model="form" label-width="70">
             <card-container>
                 <div class="mb-20">数据源</div>