From 7b19f1c7e5acda0feb2fef0f8c540d73dee14df5 Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Thu, 5 Sep 2024 16:48:13 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=AE=9E=E7=8E=B0goodsIDs=E5=92=8Cd?= =?UTF-8?q?ataIDs=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在数据模块的组件中，goods_list和data_list属性现在将仅保存从后端获取的相关ID。这些ID将分别存储在新的goods_ids和data_ids属性中，以简化前端处理。该更改旨在提高数据处理效率，并为后续流程如预览和保存提供更简洁的数据结构。 --- .../model-data-magic-content.vue | 1 + .../layout/components/main/default/coupon.ts | 2 ++ src/views/layout/index.vue | 24 +++++++++++-------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/components/model-data-magic/model-data-magic-content.vue b/src/components/model-data-magic/model-data-magic-content.vue index f30b1021..4938861a 100644 --- a/src/components/model-data-magic/model-data-magic-content.vue +++ b/src/components/model-data-magic/model-data-magic-content.vue @@ -97,6 +97,7 @@ const data_content = { heading_title: '主标题', subtitle: '副标题', goods_list:[], + goods_ids: '', is_show: ['title', 'price'], images_list:[ { diff --git a/src/views/layout/components/main/default/coupon.ts b/src/views/layout/components/main/default/coupon.ts index f958ba81..57b78322 100644 --- a/src/views/layout/components/main/default/coupon.ts +++ b/src/views/layout/components/main/default/coupon.ts @@ -8,6 +8,7 @@ interface DefaultCoupon { title: string; desc: string; data_list: object[]; + data_ids: string; }; style: { price_color: string; @@ -41,6 +42,7 @@ const defaultCoupoin: DefaultCoupon = { // 只有主题4用到 desc: '领券下单·享购物优惠', data_list: [], + data_ids: '', }, style: { price_color: '#FF3830', diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue index d0c78e33..e248e288 100644 --- a/src/views/layout/index.vue +++ b/src/views/layout/index.vue @@ -116,6 +116,7 @@ const init = () => { DiyAPI.getInit({ id: get_id() }).then((res: any) => { if (res.data) { form.value = form_data_transfor_diy_data(res.data); + console.log(form.value); } else { is_empty.value = true; } @@ -131,13 +132,6 @@ const init = () => { // 初始化公共数据 const common_init = () => { CommonAPI.getInit().then((res: any) => { - // article_category ---- 文章分类 - // attachment_category ---- 附件分类 - // brand_category; ---- 品牌分类 - // brand_list ---- 品牌列表 - // goods_category ---- 商品分类 - // module_list ---- 模块列表 - //page_link_list ---- 页面链接 common_store.set_common(res.data); api_count.value += 1; loading_event(api_count.value); @@ -159,16 +153,26 @@ const preview = () => { console.log('预览'); }; const save = () => { - formmat_form_data(form.value); + save_formmat_form_data(form.value); }; const save_close = () => { - formmat_form_data(form.value, true); + save_formmat_form_data(form.value, true); }; -const formmat_form_data = (data: diy_data_item, close: boolean = false) => { +const save_formmat_form_data = (data: diy_data_item, close: boolean = false) => { const clone_form = cloneDeep(data); clone_form.header.show_tabs = '1'; clone_form.footer.show_tabs = '0'; + const new_array = ['goods-list', 'goods-tabs', 'article-list', 'article-tabs', 'coupon']; clone_form.diy_data = clone_form.diy_data.map((item: any) => { + if (new_array.includes(item.key)) { + item.com_data.content.data_ids = item.com_data.content.data_list.map((item: any) => item.data.id).join(',') || ''; + item.com_data.content.data_list = []; + } else if (item.key == 'data-magic') { + item.com_data.content.data_magic_list.map((item1: any) => { + item1.goods_ids = item.goods_list.map((item2: any) => item2.data.id).join(',') || ''; + item1.goods_list = []; + }); + } return { ...item, show_tabs: '0', From d4bf294b2def520b5618f4aa21d0425da94bf98d Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Thu, 5 Sep 2024 16:48:29 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=AE=9E=E7=8E=B0goodsIDs=E5=92=8Cd?= =?UTF-8?q?ataIDs=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在数据模块的组件中，goods_list和data_list属性现在将仅保存从后端获取的相关ID。这些ID将分别存储在新的goods_ids和data_ids属性中，以简化前端处理。该更改旨在提高数据处理效率，并为后续流程如预览和保存提供更简洁的数据结构。 --- src/views/layout/index.vue | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue index e248e288..5f80d151 100644 --- a/src/views/layout/index.vue +++ b/src/views/layout/index.vue @@ -162,17 +162,17 @@ const save_formmat_form_data = (data: diy_data_item, close: boolean = false) => const clone_form = cloneDeep(data); clone_form.header.show_tabs = '1'; clone_form.footer.show_tabs = '0'; - const new_array = ['goods-list', 'goods-tabs', 'article-list', 'article-tabs', 'coupon']; + // const new_array = ['goods-list', 'goods-tabs', 'article-list', 'article-tabs', 'coupon']; clone_form.diy_data = clone_form.diy_data.map((item: any) => { - if (new_array.includes(item.key)) { - item.com_data.content.data_ids = item.com_data.content.data_list.map((item: any) => item.data.id).join(',') || ''; - item.com_data.content.data_list = []; - } else if (item.key == 'data-magic') { - item.com_data.content.data_magic_list.map((item1: any) => { - item1.goods_ids = item.goods_list.map((item2: any) => item2.data.id).join(',') || ''; - item1.goods_list = []; - }); - } + // if (new_array.includes(item.key)) { + // item.com_data.content.data_ids = item.com_data.content.data_list.map((item: any) => item.data.id).join(',') || ''; + // item.com_data.content.data_list = []; + // } else if (item.key == 'data-magic') { + // item.com_data.content.data_magic_list.map((item1: any) => { + // item1.goods_ids = item.goods_list.map((item2: any) => item2.data.id).join(',') || ''; + // item1.goods_list = []; + // }); + // } return { ...item, show_tabs: '0', From 1180942af1b936809358e96b4bbc77db3f017727 Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Thu, 5 Sep 2024 16:48:57 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=AE=9E=E7=8E=B0goodsIDs=E5=92=8Cd?= =?UTF-8?q?ataIDs=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在数据模块的组件中，goods_list和data_list属性现在将仅保存从后端获取的相关ID。这些ID将分别存储在新的goods_ids和data_ids属性中，以简化前端处理。该更改旨在提高数据处理效率，并为后续流程如预览和保存提供更简洁的数据结构。 --- src/views/layout/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue index 5f80d151..f86f4a75 100644 --- a/src/views/layout/index.vue +++ b/src/views/layout/index.vue @@ -116,7 +116,6 @@ const init = () => { DiyAPI.getInit({ id: get_id() }).then((res: any) => { if (res.data) { form.value = form_data_transfor_diy_data(res.data); - console.log(form.value); } else { is_empty.value = true; } From e5b3a646392d71f32d01f10cdb6b615334392c4e Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Thu, 5 Sep 2024 16:52:54 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix(model-coupon):=20=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=BB=9A=E5=8A=A8=E6=9D=A1=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E7=9A=84=E9=80=89=E6=8B=A9=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 使用深度选择器修正了`.hide-scrollbar`类的应用方式，以确保滚动条在Vue组件中被隐藏。之前的实现可能导致样式没有正确应用，因为它们被更具体的规则覆盖。此更改确保滚动条在需要时正确隐藏。 --- src/components/model-coupon/index.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/model-coupon/index.vue b/src/components/model-coupon/index.vue index 26ea5b0f..07acf88d 100644 --- a/src/components/model-coupon/index.vue +++ b/src/components/model-coupon/index.vue @@ -832,7 +832,9 @@ onBeforeMount(() => { } } } -.hide-scrollbar .el-scrollbar__bar { - display: none; +.hide-scrollbar { + :deep(.el-scrollbar__bar) { + display: none !important; + } } From 993e8b3a1f045d1422fa7d9a06afec3f418cb836 Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Thu, 5 Sep 2024 17:00:06 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=96=B0=E6=B7=BB=E5=8A=A0=E7=9A=84Footer?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E7=BB=84=E4=BB=B6=E5=85=81=E8=AE=B8=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E6=8F=90=E4=BE=9B=E7=9A=84=E6=95=B0=E6=8D=AE=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E5=8A=A8=E6=80=81=E6=9B=B4=E6=94=B9=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=92=8C=E5=86=85=E5=AE=B9=E3=80=82=E6=AD=A4=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=8C=85=E6=8B=AC=E5=9B=BE=E5=83=8F=E9=A2=84=E5=A4=84=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E7=A1=AE=E4=BF=9D=E5=9C=A8=E6=9C=AA=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E5=88=B0=E4=BA=92=E8=81=94=E7=BD=91=E6=97=B6=E7=9A=84?= =?UTF-8?q?=E5=9B=9E=E9=80=80=EF=BC=8C=E4=BB=A5=E5=8F=8A=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E7=9A=84=E5=8A=A8=E6=80=81=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E4=BB=A5=E6=8C=87=E7=A4=BA=E6=B4=BB=E5=8A=A8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E3=80=82=E8=AF=A5=E7=BB=84=E4=BB=B6=E8=BF=98=E5=8C=85=E5=90=AB?= =?UTF-8?q?=E5=93=8D=E5=BA=94=E5=BC=8F=E8=AE=BE=E8=AE=A1=E5=85=83=E7=B4=A0?= =?UTF-8?q?=EF=BC=8C=E5=85=81=E8=AE=B8=E5=9C=A8=E6=82=AC=E5=81=9C=E6=97=B6?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BA=A4=E4=BA=92=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/footer-nav/index copy.vue | 116 ----------------------- 1 file changed, 116 deletions(-) delete mode 100644 src/components/footer-nav/index copy.vue diff --git a/src/components/footer-nav/index copy.vue b/src/components/footer-nav/index copy.vue deleted file mode 100644 index bb582f9f..00000000 --- a/src/components/footer-nav/index copy.vue +++ /dev/null @@ -1,116 +0,0 @@ - - - From 951822b3f325f61e4a75ac5b867942a351cf1fb0 Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Thu, 5 Sep 2024 17:02:36 +0800 Subject: [PATCH 6/9] =?UTF-8?q?refactor(types):=20=E4=BB=8EComponents?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=B8=AD=E7=A7=BB=E9=99=A4ElementPlus?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ElementPlus组件已从全局Components接口中移除，以简化类型定义并允许更细粒度的组件导入。这更改支持从'element-plus/es'按需导入组件，而不是在一个大型导入中包含所有组件。此调整要求在使用特定组件时单独导入它们。 --- src/types/components.d.ts | 54 --------------------------------------- 1 file changed, 54 deletions(-) diff --git a/src/types/components.d.ts b/src/types/components.d.ts index 7e2a8dbc..0eeb808b 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -14,50 +14,9 @@ declare module 'vue' { ColorTextSizeGroup: typeof import('./../components/common/color-text-size-group/index.vue')['default'] CommonStyles: typeof import('./../components/common/common-styles/index.vue')['default'] Components: typeof import('./../components/model-custom/components/index.vue')['default'] - copy: typeof import('./../components/footer-nav/index copy.vue')['default'] Dialog: typeof import('./../components/model-custom/components/dialog.vue')['default'] Drag: typeof import('./../components/base/drag/index.vue')['default'] DragGroup: typeof import('./../components/common/drag-group/index.vue')['default'] - ElBadge: typeof import('element-plus/es')['ElBadge'] - ElButton: typeof import('element-plus/es')['ElButton'] - ElCarousel: typeof import('element-plus/es')['ElCarousel'] - ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] - ElCascader: typeof import('element-plus/es')['ElCascader'] - ElCascaderPanel: typeof import('element-plus/es')['ElCascaderPanel'] - ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] - ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] - ElCol: typeof import('element-plus/es')['ElCol'] - ElCollapse: typeof import('element-plus/es')['ElCollapse'] - ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem'] - ElColorPicker: typeof import('element-plus/es')['ElColorPicker'] - ElDialog: typeof import('element-plus/es')['ElDialog'] - ElForm: typeof import('element-plus/es')['ElForm'] - ElFormItem: typeof import('element-plus/es')['ElFormItem'] - ElIcon: typeof import('element-plus/es')['ElIcon'] - ElImage: typeof import('element-plus/es')['ElImage'] - ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] - ElInput: typeof import('element-plus/es')['ElInput'] - ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] - ElMenu: typeof import('element-plus/es')['ElMenu'] - ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] - ElOption: typeof import('element-plus/es')['ElOption'] - ElPagination: typeof import('element-plus/es')['ElPagination'] - ElPopover: typeof import('element-plus/es')['ElPopover'] - ElRadio: typeof import('element-plus/es')['ElRadio'] - ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] - ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] - ElRow: typeof import('element-plus/es')['ElRow'] - ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] - ElSelect: typeof import('element-plus/es')['ElSelect'] - ElSlider: typeof import('element-plus/es')['ElSlider'] - ElSwitch: typeof import('element-plus/es')['ElSwitch'] - ElTable: typeof import('element-plus/es')['ElTable'] - ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] - ElTabPane: typeof import('element-plus/es')['ElTabPane'] - ElTabs: typeof import('element-plus/es')['ElTabs'] - ElTooltip: typeof import('element-plus/es')['ElTooltip'] - ElTree: typeof import('element-plus/es')['ElTree'] - ElUpload: typeof import('element-plus/es')['ElUpload'] FlexGradientsCreate: typeof import('./../components/common/flex-gradients-create/index.vue')['default'] FooterNav: typeof import('./../components/footer-nav/index.vue')['default'] FooterNavContent: typeof import('./../components/footer-nav/footer-nav-content.vue')['default'] @@ -68,7 +27,6 @@ declare module 'vue' { Hot: typeof import('./../components/common/hot/index.vue')['default'] Icon: typeof import('./../components/base/icon/index.vue')['default'] ImageEmpty: typeof import('./../components/base/image-empty/index.vue')['default'] - 'Index copy': typeof import('./../components/footer-nav/index copy.vue')['default'] InputNumber: typeof import('./../components/base/input-number/index.vue')['default'] LinkArticles: typeof import('./../components/common/url-value/link-articles.vue')['default'] LinkBrand: typeof import('./../components/common/url-value/link-brand.vue')['default'] @@ -160,14 +118,6 @@ declare module 'vue' { ModelSeckillContent: typeof import('./../components/model-seckill/model-seckill-content.vue')['default'] ModelSeckillSetting: typeof import('./../components/model-seckill/model-seckill-setting.vue')['default'] ModelSeckillStyles: typeof import('./../components/model-seckill/model-seckill-styles.vue')['default'] - ModelShopList: typeof import('./../components/model-shop-list/index.vue')['default'] - ModelShopListContent: typeof import('./../components/model-shop-list/model-shop-list-content.vue')['default'] - ModelShopListSetting: typeof import('./../components/model-shop-list/model-shop-list-setting.vue')['default'] - ModelShopListStyles: typeof import('./../components/model-shop-list/model-shop-list-styles.vue')['default'] - ModelShopTabs: typeof import('./../components/model-shop-tabs/index.vue')['default'] - ModelShopTabsContent: typeof import('./../components/model-shop-tabs/model-shop-tabs-content.vue')['default'] - ModelShopTabsSetting: typeof import('./../components/model-shop-tabs/model-shop-tabs-setting.vue')['default'] - ModelShopTabsStyles: typeof import('./../components/model-shop-tabs/model-shop-tabs-styles.vue')['default'] ModelTabs: typeof import('./../components/model-tabs/index.vue')['default'] ModelTabsContent: typeof import('./../components/model-tabs/model-tabs-content.vue')['default'] ModelTabsSetting: typeof import('./../components/model-tabs/model-tabs-setting.vue')['default'] @@ -205,7 +155,6 @@ declare module 'vue' { TabsContent: typeof import('./../components/model-data-magic/components/tabs-content.vue')['default'] TabsStyles: typeof import('./../components/model-data-magic/components/tabs-styles.vue')['default'] TabsView: typeof import('./../components/common/tabs-view/index.vue')['default'] - TextSizeType: typeof import('./../components/common/text-size-type/index.vue')['default'] ThemeSelect: typeof import('./../components/common/theme-select/index.vue')['default'] TMap: typeof import('./../components/base/maps/t-map.vue')['default'] TransformCategory: typeof import('./../components/common/upload/transform-category.vue')['default'] @@ -216,7 +165,4 @@ declare module 'vue' { UrlValue: typeof import('./../components/common/url-value/index.vue')['default'] UrlValueDialog: typeof import('./../components/common/url-value/url-value-dialog.vue')['default'] } - export interface ComponentCustomProperties { - vLoading: typeof import('element-plus/es')['ElLoadingDirective'] - } } From 227d4715e63e97c964cc2409608da1741acae086 Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Thu, 5 Sep 2024 17:05:19 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=89=A9=E5=B1=95=EF=BC=9A=E4=B8=BA`vue`=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0ElementPlus=E7=BB=84=E4=BB=B6=E5=92=8C`vLoadi?= =?UTF-8?q?ng`=E6=8C=87=E4=BB=A4=E7=9A=84=E7=B1=BB=E5=9E=8B=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在`src/types/components.d.ts`中，为`vue`模块的类型定义新增了多个ElementPlus组件和`vLoading`指令的类型定义。这将改善使用这些组件和指令时的类型检查和 IntelliSense支持。同时，添加了`ComponentCustomProperties`接口定义，以增强对全局属性的支持。 --- .gitignore | 1 + src/types/components.d.ts | 43 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/.gitignore b/.gitignore index e1453088..e2395fab 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ coverage *.sw? pnpm-lock.yaml +src/types/components.d.ts diff --git a/src/types/components.d.ts b/src/types/components.d.ts index 0eeb808b..95171be3 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -17,6 +17,46 @@ declare module 'vue' { Dialog: typeof import('./../components/model-custom/components/dialog.vue')['default'] Drag: typeof import('./../components/base/drag/index.vue')['default'] DragGroup: typeof import('./../components/common/drag-group/index.vue')['default'] + ElBadge: typeof import('element-plus/es')['ElBadge'] + ElButton: typeof import('element-plus/es')['ElButton'] + ElCarousel: typeof import('element-plus/es')['ElCarousel'] + ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] + ElCascader: typeof import('element-plus/es')['ElCascader'] + ElCascaderPanel: typeof import('element-plus/es')['ElCascaderPanel'] + ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] + ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] + ElCol: typeof import('element-plus/es')['ElCol'] + ElCollapse: typeof import('element-plus/es')['ElCollapse'] + ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem'] + ElColorPicker: typeof import('element-plus/es')['ElColorPicker'] + ElDialog: typeof import('element-plus/es')['ElDialog'] + ElForm: typeof import('element-plus/es')['ElForm'] + ElFormItem: typeof import('element-plus/es')['ElFormItem'] + ElIcon: typeof import('element-plus/es')['ElIcon'] + ElImage: typeof import('element-plus/es')['ElImage'] + ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] + ElInput: typeof import('element-plus/es')['ElInput'] + ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] + ElMenu: typeof import('element-plus/es')['ElMenu'] + ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] + ElOption: typeof import('element-plus/es')['ElOption'] + ElPagination: typeof import('element-plus/es')['ElPagination'] + ElPopover: typeof import('element-plus/es')['ElPopover'] + ElRadio: typeof import('element-plus/es')['ElRadio'] + ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] + ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] + ElRow: typeof import('element-plus/es')['ElRow'] + ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] + ElSelect: typeof import('element-plus/es')['ElSelect'] + ElSlider: typeof import('element-plus/es')['ElSlider'] + ElSwitch: typeof import('element-plus/es')['ElSwitch'] + ElTable: typeof import('element-plus/es')['ElTable'] + ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] + ElTabPane: typeof import('element-plus/es')['ElTabPane'] + ElTabs: typeof import('element-plus/es')['ElTabs'] + ElTooltip: typeof import('element-plus/es')['ElTooltip'] + ElTree: typeof import('element-plus/es')['ElTree'] + ElUpload: typeof import('element-plus/es')['ElUpload'] FlexGradientsCreate: typeof import('./../components/common/flex-gradients-create/index.vue')['default'] FooterNav: typeof import('./../components/footer-nav/index.vue')['default'] FooterNavContent: typeof import('./../components/footer-nav/footer-nav-content.vue')['default'] @@ -165,4 +205,7 @@ declare module 'vue' { UrlValue: typeof import('./../components/common/url-value/index.vue')['default'] UrlValueDialog: typeof import('./../components/common/url-value/url-value-dialog.vue')['default'] } + export interface ComponentCustomProperties { + vLoading: typeof import('element-plus/es')['ElLoadingDirective'] + } } From 12cfaba5ad1b14d5970aaf140a61938772814140 Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Thu, 5 Sep 2024 17:07:33 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BB=8E`.gitignore`=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=E7=A7=BB=E9=99=A4=E4=BA=86=E5=AF=B9`src/types/compone?= =?UTF-8?q?nts.d.ts`=E7=9A=84=E5=BF=BD=E7=95=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index e2395fab..e1453088 100644 --- a/.gitignore +++ b/.gitignore @@ -31,4 +31,3 @@ coverage *.sw? pnpm-lock.yaml -src/types/components.d.ts From 0e4e2c699a1f9cc1ff3e5d6d64920228a27564c5 Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Thu, 5 Sep 2024 17:08:21 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=AD=E7=BB=84=E4=BB=B6=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=8A=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在类型定义文件中新增了多个组件的类型定义，包括BdMap、CardContainer、CarouselIndicator等，并对GlobalComponents接口进行了相应的调整，以支持这些新组件的使用。 --- src/types/components.d.ts | 211 -------------------------------------- 1 file changed, 211 deletions(-) delete mode 100644 src/types/components.d.ts diff --git a/src/types/components.d.ts b/src/types/components.d.ts deleted file mode 100644 index 95171be3..00000000 --- a/src/types/components.d.ts +++ /dev/null @@ -1,211 +0,0 @@ -/* eslint-disable */ -/* prettier-ignore */ -// @ts-nocheck -// Generated by unplugin-vue-components -// Read more: https://github.com/vuejs/core/pull/3399 -export {} - -declare module 'vue' { - export interface GlobalComponents { - BdMap: typeof import('./../components/base/maps/bd-map.vue')['default'] - CardContainer: typeof import('./../components/base/card-container/index.vue')['default'] - CarouselIndicator: typeof import('./../components/common/carousel-indicator/index.vue')['default'] - ColorPicker: typeof import('./../components/base/color-picker/index.vue')['default'] - ColorTextSizeGroup: typeof import('./../components/common/color-text-size-group/index.vue')['default'] - CommonStyles: typeof import('./../components/common/common-styles/index.vue')['default'] - Components: typeof import('./../components/model-custom/components/index.vue')['default'] - Dialog: typeof import('./../components/model-custom/components/dialog.vue')['default'] - Drag: typeof import('./../components/base/drag/index.vue')['default'] - DragGroup: typeof import('./../components/common/drag-group/index.vue')['default'] - ElBadge: typeof import('element-plus/es')['ElBadge'] - ElButton: typeof import('element-plus/es')['ElButton'] - ElCarousel: typeof import('element-plus/es')['ElCarousel'] - ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] - ElCascader: typeof import('element-plus/es')['ElCascader'] - ElCascaderPanel: typeof import('element-plus/es')['ElCascaderPanel'] - ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] - ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] - ElCol: typeof import('element-plus/es')['ElCol'] - ElCollapse: typeof import('element-plus/es')['ElCollapse'] - ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem'] - ElColorPicker: typeof import('element-plus/es')['ElColorPicker'] - ElDialog: typeof import('element-plus/es')['ElDialog'] - ElForm: typeof import('element-plus/es')['ElForm'] - ElFormItem: typeof import('element-plus/es')['ElFormItem'] - ElIcon: typeof import('element-plus/es')['ElIcon'] - ElImage: typeof import('element-plus/es')['ElImage'] - ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] - ElInput: typeof import('element-plus/es')['ElInput'] - ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] - ElMenu: typeof import('element-plus/es')['ElMenu'] - ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] - ElOption: typeof import('element-plus/es')['ElOption'] - ElPagination: typeof import('element-plus/es')['ElPagination'] - ElPopover: typeof import('element-plus/es')['ElPopover'] - ElRadio: typeof import('element-plus/es')['ElRadio'] - ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] - ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] - ElRow: typeof import('element-plus/es')['ElRow'] - ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] - ElSelect: typeof import('element-plus/es')['ElSelect'] - ElSlider: typeof import('element-plus/es')['ElSlider'] - ElSwitch: typeof import('element-plus/es')['ElSwitch'] - ElTable: typeof import('element-plus/es')['ElTable'] - ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] - ElTabPane: typeof import('element-plus/es')['ElTabPane'] - ElTabs: typeof import('element-plus/es')['ElTabs'] - ElTooltip: typeof import('element-plus/es')['ElTooltip'] - ElTree: typeof import('element-plus/es')['ElTree'] - ElUpload: typeof import('element-plus/es')['ElUpload'] - FlexGradientsCreate: typeof import('./../components/common/flex-gradients-create/index.vue')['default'] - FooterNav: typeof import('./../components/footer-nav/index.vue')['default'] - FooterNavContent: typeof import('./../components/footer-nav/footer-nav-content.vue')['default'] - FooterNavSetting: typeof import('./../components/footer-nav/footer-nav-setting.vue')['default'] - FooterNavStyles: typeof import('./../components/footer-nav/footer-nav-styles.vue')['default'] - FormUploadCategory: typeof import('./../components/common/upload/form-upload-category.vue')['default'] - GdMap: typeof import('./../components/base/maps/gd-map.vue')['default'] - Hot: typeof import('./../components/common/hot/index.vue')['default'] - Icon: typeof import('./../components/base/icon/index.vue')['default'] - ImageEmpty: typeof import('./../components/base/image-empty/index.vue')['default'] - InputNumber: typeof import('./../components/base/input-number/index.vue')['default'] - LinkArticles: typeof import('./../components/common/url-value/link-articles.vue')['default'] - LinkBrand: typeof import('./../components/common/url-value/link-brand.vue')['default'] - LinkCoupon: typeof import('./../components/common/url-value/link-coupon.vue')['default'] - LinkCustom: typeof import('./../components/common/url-value/link-custom.vue')['default'] - LinkGoods: typeof import('./../components/common/url-value/link-goods.vue')['default'] - LinkGoodsCategory: typeof import('./../components/common/url-value/link-goods-category.vue')['default'] - LinkGoodsSearch: typeof import('./../components/common/url-value/link-goods-search.vue')['default'] - LinkList: typeof import('./../components/common/url-value/link-list.vue')['default'] - LinkTable: typeof import('./../components/common/url-value/link-table.vue')['default'] - MagicCarousel: typeof import('./../components/model-data-magic/components/magic-carousel.vue')['default'] - MagicCube: typeof import('./../components/common/magic-cube/index.vue')['default'] - Main: typeof import('./../views/layout/components/main/index.vue')['default'] - Maps: typeof import('./../components/base/maps/index.vue')['default'] - Margin: typeof import('./../components/base/margin/index.vue')['default'] - ModelArticleList: typeof import('./../components/model-article-list/index.vue')['default'] - ModelArticleListContent: typeof import('./../components/model-article-list/model-article-list-content.vue')['default'] - ModelArticleListSetting: typeof import('./../components/model-article-list/model-article-list-setting.vue')['default'] - ModelArticleListStyles: typeof import('./../components/model-article-list/model-article-list-styles.vue')['default'] - ModelArticleTabs: typeof import('./../components/model-article-tabs/index.vue')['default'] - ModelArticleTabsContent: typeof import('./../components/model-article-tabs/model-article-tabs-content.vue')['default'] - ModelArticleTabsSetting: typeof import('./../components/model-article-tabs/model-article-tabs-setting.vue')['default'] - ModelArticleTabsStyles: typeof import('./../components/model-article-tabs/model-article-tabs-styles.vue')['default'] - ModelAuxiliaryBlank: typeof import('./../components/model-auxiliary-blank/index.vue')['default'] - ModelAuxiliaryBlankContent: typeof import('./../components/model-auxiliary-blank/model-auxiliary-blank-content.vue')['default'] - ModelAuxiliaryBlankSetting: typeof import('./../components/model-auxiliary-blank/model-auxiliary-blank-setting.vue')['default'] - ModelAuxiliaryBlankStyles: typeof import('./../components/model-auxiliary-blank/model-auxiliary-blank-styles.vue')['default'] - ModelAuxiliaryLine: typeof import('./../components/model-auxiliary-line/index.vue')['default'] - ModelAuxiliaryLineContent: typeof import('./../components/model-auxiliary-line/model-auxiliary-line-content.vue')['default'] - ModelAuxiliaryLineSetting: typeof import('./../components/model-auxiliary-line/model-auxiliary-line-setting.vue')['default'] - ModelAuxiliaryLineStyles: typeof import('./../components/model-auxiliary-line/model-auxiliary-line-styles.vue')['default'] - ModelCarousel: typeof import('./../components/model-carousel/index.vue')['default'] - ModelCarouselContent: typeof import('./../components/model-carousel/model-carousel-content.vue')['default'] - ModelCarouselSetting: typeof import('./../components/model-carousel/model-carousel-setting.vue')['default'] - ModelCarouselStyles: typeof import('./../components/model-carousel/model-carousel-styles.vue')['default'] - ModelCoupon: typeof import('./../components/model-coupon/index.vue')['default'] - ModelCouponContent: typeof import('./../components/model-coupon/model-coupon-content.vue')['default'] - ModelCouponSetting: typeof import('./../components/model-coupon/model-coupon-setting.vue')['default'] - ModelCouponStyles: typeof import('./../components/model-coupon/model-coupon-styles.vue')['default'] - ModelCustom: typeof import('./../components/model-custom/index.vue')['default'] - ModelCustomContent: typeof import('./../components/model-custom/model-custom-content.vue')['default'] - ModelCustomSetting: typeof import('./../components/model-custom/model-custom-setting.vue')['default'] - ModelCustomStyles: typeof import('./../components/model-custom/model-custom-styles.vue')['default'] - ModelDataMagic: typeof import('./../components/model-data-magic/index.vue')['default'] - ModelDataMagicContent: typeof import('./../components/model-data-magic/model-data-magic-content.vue')['default'] - ModelDataMagicSetting: typeof import('./../components/model-data-magic/model-data-magic-setting.vue')['default'] - ModelDataMagicStyles: typeof import('./../components/model-data-magic/model-data-magic-styles.vue')['default'] - ModelFloatWindow: typeof import('./../components/model-float-window/index.vue')['default'] - ModelFloatWindowContent: typeof import('./../components/model-float-window/model-float-window-content.vue')['default'] - ModelFloatWindowSetting: typeof import('./../components/model-float-window/model-float-window-setting.vue')['default'] - ModelFloatWindowStyles: typeof import('./../components/model-float-window/model-float-window-styles.vue')['default'] - ModelGoodsList: typeof import('./../components/model-goods-list/index.vue')['default'] - ModelGoodsListContent: typeof import('./../components/model-goods-list/model-goods-list-content.vue')['default'] - ModelGoodsListSetting: typeof import('./../components/model-goods-list/model-goods-list-setting.vue')['default'] - ModelGoodsListStyles: typeof import('./../components/model-goods-list/model-goods-list-styles.vue')['default'] - ModelGoodsTabs: typeof import('./../components/model-goods-tabs/index.vue')['default'] - ModelGoodsTabsContent: typeof import('./../components/model-goods-tabs/model-goods-tabs-content.vue')['default'] - ModelGoodsTabsSetting: typeof import('./../components/model-goods-tabs/model-goods-tabs-setting.vue')['default'] - ModelGoodsTabsStyles: typeof import('./../components/model-goods-tabs/model-goods-tabs-styles.vue')['default'] - ModelHotZone: typeof import('./../components/model-hot-zone/index.vue')['default'] - ModelHotZoneContent: typeof import('./../components/model-hot-zone/model-hot-zone-content.vue')['default'] - ModelHotZoneSetting: typeof import('./../components/model-hot-zone/model-hot-zone-setting.vue')['default'] - ModelHotZoneStyles: typeof import('./../components/model-hot-zone/model-hot-zone-styles.vue')['default'] - ModelImage: typeof import('./../components/common/custom-module/model-image/index.vue')['default'] - ModelImageStyle: typeof import('./../components/common/custom-module/model-image/model-image-style.vue')['default'] - ModelImgMagic: typeof import('./../components/model-img-magic/index.vue')['default'] - ModelImgMagicContent: typeof import('./../components/model-img-magic/model-img-magic-content.vue')['default'] - ModelImgMagicSetting: typeof import('./../components/model-img-magic/model-img-magic-setting.vue')['default'] - ModelImgMagicStyles: typeof import('./../components/model-img-magic/model-img-magic-styles.vue')['default'] - ModelLines: typeof import('./../components/common/custom-module/model-lines/index.vue')['default'] - ModelLinesStyle: typeof import('./../components/common/custom-module/model-lines/model-lines-style.vue')['default'] - ModelNavGroup: typeof import('./../components/model-nav-group/index.vue')['default'] - ModelNavGroupContent: typeof import('./../components/model-nav-group/model-nav-group-content.vue')['default'] - ModelNavGroupSetting: typeof import('./../components/model-nav-group/model-nav-group-setting.vue')['default'] - ModelNavGroupStyles: typeof import('./../components/model-nav-group/model-nav-group-styles.vue')['default'] - ModelNotice: typeof import('./../components/model-notice/index.vue')['default'] - ModelNoticeContent: typeof import('./../components/model-notice/model-notice-content.vue')['default'] - ModelNoticeSetting: typeof import('./../components/model-notice/model-notice-setting.vue')['default'] - ModelNoticeStyles: typeof import('./../components/model-notice/model-notice-styles.vue')['default'] - ModelRichText: typeof import('./../components/model-rich-text/index.vue')['default'] - ModelRichTextContent: typeof import('./../components/model-rich-text/model-rich-text-content.vue')['default'] - ModelRichTextSetting: typeof import('./../components/model-rich-text/model-rich-text-setting.vue')['default'] - ModelRichTextStyles: typeof import('./../components/model-rich-text/model-rich-text-styles.vue')['default'] - ModelSearch: typeof import('./../components/model-search/index.vue')['default'] - ModelSearchContent: typeof import('./../components/model-search/model-search-content.vue')['default'] - ModelSearchSetting: typeof import('./../components/model-search/model-search-setting.vue')['default'] - ModelSearchStyles: typeof import('./../components/model-search/model-search-styles.vue')['default'] - ModelSeckill: typeof import('./../components/model-seckill/index.vue')['default'] - ModelSeckillContent: typeof import('./../components/model-seckill/model-seckill-content.vue')['default'] - ModelSeckillSetting: typeof import('./../components/model-seckill/model-seckill-setting.vue')['default'] - ModelSeckillStyles: typeof import('./../components/model-seckill/model-seckill-styles.vue')['default'] - ModelTabs: typeof import('./../components/model-tabs/index.vue')['default'] - ModelTabsContent: typeof import('./../components/model-tabs/model-tabs-content.vue')['default'] - ModelTabsSetting: typeof import('./../components/model-tabs/model-tabs-setting.vue')['default'] - ModelTabsStyles: typeof import('./../components/model-tabs/model-tabs-styles.vue')['default'] - ModelText: typeof import('./../components/common/custom-module/model-text/index.vue')['default'] - ModelTextStyle: typeof import('./../components/common/custom-module/model-text/model-text-style.vue')['default'] - ModelTextTitle: typeof import('./../components/model-text-title/index.vue')['default'] - ModelTextTitleContent: typeof import('./../components/model-text-title/model-text-title-content.vue')['default'] - ModelTextTitleSetting: typeof import('./../components/model-text-title/model-text-title-setting.vue')['default'] - ModelTextTitleStyles: typeof import('./../components/model-text-title/model-text-title-styles.vue')['default'] - ModelUserInfo: typeof import('./../components/model-user-info/index.vue')['default'] - ModelUserInfoContent: typeof import('./../components/model-user-info/model-user-info-content.vue')['default'] - ModelUserInfoSetting: typeof import('./../components/model-user-info/model-user-info-setting.vue')['default'] - ModelUserInfoStyles: typeof import('./../components/model-user-info/model-user-info-styles.vue')['default'] - ModelVideo: typeof import('./../components/model-video/index.vue')['default'] - ModelVideoContent: typeof import('./../components/model-video/model-video-content.vue')['default'] - ModelVideoSetting: typeof import('./../components/model-video/model-video-setting.vue')['default'] - ModelVideoStyles: typeof import('./../components/model-video/model-video-styles.vue')['default'] - MultColorPicker: typeof import('./../components/common/mult-color-picker/index.vue')['default'] - Navbar: typeof import('./../views/layout/components/navbar/index.vue')['default'] - NoData: typeof import('./../components/base/no-data/index.vue')['default'] - Padding: typeof import('./../components/base/padding/index.vue')['default'] - PageContent: typeof import('./../components/page-settings/page-content.vue')['default'] - PageSetting: typeof import('./../components/page-settings/page-setting.vue')['default'] - PageSettings: typeof import('./../components/page-settings/index.vue')['default'] - PageStyles: typeof import('./../components/page-settings/page-styles.vue')['default'] - ProductListShow: typeof import('./../components/model-data-magic/components/product-list-show.vue')['default'] - ProductShowConfig: typeof import('./../components/common/product-show-config/index.vue')['default'] - Qrcode: typeof import('./../components/base/qrcode/index.vue')['default'] - Radius: typeof import('./../components/base/radius/index.vue')['default'] - RouterLink: typeof import('vue-router')['RouterLink'] - RouterView: typeof import('vue-router')['RouterView'] - Settings: typeof import('./../views/layout/components/settings/index.vue')['default'] - Slider: typeof import('./../components/base/slider/index.vue')['default'] - TabsContent: typeof import('./../components/model-data-magic/components/tabs-content.vue')['default'] - TabsStyles: typeof import('./../components/model-data-magic/components/tabs-styles.vue')['default'] - TabsView: typeof import('./../components/common/tabs-view/index.vue')['default'] - ThemeSelect: typeof import('./../components/common/theme-select/index.vue')['default'] - TMap: typeof import('./../components/base/maps/t-map.vue')['default'] - TransformCategory: typeof import('./../components/common/upload/transform-category.vue')['default'] - TxMap: typeof import('./../components/base/maps/tx-map.vue')['default'] - Upload: typeof import('./../components/common/upload/index.vue')['default'] - UploadIcon: typeof import('./../components/common/upload-icon/index.vue')['default'] - UploadModel: typeof import('./../components/common/upload/upload-model.vue')['default'] - UrlValue: typeof import('./../components/common/url-value/index.vue')['default'] - UrlValueDialog: typeof import('./../components/common/url-value/url-value-dialog.vue')['default'] - } - export interface ComponentCustomProperties { - vLoading: typeof import('element-plus/es')['ElLoadingDirective'] - } -}