diff --git a/doc/docs/.vuepress/config.js b/doc/docs/.vuepress/config.js index adc34ebf..5ba90e51 100644 --- a/doc/docs/.vuepress/config.js +++ b/doc/docs/.vuepress/config.js @@ -92,7 +92,8 @@ module.exports = { children: [ {title: '说明', path: '/guide/community/report'}, {title: '搭建AJ-Report开发环境', path: '/guide/community/AC1688/搭建aj-report开发环境'}, - {title: '大屏组件对齐和拖拽实现', path: '/guide/community/JiangHH/AJ_Report大屏设计时多组件对齐和拖拽移动实现'} + {title: '大屏组件对齐和拖拽实现', path: '/guide/community/JiangHH/AJ_Report大屏设计时多组件对齐和拖拽移动实现'}, + {title: '按钮控制多图表联动实现', path: '/guide/community/JiangHH/按钮组件控制多条件组件联动图表实现'} ] } ], diff --git a/doc/docs/guide/chartsLinkage.md b/doc/docs/guide/chartsLinkage.md index 02b7ffee..34ab3855 100644 --- a/doc/docs/guide/chartsLinkage.md +++ b/doc/docs/guide/chartsLinkage.md @@ -214,3 +214,15 @@ function doHandleMonth(month) { 2、联动与被联动的图表必须有相同的数据格式。理论上多维向低维填充数据是没问题的,但实际操作时带来的问题会很多,因此当前版本高维图表都不支持图表组件联动。
3、被联动的图表的动态数据集必须得有查询参数。说的简单一点就是联动始终都是数据集参数的传递,图表只是数据的载体表象。
4、使用后的情况和表单组件使用后情况一致。
+ + +## 按钮联动 + +- 简介
+ 按钮联动本质上是将表单组件(下拉框、时间筛选器)组件的查询参数提交给联动图表组件,实现多条件查询。 + +- 说明
+![img12](../picture/chartsLinkage/img_12.png) + +- 详细设计
+[详细设计](https://ajreport.beliefteam.cn/report-doc/guide/community/JiangHH/按钮组件控制多条件组件联动图表实现) diff --git a/doc/docs/guide/community/JiangHH/按钮组件控制多条件组件联动图表实现.md b/doc/docs/guide/community/JiangHH/按钮组件控制多条件组件联动图表实现.md index 41b5c2eb..a29db28e 100644 --- a/doc/docs/guide/community/JiangHH/按钮组件控制多条件组件联动图表实现.md +++ b/doc/docs/guide/community/JiangHH/按钮组件控制多条件组件联动图表实现.md @@ -10,7 +10,7 @@ 所以,设计一个按钮组件,在条件组件都输入完成的情况下,有按钮组件触发联动。 - 图标组件所需要的参数均有按钮组件提供,而按钮组件的参数有条件组件传递,形成一个提交表单。 + 图表组件所需要的参数均有按钮组件提供,而按钮组件的参数由条件组件(表单组件)传递,形成一个提交表单。 按钮组件的数据集跟图表的数据集选择保持一致,即参数保持一直. diff --git a/doc/docs/picture/chartsLinkage/img_12.png b/doc/docs/picture/chartsLinkage/img_12.png new file mode 100644 index 00000000..b6bb8b87 Binary files /dev/null and b/doc/docs/picture/chartsLinkage/img_12.png differ diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-button.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-button.js index 3b69c17d..8549b4be 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-button.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-button.js @@ -37,7 +37,7 @@ export const widgetButton = { name: 'fontSize', required: false, placeholder: '', - value: '26', + value: '16', }, { type: 'vue-color', @@ -91,15 +91,11 @@ export const widgetButton = { value: 'center' }, { - type: 'el-select', + type: 'el-switch', label: '是否圆角边框', name: 'isBorderRadius', required: false, placeholder: '', - selectOptions: [ - { code: 'true', name: '是' }, - { code: 'false', name: '否' }, - ], value: 'false', }, { diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetButton.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetButton.vue index d513df96..e6a64444 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetButton.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetButton.vue @@ -68,7 +68,7 @@ export default { left: this.transStyle.left + "px", top: this.transStyle.top + "px", right: this.transStyle.right + "px", - borderRadius: this.transStyle.isBorderRadius === "true"? this.transStyle.borderRadius +"px" :"0px", + borderRadius: this.transStyle.isBorderRadius ? this.transStyle.borderRadius +"px" :"0px", "text-align": this.transStyle.textAlign, "font-weight": this.transStyle.fontWeight || "600", "font-size": this.transStyle.fontSize + "px" || "12px",