From fda763cc43c0341de59f87da3f5c9af48381e7a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com>
Date: Tue, 16 Jan 2018 15:26:07 +0800
Subject: [PATCH] no message
Former-commit-id: 8ef30c0089a7268a441a328fc74f113b0af017a1
Former-commit-id: 2d06ade06f52ff92a2fefcf42b8b114b3506ca27
Former-commit-id: 5fda8f1a5e9ec9bc5e30e17f44f21bf1a43666cf
---
build/webpack.base.conf.js | 1 +
package.json | 1 +
src/components/core/QuillEditor/index.vue | 78 +++++++++++++++++++
src/components/index.js | 20 +++--
src/pages/demo/plugins/quill-editor/demo.vue | 40 ++++++++++
.../demo/plugins/quill-editor/readme.vue | 10 +++
src/router/menu/_plugin.js | 25 +++++-
7 files changed, 166 insertions(+), 9 deletions(-)
create mode 100644 src/components/core/QuillEditor/index.vue
create mode 100644 src/pages/demo/plugins/quill-editor/demo.vue
create mode 100644 src/pages/demo/plugins/quill-editor/readme.vue
diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
index 787195a2..d56a799d 100755
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -1,6 +1,7 @@
'use strict'
const path = require('path')
const utils = require('./utils')
+const webpack = require('webpack')
const config = require('../config')
const vueLoaderConfig = require('./vue-loader.conf')
diff --git a/package.json b/package.json
index 5b264471..b7908def 100755
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
"marked": "^0.3.9",
"mockjs": "^1.0.1-beta3",
"papaparse": "^4.3.6",
+ "quill": "^1.3.4",
"simplemde": "^1.11.2",
"vue": "^2.5.2",
"vue-grid-layout": "^2.1.11",
diff --git a/src/components/core/QuillEditor/index.vue b/src/components/core/QuillEditor/index.vue
new file mode 100644
index 00000000..0f1d4e4f
--- /dev/null
+++ b/src/components/core/QuillEditor/index.vue
@@ -0,0 +1,78 @@
+
+
+
+
+
diff --git a/src/components/index.js b/src/components/index.js
index e422b70a..091c4805 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -16,41 +16,47 @@ Vue.component('SplitPane', SplitPane)
// 名称:页面容器
// 用途:每个页面的最外层元素,统一样式
Vue.component('Container', resolve => {
- require(['@/components/core/Container/index.vue'], resolve)
+ require(['@/components/core/Container'], resolve)
})
// 名称:markdown加载器
// 用途:加载一个markdown文件
Vue.component('Markdown', resolve => {
- require(['@/components/core/Markdown/index.vue'], resolve)
+ require(['@/components/core/Markdown'], resolve)
})
// 名称:github 链接
// 用途:本质上这就是一个 github 的链接
Vue.component('GithubLink', resolve => {
- require(['@/components/demo/GithubLink/index.vue'], resolve)
+ require(['@/components/demo/GithubLink'], resolve)
})
// 名称:SimpleMDE markdown 编辑器
// 用途:SimpleMDE markdown 编辑器
Vue.component('SimpleMDE', resolve => {
- require(['@/components/core/SimpleMDE/index.vue'], resolve)
+ require(['@/components/core/SimpleMDE'], resolve)
+})
+
+// 名称:富文本编辑器
+// 用途:富文本编辑器
+Vue.component('QuillEditor', resolve => {
+ require(['@/components/core/QuillEditor'], resolve)
})
// 名称:数字动画
// 用途:数字动画
Vue.component('CountUp', resolve => {
- require(['@/components/core/CountUp/index.vue'], resolve)
+ require(['@/components/core/CountUp'], resolve)
})
// 名称:代码高亮
// 用途:代码高亮
Vue.component('Highlight', resolve => {
- require(['@/components/core/Highlight/index.vue'], resolve)
+ require(['@/components/core/Highlight'], resolve)
})
// 名称:页面Header
// 用途:页面Header
Vue.component('PageHeader', resolve => {
- require(['@/components/demo/PageHeader/index.vue'], resolve)
+ require(['@/components/demo/PageHeader'], resolve)
})
diff --git a/src/pages/demo/plugins/quill-editor/demo.vue b/src/pages/demo/plugins/quill-editor/demo.vue
new file mode 100644
index 00000000..51e0487d
--- /dev/null
+++ b/src/pages/demo/plugins/quill-editor/demo.vue
@@ -0,0 +1,40 @@
+
+
+
+
+
+ {{value}}
+
+
+
+
+
diff --git a/src/pages/demo/plugins/quill-editor/readme.vue b/src/pages/demo/plugins/quill-editor/readme.vue
new file mode 100644
index 00000000..4784dadc
--- /dev/null
+++ b/src/pages/demo/plugins/quill-editor/readme.vue
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/router/menu/_plugin.js b/src/router/menu/_plugin.js
index 9b04b686..feaa0c5f 100644
--- a/src/router/menu/_plugin.js
+++ b/src/router/menu/_plugin.js
@@ -36,9 +36,9 @@ export const pluginMenu = {
}
]
},
- // SimpleMDE
+ // MD编辑器
{
- title: 'SimpleMDE',
+ title: 'MD编辑器',
icon: 'columns',
children: [
{
@@ -57,6 +57,27 @@ export const pluginMenu = {
}
]
},
+ // 富文本编辑器
+ {
+ title: '富文本编辑器',
+ icon: 'edit',
+ children: [
+ {
+ title: 'README',
+ icon: 'file-text',
+ path: 'quill-editor/readme',
+ name: 'demo-plugin-quill-editor-readme',
+ component: resolve => { require(['@/pages/demo/plugins/quill-editor/readme.vue'], resolve) }
+ },
+ {
+ title: '基本示例',
+ icon: 'file-o',
+ path: 'quill-editor/demo',
+ name: 'demo-plugin-quill-editor-demo',
+ component: resolve => { require(['@/pages/demo/plugins/quill-editor/demo.vue'], resolve) }
+ }
+ ]
+ },
// 拖拽网格布局组件
{
title: '网格布局',