diff --git a/pigx-visual/pigx-jimu-platform/src/main/java/com/pig4cloud/pigx/bi/config/JimuReportTokenService.java b/pigx-visual/pigx-jimu-platform/src/main/java/com/pig4cloud/pigx/bi/config/JimuReportTokenService.java index 72a8df299..49c9fb673 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/java/com/pig4cloud/pigx/bi/config/JimuReportTokenService.java +++ b/pigx-visual/pigx-jimu-platform/src/main/java/com/pig4cloud/pigx/bi/config/JimuReportTokenService.java @@ -18,7 +18,7 @@ import java.util.Map; /** * @author lengleng * @date 2022/4/6 - * + *

* 积木安全控制 */ @Component @@ -40,7 +40,7 @@ public class JimuReportTokenService implements JmReportTokenServiceI { // @formatter:off } @Override public String[] getRoles(String s) { - return new String[0]; + return new String[]{"admin"}; } @Override 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 93bd4dd71..86eb3ee81 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=1694491301.10"> +<#assign CACHE_VERSION = "v=1699715555.10"> 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 c62c7f8ae..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 @@ -5,7 +5,7 @@ var s = document.createElement('script'); s.type = 'text/javascript'; s.async = true; - s.src = "https://hm.baidu.com/hm.js?b756a4a8e1c58d613e27d1459c6d6076"; + s.src = "https://hm.baidu.com/hm.js?5819d05c0869771ff6e6a81cdec5b2e8"; var x = document.getElementsByTagName('script')[0]; x.parentNode.insertBefore(s, x); } 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 6ca4252cb..ca1f05d1c 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 @@ -828,7 +828,7 @@ function load() { // 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/error.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/error.ftl new file mode 100644 index 000000000..32347c969 --- /dev/null +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/error.ftl @@ -0,0 +1,15 @@ + + + + + + 系统错误 + + + +

+ ${message} + Upgrade Now +
+ + \ No newline at end of file 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 b97d48bbd..b23847d50 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=1694491301.10"> +<#assign CACHE_VERSION = "v=1699715555.10"> <#assign config_id = "${id!''}"> @@ -582,12 +582,12 @@ 图片 条形码 二维码 - 富文本? + 富文本 <#--图表-->
- 尺寸? + 尺寸 完全覆盖(cover) 适应内容(contain) @@ -1139,7 +1139,7 @@ x.spreadsheet.locale('zh-cn'); xs = x.spreadsheet('#jm-sheet-wrapper', options) .onSave(function (data) { - console.log("data: ", data) + //console.log("data: ", data) //设置报表打印宽度 const dataRect = xs.data.getDataRect(); let dataRectWidth = 0; 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 c0ad99bd6..95cea3b7a 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=1694491301.10"> +<#assign CACHE_VERSION = "v=1699715555.10"> @@ -131,6 +131,10 @@ <#include "./template/list.ftl">
+<#--
--> +<#-- --> +<#-- 欢迎进入积木报表工作台 --> +<#--
--> @@ -143,14 +147,14 @@ 数据报表 - - - 图形报表 - 打印设计 + + + 回收站 +
@@ -158,7 +162,9 @@
-
+
+ + 导入报表
@@ -184,7 +190,7 @@
-
+

新建报表

@@ -202,7 +208,7 @@
-
+
设计 @@ -219,24 +225,24 @@ {{ item.name }}
-
+
- + - + - + - + @@ -247,51 +253,78 @@
+ +
- + 新建报表
- +
@@ -350,7 +383,7 @@
- + @@ -360,7 +393,7 @@ - + @@ -396,7 +429,7 @@ - + @@ -406,7 +439,7 @@ - + @@ -765,6 +798,33 @@ this.$Spin.hide(); }, 3000);*/ }, + //----------导入导出begin---------------------- + handleFileUpload(event) { + const file = event.target.files[0]; + const formData = new FormData(); + formData.append('file', file); + // 处理文件上传操作，例如读取文件内容等 + $http.post({ + url:api.importReportJson, + contentType: "multipart/form-data", + data:formData, + success:(result)=>{ + //console.log(result); + this.$Message.success(result); + this.loadData() + this.$refs.fileInput.value = null; + }, + error:(err)=>{ + console.error(err); + this.$Message.error(err); + } + }); + }, + uploadFile(event) { + const input = document.querySelector("#fileInput"); + input?.click(); + }, + //----------导入导出end---------------------- //分享按钮点击事件 handleShare(id){ $http.get({ @@ -810,6 +870,46 @@ return "${base}"+"${customPrePath}"+JM_VIEW_IMG_URL+"/"+item.thumb } } + }, + /** + * 真实删除 + * @param item + */ + handleRealDelete(item){ + var that = this; + this.$Modal.confirm({ + title: "彻底删除", + content: "确定要彻底删除吗，删除之后无法恢复", + closable: true, + onOk: (res) => { + $http.del({ + url: api.deleteReportById, + data: { + id: item.id + }, + success:(res)=>{ + that.loadData(); + } + }) + }, + }); + }, + /** + * 撤回 + * @param item + */ + handleReduction(item){ + var that = this; + $http.post({ + contentType:'json', + url: api.revertReportById, + data: { + id: item.id + }, + success:(res)=>{ + that.loadData(); + } + }) } } }) 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 462cbe4a1..1d4a8fdbb 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 @@ -316,11 +316,11 @@ getChartParamSelectOptions() { let data = this.currentChart if(!data){ - console.log("未选择联动图表!") + //console.log("未选择联动图表!") return [] } if(!data.x || !data.y){ - console.log("图表未正确配置数据源!") + //console.log("图表未正确配置数据源!") return [] } let arr = [{ 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 46214f9ce..9d4f13d65 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 @@ -7,7 +7,8 @@ :title="moduleTitle" fullscreen=true :closable="true" - :mask-closable="false"> + :mask-closable="false" + :closable="false">
关闭
@@ -37,6 +38,7 @@ 添加 刷新缓存 删除 + 回收站
关闭
+
+ 批量取回 + 批量刪除 +
+ style="margin-top: 1%;" @on-selection-change="recycleBinChange">