From 19906d8ec0fd63ffd5ab386e81da2976c477df4f Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 29 Aug 2018 20:02:34 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=9F=BA=E7=A1=80=20frame=20=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: f87bcbcd649d8ccb32315a616373da5d3c06c951 [formerly f87bcbcd649d8ccb32315a616373da5d3c06c951 [formerly f87bcbcd649d8ccb32315a616373da5d3c06c951 [formerly f87bcbcd649d8ccb32315a616373da5d3c06c951 [formerly f154a2ad488744fafe95ae76e35ac95630f75b75 [formerly 6f524e41dacef0b063ea0fce43a905c562bc0391]]]]]
Former-commit-id: 4abfc995797ecb981d73f3e4bf0852b1967e8276
Former-commit-id: eac9f2e9aaba8b2655f39407781e200d81c39ee9
Former-commit-id: fe393da3d9eaf174d6abae109114ebd8aadb4266 [formerly f43cdcd4e947a8cfb1a94f0f7d824b9644b02bc3]
Former-commit-id: 8a71ea98b43c42fa0ba3805f1ebd464ebe8e83ae
Former-commit-id: 2b6f970add4b5456b7bc40fcae7ae44e66b49347
Former-commit-id: debe62818c1f6dac78c1aaef67518d994395fd6c
Former-commit-id: d0050073d042ca073b8cd4f5f5a7972fbfc46e15
Former-commit-id: ce0fcfba77b7714db0ff25a229ae6f0d3559e050
---
 src/components/d2-container-frame/index.vue | 31 +++++++++++++++++++++
 src/components/index.js                     |  2 ++
 src/menu/index.js                           |  8 ++++--
 src/menu/modules/demo-frame.js              |  8 ++++++
 src/pages/demo/frame/d2-doc/index.vue       |  3 ++
 src/router/routes.js.REMOVED.git-id         |  2 +-
 6 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 src/components/d2-container-frame/index.vue
 create mode 100644 src/menu/modules/demo-frame.js
 create mode 100644 src/pages/demo/frame/d2-doc/index.vue

diff --git a/src/components/d2-container-frame/index.vue b/src/components/d2-container-frame/index.vue
new file mode 100644
index 00000000..3a2afddc
--- /dev/null
+++ b/src/components/d2-container-frame/index.vue
@@ -0,0 +1,31 @@
+<template>
+  <d2-container>
+    <iframe
+      class="d2-container-frame"
+      :src="src"
+      frameborder="0"/>
+  </d2-container>
+</template>
+
+<script>
+export default {
+  name: 'd2-container-frame',
+  props: {
+    src: {
+      type: String,
+      required: false,
+      default: 'http://app.d3collection.cn/d2-admin-doc/lastest/zh/'
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.d2-container-frame {
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  height: 100%;
+  width: 100%;
+}
+</style>
diff --git a/src/components/index.js b/src/components/index.js
index a91fbf51..271269c2 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -1,10 +1,12 @@
 import Vue from 'vue'
 
 import d2Container from './d2-container'
+import d2ContainerFrame from './d2-container-frame'
 import d2LinkBtn from './d2-link-btn'
 
 // 注意 有些组件使用异步加载会有影响
 Vue.component('d2-container', d2Container)
+Vue.component('d2-container-frame', d2ContainerFrame)
 Vue.component('d2-link-btn', d2LinkBtn)
 Vue.component('d2-page-cover', () => import('./d2-page-cover'))
 Vue.component('d2-count-up', () => import('./d2-count-up'))
diff --git a/src/menu/index.js b/src/menu/index.js
index 2a618ff8..70ab300d 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -10,8 +10,10 @@ import demoElement from './modules/demo-element'
 import demoPlayground from './modules/demo-playground'
 // 示例
 import demoBusiness from './modules/demo-business'
-// 示例
+// CRUD
 import demoD2Crud from './modules/demo-d2-crud'
+// 第三方网页
+import demoFrame from './modules/demo-frame'
 
 // 菜单 侧边栏
 export const menuAside = [
@@ -21,7 +23,8 @@ export const menuAside = [
   demoElement,
   demoPlayground,
   demoBusiness,
-  demoD2Crud
+  demoD2Crud,
+  demoFrame
 ]
 
 // 菜单 顶栏
@@ -40,6 +43,7 @@ export const menuHeader = [
       demoElement,
       demoCharts,
       demoPlugins,
+      demoFrame,
       {
         title: '跳转外部链接',
         icon: 'link',
diff --git a/src/menu/modules/demo-frame.js b/src/menu/modules/demo-frame.js
new file mode 100644
index 00000000..6a259d91
--- /dev/null
+++ b/src/menu/modules/demo-frame.js
@@ -0,0 +1,8 @@
+export default {
+  path: '/demo/frame',
+  title: '第三方网页',
+  icon: 'globe',
+  children: (pre => [
+    { path: `${pre}d2-doc`, title: 'D2Admin 中文文档', iconSvg: 'd2-admin' }
+  ])('/demo/frame/')
+}
diff --git a/src/pages/demo/frame/d2-doc/index.vue b/src/pages/demo/frame/d2-doc/index.vue
new file mode 100644
index 00000000..e817dfc0
--- /dev/null
+++ b/src/pages/demo/frame/d2-doc/index.vue
@@ -0,0 +1,3 @@
+<template>
+  <d2-container-frame src="http://app.d3collection.cn/d2-admin-doc/lastest/zh/"/>
+</template>
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index 30c09824..fe33d25b 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-f5ad92d6dec7e541030e26da35a3cb2dd5cb620f
\ No newline at end of file
+0008f6d41147f385826214dfa9342f1262b056b6
\ No newline at end of file

From 079e6182a1b27c41a1eced6bf85a61392bea8ce6 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 29 Aug 2018 20:04:22 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: f4140e1b1c3a6f594319bdaac1d23a6f0a97ec8e [formerly f4140e1b1c3a6f594319bdaac1d23a6f0a97ec8e [formerly f4140e1b1c3a6f594319bdaac1d23a6f0a97ec8e [formerly f4140e1b1c3a6f594319bdaac1d23a6f0a97ec8e [formerly b6c70bc72f80c2d4fbc5cebe46d648adb6243ae0 [formerly 08c897c92106d2fc33509b8b5d60706473350b34]]]]]
Former-commit-id: d0f06ef949fa13334cd8d5b811399ec4455ecdc6
Former-commit-id: 84416ab301334e42dee9983f5d44a05f7f1645df
Former-commit-id: 9a13fcdeb71d4c817eaccbeabbd4c87be33cc8b6 [formerly ffefa6e69065fa29849f31d0140c92cce81f761e]
Former-commit-id: 05d7617d4228c3bc318d3cdd1e3ddd70915b42e2
Former-commit-id: 1ec1a91857e334f1784d5ae99fb995c6932241a5
Former-commit-id: ca7fcedcd4608a13513e8559feb9c75f6c2e7beb
Former-commit-id: a57caec40e9f9993fea19ba5cc876fcb024d3dee
Former-commit-id: d6fee5b1675623cebddf9316f6c56b3e0db64d0d
---
 src/router/routes.js.REMOVED.git-id | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index fe33d25b..9769bbca 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-0008f6d41147f385826214dfa9342f1262b056b6
\ No newline at end of file
+49fda24126560af976b40d0e8a29042af7df7d34
\ No newline at end of file

From d1ee5ff7e7beb597e0d533771364eac46c771d1a Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 29 Aug 2018 20:14:14 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 10dbef81192848923018d0c46e1ab5dbc2cd8b46 [formerly ce8c46678bae6579f6ac764db3f86ed289248c29] [formerly 10dbef81192848923018d0c46e1ab5dbc2cd8b46 [formerly ce8c46678bae6579f6ac764db3f86ed289248c29] [formerly 10dbef81192848923018d0c46e1ab5dbc2cd8b46 [formerly ce8c46678bae6579f6ac764db3f86ed289248c29] [formerly ce8c46678bae6579f6ac764db3f86ed289248c29 [formerly a10b32da5f74d94da06e7cd71aa33556fda9df08 [formerly 65fd96febf0ec82e2d0a3c6f368b3882101873b6]]]]]
Former-commit-id: 1f3376cc20eef14a3ff26ef02a705bfaa1ba6925
Former-commit-id: d1b32ce89532ee2d9cb255530f0d8b742850db5a
Former-commit-id: 73ac21e8558f745a45c0bb7e0ff0f77677c33204 [formerly 2788e7332be8d0a82c8ec2596cb4bef23c700a5d]
Former-commit-id: cc5fc094f83b1855196b4b79b272cc9ce2acf34c
Former-commit-id: ce441a2fbab9e49ccfd7e31bcf59bcd1cdb8b0f3
Former-commit-id: 0bc054ec930323bf32136a9e38fc613f69e82039
Former-commit-id: 1275c34599eba7bdf15b3a037f732b33e7c87c51
Former-commit-id: 34ab4975c03606cde596b5f7da3833861a1b6dbf
---
 src/menu/modules/demo-frame.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/menu/modules/demo-frame.js b/src/menu/modules/demo-frame.js
index 6a259d91..c00234bb 100644
--- a/src/menu/modules/demo-frame.js
+++ b/src/menu/modules/demo-frame.js
@@ -1,6 +1,6 @@
 export default {
   path: '/demo/frame',
-  title: '第三方网页',
+  title: '内嵌网页',
   icon: 'globe',
   children: (pre => [
     { path: `${pre}d2-doc`, title: 'D2Admin 中文文档', iconSvg: 'd2-admin' }

From 2e8acdfe66e34f5eb9fe61245f521a1c13aed37c Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 30 Aug 2018 08:53:57 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 5d8dc4b322a99bcc064f203ba8744b59f0cba78b [formerly 5d8dc4b322a99bcc064f203ba8744b59f0cba78b [formerly 5d8dc4b322a99bcc064f203ba8744b59f0cba78b [formerly 5d8dc4b322a99bcc064f203ba8744b59f0cba78b [formerly 7fa74709d04a6653608bc570aeafce6f6d67ace6 [formerly 992165f41ead447e33dc4243846aec0d1eeb601d]]]]]
Former-commit-id: c2ad27bddbf106d63aa07c8f8f1412714eb9b26a
Former-commit-id: ff7713b49ade05a33d4f8ebe2f214f59ad0b2312
Former-commit-id: 2b849cd7f40f63f0a5032c6d86bba14bf9ae5fa4 [formerly dd33a3f2d5a23bae49fa67cef9afdf3b09213862]
Former-commit-id: ea8a4cc602f3c5fd567f5f029163c5f5090eefea
Former-commit-id: 8fdd4c1f5ee83c64fb85c3bc9aad628ef20f96c8
Former-commit-id: bab8938bb32647a6ddeec6c63e6294eb21a35f62
Former-commit-id: d30917b708c01bd818f82adfabadb1c3a3fa27e0
Former-commit-id: b883593d479b9f3de338765a8d86516f1b6f3270
---
 src/menu/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/menu/index.js b/src/menu/index.js
index 70ab300d..3c3a7684 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -45,7 +45,7 @@ export const menuHeader = [
       demoPlugins,
       demoFrame,
       {
-        title: '跳转外部链接',
+        title: '新窗口打开链接',
         icon: 'link',
         children: [
           { path: 'https://github.com/d2-projects/d2-admin', title: 'D2Admin Github', icon: 'github' },