diff --git a/core/datacap-ui/src/i18n/langs/en/dataset.ts b/core/datacap-ui/src/i18n/langs/en/dataset.ts
index 38b2d053..6dc5748d 100644
--- a/core/datacap-ui/src/i18n/langs/en/dataset.ts
+++ b/core/datacap-ui/src/i18n/langs/en/dataset.ts
@@ -83,6 +83,7 @@ export default {
visualConfigureDataBreakpointContinuous: 'Continuous',
visualConfigureDataBreakpointZero: 'Zero',
visualConfigureDataBreakpointIgnore: 'Ignore',
+ visualConfigureGeneralGroup: 'General Configure',
columnExpressionMax: 'Maximum',
columnExpressionMin: 'Minimum',
columnExpressionSum: 'Sum',
diff --git a/core/datacap-ui/src/i18n/langs/zhCn/dataset.ts b/core/datacap-ui/src/i18n/langs/zhCn/dataset.ts
index f967acca..58248ebf 100644
--- a/core/datacap-ui/src/i18n/langs/zhCn/dataset.ts
+++ b/core/datacap-ui/src/i18n/langs/zhCn/dataset.ts
@@ -83,6 +83,7 @@ export default {
visualConfigureDataBreakpointContinuous: '连续',
visualConfigureDataBreakpointZero: '补 0',
visualConfigureDataBreakpointIgnore: '忽略',
+ visualConfigureGeneralGroup: '通用配置',
columnExpressionMax: '最大值',
columnExpressionMin: '最小值',
columnExpressionSum: '总和',
diff --git a/core/datacap-ui/src/views/components/sql/SqlInfo.vue b/core/datacap-ui/src/views/components/sql/SqlInfo.vue
index d8ec1279..0dc7705e 100644
--- a/core/datacap-ui/src/views/components/sql/SqlInfo.vue
+++ b/core/datacap-ui/src/views/components/sql/SqlInfo.vue
@@ -4,8 +4,7 @@
SQL
-
+
@@ -26,18 +25,15 @@ import {
AlertDialogTitle,
AlertDialogTrigger
} from '@/components/ui/alert-dialog'
-import CommonUtils from '@/views/components/echarts/utils/CommonUtils'
-import { UserEditor } from '@/model/user'
import { Button } from '@/components/ui/button'
-import { VAceEditor } from 'vue3-ace-editor'
-import '@/ace-editor-theme'
+import AceEditor from '@/views/components/editor/AceEditor.vue'
export default defineComponent({
name: 'SqlInfo',
components: {
+ AceEditor,
Button,
- AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle, AlertDialogTrigger,
- VAceEditor
+ AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle, AlertDialogTrigger
},
props: {
isVisible: {
@@ -48,25 +44,7 @@ export default defineComponent({
type: String as PropType
}
},
- data()
- {
- return {
- localContent: this.content as string,
- configure: null as UserEditor | null,
- editorOptions: {readOnly: true}
- }
- },
- created()
- {
- this.handlerInitialize()
- },
methods: {
- handlerInitialize()
- {
- const localEditorConfigure = localStorage.getItem(CommonUtils.userEditorConfigure)
- const defaultEditorConfigure: UserEditor = {fontSize: 12, theme: 'chrome'}
- this.configure = localEditorConfigure ? JSON.parse(localEditorConfigure) : defaultEditorConfigure
- },
handlerCancel()
{
this.visible = false
diff --git a/core/datacap-ui/src/views/components/visual/Configuration.ts b/core/datacap-ui/src/views/components/visual/Configuration.ts
index 0c09eac0..dfe81a3d 100644
--- a/core/datacap-ui/src/views/components/visual/Configuration.ts
+++ b/core/datacap-ui/src/views/components/visual/Configuration.ts
@@ -36,6 +36,12 @@ export interface IChart
endAngle?: number[]
}
+export interface ChartFieldGroup
+{
+ label?: string
+ fields?: ChartField[]
+}
+
export interface ChartField
{
label?: string
diff --git a/core/datacap-ui/src/views/components/visual/VisualEditor.vue b/core/datacap-ui/src/views/components/visual/VisualEditor.vue
index 6a303f52..6cb7ed06 100644
--- a/core/datacap-ui/src/views/components/visual/VisualEditor.vue
+++ b/core/datacap-ui/src/views/components/visual/VisualEditor.vue
@@ -169,13 +169,15 @@
{{ $t('dataset.common.visualConfigure') }}
-
+
-
+
+