From 9adeac21a3ecab7ce2373068fd9c4fef22a67dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com> Date: Sat, 14 Sep 2024 15:32:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base/drag/index.vue | 15 +++++++-- .../model-tabs/model-tabs-content.vue | 32 ++++++++++--------- .../layout/components/main/default/tabs.ts | 2 +- src/views/layout/components/main/index.vue | 2 +- 4 files changed, 31 insertions(+), 20 deletions(-) diff --git a/src/components/base/drag/index.vue b/src/components/base/drag/index.vue index c44114f8..fd1fdd79 100644 --- a/src/components/base/drag/index.vue +++ b/src/components/base/drag/index.vue @@ -2,11 +2,18 @@
  • - + + - - +
  • @@ -22,11 +29,13 @@ interface Props { spaceCol?: number; // 上下间距 iconPosition?: string; // top/bottom/center isShowEdit?: boolean; + isNotCloseIndex?: number[]; } const props = withDefaults(defineProps(), { type: () => 'line', isShowEdit: false, spaceCol: () => 5, + isNotCloseIndex: () => [], iconPosition: 'center', }); const className = ref(''); diff --git a/src/components/model-tabs/model-tabs-content.vue b/src/components/model-tabs/model-tabs-content.vue index 9bcdb153..80e67f8d 100644 --- a/src/components/model-tabs/model-tabs-content.vue +++ b/src/components/model-tabs/model-tabs-content.vue @@ -17,26 +17,28 @@
    选项卡设置
    - + diff --git a/src/views/layout/components/main/default/tabs.ts b/src/views/layout/components/main/default/tabs.ts index a96294d8..6eb25476 100644 --- a/src/views/layout/components/main/default/tabs.ts +++ b/src/views/layout/components/main/default/tabs.ts @@ -34,7 +34,7 @@ const defaultTabs: defaultTabs = { tabs_theme: '0', tabs_top_up: '1', tabs_list: [ - { id: get_math(), title: '热门推荐', desc: '简介', data_type: '0', classify: {}, micro_page: '', micro_page_list: {}, category_list: {} }, + { id: get_math(), title: '首页', desc: '简介', data_type: '0', classify: {}, micro_page: '', micro_page_list: {}, category_list: {} }, { id: get_math(), title: '测试一', desc: '简介', data_type: '0', classify: {}, micro_page: '', micro_page_list: {}, category_list: {} }, { id: get_math(), title: '测试二', desc: '简介', data_type: '0', classify: {}, micro_page: '', micro_page_list: {}, category_list: {} }, ], diff --git a/src/views/layout/components/main/index.vue b/src/views/layout/components/main/index.vue index 6ec8cb98..c23500ae 100644 --- a/src/views/layout/components/main/index.vue +++ b/src/views/layout/components/main/index.vue @@ -206,7 +206,7 @@ const url_computer = (name: string) => { const show_model_border = ref(true); // 点击添加tabs组件 const draggable_click = (item: componentsData) => { - if (item.key == 'tabs' && isEmpty(tabs_data.value.length)) { + if (item.key == 'tabs' && isEmpty(tabs_data.value)) { // 添加tabs组件 tabs_data.value.push({ name: item.name,