From 9485aabf31ddc669e185bc6729b3300daf307c7c Mon Sep 17 00:00:00 2001
From: FairyEver <1711467488@qq.com>
Date: Mon, 31 Aug 2020 22:13:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20:sparkles:=20=E8=BF=81=E7=A7=BB?=
 =?UTF-8?q?=E5=B5=8C=E5=A5=97=E9=A1=B5=E9=9D=A2=E6=BC=94=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/menu/index.js                             |  6 +-----
 src/menu/modules/demo-frame.js                | 11 ----------
 src/menu/modules/demo-playground.js           | 10 +++++++++
 src/router/modules/frame.js                   | 20 ------------------
 src/router/modules/playground.js              |  5 ++++-
 src/router/routes.js                          |  2 --
 src/views/demo/frame/index/index.vue          | 21 -------------------
 .../{ => playground}/frame/d2-doc/index.vue   |  0
 .../{ => playground}/frame/html/index.vue     |  0
 .../{ => playground}/frame/report/index.vue   |  0
 10 files changed, 15 insertions(+), 60 deletions(-)
 delete mode 100644 src/menu/modules/demo-frame.js
 delete mode 100644 src/router/modules/frame.js
 delete mode 100644 src/views/demo/frame/index/index.vue
 rename src/views/demo/{ => playground}/frame/d2-doc/index.vue (100%)
 rename src/views/demo/{ => playground}/frame/html/index.vue (100%)
 rename src/views/demo/{ => playground}/frame/report/index.vue (100%)

diff --git a/src/menu/index.js b/src/menu/index.js
index 6a54c2c2..a91adcd6 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -14,8 +14,6 @@ import demoBusiness from './modules/demo-business'
 import demoD2Crud from './modules/demo-d2-crud'
 // CRUD PLUS
 import demoD2CrudPlus from './modules/demo-d2-crud-plus'
-// 第三方网页
-import demoFrame from './modules/demo-frame'
 
 /**
  * @description 给菜单数据补充上 path 字段
@@ -40,8 +38,7 @@ export const menuAside = supplementPath([
   demoPlayground,
   demoBusiness,
   demoD2Crud,
-  demoD2CrudPlus,
-  demoFrame
+  demoD2CrudPlus
 ])
 
 // 菜单 顶栏
@@ -60,7 +57,6 @@ export const menuHeader = supplementPath([
       demoComponents,
       demoCharts,
       demoPlugins,
-      demoFrame,
       {
         title: '新窗口打开链接',
         icon: 'link',
diff --git a/src/menu/modules/demo-frame.js b/src/menu/modules/demo-frame.js
deleted file mode 100644
index 30995db3..00000000
--- a/src/menu/modules/demo-frame.js
+++ /dev/null
@@ -1,11 +0,0 @@
-export default {
-  path: '/demo/frame',
-  title: '内嵌网页',
-  icon: 'globe',
-  children: (pre => [
-    { path: `${pre}index`, title: 'Frame ', icon: 'home' },
-    { path: `${pre}d2-doc`, title: 'D2Admin 中文文档', iconSvg: 'd2-admin' },
-    { path: `${pre}html`, title: '静态 HTML', icon: 'code' },
-    { path: `${pre}report`, title: '构建分析', icon: 'pie-chart' }
-  ])('/demo/frame/')
-}
diff --git a/src/menu/modules/demo-playground.js b/src/menu/modules/demo-playground.js
index 4200500f..2eab988b 100644
--- a/src/menu/modules/demo-playground.js
+++ b/src/menu/modules/demo-playground.js
@@ -37,6 +37,16 @@ export default {
         { title: '正在开发 3' }
       ]
     },
+    {
+      path: `${pre}frame`,
+      title: '内嵌网页',
+      icon: 'globe',
+      children: [
+        { path: `${pre}frame/d2-doc`, title: 'D2Admin 中文文档', iconSvg: 'd2-admin' },
+        { path: `${pre}frame/html`, title: '静态 HTML', icon: 'code' },
+        { path: `${pre}frame/report`, title: '构建分析', icon: 'pie-chart' }
+      ]
+    },
     {
       path: `${pre}store`,
       title: '全局状态管理',
diff --git a/src/router/modules/frame.js b/src/router/modules/frame.js
deleted file mode 100644
index 973dc050..00000000
--- a/src/router/modules/frame.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import layoutHeaderAside from '@/layout/header-aside'
-
-// 由于懒加载页面太多的话会造成webpack热更新太慢，所以开发环境不使用懒加载，只有生产环境使用懒加载
-const _import = require('@/libs/util.import.' + process.env.NODE_ENV)
-
-const meta = { auth: true }
-
-export default {
-  path: '/demo/frame',
-  name: 'demo-frame',
-  meta,
-  redirect: { name: 'demo-frame-index' },
-  component: layoutHeaderAside,
-  children: (pre => [
-    { path: 'index', name: `${pre}index`, component: _import('demo/frame/index'), meta: { ...meta, title: 'Frame 首页' } },
-    { path: 'html', name: `${pre}html`, component: _import('demo/frame/html'), meta: { ...meta, title: '静态 HTML' } },
-    { path: 'report', name: `${pre}report`, component: _import('demo/frame/report'), meta: { ...meta, title: 'Size report' } },
-    { path: 'd2-doc', name: `${pre}d2-doc`, component: _import('demo/frame/d2-doc'), meta: { ...meta, title: 'D2Admin 中文文档' } }
-  ])('demo-frame-')
-}
diff --git a/src/router/modules/playground.js b/src/router/modules/playground.js
index c6451f04..a299caf2 100644
--- a/src/router/modules/playground.js
+++ b/src/router/modules/playground.js
@@ -39,6 +39,9 @@ export default {
     { path: 'log/log', name: `${pre}log-log`, component: _import('demo/playground/log/log'), meta: { ...meta, title: '日志记录' } },
     { path: 'add-routes/routes', name: `${pre}add-routes-routes`, component: _import('demo/playground/add-routes/routes'), meta: { ...meta, title: '添加页面' } },
     { path: 'env', name: `${pre}env`, component: _import('demo/playground/env'), meta: { ...meta, title: '环境信息' } },
-    { path: 'locales', name: `${pre}locales`, component: _import('demo/playground/locales'), meta: { ...meta, title: '国际化' } }
+    { path: 'locales', name: `${pre}locales`, component: _import('demo/playground/locales'), meta: { ...meta, title: '国际化' } },
+    { path: 'frame/html', name: `${pre}frame-html`, component: _import('demo/playground/frame/html'), meta: { ...meta, title: '静态 HTML' } },
+    { path: 'frame/report', name: `${pre}frame-report`, component: _import('demo/playground/frame/report'), meta: { ...meta, title: 'Size report' } },
+    { path: 'frame/d2-doc', name: `${pre}frame-d2-doc`, component: _import('demo/playground/frame/d2-doc'), meta: { ...meta, title: 'D2Admin 中文文档' } }
   ])('demo-playground-')
 }
diff --git a/src/router/routes.js b/src/router/routes.js
index f1cbd87f..c6fed061 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -1,5 +1,4 @@
 import playground from './modules/playground'
-import frame from './modules/frame'
 import d2Crud from './modules/d2-crud'
 import d2CrudPlus from './modules/d2-crud-plus'
 import plugins from './modules/plugins'
@@ -58,7 +57,6 @@ const frameIn = [
     ]
   },
   playground,
-  frame,
   d2Crud,
   d2CrudPlus,
   plugins,
diff --git a/src/views/demo/frame/index/index.vue b/src/views/demo/frame/index/index.vue
deleted file mode 100644
index 2d2c4ef4..00000000
--- a/src/views/demo/frame/index/index.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-<template>
-  <d2-container type="ghost">
-    <d2-module-index-banner slot="header" v-bind="banner"/>
-    <d2-module-index-menu :menu="menu"/>
-  </d2-container>
-</template>
-
-<script>
-import menu from '@/menu/modules/demo-frame'
-export default {
-  data () {
-    return {
-      menu,
-      banner: {
-        title: 'FRAME',
-        subTitle: '在 D2Admin 中嵌入其它页面'
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/demo/frame/d2-doc/index.vue b/src/views/demo/playground/frame/d2-doc/index.vue
similarity index 100%
rename from src/views/demo/frame/d2-doc/index.vue
rename to src/views/demo/playground/frame/d2-doc/index.vue
diff --git a/src/views/demo/frame/html/index.vue b/src/views/demo/playground/frame/html/index.vue
similarity index 100%
rename from src/views/demo/frame/html/index.vue
rename to src/views/demo/playground/frame/html/index.vue
diff --git a/src/views/demo/frame/report/index.vue b/src/views/demo/playground/frame/report/index.vue
similarity index 100%
rename from src/views/demo/frame/report/index.vue
rename to src/views/demo/playground/frame/report/index.vue