From 621a3024517557c6d5c90f19a3a9801f3e203de5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Mon, 2 May 2022 17:18:18 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20@mixin=20?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/GoReload/index.vue             |  2 +-
 .../components/LayoutTransitionMain/index.vue |  1 -
 src/router/modules/project.router.ts          |  1 -
 src/styles/common/mixins/mixins.scss          |  4 ++--
 src/styles/common/style.scss                  |  4 ++--
 src/utils/plugin.ts                           |  1 -
 src/views/chart/ContentBox/index.vue          | 20 +++++++++----------
 .../components/ChartsItemBox/index.vue        |  4 ++--
 .../components/ChartsOptionContent/index.vue  |  2 +-
 src/views/chart/ContentCharts/index.vue       |  2 +-
 .../components/ChartThemeColor/index.vue      |  2 +-
 .../components/EditRange/index.vue            |  4 ++--
 .../components/EditTools/index.vue            |  2 +-
 .../components/LayersListItem/index.vue       |  2 +-
 .../chart/contentHeader/headerTitle/index.vue |  1 -
 src/views/login/index.vue                     |  2 +-
 .../components/ProjectItemsCard/index.vue     |  1 -
 .../components/ProjectLayoutSider/index.vue   |  2 +-
 18 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/src/components/GoReload/index.vue b/src/components/GoReload/index.vue
index 80f5b1da..f8be83a0 100644
--- a/src/components/GoReload/index.vue
+++ b/src/components/GoReload/index.vue
@@ -15,6 +15,6 @@ onMounted(() => {
 @include go('reload') {
   height: 100vh;
   width: 100vw;
-  @include filter-bg-color('background-color')
+  @include fetch-bg-color('background-color')
 }
 </style>
diff --git a/src/layout/components/LayoutTransitionMain/index.vue b/src/layout/components/LayoutTransitionMain/index.vue
index a197a228..41f67ccd 100644
--- a/src/layout/components/LayoutTransitionMain/index.vue
+++ b/src/layout/components/LayoutTransitionMain/index.vue
@@ -1,6 +1,5 @@
 <template>
   <router-view #default="{ Component, route }">
-    <!-- todo 动画暂时不生效，待处理 -->
     <transition name="fade" mode="out-in" appear>
       <component
         v-if="route.noKeepAlive"
diff --git a/src/router/modules/project.router.ts b/src/router/modules/project.router.ts
index 6c545c40..45f51f15 100644
--- a/src/router/modules/project.router.ts
+++ b/src/router/modules/project.router.ts
@@ -18,7 +18,6 @@ const projectRoutes: RouteRecordRaw = {
     title: '项目',
     isRoot: true
   },
-  // todo 可采用循环动态插入
   children: [
     {
       path: PageEnum.BASE_HOME_ITEMS,
diff --git a/src/styles/common/mixins/mixins.scss b/src/styles/common/mixins/mixins.scss
index e4f4fd65..39374ff1 100644
--- a/src/styles/common/mixins/mixins.scss
+++ b/src/styles/common/mixins/mixins.scss
@@ -52,7 +52,7 @@
 }
 
 //获取背景颜色
-@mixin filter-bg-color($target) {
+@mixin fetch-bg-color($target) {
   @include themeify {
     background-color: themed($target);
   }
@@ -66,7 +66,7 @@
 }
 
 //设置边框颜色
-@mixin filter-border-color($target) {
+@mixin fetch-border-color($target) {
   @include themeify {
     border-color: themed($target);
   }
diff --git a/src/styles/common/style.scss b/src/styles/common/style.scss
index a192daf9..8bd325e6 100644
--- a/src/styles/common/style.scss
+++ b/src/styles/common/style.scss
@@ -49,14 +49,14 @@
 // 毛玻璃
 .go-background-filter {
   backdrop-filter: $--filter-blur-base;
-  @include filter-bg-color('filter-color');
+  @include fetch-bg-color('filter-color');
   box-shadow: $--border-shadow;
 }
 
 // 毛玻璃
 .go-background-filter-shallow {
   backdrop-filter: $--filter-blur-base;
-  @include filter-bg-color('filter-color-shallow');
+  @include fetch-bg-color('filter-color-shallow');
   box-shadow: $--border-shadow;
 }
 
diff --git a/src/utils/plugin.ts b/src/utils/plugin.ts
index fbc2741b..358859f1 100644
--- a/src/utils/plugin.ts
+++ b/src/utils/plugin.ts
@@ -1,4 +1,3 @@
-import { nextTick } from 'vue'
 import { icon } from '@/plugins'
 import { DialogEnum } from '@/enums/pluginEnum'
 import { dialogIconSize } from '@/settings/designSetting'
diff --git a/src/views/chart/ContentBox/index.vue b/src/views/chart/ContentBox/index.vue
index a3593228..8c10edcf 100644
--- a/src/views/chart/ContentBox/index.vue
+++ b/src/views/chart/ContentBox/index.vue
@@ -103,31 +103,31 @@ $topOrBottomHeight: 40px;
   margin: 1px;
   margin-bottom: 0;
   &.bg-depth0 {
-    @include filter-bg-color('background-color1');
+    @include fetch-bg-color('background-color1');
     .bottom,
     .top {
-      @include filter-bg-color('background-color1');
+      @include fetch-bg-color('background-color1');
     }
   }
   &.bg-depth1 {
-    @include filter-bg-color('background-color1');
+    @include fetch-bg-color('background-color1');
     .bottom,
     .top {
-      @include filter-bg-color('background-color2');
+      @include fetch-bg-color('background-color2');
     }
   }
   &.bg-depth2 {
-    @include filter-bg-color('background-color2');
+    @include fetch-bg-color('background-color2');
     .bottom,
     .top {
-      @include filter-bg-color('background-color3');
+      @include fetch-bg-color('background-color3');
     }
   }
   &.bg-depth3 {
-    @include filter-bg-color('background-color3');
+    @include fetch-bg-color('background-color3');
     .bottom,
     .top {
-      @include filter-bg-color('background-color4');
+      @include fetch-bg-color('background-color4');
     }
   }
   &.flex {
@@ -142,14 +142,14 @@ $topOrBottomHeight: 40px;
     height: $topOrBottomHeight;
     padding: 0 10px;
     border-top: 1px solid;
-    @include filter-border-color('hover-border-color');
+    @include fetch-border-color('hover-border-color');
     .mt-1 {
       margin-top: 2px;
     }
   }
   .top {
     border-bottom: 1px solid;
-    @include filter-border-color('background-color1');
+    @include fetch-border-color('background-color1');
   }
   
   .content {
diff --git a/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue b/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue
index fc8b0541..06208652 100644
--- a/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue
+++ b/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue
@@ -70,7 +70,7 @@ $centerHeight: 100px;
     border-radius: 6px;
     cursor: pointer;
     border: 1px solid rgba(0, 0, 0, 0);
-    @include filter-bg-color('background-color2');
+    @include fetch-bg-color('background-color2');
     @extend .go-transition;
     &:hover {
       @include hover-border-color('background-color4');
@@ -83,7 +83,7 @@ $centerHeight: 100px;
       align-items: center;
       justify-content: space-between;
       padding: 2px 15px;
-      @include filter-bg-color('background-color3');
+      @include fetch-bg-color('background-color3');
       &-text {
         font-size: 12px;
         margin-left: 8px;
diff --git a/src/views/chart/ContentCharts/components/ChartsOptionContent/index.vue b/src/views/chart/ContentCharts/components/ChartsOptionContent/index.vue
index ec123885..5be48f5e 100644
--- a/src/views/chart/ContentCharts/components/ChartsOptionContent/index.vue
+++ b/src/views/chart/ContentCharts/components/ChartsOptionContent/index.vue
@@ -118,7 +118,7 @@ $menuWidth: 65px;
   .chart-menu-width {
     width: $menuWidth;
     flex-shrink: 0;
-    @include filter-bg-color('background-color2-shallow');
+    @include fetch-bg-color('background-color2-shallow');
   }
   .chart-content-list {
     flex: 1;
diff --git a/src/views/chart/ContentCharts/index.vue b/src/views/chart/ContentCharts/index.vue
index cc3b00d7..2ffe8be3 100644
--- a/src/views/chart/ContentCharts/index.vue
+++ b/src/views/chart/ContentCharts/index.vue
@@ -81,7 +81,7 @@ $topHeight: 40px;
     height: calc(100vh - #{$--header-height} - #{$topHeight});
     .menu-width {
       flex-shrink: 0;
-      @include filter-bg-color('background-color2');
+      @include fetch-bg-color('background-color2');
     }
     .menu-component-box {
       flex-shrink: 0;
diff --git a/src/views/chart/ContentConfigurations/components/CanvasPage/components/ChartThemeColor/index.vue b/src/views/chart/ContentConfigurations/components/CanvasPage/components/ChartThemeColor/index.vue
index 96576770..18c43f66 100644
--- a/src/views/chart/ContentConfigurations/components/CanvasPage/components/ChartThemeColor/index.vue
+++ b/src/views/chart/ContentConfigurations/components/CanvasPage/components/ChartThemeColor/index.vue
@@ -70,7 +70,7 @@ const selectTheme = (theme: ChartColorsNameType) => {
     cursor: pointer;
     margin-top: 15px;
     padding: 0;
-    @include filter-bg-color('background-color4-shallow');
+    @include fetch-bg-color('background-color4-shallow');
     border-radius: 23px;
     overflow: hidden;
     @include deep() {
diff --git a/src/views/chart/ContentEdit/components/EditRange/index.vue b/src/views/chart/ContentEdit/components/EditRange/index.vue
index 14c9cd9c..ff9e4955 100644
--- a/src/views/chart/ContentEdit/components/EditRange/index.vue
+++ b/src/views/chart/ContentEdit/components/EditRange/index.vue
@@ -67,8 +67,8 @@ const rangeModelStyle = computed(() => {
 @include go(edit-range) {
   position: relative;
   transform-origin: left top;
-  @include filter-border-color('hover-border-color');
-  @include filter-bg-color('background-color2');
+  @include fetch-border-color('hover-border-color');
+  @include fetch-bg-color('background-color2');
 
   @include go(edit-range-model) {
     z-index: -1;
diff --git a/src/views/chart/ContentEdit/components/EditTools/index.vue b/src/views/chart/ContentEdit/components/EditTools/index.vue
index 103a3739..d824aabd 100644
--- a/src/views/chart/ContentEdit/components/EditTools/index.vue
+++ b/src/views/chart/ContentEdit/components/EditTools/index.vue
@@ -142,7 +142,7 @@ $asideBottom: 70px;
   border-radius: 25px;
   border: 1px solid;
   mix-blend-mode: luminosity;
-  @include filter-border-color("hover-border-color-shallow");
+  @include fetch-border-color("hover-border-color-shallow");
   &.aside {
     flex-direction: column-reverse;
     height: auto;
diff --git a/src/views/chart/ContentLayers/components/LayersListItem/index.vue b/src/views/chart/ContentLayers/components/LayersListItem/index.vue
index 0d80c3e4..e058a199 100644
--- a/src/views/chart/ContentLayers/components/LayersListItem/index.vue
+++ b/src/views/chart/ContentLayers/components/LayersListItem/index.vue
@@ -67,7 +67,7 @@ $textSize: 10px;
   @extend .go-transition-quick;
   &.hover,
   &:hover {
-    @include filter-bg-color('background-color4');
+    @include fetch-bg-color('background-color4');
   }
   /* 选中 */
   &.select {
diff --git a/src/views/chart/contentHeader/headerTitle/index.vue b/src/views/chart/contentHeader/headerTitle/index.vue
index 09408297..a0cebe50 100644
--- a/src/views/chart/contentHeader/headerTitle/index.vue
+++ b/src/views/chart/contentHeader/headerTitle/index.vue
@@ -38,7 +38,6 @@ const fetchProhectInfoById = () => {
   if (!routeParamsRes) return
   const { id } = routeParamsRes
   if (id.length) {
-    // todo 从后端获取项目信息并存储
     return id[0]
   }
   return ''
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 6eadb00f..cf3cde62 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -287,7 +287,7 @@ $carousel-image-height: 60vh;
 
       &-card {
         @extend .go-background-filter;
-        @include filter-bg-color('filter-color');
+        @include fetch-bg-color('filter-color');
         box-shadow: 0 0 20px 5px rgba(40, 40, 40, 0.5);
       }
 
diff --git a/src/views/project/items/components/ProjectItemsCard/index.vue b/src/views/project/items/components/ProjectItemsCard/index.vue
index 4445d5a2..37b15d9a 100644
--- a/src/views/project/items/components/ProjectItemsCard/index.vue
+++ b/src/views/project/items/components/ProjectItemsCard/index.vue
@@ -101,7 +101,6 @@ const {
 const emit = defineEmits(['delete', 'resize', 'edit'])
 
 const props = defineProps({
-  // todo 定义列表ITEN的 type
   cardData: Object as PropType<Chartype>
 })
 
diff --git a/src/views/project/layout/components/ProjectLayoutSider/index.vue b/src/views/project/layout/components/ProjectLayoutSider/index.vue
index 6fb5d600..c7b963e0 100644
--- a/src/views/project/layout/components/ProjectLayoutSider/index.vue
+++ b/src/views/project/layout/components/ProjectLayoutSider/index.vue
@@ -73,7 +73,7 @@ $siderHeight: 100vh;
 
 @include go(project) {
   &-sider {
-    @include filter-bg-color('aside-background-color');
+    @include fetch-bg-color('aside-background-color');
     &-top {
       display: flex;
       align-items: center;