zianxin/pigx
1
0 Fork 0
mirror of http://git.pig4cloud.com/pig/pigx.git synced 2026-11-11 21:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

⬆️ Upgrading dependencies. jimu 最新稳定版

Browse Source
This commit is contained in:
lbw committed 2023-09-23 15:31:07 +08:00
1 parent a72fe4c95f
commit 85ebfca4ce
11 files changed
+146 -57
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-visual/pigx-jimu-platform/src/main/java/com/pig4cloud/pigx/bi/config/JimuReportTokenService.java
+3
View File
@@ -38,6 +38,9 @@ public class JimuReportTokenService implements JmReportTokenServiceI {
.orElse(null);
// @formatter:off
}
@Override public String[] getRoles(String s) {
return new String[0];
}
@Override
public Map<String, Object> getUserInfo(String token) {
pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/authority.ftl
+1 -1
View File
@@ -1,4 +1,4 @@
<#assign CACHE_VERSION = "v=1693888295.10">
<#assign CACHE_VERSION = "v=1694491301.10">
<!DOCTYPE html>
<html>
<head>
pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/index.ftl
+53 -22
View File
@@ -1,4 +1,4 @@
<#assign CACHE_VERSION = "v=1693888295.10">
<#assign CACHE_VERSION = "v=1694491301.10">
<#assign config_id = "${id!''}">
<!DOCTYPE html>
<html>
@@ -582,9 +582,22 @@
<i-option value="img" key="2" class="rightFontSize">图片</i-option>
<i-option value="barcode" key="3" class="rightFontSize">条形码</i-option>
<i-option value="qrcode" key="4" class="rightFontSize">二维码</i-option>
<i-option value="richText" key="5" class="rightFontSize">富文本?</i-option>
<#--<i-option value="chart" key="5">图表</i-option>-->
</i-select>
</div>
<div class="basicSettingTop rightFontSize" v-if="excel.type == 'img'">
<span>尺寸?</span>
<i-select class="twoInputWidth" v-model="excel.imgSize" @on-change="onChangeCellImgSize">
<i-option value="0" key="0" class="rightFontSize">完全覆盖(cover)</i-option>
<i-option value="1" key="1" class="rightFontSize">适应内容(contain)</i-option>
<i-option value="2" key="2" class="rightFontSize">width100%--center</i-option>
<i-option value="3" key="3" class="rightFontSize">height100%--center</i-option>
<i-option value="4" key="4" class="rightFontSize">居中显示</i-option>
<i-option value="5" key="5" class="rightFontSize">拉伸(100% 100%)</i-option>
</i-select>
</div>
<div class="basicSettingTop rightFontSize">
<span>值</span>
<i-input @on-click="enlargeInputClick" icon="md-contract" style="margin-left: 16px;" v-model="excel.excelValue" @keyup.enter.native="submitValue" @on-blur="submitValue" class="twoInputWidth"></i-input>
@@ -1036,6 +1049,7 @@
var excel_config_id = "${config_id}";
var excel_req_token = '';
var excel_req_tenantId = '';
var xs = null;
var vm = null;
let autoSaveFun;
@@ -1054,6 +1068,11 @@
token = getRequestUrl().token;
}
excel_req_token = token
let tenantId = window.localStorage.getItem('JmReport-Tenant-Id');
if (tenantId == "" || tenantId == null){
tenantId = getRequestUrl().tenantId;
}
excel_req_tenantId = tenantId;
//console.log("index_load--------------",token);
let reportConfig = getReportConfigJson();
let colLength = 50,rowLength = 100, viewPageSize = [10,20,30], printPaper = []
@@ -1264,33 +1283,45 @@
if(excel_req_token && excel_req_token!="null"){
xs.data.settings.viewUrl = xs.data.settings.viewUrl +'?token='+excel_req_token
}
if(excel_req_tenantId && excel_req_tenantId!=="null"){
if(xs.data.settings.viewUrl.indexOf("?") !== -1){
xs.data.settings.viewUrl = xs.data.settings.viewUrl +'&tenantId='+excel_req_tenantId
}else{
xs.data.settings.viewUrl = xs.data.settings.viewUrl +'?tenantId='+excel_req_tenantId
}
}
//update-end---author:wangshuai ---date:20220215 for：[issues/I4SOSH]做完的积木报表，预览生成的访问地址，默认都加了token=null------------
var str = res.jsonStr;
if(!str) return;
//页面加载时设置报表宽度
const jsonStr = JSON.parse(str);
//console.log('jsonstr', jsonStr)
// 设置增强
vm.setEnhanceConfig(res.cssStr, res.jsStr)
if(jsonStr.chartList)
{
jsonStr.chartList.forEach(function(item){
let config = JSON.parse(item.config);
if (config.geo){
if (loadMap){
loadMap && loadMap(item)
try{
const jsonStr = JSON.parse(str);
//console.log('jsonstr', jsonStr)
// 设置增强
vm.setEnhanceConfig(res.cssStr, res.jsStr)
if(jsonStr.chartList)
{
jsonStr.chartList.forEach(function(item){
let config = JSON.parse(item.config);
if (config.geo){
if (loadMap){
loadMap && loadMap(item)
}
}
}
})
}
xs.data.settings.printElWidth = jsonStr.printElWidth || 0;
xs.data.printElHeight = jsonStr.printElHeight || 1047; //默认a4纸大小
// xs.sheet.toolbar.toolPrintHeightInputEl.input.el.value = xs.data.printElHeight;
xs.loadData(jsonStr);
if(jsonStr.settings){
if(jsonStr.settings.showGrid == false){
vm.gridLine = "false"
})
}
xs.data.settings.printElWidth = jsonStr.printElWidth || 0;
xs.data.printElHeight = jsonStr.printElHeight || 1047; //默认a4纸大小
// xs.sheet.toolbar.toolPrintHeightInputEl.input.el.value = xs.data.printElHeight;
xs.loadData(jsonStr);
if(jsonStr.settings){
if(jsonStr.settings.showGrid == false){
vm.gridLine = "false"
}
}
}catch(error){
console.error('jsonStr数据解析报错:', error)
vm.$Message.warning('配置有误,请检查数据JSON配置项！');
}
setTimeout(function(){
if (xs.data.chartList && xs.data.chartList.length > 0){
pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/list.ftl
+26 -7
View File
@@ -1,4 +1,4 @@
<#assign CACHE_VERSION = "v=1693888295.10">
<#assign CACHE_VERSION = "v=1694491301.10">
<!DOCTYPE html>
<html>
<head>
@@ -143,6 +143,10 @@
<Icon type="md-list"/></Icon>
<span>数据报表</span>
</Menu-Item>
<Menu-Item name="chartinfo">
<Icon type="md-images"></Icon>
<span>图形报表</span>
</Menu-Item>
<Menu-Item name="printinfo">
<Icon type="md-print"></Icon>
<span>打印设计</span>
@@ -425,6 +429,7 @@
data: {
isCollapsed: false,
token:'',//token
tenantId:'',//租户id
name:'',
designerObj:{},
loading:true,
@@ -501,7 +506,8 @@
},
mounted:function(){
this.token = token;
//console.log("list_mount--------------",this.token);
this.tenantId = tenantId;
//console.log("list_mount--------------",this.token);
this.uploadHeader = {"X-Access-Token":this.token};
this.actionUrl=BASE_URL+"/jmreport/putFile";
this.$nextTick(()=>{
@@ -617,14 +623,27 @@
*/
splicingToken(url){
if(this.token && "null" != this.token){
if(url.indexOf("?")!=-1){
url =url + "&token="+this.token;
}else{
url =url + "?token="+this.token;
}
url = this.splicingUrl("token",this.token,url);
}
if(this.tenantId && "null" !== this.tenantId){
url = this.splicingUrl("tenantId",this.tenantId,url);
}
return url;
},
/**
* 拼接路径
* @param name
* @param value
* @param url
*/
splicingUrl(name, value, url) {
if (url.indexOf("?") !== -1) {
url = url + "&" + name + "=" + value;
} else {
url = url + "?" + name + "=" + value;
}
return url;
},
//删除报表
handleDelete:function(item){
$http.confirm({
pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/data_source_setting.ftl
+15 -13
View File
@@ -856,10 +856,6 @@
}
}
},
{
title: '用户名',
key: 'dbUsername'
},
{
title: '操作',
key: 'action',
@@ -1472,8 +1468,10 @@
//Vue.prototype.$Message.error(message);
//弹窗sql解析报错字段
if(dbDynSql.indexOf("$")!=-1){
this.$refs.sqlFunctionReplace.sqlFunctionShow = true
this.$refs.sqlFunctionReplace.initDataSource(this.sqlForm.dbDynSql, this.sqlForm.dbSource, this.tab2.data)
if(this.tab2.data.length>0){
this.$refs.sqlFunctionReplace.sqlFunctionShow = true
this.$refs.sqlFunctionReplace.initDataSource(this.sqlForm.dbDynSql, this.sqlForm.dbSource, this.tab2.data)
}
}else{
Vue.prototype.$Message.error(message);
}
@@ -1529,9 +1527,11 @@
fail:(res)=>{
//1001注入异常
if(res.code!=1001 && type!=1){
//弹窗sql解析报错字段
this.$refs.sqlFunctionReplace.sqlFunctionShow = true
this.$refs.sqlFunctionReplace.initDataSource(this.sqlForm.dbDynSql,this.sqlForm.dbSource,this.tab2.data)
if(this.tab2.data.length>0){
//弹窗sql解析报错字段
this.$refs.sqlFunctionReplace.sqlFunctionShow = true
this.$refs.sqlFunctionReplace.initDataSource(this.sqlForm.dbDynSql,this.sqlForm.dbSource,this.tab2.data)
}
}
}
})
@@ -2126,12 +2126,14 @@
},
on: {
click: () => {
this.sourceTab.data.forEach((item)=>{
if (item.id === params.row.id){
this.dataSource = item;
$http.get({
url: api.getDataSourceById,
data:{'id': params.row.id},
success:(result)=>{
this.visibleData = true;
this.dataSource = result;
}
})
this.visibleData = true;
}
}
},'编辑'),
pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/javabean_setting.ftl
-1
View File
@@ -1066,7 +1066,6 @@
this.$Notice.success({
title: '删除成功'
});
this.initDataSource();
}
});
}
pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/template/components/print_setting.ftl
+38 -3
View File
@@ -78,7 +78,35 @@
<i-input v-model="printCallBackUrl" style="width: 100%"></i-input>
</i-col>
</Row>
<Row style="margin-top: 8px">
<i-col span="6">
<span>显示页码?：</span>
</i-col>
<i-col span="18">
<i-switch v-model="paginationShow"></i-switch>
</i-col>
</Row>
<Row style="margin-top: 8px" v-if="paginationShow">
<i-col span="6">
<span>页码位置?：</span>
</i-col>
<i-col span="18">
<RadioGroup v-model="paginationLocation">
<Radio label="left" border>
<span>左</span>
</Radio>
<Radio label="middle" border>
<span>中</span>
</Radio>
<Radio label="right" border>
<span>右</span>
</Radio>
</RadioGroup>
</i-col>
</Row>
</i-form>
</Modal>
</div>
@@ -128,7 +156,8 @@
marginX: 10,
marginY: 10,
layout: 'portrait',
printCallBackUrl: ''
paginationShow: true,
paginationLocation: 'middle',
}
},
created(){
@@ -169,7 +198,9 @@
marginX: this.marginX || 0,
marginY: this.marginY || 0,
layout: this.layout,
printCallBackUrl: this.printCallBackUrl
printCallBackUrl: this.printCallBackUrl,
paginationShow: this.paginationShow,
paginationLocation: this.paginationLocation,
}
},
// 纸张大小改变事件
@@ -247,6 +278,10 @@
this.isBackend = param.isBackend
}
this.printCallBackUrl = param.printCallBackUrl || ''
this.paginationShow = param.paginationShow || false
if(param.paginationLocation){
this.paginationLocation = param.paginationLocation
}
}
},
// 重置宽高px的值
pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/view.ftl
+5 -5
View File
@@ -1,4 +1,4 @@
<#assign CACHE_VERSION = "v=1693888295.10">
<#assign CACHE_VERSION = "v=1694491301.10">
<#assign config_id = "${id!''}">
<#assign shareView = "${shareView}">
<!DOCTYPE html>
@@ -220,14 +220,14 @@ function getLocalRequestUrl() {
<template v-else-if="item.type=='number'">
<Row v-if="item.mode==2">
<i-col span="11">
<i-input :ref="item.key+'_begin'" v-model="queryInfo[item.key+'_begin']" type="number" :placeholder="'请输入起始值'" clearable></i-input>
<input-number :ref="item.key+'_begin'" v-model="queryInfo[item.key+'_begin']" :placeholder="'请输入起始值'" clearable style="width: 100%"></input-number>
</i-col>
<i-col span="2" style="text-align: center">&nbsp;~</i-col>
<i-col span="11">
<i-input :ref="item.key+'_end'" v-model="queryInfo[item.key+'_end']" type="number" :placeholder="'请输入结束值'" clearable></i-input>
<input-number :ref="item.key+'_end'" v-model="queryInfo[item.key+'_end']" :placeholder="'请输入结束值'" clearable style="width: 100%"></input-number>
</i-col>
</Row>
<i-input v-else :ref="item.key" class="jm-select-box" type="number" v-model="queryInfo[item.key]" :placeholder="'请输入'+item.title" clearable></i-input>
<input-number v-else :ref="item.key" class="jm-select-box" v-model="queryInfo[item.key]" :placeholder="'请输入'+item.title" clearable style="width: 100%"></input-number>
</template>
<!-- 默认输入框 模糊查询参数加* -->
@@ -287,7 +287,7 @@ function getLocalRequestUrl() {
<i-button type="primary" @click="lockClick('${config_id}')">确定</i-button>
</div>
<div style="padding-right: 30px">
<i-form label-colon :label-width="90">
<i-form label-colon :label-width="90" @keydown.native.enter.prevent="lockClick('${config_id}')">
<form-item label="密码">
<i-input v-model="lock" placeholder="请输入密码"></i-input>
</form-item>