完善

Former-commit-id: 5d75986f02de2f4515121e9f797b835dba132732 [formerly 5d75986f02de2f4515121e9f797b835dba132732 [formerly 5d75986f02de2f4515121e9f797b835dba132732 [formerly 5d75986f02de2f4515121e9f797b835dba132732 [formerly 8c4098bcffd50089b041edcf9d539c64c3c92b16 [formerly 1bf5ee08c5424c0a4cedac421d52cf8c8393ae7f]]]]]
Former-commit-id: 3aa6fad9f9c31f62376dfb27f62fa937d0735e55
Former-commit-id: d293c0b275dc8c4d439fa04a45d9d4efa1dd8f4c
Former-commit-id: a737d8ff3f0c9d829e66a1cd305257961c551eda [formerly 4d2360f8b865bfab066291680106dc95df97ce2a]
Former-commit-id: b64f59d9203d16e71bcd21065aba7ead88566938
Former-commit-id: 4350c691cdff708266be623edf8f1b9d61faeb02
Former-commit-id: 1dba1637790b1f2c87733adfdfcc8491a97bfd1d
Former-commit-id: e17d989004ecb5fb7ce620103b997998da42b8d9
Former-commit-id: 3b781b9b28f6ed584b9c6dbfa5fafe3f8c1475b5

src/assets/style/theme/theme-base.scss

@@ -1,5 +1,5 @@
 // 整体框架结构
-.d2-layout-main-group {
+.d2-layout-header-aside-group {
   height: 100%;
   width: 100%;
   background-size: cover;
@@ -7,11 +7,11 @@
   overflow: hidden;
   position: relative;
   // 背景上面的半透明遮罩
-  .d2-layout-main-mask {
+  .d2-layout-header-aside-mask {
     @extend %full;
   }
   // 内容层
-  .d2-layout-main-content {
+  .d2-layout-header-aside-content {
     @extend %full;
     $d2-theme-header-height: 60px;
     .d2-theme-header {
@@ -33,7 +33,7 @@
         transition: width .3s;
         flex-grow: 0;
         position: relative;
-        .d2-layout-main-menu-side {
+        .d2-layout-header-aside-menu-side {
           @extend %full;
           overflow: hidden;
         }
@@ -66,7 +66,7 @@
 
 
 // 主题公用
-.d2-layout-main-group {
+.d2-layout-header-aside-group {
   &.grayMode {
     -webkit-filter: grayscale(100%);
     -moz-filter: grayscale(100%);
@@ -76,7 +76,7 @@
     filter: gray;
   }
   // 主体
-  .d2-layout-main-content {
+  .d2-layout-header-aside-content {
     // [布局] 顶栏
     .d2-theme-header {
       // logo区域
@@ -174,7 +174,7 @@
           }
         }
         // 菜单为空的时候显示的信息
-        .d2-layout-main-menu-empty {
+        .d2-layout-header-aside-menu-empty {
           height: 160px;
           margin: 10px;
           margin-top: 0px;

src/assets/style/theme/theme.scss

@@ -2,9 +2,9 @@
 .theme-#{$theme-name} {
 
   // 背景图片和遮罩
-  .d2-layout-main-group {
+  .d2-layout-header-aside-group {
     background-color: $theme-bg-color;
-    .d2-layout-main-mask {
+    .d2-layout-header-aside-mask {
       background: $theme-bg-mask;
     }
   }
@@ -127,7 +127,7 @@
     // 侧边栏
     .d2-theme-container-aside {
       // 菜单为空的时候显示的信息
-      .d2-layout-main-menu-empty {
+      .d2-layout-header-aside-menu-empty {
         background: $theme-aside-menu-empty-background-color;
         i {
           color: $theme-aside-menu-empty-icon-color;

src/assets/style/theme/violet/index.scss

@@ -2,7 +2,7 @@
 @import '../theme.scss';
 
 .theme-#{$theme-name} {
-  .d2-layout-main-group {
+  .d2-layout-header-aside-group {
     background: #bc00e3;
     background: linear-gradient(120deg, #bc00e3 0%, #4EFFFB 100%);
   }

src/components/core/d2-layout-main/components/-menu-header/index.vue

@@ -1,32 +0,0 @@
-<template>
-  <el-menu mode="horizontal" @select="handleMenuSelect">
-    <template v-for="(menu, menuIndex) in menus">
-      <d2-layout-main-menu-item v-if="menu.children === undefined" :menu="menu" :key="menuIndex"/>
-      <d2-layout-main-menu-sub v-else :menu="menu" :key="menuIndex"/>
-    </template>
-  </el-menu>
-</template>
-
-<script>
-import menus from '@/menu/index.js'
-import menuMixin from '../mixin/menu'
-// 组件
-import d2LayoutMainMenuItem from '../-menu-item/index.vue'
-import d2LayoutMainMenuSub from '../-menu-sub/index.vue'
-
-export default {
-  name: 'd2-layout-main-menu-header',
-  mixins: [
-    menuMixin
-  ],
-  components: {
-    'd2-layout-main-menu-item': d2LayoutMainMenuItem,
-    'd2-layout-main-menu-sub': d2LayoutMainMenuSub
-  },
-  data () {
-    return {
-      menus
-    }
-  }
-}
-</script>

src/components/core/index.js

@@ -4,14 +4,12 @@ import { GridLayout, GridItem } from 'vue-grid-layout'
 import SplitPane from 'vue-splitpane'
 
 import d2Container from '@/components/core/d2-container'
-import d2MultiplePageControl from '@/components/core/d2-multiple-page-control'
 
 Vue.component('d2-grid-layout', GridLayout)
 Vue.component('d2-grid-item', GridItem)
 Vue.component('SplitPane', SplitPane)
 
 Vue.component('d2-container', d2Container)
-Vue.component('d2-multiple-page-control', d2MultiplePageControl)
 Vue.component('d2-count-up', () => import('@/components/core/d2-count-up'))
 Vue.component('d2-highlight', () => import('@/components/core/d2-highlight'))
 Vue.component('d2-icon', () => import('@/components/core/d2-icon'))
@@ -20,4 +18,3 @@ Vue.component('d2-icon-svg', () => import('@/components/core/d2-icon-svg/index.v
 Vue.component('d2-markdown', () => import('@/components/core/d2-markdown'))
 Vue.component('d2-mde', () => import('@/components/core/d2-mde'))
 Vue.component('d2-quill', () => import('@/components/core/d2-quill'))
-Vue.component('d2-theme-list', () => import('@/components/core/d2-theme-list'))

src/layout/header-aside/components/components/menu-item/index.vue

@@ -8,7 +8,7 @@
 <script>
 import _uniqueid from 'lodash.uniqueid'
 export default {
-  name: 'd2-layout-main-menu-item',
+  name: 'd2-layout-header-aside-menu-item',
   props: {
     menu: {
       type: Object,

src/layout/header-aside/components/components/menu-sub/index.vue

@@ -5,8 +5,8 @@
       <span slot="title">{{menu.title}}</span>
     </template>
     <template v-for="(child, childIndex) in menu.children">
-      <d2-layout-main-menu-item v-if="child.children === undefined" :menu="child" :key="childIndex"/>
+      <d2-layout-header-aside-menu-item v-if="child.children === undefined" :menu="child" :key="childIndex"/>
-      <d2-layout-main-menu-sub v-else :menu="child" :key="childIndex"/>
+      <d2-layout-header-aside-menu-sub v-else :menu="child" :key="childIndex"/>
     </template>
   </el-submenu>
 </template>
@@ -14,12 +14,12 @@
 <script>
 import _uniqueid from 'lodash.uniqueid'
 // 组件
-import d2LayoutMainMenuItem from '../-menu-item/index.vue'
+import d2LayoutMainMenuItem from '../menu-item'
 
 export default {
-  name: 'd2-layout-main-menu-sub',
+  name: 'd2-layout-header-aside-menu-sub',
   components: {
-    'd2-layout-main-menu-item': d2LayoutMainMenuItem
+    'd2-layout-header-aside-menu-item': d2LayoutMainMenuItem
   },
   props: {
     menu: {

src/layout/header-aside/components/header-theme/index.vue

@@ -12,7 +12,11 @@
 </template>
 
 <script>
+import themeList from './components/d2-theme-list'
 export default {
+  components: {
+    'd2-theme-list': themeList
+  },
   data () {
     return {
       dialogVisible: false

src/layout/header-aside/components/menu-header/index.vue

@@ -0,0 +1,32 @@
+<template>
+  <el-menu mode="horizontal" @select="handleMenuSelect">
+    <template v-for="(menu, menuIndex) in menus">
+      <d2-layout-header-aside-menu-item v-if="menu.children === undefined" :menu="menu" :key="menuIndex"/>
+      <d2-layout-header-aside-menu-sub v-else :menu="menu" :key="menuIndex"/>
+    </template>
+  </el-menu>
+</template>
+
+<script>
+import menus from '@/menu/index.js'
+import menuMixin from '../mixin/menu'
+// 组件
+import d2LayoutMainMenuItem from '../components/menu-item/index.vue'
+import d2LayoutMainMenuSub from '../components/menu-sub/index.vue'
+
+export default {
+  name: 'd2-layout-header-aside-menu-header',
+  mixins: [
+    menuMixin
+  ],
+  components: {
+    'd2-layout-header-aside-menu-item': d2LayoutMainMenuItem,
+    'd2-layout-header-aside-menu-sub': d2LayoutMainMenuSub
+  },
+  data () {
+    return {
+      menus
+    }
+  }
+}
+</script>

src/layout/header-aside/components/menu-side/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="d2-layout-main-menu-side">
+  <div class="d2-layout-header-aside-menu-side">
     <el-menu
       :collapse="collapse"
       :unique-opened="true"
@@ -7,11 +7,11 @@
       ref="menu"
       @select="handleMenuSelect">
       <template v-for="(menu, menuIndex) in menus">
-        <d2-layout-main-menu-item v-if="menu.children === undefined" :menu="menu" :key="menuIndex"/>
+        <d2-layout-header-aside-menu-item v-if="menu.children === undefined" :menu="menu" :key="menuIndex"/>
-        <d2-layout-main-menu-sub v-else :menu="menu" :key="menuIndex"/>
+        <d2-layout-header-aside-menu-sub v-else :menu="menu" :key="menuIndex"/>
       </template>
     </el-menu>
-    <div v-if="menus.length === 0 && !collapse" class="d2-layout-main-menu-empty">
+    <div v-if="menus.length === 0 && !collapse" class="d2-layout-header-aside-menu-empty">
       <d2-icon name="hdd-o"/>
       <span>当前目录没有菜单</span>
     </div>
@@ -22,19 +22,19 @@
 import { side } from '@/menu/index.js'
 import menuMixin from '../mixin/menu'
 // 组件
-import d2LayoutMainMenuItem from '../-menu-item/index.vue'
+import d2LayoutMainMenuItem from '../components/menu-item/index.vue'
-import d2LayoutMainMenuSub from '../-menu-sub/index.vue'
+import d2LayoutMainMenuSub from '../components/menu-sub/index.vue'
 // 插件
 import BScroll from 'better-scroll'
 
 export default {
-  name: 'd2-layout-main-menu-side',
+  name: 'd2-layout-header-aside-menu-side',
   mixins: [
     menuMixin
   ],
   components: {
-    'd2-layout-main-menu-item': d2LayoutMainMenuItem,
+    'd2-layout-header-aside-menu-item': d2LayoutMainMenuItem,
-    'd2-layout-main-menu-sub': d2LayoutMainMenuSub
+    'd2-layout-header-aside-menu-sub': d2LayoutMainMenuSub
   },
   props: {
     collapse: {

src/layout/header-aside/index.js

@@ -0,0 +1,3 @@
+import layout from './layout'
+
+export default layout

src/layout/header-aside/layout.vue

@@ -1,12 +1,12 @@
 <template>
   <div
-    class="d2-layout-main-group"
+    class="d2-layout-header-aside-group"
     :style="styleLayoutMainGroup"
     :class="{grayMode: isGrayMode}">
     <!-- 半透明遮罩 -->
-    <div class="d2-layout-main-mask"></div>
+    <div class="d2-layout-header-aside-mask"></div>
     <!-- 主体内容 -->
-    <div class="d2-layout-main-content">
+    <div class="d2-layout-header-aside-content">
       <!-- 顶栏 -->
       <div class="d2-theme-header">
         <div class="logo-group" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
@@ -16,21 +16,21 @@
         <div class="toggle-aside-btn" @click="collapse = !collapse">
           <d2-icon name="bars"/>
         </div>
-        <d2-layout-main-menu-header/>
+        <d2-menu-header/>
         <!-- 顶栏右侧 -->
         <div class="d2-header-right">
-          <d2-layout-main-header-github/>
+          <d2-header-github/>
-          <d2-layout-main-header-help/>
+          <d2-header-help/>
-          <d2-layout-main-header-full-screen/>
+          <d2-header-fullscreen/>
-          <d2-layout-main-header-theme/>
+          <d2-header-theme/>
-          <d2-layout-main-header-user/>
+          <d2-header-user/>
         </div>
       </div>
       <!-- 下面 主体 -->
       <div class="d2-theme-container">
         <!-- 主体 侧边栏 -->
         <div ref="aside" class="d2-theme-container-aside" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
-          <d2-layout-main-menu-side :collapse="collapse"/>
+          <d2-menu-side :collapse="collapse"/>
         </div>
         <!-- 主体 -->
         <div class="d2-theme-container-main">
@@ -52,16 +52,27 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex'
+
+import menuSide from './components/menu-side'
+import menuHeader from './components/menu-header'
+import multiplePageControl from './components/multiple-page-control'
+import headerFullscreen from './components/header-fullscreen'
+import headerTheme from './components/header-theme'
+import headerUser from './components/header-user'
+import headerHelp from './components/header-help'
+import headerGithub from './components/header-github'
+
 export default {
-  name: 'd2-layout-main',
+  name: 'd2-layout-header-aside',
   components: {
-    'd2-layout-main-menu-side': () => import('./components/-menu-side'),
+    'd2-menu-side': menuSide,
-    'd2-layout-main-menu-header': () => import('./components/-menu-header'),
+    'd2-menu-header': menuHeader,
-    'd2-layout-main-header-full-screen': () => import('./components/-full-screen'),
+    'd2-multiple-page-control': multiplePageControl,
-    'd2-layout-main-header-theme': () => import('./components/-theme'),
+    'd2-header-fullscreen': headerFullscreen,
-    'd2-layout-main-header-user': () => import('./components/-user'),
+    'd2-header-theme': headerTheme,
-    'd2-layout-main-header-help': () => import('./components/-help'),
+    'd2-header-user': headerUser,
-    'd2-layout-main-header-github': () => import('./components/-github')
+    'd2-header-help': headerHelp,
+    'd2-header-github': headerGithub
   },
   data () {
     return {

src/libs/db.js

@@ -7,7 +7,6 @@ const db = low(adapter)
 db.defaults({
   themeActiveName: [],
   pageOpenedList: [],
-  updateNotify: [],
   username: []
 })
   .write()

src/libs/util.js

@@ -64,8 +64,7 @@ util.checkUpdate = function (vm) {
         util.logCapsule('D2Admin', `New version ${res.name}`)
         console.log(`${dayjs(res.created_at).format('YYYY年M月D日')}更新 版本号: ${res.tag_name} | 详情${res.html_url}`)
       }
-      vm.$store.commit('d2adminUpdateSet', update)
+      vm.$store.commit('d2adminUpdateSet', res)
-      vm.$store.commit('d2adminReleasesSet', res)
     })
     .catch(err => {
       console.log('checkUpdate error', err)

src/main.js

@@ -51,8 +51,6 @@ new Vue({
     util.showInfo()
     // DB -> store 加载用户名
     this.$store.commit('d2adminUsernameLoad')
-    // DB -> store 加载版本更新弹窗的设置
-    this.$store.commit('d2adminUpdateNotifyLoad')
     // DB -> store 加载主题
     this.$store.commit('d2adminThemeLoad')
     // DB -> store 数据库加载上次退出时的多页列表

src/pages/dashboard/index.js

@@ -0,0 +1,3 @@
+import page from './dashboard'
+
+export default page

src/pages/demo/charts/list/bar/demo1/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/bar/demo2/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/bar/demo3/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/bar/demo4/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/bar/demo5/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/candle/demo1/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/candle/demo2/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/candle/demo3/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/funnel/demo1/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/funnel/demo2/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/gauge/demo1/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/heatmap/demo1/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/heatmap/demo2/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/histogram/demo1/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/histogram/demo2/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/histogram/demo3/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/histogram/demo4/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/histogram/demo5/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/histogram/demo6/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/line/demo1/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/line/demo2/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/line/demo3/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/line/demo4/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/line/demo5/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/map/demo1/index.vue

@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/map/demo2/index.vue

@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/map/demo3/index.vue

@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/pie/demo1/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/pie/demo2/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/pie/demo3/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/pie/demo4/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/pie/demo5/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/pie/demo6/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/radar/demo1/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/ring/demo1/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/ring/demo2/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/ring/demo3/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/ring/demo4/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/ring/demo5/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/sankey/demo1/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/scatter/demo1/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/scatter/demo2/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/tree/demo1/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list

src/pages/demo/charts/list/waterfall/demo1/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import list from '@/views/demo/charts/list/_mixin/list.js'
+import list from '@/pages/demo/charts/list/_mixin/list.js'
 export default {
   mixins: [
     list