From 771129f3b030b950687a714f329a02242da8d6ba Mon Sep 17 00:00:00 2001
From: fmm <1442620801@qq.com>
Date: Sun, 25 Aug 2024 16:14:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20vue=E4=BF=AE=E5=A4=8Dmock/dashboard?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F/=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E8=B6=85=E9=95=BF=E9=97=AE=E9=A2=98/=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=99=9A=E6=8B=9F=E6=BB=9A=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/tinyvue/src/api/interceptor.ts   |  3 ++
 .../tinyvue/src/layout/default-layout.vue     | 12 ++++--
 .../pro/template/tinyvue/src/mock/index.ts    | 20 ++--------
 .../src/views/board/home/components/curve.vue | 24 ++++++-----
 .../src/views/board/home/components/falls.vue | 23 +++++++----
 .../views/board/home/components/region.vue    | 34 +++++++++-------
 .../src/views/board/home/components/round.vue | 31 ++++++++------
 .../tinyvue/src/views/board/home/index.vue    |  6 +--
 .../views/menu/info/components/info-tab.vue   | 40 ++++++++-----------
 .../views/user/info/components/info-tab.vue   |  2 +-
 .../tinyvue/src/views/user/info/index.vue     |  8 ++--
 11 files changed, 109 insertions(+), 94 deletions(-)

diff --git a/packages/toolkits/pro/template/tinyvue/src/api/interceptor.ts b/packages/toolkits/pro/template/tinyvue/src/api/interceptor.ts
index a3bc6610..692b3d79 100644
--- a/packages/toolkits/pro/template/tinyvue/src/api/interceptor.ts
+++ b/packages/toolkits/pro/template/tinyvue/src/api/interceptor.ts
@@ -46,6 +46,9 @@ axios.interceptors.request.use(
 axios.interceptors.response.use(
   (response: AxiosResponse<HttpResponse>) => {
     const res = response;
+    if (res.request.responseURL.includes('mock')) {
+      return res.data;
+    }
     return res;
   },
   (error) => {
diff --git a/packages/toolkits/pro/template/tinyvue/src/layout/default-layout.vue b/packages/toolkits/pro/template/tinyvue/src/layout/default-layout.vue
index 8835a00c..bcc9e277 100644
--- a/packages/toolkits/pro/template/tinyvue/src/layout/default-layout.vue
+++ b/packages/toolkits/pro/template/tinyvue/src/layout/default-layout.vue
@@ -77,16 +77,18 @@
     Container as TinyContainer,
     Layout as TinyLayout,
     Modal as tinyModal,
-   Tabs, TabItem } from '@opentiny/vue';
+    Tabs,
+    TabItem,
+  } from '@opentiny/vue';
   import TinyThemeTool from '@opentiny/vue-theme/theme-tool.js';
-  import { useAppStore , useTabStore } from '@/store';
+  import { useAppStore, useTabStore } from '@/store';
   // eslint-disable-next-line import/extensions
   import Footer from '@/components/footer/index.vue';
   import NavBar from '@/components/navbar/index.vue';
   import Theme from '@/components/theme/index.vue';
   import Menu from '@/components/menu/index.vue';
   import { DefaultTheme } from '@/components/theme/type';
-      import { useRouter } from 'vue-router';
+  import { useRouter } from 'vue-router';
   import PageLayout from './page-layout.vue';
   // 动态切换
   const router = useRouter();
@@ -239,7 +241,9 @@
     padding-left: 50px;
   }
 
-  :deep(.tiny-tabs__content) {
+  :deep(
+      .tiny-container__main > .tiny-layout > .tiny-tabs > .tiny-tabs__content
+    ) {
     display: none;
   }
 
diff --git a/packages/toolkits/pro/template/tinyvue/src/mock/index.ts b/packages/toolkits/pro/template/tinyvue/src/mock/index.ts
index a99cfb91..330c7d08 100644
--- a/packages/toolkits/pro/template/tinyvue/src/mock/index.ts
+++ b/packages/toolkits/pro/template/tinyvue/src/mock/index.ts
@@ -1,24 +1,12 @@
-import {createMockServer} from '@gaonengwww/mock-server';
+import { createMockServer } from '@gaonengwww/mock-server';
 import list from './list';
 import froms from '../views/form/step/mock';
 import profile from './profile';
 import board from './board';
+import user from './user';
 
-let mockData = [] as any
-for(let i=0; i<board.length; i+=1){
-  mockData.push(board[i])
-}
-for(let i=0; i<list.length; i+=1){
-  mockData.push(list[i])
-}
-for(let i=0; i<froms.length; i+=1){
-  mockData.push(froms[i])
-}
-for(let i=0; i<profile.length; i+=1){
-  mockData.push(profile[i])
-}
+let mockData = [...list, ...froms, ...profile, ...board, ...user] as any;
 
 createMockServer({
   mocks: mockData,
-})
-
+});
diff --git a/packages/toolkits/pro/template/tinyvue/src/views/board/home/components/curve.vue b/packages/toolkits/pro/template/tinyvue/src/views/board/home/components/curve.vue
index 17510961..43ca7fd8 100644
--- a/packages/toolkits/pro/template/tinyvue/src/views/board/home/components/curve.vue
+++ b/packages/toolkits/pro/template/tinyvue/src/views/board/home/components/curve.vue
@@ -1,8 +1,10 @@
 <template>
-  <div class="curve">
-    <img src="@/assets/images/map-background3.png" class="image" />
-    <h3>{{ $t('home.curve.trend') }}</h3>
-    <div id="line" ref="echartsDom"></div>
+  <div class="curve-box">
+    <div class="curve">
+      <img src="@/assets/images/map-background3.png" class="image" />
+      <h3>{{ $t('home.curve.trend') }}</h3>
+      <div id="line" ref="echartsDom"></div>
+    </div>
   </div>
 </template>
 
@@ -193,7 +195,7 @@
       myChart.resize();
     });
     nextTick(() => {
-      myChart.resize()
+      myChart.resize();
     });
   });
 
@@ -220,13 +222,17 @@
 </script>
 
 <style scoped lang="less">
+  .curve-box {
+    margin-top: 20px;
+    padding: 20px 16px;
+    background: #fff;
+    border-radius: 6px;
+    box-shadow: 0 3px 10px #4062e133;
+  }
+
   .curve {
     width: 100%;
     height: 491px;
-    margin-top: 2%;
-    background: #fff;
-    border-radius: 6px;
-    box-shadow: 0 3px 10px 0 rgb(64 98 225 / 20%);
   }
 
   #line {
diff --git a/packages/toolkits/pro/template/tinyvue/src/views/board/home/components/falls.vue b/packages/toolkits/pro/template/tinyvue/src/views/board/home/components/falls.vue
index 8d0c81ef..502bb40d 100644
--- a/packages/toolkits/pro/template/tinyvue/src/views/board/home/components/falls.vue
+++ b/packages/toolkits/pro/template/tinyvue/src/views/board/home/components/falls.vue
@@ -1,8 +1,10 @@
 <template>
-  <div class="falls">
-    <img src="@/assets/images/map-background2.png" class="image" />
-    <h3>{{ $t('home.falls.line') }}</h3>
-    <div id="flow" ref="echartsDom"></div>
+  <div class="falls-box">
+    <div class="falls">
+      <img src="@/assets/images/map-background2.png" class="image" />
+      <h3>{{ $t('home.falls.line') }}</h3>
+      <div id="flow" ref="echartsDom"></div>
+    </div>
   </div>
 </template>
 
@@ -175,7 +177,7 @@
       myChart.resize();
     });
     nextTick(() => {
-      myChart.resize()
+      myChart.resize();
     });
   });
 
@@ -187,13 +189,18 @@
 </script>
 
 <style scoped lang="less">
+  .falls-box {
+    margin-top: 20px;
+    padding: 20px 16px;
+    background: #fff;
+    border-radius: 6px;
+    box-shadow: 0 3px 10px #4062e133;
+  }
+
   .falls {
     width: 100%;
     height: 406px;
     margin-top: 2%;
-    background: #fff;
-    border-radius: 6px;
-    box-shadow: 0 3px 10px 0 rgb(64 98 225 / 20%);
   }
 
   #flow {
diff --git a/packages/toolkits/pro/template/tinyvue/src/views/board/home/components/region.vue b/packages/toolkits/pro/template/tinyvue/src/views/board/home/components/region.vue
index ac6b384b..5caeadb5 100644
--- a/packages/toolkits/pro/template/tinyvue/src/views/board/home/components/region.vue
+++ b/packages/toolkits/pro/template/tinyvue/src/views/board/home/components/region.vue
@@ -1,14 +1,16 @@
 <template>
-  <div class="region">
-    <div>
-      <div class="region-title">
-        <img src="@/assets/images/map-background3.png" class="image" />
-        <h3>{{ $t('home.region.title') }}</h3>
+  <div class="region-box">
+    <div class="region">
+      <div>
+        <div class="region-title">
+          <img src="@/assets/images/map-background3.png" class="image" />
+          <h3>{{ $t('home.region.title') }}</h3>
+        </div>
+        <div id="earth" ref="echartsDom"></div>
+      </div>
+      <div class="region-from">
+        <RegionTable></RegionTable>
       </div>
-      <div id="earth" ref="echartsDom"></div>
-    </div>
-    <div class="region-from">
-      <RegionTable></RegionTable>
     </div>
   </div>
 </template>
@@ -115,19 +117,23 @@
       myChart.resize();
     });
     nextTick(() => {
-      myChart.resize()
+      myChart.resize();
     });
   });
 </script>
 
 <style scoped lang="less">
+  .region-box {
+    margin-top: 20px;
+    padding: 20px 16px;
+    background: #fff;
+    border-radius: 6px;
+    box-shadow: 0 3px 10px #4062e133;
+  }
+
   .region {
     display: flex;
     justify-content: space-between;
-    margin-top: 2%;
-    background: #fff;
-    border-radius: 6px;
-    box-shadow: 0 3px 10px 0 rgb(64 98 225 / 20%);
 
     .region-title {
       display: flex;
diff --git a/packages/toolkits/pro/template/tinyvue/src/views/board/home/components/round.vue b/packages/toolkits/pro/template/tinyvue/src/views/board/home/components/round.vue
index 6d5935df..093af81b 100644
--- a/packages/toolkits/pro/template/tinyvue/src/views/board/home/components/round.vue
+++ b/packages/toolkits/pro/template/tinyvue/src/views/board/home/components/round.vue
@@ -1,12 +1,14 @@
 <template>
-  <div class="round">
-    <div>
-      <img src="@/assets/images/map-background3.png" class="image" />
-      <h3>{{ $t('home.round.title') }}</h3>
-      <div id="circled" ref="echartsDom"></div>
-    </div>
-    <div class="round-from">
-      <RoundTable></RoundTable>
+  <div class="round-box">
+    <div class="round">
+      <div>
+        <img src="@/assets/images/map-background3.png" class="image" />
+        <h3>{{ $t('home.round.title') }}</h3>
+        <div id="circled" ref="echartsDom"></div>
+      </div>
+      <div class="round-from">
+        <RoundTable></RoundTable>
+      </div>
     </div>
   </div>
 </template>
@@ -75,7 +77,7 @@
       myChart.resize();
     });
     nextTick(() => {
-      myChart.resize()
+      myChart.resize();
     });
   });
 
@@ -87,13 +89,18 @@
 </script>
 
 <style scoped lang="less">
+  .round-box {
+    margin-top: 20px;
+    padding: 20px 16px;
+    background: #fff;
+    border-radius: 6px;
+    box-shadow: 0 3px 10px #4062e133;
+  }
+
   .round {
     display: flex;
     justify-content: space-between;
-    margin-top: 2%;
-    background: #fff;
     border-radius: 6px;
-    box-shadow: 0 3px 10px 0 rgb(64 98 225 / 20%);
   }
 
   #circled {
diff --git a/packages/toolkits/pro/template/tinyvue/src/views/board/home/index.vue b/packages/toolkits/pro/template/tinyvue/src/views/board/home/index.vue
index 33e8e262..74391f81 100644
--- a/packages/toolkits/pro/template/tinyvue/src/views/board/home/index.vue
+++ b/packages/toolkits/pro/template/tinyvue/src/views/board/home/index.vue
@@ -21,8 +21,8 @@
 
 <style scoped lang="less">
   .container {
-    width: 98%;
-    height: inherit;
+    width: 100%;
+    height: calc(100% - 60px);
     margin: 0 auto;
     overflow-x: hidden;
     overflow-y: auto;
@@ -33,7 +33,7 @@
   // responsive
   @media (max-width: @screen-xs) {
     .container {
-      overflow-x: auto;
+      overflow-x: hidden;
     }
   }
 </style>
diff --git a/packages/toolkits/pro/template/tinyvue/src/views/menu/info/components/info-tab.vue b/packages/toolkits/pro/template/tinyvue/src/views/menu/info/components/info-tab.vue
index 2ceb03c5..1dd2b04f 100644
--- a/packages/toolkits/pro/template/tinyvue/src/views/menu/info/components/info-tab.vue
+++ b/packages/toolkits/pro/template/tinyvue/src/views/menu/info/components/info-tab.vue
@@ -12,9 +12,9 @@
       <div class="table">
         <tiny-tree
           :data="i18MenuDatas"
-          :size="medium"
+          size="'medium'"
           :indent="18"
-          :show-line="showLine === 'show'"
+          show-line
           default-expand-all
         >
           <template #operation="{ node }">
@@ -224,7 +224,7 @@
                     <tiny-option
                       v-for="icon in state.iconData"
                       :key="icon.value"
-                      :label="$t(icon.label)"
+                      :label="icon.label"
                       :value="icon.value"
                     ></tiny-option>
                   </tiny-select>
@@ -258,13 +258,10 @@
                     :placeholder="$t('baseForm.form.label.placeholder')"
                     filterable
                     no-match-text="No Match"
+                    :options="state.localeData"
+                    is-drop-inherit-width
+                    optimization
                   >
-                    <tiny-option
-                      v-for="locale in state.localeData"
-                      :key="locale.key"
-                      :label="$t(locale.content)"
-                      :value="locale.key"
-                    ></tiny-option>
                   </tiny-select>
                 </tiny-form-item>
               </tiny-col>
@@ -360,7 +357,7 @@
                     <tiny-option
                       v-for="icon in state.iconData"
                       :key="icon.value"
-                      :label="$t(icon.label)"
+                      :label="icon.label"
                       :value="icon.value"
                     ></tiny-option>
                   </tiny-select>
@@ -397,13 +394,15 @@
                     :placeholder="$t('baseForm.form.label.placeholder')"
                     filterable
                     no-match-text="No Match"
+                    :options="state.localeData"
+                    optimization
                   >
-                    <tiny-option
+                    <!-- <tiny-option
                       v-for="locale in state.localeData"
                       :key="locale.key"
                       :label="$t(locale.content)"
                       :value="locale.key"
-                    ></tiny-option>
+                    ></tiny-option> -->
                   </tiny-select>
                 </tiny-form-item>
               </tiny-col>
@@ -440,7 +439,6 @@
     Option as TinyOption,
     Tree as TinyTree,
   } from '@opentiny/vue';
-  import { IconChevronDown } from '@opentiny/vue-icon';
   import { useUserStore } from '@/store';
   import {
     getAllMenu,
@@ -449,21 +447,12 @@
     deleteMenu,
     ITreeNodeData,
   } from '@/api/menu';
-  import { getAllPermission } from '@/api/permission';
-  import { useRouter } from 'vue-router';
-  import { getSimpleDate } from '@/utils/time';
-  import { updateUserInfo } from '@/api/user';
   import { useI18nMenu } from '@/hooks/useI18nMenu';
   import { getAllLocalItems } from '@/api/local';
   import useLoading from '@/hooks/loading';
   import * as icons from '@opentiny/vue-icon';
 
-  const router = useRouter();
-
   const { t } = useI18n();
-
-  const treeRef = ref();
-
   // 加载效果
   const state = reactive<{
     tableData: any;
@@ -562,7 +551,12 @@
 
   async function fetchLocaleData() {
     getAllLocalItems(1, 0, 1).then(({ data }) => {
-      state.localeData = data.items;
+      state.localeData = data.items.map((item) => {
+        return {
+          value: item.key,
+          label: t(item.key),
+        };
+      });
     });
   }
 
diff --git a/packages/toolkits/pro/template/tinyvue/src/views/user/info/components/info-tab.vue b/packages/toolkits/pro/template/tinyvue/src/views/user/info/components/info-tab.vue
index 9f67478c..40c6d8b5 100644
--- a/packages/toolkits/pro/template/tinyvue/src/views/user/info/components/info-tab.vue
+++ b/packages/toolkits/pro/template/tinyvue/src/views/user/info/components/info-tab.vue
@@ -130,7 +130,7 @@
   #contain {
     height: 100%;
     padding: 15px;
-    overflow: hidden;
+    overflow: auto;
   }
 
   .contentFilter {
diff --git a/packages/toolkits/pro/template/tinyvue/src/views/user/info/index.vue b/packages/toolkits/pro/template/tinyvue/src/views/user/info/index.vue
index c4153ec7..6fe846b3 100644
--- a/packages/toolkits/pro/template/tinyvue/src/views/user/info/index.vue
+++ b/packages/toolkits/pro/template/tinyvue/src/views/user/info/index.vue
@@ -24,6 +24,7 @@
     width: 100%;
     height: 100%;
   }
+
   .container-info {
     display: flex;
     flex-direction: column;
@@ -35,8 +36,8 @@
     .general-card {
       flex: 1 1 auto;
       height: 100%;
-      overflow-x: hidden;
-      overflow-y: auto;
+      // overflow-x: hidden;
+      // overflow-y: auto;
       border-radius: 10px;
 
       .general-top {
@@ -51,14 +52,13 @@
       }
 
       .general-content {
-        height: calc(100% - 198px);
         position: relative;
+        height: calc(100% - 198px);
         color: black;
         font-size: medium;
         background-color: #fff;
         border-radius: 10px;
         box-shadow: 0 0 8px 8px rgba(169, 174, 184, 0.05);
-        overflow-y: auto;
       }
     }
   }