diff --git a/frontend/src/api/dataset/dataset.js b/frontend/src/api/dataset/dataset.js
index fc4c5b7c69..6ca3a206a6 100644
--- a/frontend/src/api/dataset/dataset.js
+++ b/frontend/src/api/dataset/dataset.js
@@ -185,7 +185,7 @@ export function multFieldValues(data) {
return request({
url: '/dataset/field/multFieldValues',
method: 'post',
- loading: true,
+ loading: false,
data
})
}
@@ -241,6 +241,7 @@ export function checkCustomDs() {
loading: true
})
}
+
export function exportExcel(data) {
return request({
url: '/dataset/taskLog/export',
@@ -268,4 +269,5 @@ export function exportDataset(data) {
responseType: 'blob'
})
}
+
export default { loadTable, getScene, addGroup, delGroup, addTable, delTable, groupTree, checkCustomDs, exportDataset }
diff --git a/frontend/src/components/canvas/components/editor/EditBar.vue b/frontend/src/components/canvas/components/editor/EditBar.vue
index 3f2c726998..bab1c21ef1 100644
--- a/frontend/src/components/canvas/components/editor/EditBar.vue
+++ b/frontend/src/components/canvas/components/editor/EditBar.vue
@@ -137,7 +137,7 @@
:target="curComponent.hyperlinks.openMode "
:href="curComponent.hyperlinks.content "
>
-
+
@@ -243,6 +243,7 @@ export default {
},
data() {
return {
+ systemOS: 'Mac',
maxImageSize: 15000000,
boardSetVisible: false,
linkJumpSetVisible: false,
@@ -362,6 +363,9 @@ export default {
])
},
mounted() {
+ if (navigator.platform.indexOf('Mac') == -1) {
+ this.systemOS = 'Other'
+ }
this.initCurFields()
if (this.element.type === 'view') {
bus.$on('initCurFields-' + this.element.id, this.initCurFields)
diff --git a/frontend/src/components/canvas/components/editor/SettingMenu.vue b/frontend/src/components/canvas/components/editor/SettingMenu.vue
index 28ca324d09..8eebf374c9 100644
--- a/frontend/src/components/canvas/components/editor/SettingMenu.vue
+++ b/frontend/src/components/canvas/components/editor/SettingMenu.vue
@@ -17,7 +17,8 @@
v-if="curComponent.type != 'custom-button'"
icon="el-icon-document-copy"
@click.native="copy"
- >{{ $t('panel.copy') }}
+ >{{ $t('panel.copy') }}(+ D Control + D)
import tinymce from 'tinymce/tinymce' // tinymce默认hidden,不引入不显示
-import Editor from '@tinymce/tinymce-vue'// 编辑器引入
-import 'tinymce/themes/silver/theme'// 编辑器主题
+import Editor from '@tinymce/tinymce-vue' // 编辑器引入
+import 'tinymce/themes/silver/theme' // 编辑器主题
import 'tinymce/icons/default' // 引入编辑器图标icon,不引入则不显示对应图标
// 引入编辑器插件(基本免费插件都在这儿了)
import 'tinymce/plugins/advlist' // 高级列表
@@ -29,9 +29,9 @@ import 'tinymce/plugins/image' // 插入编辑图片
import 'tinymce/plugins/lists' // 列表插件
import 'tinymce/plugins/charmap' // 特殊字符
import 'tinymce/plugins/media' // 插入编辑媒体
-import 'tinymce/plugins/wordcount'// 字数统计
-import 'tinymce/plugins/table'// 表格
-import 'tinymce/plugins/contextmenu'// contextmenu
+import 'tinymce/plugins/wordcount' // 字数统计
+import 'tinymce/plugins/table' // 表格
+import 'tinymce/plugins/contextmenu' // contextmenu
import 'tinymce/plugins/directionality'
import 'tinymce/plugins/nonbreaking'
import 'tinymce/plugins/pagebreak'
@@ -173,34 +173,43 @@ export default {
.rich-main-class {
width: 100%;
height: 100%;
- overflow-y: auto!important;
+ overflow-y: auto !important;
position: relative;
}
+
::-webkit-scrollbar {
- width: 0px!important;
- height: 0px!important;
+ width: 0px !important;
+ height: 0px !important;
}
+
::v-deep ol {
- display: block!important;
+ display: block !important;
list-style-type: decimal;
- margin-block-start: 1em!important;
- margin-block-end: 1em!important;
- margin-inline-start: 0px!important;
- margin-inline-end: 0px!important;
- padding-inline-start: 40px!important;
+ margin-block-start: 1em !important;
+ margin-block-end: 1em !important;
+ margin-inline-start: 0px !important;
+ margin-inline-end: 0px !important;
+ padding-inline-start: 40px !important;
}
+
::v-deep ul {
- display: block!important;
+ display: block !important;
list-style-type: disc;
- margin-block-start: 1em!important;
- margin-block-end: 1em!important;
- margin-inline-start: 0px!important;
- margin-inline-end: 0px!important;
- padding-inline-start: 40px!important;
+ margin-block-start: 1em !important;
+ margin-block-end: 1em !important;
+ margin-inline-start: 0px !important;
+ margin-inline-end: 0px !important;
+ padding-inline-start: 40px !important;
}
+
::v-deep li {
- display: list-item!important;
- text-align: -webkit-match-parent!important;
+ display: list-item !important;
+ text-align: -webkit-match-parent !important;
+}
+
+::v-deep p {
+ margin: 0px;
+ padding: 0px;
}
diff --git a/frontend/src/components/canvas/customComponent/DeRichTextView.vue b/frontend/src/components/canvas/customComponent/DeRichTextView.vue
index 8dfecebff4..7b5f717876 100644
--- a/frontend/src/components/canvas/customComponent/DeRichTextView.vue
+++ b/frontend/src/components/canvas/customComponent/DeRichTextView.vue
@@ -18,8 +18,8 @@