fix(tinymce): ensure that the public resource path is correct,fix vbe…

…njs#487
ethan-wilson-1291 · Apr 16, 2021 · 477b5bb · 477b5bb
1 parent dc337f8
commit 477b5bb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/components/Tinymce/src/Editor.vue b/src/components/Tinymce/src/Editor.vue
@@ -96,21 +96,22 @@
 
       const initOptions = computed(() => {
         const { height, options, toolbar, plugins } = props;
+        const publicPath = import.meta.env.VITE_PUBLIC_PATH || '/';
         return {
           selector: `#${unref(tinymceId)}`,
           height,
           toolbar,
           menubar: 'file edit insert view format table',
           plugins,
-          language_url: '/resource/tinymce/langs/zh_CN.js',
+          language_url: publicPath + 'resource/tinymce/langs/zh_CN.js',
           language: 'zh_CN',
           branding: false,
           default_link_target: '_blank',
           link_title: false,
           object_resizing: false,
           skin: 'oxide',
-          skin_url: 'resource/tinymce/skins/ui/oxide',
-          content_css: 'resource/tinymce/skins/ui/oxide/content.min.css',
+          skin_url: publicPath + 'resource/tinymce/skins/ui/oxide',
+          content_css: publicPath + 'resource/tinymce/skins/ui/oxide/content.min.css',
           ...options,
           setup: (editor: any) => {
             editorRef.value = editor;

diff --git a/src/utils/lib/echarts.ts b/src/utils/lib/echarts.ts
@@ -18,6 +18,11 @@ import {
   ParallelComponent,
   LegendComponent,
   RadarComponent,
+  ToolboxComponent,
+  DataZoomComponent,
+  VisualMapComponent,
+  TimelineComponent,
+  CalendarComponent,
 } from 'echarts/components';
 
 import { SVGRenderer } from 'echarts/renderers';
@@ -38,6 +43,11 @@ echarts.use([
   SVGRenderer,
   PictorialBarChart,
   RadarComponent,
+  ToolboxComponent,
+  DataZoomComponent,
+  VisualMapComponent,
+  TimelineComponent,
+  CalendarComponent,
 ]);
 
 export default echarts;