diff --git a/pigx-register/src/main/resources/application.yml b/pigx-register/src/main/resources/application.yml index 75fa88493..102e0fd38 100644 --- a/pigx-register/src/main/resources/application.yml +++ b/pigx-register/src/main/resources/application.yml @@ -6,7 +6,7 @@ server: db: num: 1 user: ${MYSQL_USER:root} - password: ${MYSQL_PWD:root} + password: ${MYSQL_PWD:127255} url: 0: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/authority.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/authority.ftl index b20040b40..ae1e9f0d9 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/authority.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/authority.ftl @@ -1,4 +1,4 @@ -<#assign CACHE_VERSION = "v=1.0.33"> +<#assign CACHE_VERSION = "v=v=1.0.7"> diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/index.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/index.ftl index 04d6165a1..2554410ac 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/index.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/index.ftl @@ -1,11 +1,11 @@ -<#assign CACHE_VERSION = "v=1.0.5"> +<#assign CACHE_VERSION = "v=1.0.7"> <#assign config_id = "${id!''}"> - 报表设计器 - 积木报表, 免费可视化报表工具！ + 积木报表—免费可视化Web报表工具 + + + + + \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_radio.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_radio.ftl index a130b96f1..9706ae0d5 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_radio.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_radio.ftl @@ -5,7 +5,7 @@ value:view组件传递的值 v-model-->
+ @click="handleClick" style="cursor: pointer"/>
@@ -75,8 +75,11 @@ value:view组件传递的值 v-model--> this.setDictText(); } }, - dictText(val) { - this.handleOnChange() + dictText:{ + immediate: true, + handler: function () { + this.handleOnChange() + } } }, methods: { @@ -111,6 +114,9 @@ value:view组件传递的值 v-model--> this.dictText = dict[0].text this.initText = dict[0].text } + //update-begin---author:wangshuai ---date:20220315 for：下拉单选样式出现混乱-------- + this.dictHeight = this.dictList.length > 6 ? 200 : this.dictList.length * 32 + 50 + //update-end---author:wangshuai ---date:20220315 for：下拉单选样式出现混乱-------- } }, //无限加载中的事件 @@ -146,7 +152,13 @@ value:view组件传递的值 v-model--> handleOnChange() { let val = {} val.key = this.dataList.key - val.value = this.dictText + //update-begin---author:wangshuai ---date:20220315 for：[JMREP-2552]下拉单选重置就出不来了-------- + if(!this.dictText){ + val.value = "" + }else{ + val.value = this.value + } + //update-end---author:wangshuai ---date:20220315 for：[JMREP-2552]下拉单选重置就出不来了-------- this.$emit('dictok', val) this.searchLocalOrApi(); }, @@ -162,7 +174,9 @@ value:view组件传递的值 v-model--> this.searchDictByText(); } else { this.dictList = this.copyDictList - this.dictHeight = this.dictList.length > 6 ? 200 : this.dictList.length * 30 + 20 + //update-begin---author:wangshuai ---date:20220315 for：下拉单选样式出现混乱-------- + this.dictHeight = this.dictList.length > 6 ? 200 : this.dictList.length * 32 + 50 + //update-end---author:wangshuai ---date:20220315 for：下拉单选样式出现混乱-------- } } }, @@ -221,7 +235,9 @@ value:view组件传递的值 v-model--> } } this.dictList = newDictList; - this.dictHeight = this.dictList.length > 6 ? 200 : this.dictList.length * 30 + 20 + //update-begin---author:wangshuai ---date:20220315 for：下拉单选样式出现混乱-------- + this.dictHeight = this.dictList.length > 6 ? 200 : this.dictList.length * 32 + 50 + //update-end---author:wangshuai ---date:20220315 for：下拉单选样式出现混乱-------- } } }) diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/series_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/series_setting.ftl index ec5d230c2..0c7dc2f0e 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/series_setting.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/series_setting.ftl @@ -39,6 +39,11 @@ + +

是否显示数值  

+ + +
@@ -59,9 +64,11 @@ textStyle_color:'', textStyle_fontSize:'', textStyle_fontWeight:'', - position:'' + position:'', + formatter:'' }, - labelPositions:[] + labelPositions:[], + izShowNumber:false } }, watch: { @@ -77,11 +84,30 @@ initData: function (){ if (this.settings){ this.seriesOption = Object.assign(this.seriesOption, this.settings) + //update-begin---author:wangshuai ---date:20220407 for：[issues/I50IKB]饼图 如何直接在图上显示各分类对应的数值------------ + if(this.seriesOption.formatter && "{b}"!=this.seriesOption.formatter){ + this.izShowNumber = true; + }else{ + this.izShowNumber = false; + } + //update-end---author:wangshuai ---date:20220407 for：[issues/I50IKB]饼图 如何直接在图上显示各分类对应的数值------------ } }, onSeriesLabelChange(){ let {labelPositionArray,...otherOptions}=this.seriesOption; this.$emit('change', otherOptions,'label') + }, + /** + * 图表设置格式化 + */ + onSeriesFormatterChange(){ + if(this.izShowNumber){ + this.seriesOption.formatter="{b}\n{c}" + }else{ + this.seriesOption.formatter="{b}" + } + let {labelPositionArray,...otherOptions}=this.seriesOption; + this.$emit('change', otherOptions,'label') } } }) diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/view.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/view.ftl index 40783f871..360943bba 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/view.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/view.ftl @@ -1 +1,2 @@ -<#include "components/select_scroll_radio.ftl"> \ No newline at end of file +<#include "components/select_scroll_radio.ftl"> +<#include "components/select_scroll_multiple.ftl"> \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/view.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/view.ftl index 63b55df01..c5e826511 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/view.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/view.ftl @@ -1,4 +1,4 @@ -<#assign CACHE_VERSION = "v=1.0.5"> +<#assign CACHE_VERSION = "v=v=1.0.7"> <#assign config_id = "${id!''}"> <#assign shareView = "${shareView}"> @@ -209,9 +209,7 @@ function getLocalRequestUrl() {