diff --git a/report-ui/src/views/report/bigscreen/designer/form/dynamicForm.vue b/report-ui/src/views/report/bigscreen/designer/form/dynamicForm.vue index 09467880..acffc94f 100644 --- a/report-ui/src/views/report/bigscreen/designer/form/dynamicForm.vue +++ b/report-ui/src/views/report/bigscreen/designer/form/dynamicForm.vue @@ -117,12 +117,19 @@ width="50%" :before-close="handleClose" > - + + + + + + + 取 消 import ColorPicker from "./colorPicker.vue"; -import { codemirror } from "vue-codemirror"; // 引入codeMirror全局实例 +import vueJsonEditor from 'vue-json-editor' import "codemirror/lib/codemirror.css"; // 核心样式 import "codemirror/theme/cobalt.css"; // 引入主题后还需要在 options 中指定主题才会生效 // language @@ -270,7 +277,7 @@ export default { name: "DynamicForm", components: { ColorPicker, - codemirror, + vueJsonEditor, dynamicComponents, customColorComponents }, @@ -337,6 +344,8 @@ export default { } } }, + onJsonChange (value) { }, + onJsonSave (value) { }, saveData() { this.$emit("onChanged", this.formData); this.dialogVisibleStaticData = false; diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js index 66fbf3a6..2d40c1ab 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools.js +++ b/report-ui/src/views/report/bigscreen/designer/tools.js @@ -2319,7 +2319,8 @@ const widgetTools = [ value: 10, }, ], - }, { + }, + { name: '图例操作', list: [ { @@ -2391,7 +2392,8 @@ const widgetTools = [ value: '' }, ], - }, { + }, + { name: '自定义配色', list: [ { @@ -2399,7 +2401,7 @@ const widgetTools = [ label: '', name: 'customColor', required: false, - value: [{ color: '#ED0E0E' }, { color: '#6CCD17' }, { color: '#172CCD' }, { color: '#B817CD' }, { color: '#AFCD17' }], + value: [{ color: '#1E90FF' }], }, ], },