From 069a571195bad2e1ab9df49960df29b80efc2893 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 24 Jul 2018 15:54:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=8F=E5=B0=91=E5=B1=82=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 889b557de9234ebb4364ebb87f5bf8b0935294eb [formerly 889b557de9234ebb4364ebb87f5bf8b0935294eb [formerly 889b557de9234ebb4364ebb87f5bf8b0935294eb [formerly 889b557de9234ebb4364ebb87f5bf8b0935294eb [formerly 41b59da80ab4c5c0b9eceeec8fd2f527d22c4ab8 [formerly 3dc1bcda38f391962e102a990c2b68b7a33d4683]]]]] Former-commit-id: 3cd64e384a81021adeab4674894f3e4ba934924a Former-commit-id: 6c1d5c80613ac406276127f3b01566ace11becab Former-commit-id: fb1dae74ec5eea07c96632f6e8841b1bc42a614a [formerly 159c5ea89b386d484b2ef90733075633b156d87e] Former-commit-id: 5be175c876d576777072d4430a8520fc7b255112 Former-commit-id: ec65f0871fca703dbbc7a428ca9e4b582043c361 Former-commit-id: 80b73945bd350373ce7e3d15b8f0432c1427d8e3 Former-commit-id: cc2112baadf022e42428dd0019a764e266570b21 Former-commit-id: b7c059087a58e03c0d954af34b30f94b3e03b60c --- src/components/core/index.js | 20 -------------- .../components/d2-container-card-bs.vue | 0 .../components/d2-container-card.vue | 0 .../components/d2-container-full-bs.vue | 0 .../components/d2-container-full.vue | 0 .../components/d2-container-ghost-bs.vue | 0 .../components/d2-container-ghost.vue | 0 .../d2-container/components/mixins/bs.js | 0 .../{core => }/d2-container/index.vue | 0 .../{core => }/d2-count-up/index.vue | 0 .../{core => }/d2-highlight/index.vue | 0 .../libs/htmlFormat.js.REMOVED.git-id | 0 .../data/index.js.REMOVED.git-id | 0 .../{core => }/d2-icon-select/index.vue | 0 .../{core => }/d2-icon-svg/index.vue | 0 src/components/{core => }/d2-icon/index.vue | 0 .../{demo => }/d2-link-btn/index.vue | 0 .../{core => }/d2-markdown/index.vue | 0 .../{core => }/d2-markdown/plugin/baidupan.js | 0 src/components/{core => }/d2-mde/index.vue | 0 .../{demo => }/d2-page-cover/index.vue | 0 src/components/{core => }/d2-quill/index.vue | 0 src/components/demo/index.js | 6 ----- src/components/index.js | 27 ++++++++++++++++--- 24 files changed, 23 insertions(+), 30 deletions(-) delete mode 100644 src/components/core/index.js rename src/components/{core => }/d2-container/components/d2-container-card-bs.vue (100%) rename src/components/{core => }/d2-container/components/d2-container-card.vue (100%) rename src/components/{core => }/d2-container/components/d2-container-full-bs.vue (100%) rename src/components/{core => }/d2-container/components/d2-container-full.vue (100%) rename src/components/{core => }/d2-container/components/d2-container-ghost-bs.vue (100%) rename src/components/{core => }/d2-container/components/d2-container-ghost.vue (100%) rename src/components/{core => }/d2-container/components/mixins/bs.js (100%) rename src/components/{core => }/d2-container/index.vue (100%) rename src/components/{core => }/d2-count-up/index.vue (100%) rename src/components/{core => }/d2-highlight/index.vue (100%) rename src/components/{core => }/d2-highlight/libs/htmlFormat.js.REMOVED.git-id (100%) rename src/components/{core => }/d2-icon-select/data/index.js.REMOVED.git-id (100%) rename src/components/{core => }/d2-icon-select/index.vue (100%) rename src/components/{core => }/d2-icon-svg/index.vue (100%) rename src/components/{core => }/d2-icon/index.vue (100%) rename src/components/{demo => }/d2-link-btn/index.vue (100%) rename src/components/{core => }/d2-markdown/index.vue (100%) rename src/components/{core => }/d2-markdown/plugin/baidupan.js (100%) rename src/components/{core => }/d2-mde/index.vue (100%) rename src/components/{demo => }/d2-page-cover/index.vue (100%) rename src/components/{core => }/d2-quill/index.vue (100%) delete mode 100644 src/components/demo/index.js diff --git a/src/components/core/index.js b/src/components/core/index.js deleted file mode 100644 index 83445b9e..00000000 --- a/src/components/core/index.js +++ /dev/null @@ -1,20 +0,0 @@ -import Vue from 'vue' - -import { GridLayout, GridItem } from 'vue-grid-layout' -import SplitPane from 'vue-splitpane' - -import d2Container from '@/components/core/d2-container' - -Vue.component('d2-grid-layout', GridLayout) -Vue.component('d2-grid-item', GridItem) -Vue.component('SplitPane', SplitPane) - -Vue.component('d2-container', d2Container) -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')) -Vue.component('d2-icon-select', () => import('@/components/core/d2-icon-select/index.vue')) -Vue.component('d2-icon-svg', () => import('@/components/core/d2-icon-svg/index.vue')) -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')) diff --git a/src/components/core/d2-container/components/d2-container-card-bs.vue b/src/components/d2-container/components/d2-container-card-bs.vue similarity index 100% rename from src/components/core/d2-container/components/d2-container-card-bs.vue rename to src/components/d2-container/components/d2-container-card-bs.vue diff --git a/src/components/core/d2-container/components/d2-container-card.vue b/src/components/d2-container/components/d2-container-card.vue similarity index 100% rename from src/components/core/d2-container/components/d2-container-card.vue rename to src/components/d2-container/components/d2-container-card.vue diff --git a/src/components/core/d2-container/components/d2-container-full-bs.vue b/src/components/d2-container/components/d2-container-full-bs.vue similarity index 100% rename from src/components/core/d2-container/components/d2-container-full-bs.vue rename to src/components/d2-container/components/d2-container-full-bs.vue diff --git a/src/components/core/d2-container/components/d2-container-full.vue b/src/components/d2-container/components/d2-container-full.vue similarity index 100% rename from src/components/core/d2-container/components/d2-container-full.vue rename to src/components/d2-container/components/d2-container-full.vue diff --git a/src/components/core/d2-container/components/d2-container-ghost-bs.vue b/src/components/d2-container/components/d2-container-ghost-bs.vue similarity index 100% rename from src/components/core/d2-container/components/d2-container-ghost-bs.vue rename to src/components/d2-container/components/d2-container-ghost-bs.vue diff --git a/src/components/core/d2-container/components/d2-container-ghost.vue b/src/components/d2-container/components/d2-container-ghost.vue similarity index 100% rename from src/components/core/d2-container/components/d2-container-ghost.vue rename to src/components/d2-container/components/d2-container-ghost.vue diff --git a/src/components/core/d2-container/components/mixins/bs.js b/src/components/d2-container/components/mixins/bs.js similarity index 100% rename from src/components/core/d2-container/components/mixins/bs.js rename to src/components/d2-container/components/mixins/bs.js diff --git a/src/components/core/d2-container/index.vue b/src/components/d2-container/index.vue similarity index 100% rename from src/components/core/d2-container/index.vue rename to src/components/d2-container/index.vue diff --git a/src/components/core/d2-count-up/index.vue b/src/components/d2-count-up/index.vue similarity index 100% rename from src/components/core/d2-count-up/index.vue rename to src/components/d2-count-up/index.vue diff --git a/src/components/core/d2-highlight/index.vue b/src/components/d2-highlight/index.vue similarity index 100% rename from src/components/core/d2-highlight/index.vue rename to src/components/d2-highlight/index.vue diff --git a/src/components/core/d2-highlight/libs/htmlFormat.js.REMOVED.git-id b/src/components/d2-highlight/libs/htmlFormat.js.REMOVED.git-id similarity index 100% rename from src/components/core/d2-highlight/libs/htmlFormat.js.REMOVED.git-id rename to src/components/d2-highlight/libs/htmlFormat.js.REMOVED.git-id diff --git a/src/components/core/d2-icon-select/data/index.js.REMOVED.git-id b/src/components/d2-icon-select/data/index.js.REMOVED.git-id similarity index 100% rename from src/components/core/d2-icon-select/data/index.js.REMOVED.git-id rename to src/components/d2-icon-select/data/index.js.REMOVED.git-id diff --git a/src/components/core/d2-icon-select/index.vue b/src/components/d2-icon-select/index.vue similarity index 100% rename from src/components/core/d2-icon-select/index.vue rename to src/components/d2-icon-select/index.vue diff --git a/src/components/core/d2-icon-svg/index.vue b/src/components/d2-icon-svg/index.vue similarity index 100% rename from src/components/core/d2-icon-svg/index.vue rename to src/components/d2-icon-svg/index.vue diff --git a/src/components/core/d2-icon/index.vue b/src/components/d2-icon/index.vue similarity index 100% rename from src/components/core/d2-icon/index.vue rename to src/components/d2-icon/index.vue diff --git a/src/components/demo/d2-link-btn/index.vue b/src/components/d2-link-btn/index.vue similarity index 100% rename from src/components/demo/d2-link-btn/index.vue rename to src/components/d2-link-btn/index.vue diff --git a/src/components/core/d2-markdown/index.vue b/src/components/d2-markdown/index.vue similarity index 100% rename from src/components/core/d2-markdown/index.vue rename to src/components/d2-markdown/index.vue diff --git a/src/components/core/d2-markdown/plugin/baidupan.js b/src/components/d2-markdown/plugin/baidupan.js similarity index 100% rename from src/components/core/d2-markdown/plugin/baidupan.js rename to src/components/d2-markdown/plugin/baidupan.js diff --git a/src/components/core/d2-mde/index.vue b/src/components/d2-mde/index.vue similarity index 100% rename from src/components/core/d2-mde/index.vue rename to src/components/d2-mde/index.vue diff --git a/src/components/demo/d2-page-cover/index.vue b/src/components/d2-page-cover/index.vue similarity index 100% rename from src/components/demo/d2-page-cover/index.vue rename to src/components/d2-page-cover/index.vue diff --git a/src/components/core/d2-quill/index.vue b/src/components/d2-quill/index.vue similarity index 100% rename from src/components/core/d2-quill/index.vue rename to src/components/d2-quill/index.vue diff --git a/src/components/demo/index.js b/src/components/demo/index.js deleted file mode 100644 index fd8ffe19..00000000 --- a/src/components/demo/index.js +++ /dev/null @@ -1,6 +0,0 @@ -import Vue from 'vue' - -import d2DemoLinkBtn from '@/components/demo/d2-link-btn' - -Vue.component('d2-link-btn', d2DemoLinkBtn) -Vue.component('d2-page-cover', () => import('@/components/demo/d2-page-cover')) diff --git a/src/components/index.js b/src/components/index.js index c8745fcf..c254dc1d 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -1,4 +1,23 @@ -// 核心组件 -import './core' -// 非核心组件 只是在很多演示页面中用到的组件 -import './demo' +import Vue from 'vue' + +import { GridLayout, GridItem } from 'vue-grid-layout' +import SplitPane from 'vue-splitpane' + +import d2Container from '@/components/d2-container' +import d2LinkBtn from '@/components/d2-link-btn' + +Vue.component('d2-grid-layout', GridLayout) +Vue.component('d2-grid-item', GridItem) +Vue.component('SplitPane', SplitPane) + +Vue.component('d2-container', d2Container) +Vue.component('d2-link-btn', d2LinkBtn) +Vue.component('d2-page-cover', () => import('@/components/d2-page-cover')) +Vue.component('d2-count-up', () => import('@/components/d2-count-up')) +Vue.component('d2-highlight', () => import('@/components/d2-highlight')) +Vue.component('d2-icon', () => import('@/components/d2-icon')) +Vue.component('d2-icon-select', () => import('@/components/d2-icon-select/index.vue')) +Vue.component('d2-icon-svg', () => import('@/components/d2-icon-svg/index.vue')) +Vue.component('d2-markdown', () => import('@/components/d2-markdown')) +Vue.component('d2-mde', () => import('@/components/d2-mde')) +Vue.component('d2-quill', () => import('@/components/d2-quill'))