From d84ba2dcc18504d6efc992cb3ffdca1f9426a7ff Mon Sep 17 00:00:00 2001 From: aeizzz Date: Thu, 15 Dec 2022 15:17:56 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=A7=AF=E6=9C=A8=E6=8A=A5=E8=A1=A8=E5=89=8D?= =?UTF-8?q?=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jmreport/desreport/authority.ftl | 2 +- .../jmreport/desreport/common/tj.ftl | 20 ++-- .../templates/jmreport/desreport/demo.ftl | 6 +- .../templates/jmreport/desreport/index.ftl | 12 ++- .../templates/jmreport/desreport/list.ftl | 20 +++- .../components/background_setting.ftl | 4 +- .../components/bar_series_setting.ftl | 75 ++++++++++++++ .../template/components/cell_linkage.ftl | 4 +- .../components/central_point_setting.ftl | 4 +- .../template/components/chart_linkage.ftl | 2 +- .../template/components/data_dictionary.ftl | 18 +++- .../components/data_source_setting.ftl | 13 ++- .../template/components/javabean_setting.ftl | 12 +-- .../template/components/jurisdiction.ftl | 2 +- .../template/components/legend_setting.ftl | 14 ++- .../template/components/map_setting.ftl | 2 +- .../template/components/match_setting.ftl | 14 +-- .../template/components/pictorial_setting.ftl | 4 +- .../template/components/print_setting.ftl | 28 +++++- .../components/select_scroll_multiple.ftl | 13 ++- .../components/select_scroll_radio.ftl | 23 ++++- .../template/components/series_setting.ftl | 57 ++++++++--- .../template/components/tree_select.ftl | 98 +++++++++++++++++-- .../template/components/view_setting.ftl | 2 +- .../jmreport/desreport/template/index.ftl | 3 +- .../templates/jmreport/desreport/view.ftl | 18 ++-- 26 files changed, 368 insertions(+), 102 deletions(-) create mode 100644 pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/bar_series_setting.ftl 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 ae1e9f0d9..5f7fcd4cb 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=v=1.0.7"> +<#assign CACHE_VERSION = "v=1.0.13"> diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/common/tj.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/common/tj.ftl index 5e8a76222..58e8cd72c 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/common/tj.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/common/tj.ftl @@ -1,11 +1,17 @@ \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/demo.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/demo.ftl index 4a243cabc..8d496af4f 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/demo.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/demo.ftl @@ -816,10 +816,10 @@ } } ).change((cdata) => { - console.log(cdata); - console.log(xs.validate()); + // console.log(cdata); + // console.log(xs.validate()); var str = JSON.stringify(cdata) - console.log(str); + // console.log(str); }); } 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 2554410ac..d5aba8320 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,4 +1,4 @@ -<#assign CACHE_VERSION = "v=1.0.7"> +<#assign CACHE_VERSION = "v=1.0.13"> <#assign config_id = "${id!''}"> @@ -32,6 +32,14 @@ token = window.localStorage.getItem('JmReport-Access-Token'); } window.localStorage.setItem('JmReport-Access-Token',token); + + //update-begin---author:wangshuai ---date:20220708 for：[JMREP-2661]多租户权限集成------------ + let tenantId = getRequestUrl().tenantId; + if("" == tenantId || null == tenantId){ + tenantId = window.localStorage.getItem('JmReport-Tenant-Id'); + } + window.localStorage.setItem('JmReport-Tenant-Id',tenantId); + //update-end---author:wangshuai ---date:20220708 for：[JMREP-2661]多租户权限集成------------ <#include "./common/resource.ftl"> @@ -801,6 +809,8 @@ + + <#----> diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/list.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/list.ftl index 1f6d291e8..b6516ff9c 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/list.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/list.ftl @@ -1,4 +1,4 @@ -<#assign CACHE_VERSION = "v=v=1.0.7"> +<#assign CACHE_VERSION = "v=1.0.13"> @@ -26,6 +26,14 @@ token = window.localStorage.getItem('JmReport-Access-Token'); } window.localStorage.setItem('JmReport-Access-Token',token); + + //update-begin---author:wangshuai ---date:20220708 for：[JMREP-2661]多租户权限集成------------ + let tenantId = getRequestUrl().tenantId; + if("" == tenantId || null == tenantId){ + tenantId = window.localStorage.getItem('JmReport-Tenant-Id'); + } + window.localStorage.setItem('JmReport-Tenant-Id',tenantId); + //update-end---author:wangshuai ---date:20220708 for：[JMREP-2661]多租户权限集成------------ @@ -467,7 +475,7 @@ slot: 'action', className: 'table-background', fixed:'right' - } + } ],//列表的列 }, computed: { @@ -592,7 +600,7 @@ /** * 为路径拼接token * @param url 需要拼接的路径 - * @return 拼接后的token + * @return 拼接后的token */ splicingToken(url){ if(this.token && "null" != this.token){ @@ -669,7 +677,7 @@ //报表设计和模板案例点击事件 tabsClick(name){ this.name="" - this.loadData(name) + this.loadData(name) }, //回车搜索事件 enterSearchClick(){ @@ -735,7 +743,9 @@ if(result.status=='0'){ let protocol = window.location.protocol; let host = window.location.host; - let url = protocol+"//"+host+base; + //update-begin---author:wangshuai ---date:20221118 for：[issues/1383]yml中设置了项目前缀，分享链接地址有误------------ + let url = protocol+"//"+host+BASE_URL; + //update-end---author:wangshuai ---date:20221118 for：[issues/1383]yml中设置了项目前缀，分享链接地址有误------------ result.previewUrl = url+result.previewUrl; this.$refs.jurisdiction.jurisdictionData = result; this.$refs.jurisdiction.shareUrlModal = true diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/background_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/background_setting.ftl index 4617c4e04..5d20c4df9 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/background_setting.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/background_setting.ftl @@ -100,8 +100,8 @@ }, //图片上传文件大小 handleMaxSize(file, size){ - console.log("file===>", file) - console.log("size===>", size) + // console.log("file===>", file) + // console.log("size===>", size) this.$Notice.warning({ title: '超出文件大小限制', desc: '文件 ' + file.name + ' 太大，请上传' + size + 'M以内图片', diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/bar_series_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/bar_series_setting.ftl new file mode 100644 index 000000000..0e01319e5 --- /dev/null +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/bar_series_setting.ftl @@ -0,0 +1,75 @@ + + + + \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/cell_linkage.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/cell_linkage.ftl index ba24ff133..931fcb37e 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/cell_linkage.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/cell_linkage.ftl @@ -337,7 +337,7 @@ url: api.getLinkageChartInfo, data: param, success: (result) => { - console.log(112,result) + // console.log(112,result) // 设置被联动图表的参数接收 handleLinkageParams.call(this, result.paramList) // 设置当前图表的字段字典信息 @@ -391,7 +391,7 @@ }, // 参数选中改变事件 handleClParamSelected(selections){ - console.log('selections', selections) + // console.log('selections', selections) let arr = [] selections.map(k=>{ arr.push(k.index) diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/central_point_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/central_point_setting.ftl index fea81364b..d4d358e04 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/central_point_setting.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/central_point_setting.ftl @@ -40,14 +40,14 @@ deep: true, immediate: true, handler: function (){ - console.log("我进来了") + // console.log("我进来了") this.initData() } } }, methods: { initData: function (){ - console.log(this.centralPoint,"我进来了") + // console.log(this.centralPoint,"我进来了") if (this.settings){ this.centralPoint = Object.assign(this.centralPoint, this.settings) } diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/chart_linkage.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/chart_linkage.ftl index 8fd1888ee..563105722 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/chart_linkage.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/chart_linkage.ftl @@ -298,7 +298,7 @@ url: api.getLinkageChartInfo, data: param, success: (result) => { - console.log(112,result) + // console.log(112,result) // 设置被联动图表的参数接收 handleLinkageParams.call(this, result.paramList) // 设置当前图表的字段字典信息 diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_dictionary.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_dictionary.ftl index 82eb06f2b..f4cde3476 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_dictionary.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_dictionary.ftl @@ -26,7 +26,7 @@ - 查询 + 查询 清空 @@ -122,7 +122,7 @@ <#--回收站 end--> <#--end字典--> <#--字典配置页面 begin--> - +
添加
@@ -362,11 +362,17 @@ }, }, methods: { - loadData() { + loadData(arg) { //加载数据列表 let that = this; let data = {} - data.pageNo = that.dictData.page.page + //update-begin---author:wangshuai ---date:20220720 for：[VUEN-1657]积木报表的字典查询，不好使输入 sex 或者性别都查不到数据------------ + if(arg){ + data.pageNo = arg + }else{ + data.pageNo = that.dictData.page.page + } + //update-end---author:wangshuai ---date:20220720 for：[VUEN-1657]积木报表的字典查询，不好使输入 sex 或者性别都查不到数据-------------- data.pageSize = that.dictData.page.size if(this.queryParam.dictCode){ data.dictCode=this.queryParam.dictCode @@ -386,7 +392,9 @@ }, resetParam(){ this.queryParam={} - this.loadData() + //update-begin---author:wangshuai ---date:20220720 for：[VUEN-1657]积木报表的字典查询，不好使输入 sex 或者性别都查不到数据------------ + this.loadData(1) + //update-end---author:wangshuai ---date:20220720 for：[VUEN-1657]积木报表的字典查询，不好使输入 sex 或者性别都查不到数据------------ }, loadItemData() { //加载数据列表 diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_source_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_source_setting.ftl index eda44e087..6e2b49719 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_source_setting.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_source_setting.ftl @@ -152,8 +152,8 @@

    -
  • 如果id字段为字符串类型则需要加单引号:http://127.0.0.1:8080/jeecg-boot/jimureport/test?id=${"'$"}${"{id}'"}。
    • -
  • 您可以编写${"'#"}${"{sysDateTime}'"}做为一个系统变量,这里sysDateTime是当前系统时间。例如:http://127.0.0.1:8080/jeecg-boot/jimureport/test?riqi=${"'#"}${"{sysDateTime}'"}。
    • +
  • 如果id字段为字符串类型则需要加单引号:http://127.0.0.1:8080/jeecg-boot/jimureport/test?id=${"$"}${"{id}"}。
    • +
  • 您可以编写${"#"}${"{sysDateTime}"}做为一个系统变量,这里sysDateTime是当前系统时间。例如:http://127.0.0.1:8080/jeecg-boot/jimureport/test?riqi=${"#"}${"{sysDateTime}"}。
  • 您可以简写访问路径，如：{ { domainURL } }/jimureport/test。 @@ -392,7 +392,6 @@ {value: 'dm',label: '达梦'}, {value: 'kingbase8',label: '人大金仓'}, {value: 'oscar',label: '神通'}, - {value: 'SQLite',label: 'SQLite'}, {value: 'DB2',label: 'DB2'}, {value: 'Hsqldb',label: 'Hsqldb'}, {value: 'Derby',label: 'Derby'}, @@ -533,7 +532,7 @@ }, on: { 'on-change': (value) => { - console.log(this.tab1.data) + // console.log(this.tab1.data) this.tab1.data[params.index].searchMode = value; // this.tab1.data } @@ -1039,7 +1038,7 @@ editById(dbId){ this.tabValue="1"; $http.get({url:api.loadDbData(dbId),success:(result)=>{ - console.log('result=====',result); + // console.log('result=====',result); let reportResult = result; if(!reportResult){ return; @@ -1122,7 +1121,7 @@ }, getReport(){ $http.get({url:api.getReport(excel_config_id),success:(result)=>{ - console.log("result====>",result) + // console.log("result====>",result) if (result){ this.$emit('cancelback',result) this.designerObj = result; @@ -1182,7 +1181,7 @@ success:(result)=>{ this.tab3Loading=false; this.spinShow=false; - console.log("loadTableData====>result",result) + // console.log("loadTableData====>result",result) this.tab3.data=result.records; this.tab3.page.total=result.total; }, diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/javabean_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/javabean_setting.ftl index 1049ebf10..852307544 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/javabean_setting.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/javabean_setting.ftl @@ -295,7 +295,7 @@ }, on: { 'on-change': (value) => { - console.log(this.tab1.data) + // console.log(this.tab1.data) this.tab1.data[params.index].searchMode = value; // this.tab1.data } @@ -593,7 +593,7 @@ } data.fieldList = this.tab1.data; //解析出表字段 data.paramList = this.tab2.data; //动态表单参数 - console.log(123, data) + // console.log(123, data) $http.post({ url: api.saveDb, contentType:'json', @@ -640,7 +640,7 @@ this.clearData(); $http.get({url:api.loadDbData(dbId), success:(result)=>{ - console.log('result=====',result); + // console.log('result=====',result); if(!result){ return; } @@ -759,7 +759,7 @@ getReport(){ $http.get({url:api.getReport(excel_config_id),success:(result)=>{ - console.log("result====>",result) + // console.log("result====>",result) if (result){ this.$emit('cancelback',result) this.designerObj = result; @@ -805,7 +805,7 @@ success:(result)=>{ this.tab3Loading=false; this.spinShow=false; - console.log("loadTableData====>result",result) + // console.log("loadTableData====>result",result) this.tab3.data=result.records; this.tab3.page.total=result.total; }, @@ -1116,7 +1116,7 @@ }, //放大确定事件 extJsonOk(){ - console.log(this.paramConfigData) + // console.log(this.paramConfigData) if(this.tableType == 0){ this.tab1.data[this.tableIndex].extJson = this.paramConfigData }else if(this.tableType == 1){ diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/jurisdiction.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/jurisdiction.ftl index 9abcba10d..1ffd0a65d 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/jurisdiction.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/jurisdiction.ftl @@ -144,7 +144,7 @@ jurisdictionData.id= this.jurisdictionData.id jurisdictionData.status= '1' jurisdictionData.reportId= this.jurisdictionData.reportId - console.log("我进来了") + // console.log("我进来了") $http.post({ contentType:'json', url: api.addAndEdit, diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/legend_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/legend_setting.ftl index d3cf58cf5..24f7f1106 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/legend_setting.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/legend_setting.ftl @@ -52,7 +52,7 @@

    上边距  

    - +
@@ -77,7 +77,8 @@ left:"left", orient:"horizontal", textStyle_fontSize:"" - } + }, + paddingTop:'' //边距单独提出来 } }, watch: { @@ -93,13 +94,18 @@ initData: function (){ if (this.settings){ this.legendOptions = Object.assign(this.legendOptions, this.settings) + //update-begin---author:wangshuai ---date:20220628 for：[issues/I58YJG]图表中图例设置-纵向位置如果设置为底部，在挪动上边距的话那个图例就会跑到顶部去------------ + this.paddingTop = this.legendOptions.padding[0] + //update-end---author:wangshuai ---date:20220628 for：[issues/I58YJG]图表中图例设置-纵向位置如果设置为底部，在挪动上边距的话那个图例就会跑到顶部去-------------- } }, onLegendChange (){ - console.log("我进来了") - console.log(this.legendOptions) this.$emit('change','legend',this.legendOptions) }, + onLegendTopChange(){ + this.legendOptions.padding[0] = this.paddingTop; + this.onLegendChange() + }, formatTop(val){ return val }, diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/map_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/map_setting.ftl index cbf0b39f9..a2f1f5aa6 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/map_setting.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/map_setting.ftl @@ -334,7 +334,7 @@ token:this.token }, success:(result)=>{ - console.log('result',result) + // console.log('result',result) let records=result.records; that.page.total = result.total that.$nextTick(()=>{ diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/match_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/match_setting.ftl index 6d3e4a574..834020346 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/match_setting.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/match_setting.ftl @@ -119,7 +119,7 @@ methods: { //渲染button renderColorButton(h, params, key, type){ - console.log('params', params) + // console.log('params', params) if (key == 'action'){ return h('div', {style: {display: 'flex'}}, [ h('i-button', { @@ -190,7 +190,7 @@ }, initData: function (){ if (this.chartOptions){ - console.info("########", JSON.stringify(this.dataSettings)) + // console.info("########", JSON.stringify(this.dataSettings)) this.selectedChartType = this.dataSettings.chartType; let colorArr = []; let seriesList = [] @@ -244,7 +244,7 @@ } } }) - console.info("自定义颜色", colorArr) + // console.info("自定义颜色", colorArr) //已设置的颜色配置 this.colorMatchData = colorArr //系列下拉框数据 @@ -264,8 +264,8 @@ this.colorMatch={name:'',color:'',edgeColor:"",opacity:1,lineColor:''}; }, onColorChange(){ - console.log('this.colorMatchData==>',JSON.stringify(this.colorMatchData)); - console.log('this.seriesTypeData==>',JSON.stringify(this.seriesTypeData)); + // console.log('this.colorMatchData==>',JSON.stringify(this.colorMatchData)); + // console.log('this.seriesTypeData==>',JSON.stringify(this.seriesTypeData)); if(!this.colorMatchData){ return; } @@ -278,7 +278,7 @@ }else{ arr = this.chartOptions['series'] } - console.log('this.arr==>',JSON.stringify(arr)); + // console.log('this.arr==>',JSON.stringify(arr)); let seriesArray = [] let i = 0; for(let item of arr){ @@ -364,7 +364,7 @@ let arr= [[0.2, c1], [0.8, c2], [1, c3]]; this.chartOptions['series'][0]['axisLine']['lineStyle'].color =arr } - console.info("this.chartOptions",JSON.stringify(this.chartOptions)) + // console.info("this.chartOptions",JSON.stringify(this.chartOptions)) let id = this.dataSettings.id; xs.updateChart(id , this.chartOptions); }, diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/pictorial_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/pictorial_setting.ftl index d081f053a..3dafc426a 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/pictorial_setting.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/pictorial_setting.ftl @@ -107,8 +107,8 @@ }, //图片上传文件大小 handleMaxSize (file,size) { - console.log("file===>",file) - console.log("size===>",size) + // console.log("file===>",file) + // console.log("size===>",size) this.$Notice.warning({ title: '超出文件大小限制', desc: '文件 ' + file.name + ' 太大，请上传'+size+'M以内图片', diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/print_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/print_setting.ftl index d1ed279d5..f273b72ac 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/print_setting.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/print_setting.ftl @@ -1,6 +1,6 @@ \ No newline at end of file + + \ No newline at end of file diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_multiple.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_multiple.ftl index 8341ae5a1..526ef6dd3 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_multiple.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/select_scroll_multiple.ftl @@ -7,9 +7,9 @@ index:下标-->
{{dictText}} - {{'请选择'+dataList.name}} + {{'请选择'+dataList.title}}
- +
this.getDictData(1); }else{ //前台进行搜索 - if(this.dictText){ + //update-begin---author:wangshuai ---date:20221117 for：[issues/1316]查询栏 下拉多选搜索无效------------ + if(this.searchText){ + //update-end---author:wangshuai ---date:20221117 for：[issues/1316]查询栏 下拉多选搜索无效-------------- this.searchDictByText(); }else{ this.dictList = this.copyDictList @@ -339,7 +341,10 @@ index:下标--> }else{ for (let i = 0; i = 0 || value == searchText){ + let text = dictList[i].text; + if(value.indexOf(searchText) >= 0 || value === searchText){ + newDictList.push(dictList[i]) + }else if(text.indexOf(searchText) >= 0 || text ===searchText){ newDictList.push(dictList[i]) } } 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 9706ae0d5..f27488770 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 @@ -3,9 +3,12 @@ item:传递的参数，包含字典code，查询key value:view组件传递的值 v-model--> 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 0c7dc2f0e..a2d0e9d2b 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 @@ + +

数值旋转  

+ + +

是否显示数值  

@@ -65,7 +70,9 @@ textStyle_fontSize:'', textStyle_fontWeight:'', position:'', - formatter:'' + formatter:'', + rotate:0, + type:'' }, labelPositions:[], izShowNumber:false @@ -84,13 +91,28 @@ 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; + + //update-begin---author:wangshuai ---date:20220626 for：[JMREP-2655]图表数值倾斜度设置后，数值不显示了/[issues/I5CO1P、issues/1100 、issues/1086]图表的数值显示，会连轴名称一起显示 ------------ + //显示名称，没有显示数值 + let type = this.seriesOption.type; + if(type === 'pie' || type === 'funnel' || type === 'scatter' || type === 'graph'){ + //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]饼图 如何直接在图上显示各分类对应的数值------------ }else{ - this.izShowNumber = false; + //只显示数值，如formatter值不为' ',则显示数值，否则不显示 + if(this.seriesOption.formatter === " "){ + this.izShowNumber = false + }else{ + this.seriesOption.formatter="{c}" + this.izShowNumber = true + } } - //update-end---author:wangshuai ---date:20220407 for：[issues/I50IKB]饼图 如何直接在图上显示各分类对应的数值------------ + //update-end---author:wangshuai ---date:20220626 for：[JMREP-2655]图表数值倾斜度设置后，数值不显示了/[issues/I5CO1P、issues/1100 、issues/1086]图表的数值显示，会连轴名称一起显示 -------------- } }, onSeriesLabelChange(){ @@ -101,11 +123,24 @@ * 图表设置格式化 */ onSeriesFormatterChange(){ - if(this.izShowNumber){ - this.seriesOption.formatter="{b}\n{c}" - }else{ - this.seriesOption.formatter="{b}" - } + //update-begin---author:wangshuai ---date:20220626 for：[JMREP-2655]图表数值倾斜度设置后，数值不显示了/[issues/I5CO1P、issues/1100 、issues/1086]图表的数值显示，会连轴名称一起显示 ------------ + let type = this.seriesOption.type; + if(type === 'pie' || type === 'funnel' || type === 'scatter' || type === 'graph'){ + //如果是选中数值状态 + if(this.izShowNumber){ + this.seriesOption.formatter="{b}\n{c}" + }else{ + this.seriesOption.formatter="{b}" + } + }else{ + //如果是选中数值状态，并且初始值为数值 + if(this.izShowNumber){ + this.seriesOption.formatter="{c}" + }else{ + this.seriesOption.formatter=" " + } + } + //update-end---author:wangshuai ---date:20220626 for：[JMREP-2655]图表数值倾斜度设置后，数值不显示了/[issues/I5CO1P、issues/1100 、issues/1086]图表的数值显示，会连轴名称一起显示 ------------ 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/components/tree_select.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/tree_select.ftl index dc7d78d8e..ae4b36ad2 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/tree_select.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/tree_select.ftl @@ -37,7 +37,7 @@ +{{ multipleShowVal.length - 2 }} - 请选择 + 请选择
@@ -76,7 +76,10 @@ }, url: { type: String - } + }, + loadtreeurl: { + type: String + } }, data(){ return { @@ -94,6 +97,7 @@ queryData: [], inputOver: false, treeOver: false, + initValues:[] //初始化value值 } }, @@ -122,6 +126,14 @@ }) } } + + //update-begin---author:wangshuai ---date:20220627 for：[issues/965]报表下钻时返回上一页下拉树参数回显有问题------------ + //如果没有配置通过value值获取树集合，那么就不走孩子选中时间 + if(this.loadtreeurl){ + this.checkChildTreeData(arr,this.initValues) + } + //update-end---author:wangshuai ---date:20220627 for：[issues/965]报表下钻时返回上一页下拉树参数回显有问题-------------- + if(callback){ callback(arr) }else{ @@ -135,9 +147,9 @@ }, // 加载子节点 loadData(item, callback){ - console.log("====") - console.log("loadData") - console.log("====") + // console.log("====") + // console.log("loadData") + // console.log("====") let params = { params: {pid: item.id} } @@ -149,9 +161,9 @@ }, // 加载数据 loadRoot(){ - console.log("====") - console.log("loadRoot") - console.log("====") + // console.log("====") + // console.log("loadRoot") + // console.log("====") $http.metaGet(this.url).then((res) => { this.combineTreeData(res.data) }).catch(function (error){ @@ -160,7 +172,7 @@ }, initTreeSelected(){ // 如果有默认值 需要设置该方法 - console.log('initTreeSelected', this.value) + // console.log('initTreeSelected', this.value) if(!this.value){ let arr = this.queryData; this.clearTreeSelect(arr) @@ -168,6 +180,13 @@ this.multipleHideVal = [] // 勾选状态去不掉 this.queryData = JSON.parse(JSON.stringify(arr)) + }else{ + //update-begin---author:wangshuai ---date:20220627 for：[issues/965]报表下钻时返回上一页下拉树参数回显有问题------------ + //如果没有配置通过值获取数集合，那么就不走请求接口，兼容老数据 + if(this.loadtreeurl){ + this.getTreeName(this.value); + } + //update-end---author:wangshuai ---date:20220627 for：[issues/965]报表下钻时返回上一页下拉树参数回显有问题------------ } }, clearTreeSelect(arr){ @@ -256,7 +275,7 @@ } }, clearVal () { - console.log('clearVal') + // console.log('clearVal') /* if (this.clearable && !this.multiple && this.iconVal === 'ios-close-circle') { this.pickTree(this.hideValue) this.queryVal = '' @@ -339,6 +358,65 @@ let emitString = this.multipleHideVal.join(',') this.$emit('input', emitString) this.$emit('on-change', emitString) + }, + + /** + * 获取树名称 + * @param value + */ + getTreeName(value){ + let params = { + params: {value: value} + } + $http.metaGet(this.loadtreeurl, params).then((res) => { + if(res.data && res.data.length> 0){ + let initValues = []; + for (let i = 0; i < res.data.length; i++) { + if(res.data[i].value){ + if(this.multipleShowVal.indexOf(res.data[i].title) === -1){ + this.multipleShowVal.push(res.data[i].title) + } + initValues.push(res.data[i].value) + } + } + //如果有值默认选中 + this.setChecked(initValues); + this.initValues = initValues + } + }).catch(function (error){ + console.log('获取树名称失败', error) + }); + }, + + /** + * 设置选中值 + * @param children + * @param removeValue + */ + setChecked(values){ + let arr = this.queryData; + for (let i = 0; i < arr.length; i++) { + if (values.indexOf(arr[i].value)!==-1 && !values.checked) { + Vue.set(arr[i],"checked",true) + } else { + Vue.set(arr[i],"checked",false) + } + } + }, + + /** + * 子级设置选中值 + * @param children + * @param checkedValue + */ + checkChildTreeData(children, checkedValue) { + for (let i = 0; i < children.length; i++) { + if (checkedValue.indexOf(children[i].value)!==-1 && !checkedValue.checked) { + Vue.set(children[i],"checked",true) + }else{ + Vue.set(children[i],"checked",false) + } + } } } diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/view_setting.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/view_setting.ftl index cd4219a9c..c5bce2f6d 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/view_setting.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/view_setting.ftl @@ -169,7 +169,7 @@ this.$emit('change', false) }, handleClickToolbarBtn(item){ - console.log('handleClickToolbarBtn', item) + // console.log('handleClickToolbarBtn', item) let index = item.index; let position = this.selectedIndexList.indexOf(index) if(position>=0){ diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/index.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/index.ftl index 06dbee409..b6011f7f4 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/index.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/index.ftl @@ -31,4 +31,5 @@ <#include "components/chart_linkage.ftl"> <#include "components/cell_linkage.ftl"> <#include "components/primary_sub_report.ftl"> -<#include "components/sql_function_replace.ftl"> \ No newline at end of file +<#include "components/sql_function_replace.ftl"> +<#include "components/bar_series_setting.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 c5e826511..ceb15f08f 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=v=1.0.7"> +<#assign CACHE_VERSION = "v=1.0.13"> <#assign config_id = "${id!''}"> <#assign shareView = "${shareView}"> @@ -158,7 +158,7 @@ function getLocalRequestUrl() {
- + 查 询 栏
@@ -196,7 +196,7 @@ function getLocalRequestUrl() { @@ -219,20 +219,20 @@ function getLocalRequestUrl() { @@ -298,8 +298,8 @@ function getLocalRequestUrl() { -<#include "./common/tj.ftl"> +<#include "./common/tj.ftl">