From 1b8f726529b6d2b6384ee55db44b24daadc3dfa8 Mon Sep 17 00:00:00 2001 From: Aisen Date: Tue, 28 Apr 2020 10:10:58 +0800 Subject: [PATCH 1/2] perf[Tinymce]: editor try to keep these URLs intact (#3141) --- src/components/Tinymce/index.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue index 0c6174c4..c0f486f0 100644 --- a/src/components/Tinymce/index.vue +++ b/src/components/Tinymce/index.vue @@ -147,7 +147,11 @@ export default { editor.on('FullscreenStateChanged', (e) => { _this.fullscreen = e.state }) - } + }, + //it will try to keep these URLs intact + //https://www.tiny.cloud/docs-3x/reference/configuration/Configuration3x@convert_urls/ + //https://stackoverflow.com/questions/5196205/disable-tinymce-absolute-to-relative-url-conversions + convert_urls: false // 整合七牛上传 // images_dataimg_filter(img) { // setTimeout(() => { From 9580c43a8ee2ce9c71c1db6011941c7338bebfe2 Mon Sep 17 00:00:00 2001 From: ntnyq Date: Tue, 28 Apr 2020 18:26:34 +0800 Subject: [PATCH 2/2] fix[element-variables]: missing space in element-variables (#3144) --- src/styles/element-variables.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/styles/element-variables.scss b/src/styles/element-variables.scss index 30a0e6bc..5bdc4dad 100644 --- a/src/styles/element-variables.scss +++ b/src/styles/element-variables.scss @@ -6,7 +6,7 @@ /* theme color */ $--color-primary: #1890ff; $--color-success: #13ce66; -$--color-warning: #FFBA00; +$--color-warning: #ffba00; $--color-danger: #ff4949; // $--color-info: #1E1E1E; @@ -17,10 +17,10 @@ $--button-font-weight: 400; $--border-color-light: #dfe4ed; $--border-color-lighter: #e6ebf5; -$--table-border:1px solid#dfe6ec; +$--table-border: 1px solid #dfe6ec; /* icon font path, required */ -$--font-path: '~element-ui/lib/theme-chalk/fonts'; +$--font-path: "~element-ui/lib/theme-chalk/fonts"; @import "~element-ui/packages/theme-chalk/src/index";