From 504c06f648b3a99d86d5cfae6bcb50d3717b81b5 Mon Sep 17 00:00:00 2001 From: Pan Date: Fri, 10 May 2019 14:47:57 +0800 Subject: [PATCH 01/16] chore: use mockjs in production environment --- src/main.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main.js b/src/main.js index 41298d0c..e218bd83 100644 --- a/src/main.js +++ b/src/main.js @@ -22,12 +22,16 @@ import * as filters from './filters' // global filters /** * If you don't want to use mock-server - * you want to use mockjs for request interception - * you can execute: + * you want to use MockJs for mock api + * you can execute: mockXHR() * - * import { mockXHR } from '../mock' - * mockXHR() + * Currently MockJs will be used in the production environment, + * please remove it before going online! ! ! */ +import { mockXHR } from '../mock' +if (process.env.NODE_ENV === 'production') { + mockXHR() +} Vue.use(Element, { size: Cookies.get('size') || 'medium', // set element-ui default size From 3281d161314978c37db8036021709d5b23cd45aa Mon Sep 17 00:00:00 2001 From: Pan Date: Fri, 10 May 2019 18:29:50 +0800 Subject: [PATCH 02/16] fix[sidebar.css]: remove redundant css --- src/styles/sidebar.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index e55f8656..3dad4c39 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -95,10 +95,6 @@ margin-left: 54px; } - .svg-icon { - margin-right: 0px; - } - .submenu-title-noDropdown { padding: 0 !important; position: relative; From b6aa00d5de0f8b7f6f54143cd494ad6c9e3b2ebb Mon Sep 17 00:00:00 2001 From: Pan Date: Mon, 13 May 2019 09:57:33 +0800 Subject: [PATCH 03/16] perf[Tinymce]: update tinymce cdn version --- src/components/Tinymce/index.vue | 2 -- vue.config.js | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue index a5dd7a3f..08ef768d 100644 --- a/src/components/Tinymce/index.vue +++ b/src/components/Tinymce/index.vue @@ -107,8 +107,6 @@ export default { const _this = this window.tinymce.init({ language: this.language, - // language cnd URL, detail see https://github.com/PanJiaChen/tinymce-lang - language_url: this.language === 'en' ? '' : `https://cdn.jsdelivr.net/npm/tinymce-lang/langs/${this.language}.js`, selector: `#${this.tinymceId}`, height: this.height, body_class: 'panel-body ', diff --git a/vue.config.js b/vue.config.js index dcb0c248..41a7f600 100644 --- a/vue.config.js +++ b/vue.config.js @@ -60,7 +60,7 @@ module.exports = { const cdn = { // inject tinymce into index.html // why use this cdn, detail see https://github.com/PanJiaChen/tinymce-all-in-one - js: ['https://cdn.jsdelivr.net/npm/tinymce-all-in-one@4.9.2/tinymce.min.js'] + js: ['https://cdn.jsdelivr.net/npm/tinymce-all-in-one@4.9.3/tinymce.min.js'] } config.plugin('html') .tap(args => { From 5f536fdfc4c1b75ae08ec9d2e8a9f02f131f33fe Mon Sep 17 00:00:00 2001 From: Pan Date: Mon, 13 May 2019 17:32:53 +0800 Subject: [PATCH 04/16] fix[redirect]: fix redirect bug in vue-devtool again --- src/views/redirect/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/redirect/index.vue b/src/views/redirect/index.vue index bf56fbcd..db4c1d66 100644 --- a/src/views/redirect/index.vue +++ b/src/views/redirect/index.vue @@ -1,6 +1,6 @@ - <% } %>
diff --git a/src/components/Tinymce/dynamicLoadScript.js b/src/components/Tinymce/dynamicLoadScript.js new file mode 100644 index 00000000..46a93290 --- /dev/null +++ b/src/components/Tinymce/dynamicLoadScript.js @@ -0,0 +1,39 @@ +const dynamicLoadScript = (src, callback) => { + const existingScript = document.getElementById(src) + const cb = callback || function() {} + + if (!existingScript) { + const script = document.createElement('script') + script.src = src // src url for the third-party library being loaded. + script.id = src + document.body.appendChild(script) + + const onEnd = 'onload' in script ? stdOnEnd : ieOnEnd + onEnd(script, cb) + } + + if (existingScript && cb) cb(null, existingScript) + + function stdOnEnd(script, cb) { + script.onload = function() { + // this.onload = null here is necessary + // because even IE9 works not like others + this.onerror = this.onload = null + cb(null, script) + } + script.onerror = function() { + this.onerror = this.onload = null + cb(new Error('Failed to load ' + src), script) + } + } + + function ieOnEnd(script, cb) { + script.onreadystatechange = function() { + if (this.readyState !== 'complete' && this.readyState !== 'loaded') return + this.onreadystatechange = null + cb(null, script) // there is no way to catch loading errors in IE8 + } + } +} + +export default dynamicLoadScript diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue index 08ef768d..670a0e53 100644 --- a/src/components/Tinymce/index.vue +++ b/src/components/Tinymce/index.vue @@ -15,6 +15,10 @@ import editorImage from './components/EditorImage' import plugins from './plugins' import toolbar from './toolbar' +import load from './dynamicLoadScript' + +// why use this cdn, detail see https://github.com/PanJiaChen/tinymce-all-in-one +const tinymceCDN = 'https://cdn.jsdelivr.net/npm/tinymce-all-in-one@4.9.3/tinymce.min.js' export default { name: 'Tinymce', @@ -91,10 +95,12 @@ export default { } }, mounted() { - this.initTinymce() + this.init() }, activated() { - this.initTinymce() + if (window.tinymce) { + this.initTinymce() + } }, deactivated() { this.destroyTinymce() @@ -103,6 +109,16 @@ export default { this.destroyTinymce() }, methods: { + init() { + // dynamic load tinymce from cdn + load(tinymceCDN, (err) => { + if (err) { + this.$message.error(err.message) + return + } + this.initTinymce() + }) + }, initTinymce() { const _this = this window.tinymce.init({ diff --git a/vue.config.js b/vue.config.js index 41a7f600..c5e31642 100644 --- a/vue.config.js +++ b/vue.config.js @@ -57,16 +57,6 @@ module.exports = { } }, chainWebpack(config) { - const cdn = { - // inject tinymce into index.html - // why use this cdn, detail see https://github.com/PanJiaChen/tinymce-all-in-one - js: ['https://cdn.jsdelivr.net/npm/tinymce-all-in-one@4.9.3/tinymce.min.js'] - } - config.plugin('html') - .tap(args => { - args[0].cdn = cdn - return args - }) config.plugins.delete('preload') // TODO: need test config.plugins.delete('prefetch') // TODO: need test From 5b1b05b18e6c675b8106833c2d99e97cd8042ec8 Mon Sep 17 00:00:00 2001 From: Pan Date: Tue, 21 May 2019 10:53:49 +0800 Subject: [PATCH 16/16] [release] 4.2.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0becf2b3..10b0a6bd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-element-admin", - "version": "4.0.1", + "version": "4.2.0", "description": "A magical vue admin. An out-of-box UI solution for enterprise applications. Newest development stack of vue. Lots of awesome features", "author": "Pan ", "license": "MIT",