Merge pull request #6819 from dataease/pr@dev-v2_dzz

Pr@dev v2 dzz

core/core-frontend/src/custom-component/rich-text/DeRichEditor.vue

@@ -3,6 +3,7 @@
 </template>
 
 <script setup lang="ts">
+import { formatDataEaseBi } from '@/utils/url'
 //JS部分
 //在js中引入所需的主题和组件
 import tinymce from 'tinymce/tinymce'
@@ -58,9 +59,9 @@ const tinymceId = ref('vue-tinymce-' + +new Date() + ((Math.random() * 1000).toF
 const init = reactive({
   // inline: true, // 开启内联模式
   selector: '#' + tinymceId.value, //富文本编辑器的id,
-  language_url: '/tinymce-dataease-private/langs/zh_CN.js', // 语言包的路径，具体路径看自己的项目，文档后面附上中文js文件
+  language_url: formatDataEaseBi('/tinymce-dataease-private/langs/zh_CN.js'), // 语言包的路径，具体路径看自己的项目，文档后面附上中文js文件
   language: 'zh_CN', //语言
-  skin_url: '/tinymce-dataease-private/skins/ui/oxide', // skin路径，具体路径看自己的项目
+  skin_url: formatDataEaseBi('/tinymce-dataease-private/skins/ui/oxide'), // skin路径，具体路径看自己的项目
   height: 400, //编辑器高度
   branding: false, //是否禁用“Powered by TinyMCE”
   menubar: true, //顶部菜单栏显示
@@ -75,7 +76,7 @@ const init = reactive({
   nonbreaking_force_tab: false,
   paste_auto_cleanup_on_paste: false,
   file_picker_types: 'file',
-  content_css: '/tinymce-dataease-private/skins/content/default/content.css', //以css文件方式自定义可编辑区域的css样式，css文件需自己创建并引入
+  content_css: formatDataEaseBi('/tinymce-dataease-private/skins/content/default/content.css'), //以css文件方式自定义可编辑区域的css样式，css文件需自己创建并引入
   //图片上传
   images_upload_handler: blobInfo =>
     new Promise((resolve, reject) => {

core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue

@@ -28,6 +28,7 @@
 </template>
 
 <script setup lang="ts">
+import { formatDataEaseBi } from '@/utils/url'
 import tinymce from 'tinymce/tinymce' // tinymce默认hidden，不引入不显示
 import Editor from '@tinymce/tinymce-vue' // 编辑器引入
 import 'tinymce/themes/silver/theme' // 编辑器主题
@@ -114,10 +115,10 @@ const myValue = ref('')
 const init = ref({
   selector: '#' + tinymceId,
   toolbar_items_size: 'small',
-  language_url: '/tinymce-dataease-private/langs/zh_CN.js', // 汉化路径是自定义的，一般放在public或static里面
+  language_url: formatDataEaseBi('/tinymce-dataease-private/langs/zh_CN.js'), // 汉化路径是自定义的，一般放在public或static里面
   language: 'zh_CN',
-  skin_url: '/tinymce-dataease-private/skins/ui/oxide', // 皮肤
-  content_css: '/tinymce-dataease-private/skins/content/default/content.css',
+  skin_url: formatDataEaseBi('/tinymce-dataease-private/skins/ui/oxide'), // 皮肤
+  content_css: formatDataEaseBi('/tinymce-dataease-private/skins/content/default/content.css'),
   plugins:
     'advlist autolink link image lists charmap  media wordcount table contextmenu directionality pagebreak', // 插件
   // 工具栏

core/core-frontend/src/custom-component/rich-text/DeRichTextViewBack.vue

@@ -17,6 +17,7 @@
 </template>
 
 <script setup lang="ts">
+import { formatDataEaseBi } from '@/utils/url'
 import tinymce from 'tinymce/tinymce' // tinymce默认hidden，不引入不显示
 import Editor from '@tinymce/tinymce-vue' // 编辑器引入
 import 'tinymce/themes/silver/theme' // 编辑器主题
@@ -80,10 +81,10 @@ const myValue = ref(element.value.propValue.textValue)
 const init = ref({
   selector: '#' + tinymceId,
   toolbar_items_size: 'small',
-  language_url: '/tinymce-dataease-private/langs/zh_CN.js', // 汉化路径是自定义的，一般放在public或static里面
+  language_url: formatDataEaseBi('/tinymce-dataease-private/langs/zh_CN.js'), // 汉化路径是自定义的，一般放在public或static里面
   language: 'zh_CN',
-  skin_url: '/tinymce-dataease-private/skins/ui/oxide', // 皮肤
-  content_css: '/tinymce-dataease-private/skins/content/default/content.css',
+  skin_url: formatDataEaseBi('/tinymce-dataease-private/skins/ui/oxide'), // 皮肤
+  content_css: formatDataEaseBi('/tinymce-dataease-private/skins/content/default/content.css'),
   plugins:
     'advlist autolink link image lists charmap  media wordcount table contextmenu directionality pagebreak', // 插件
   // 工具栏

core/core-frontend/src/utils/url.ts

@@ -0,0 +1,3 @@
+export const formatDataEaseBi = (url: string) => {
+  return window.DataEaseBi?.baseUrl ? `${window.DataEaseBi.baseUrl}${url}` : url
+}