Browse Source

!92 update 0.9.8.6 hotfix
Merge pull request !92 from Foming/dev

Foming 3 years ago
parent
commit
0a73df2e9a

+ 4 - 3
doc/docs/guide/dataset.md

@@ -34,14 +34,15 @@
 
 
 #### js脚本
 #### js脚本
 
 
-**注**:这里的JS是java的scriptengine执行的,很多es6的语法不支持 <br>
+**注**:这里的JS是java的scriptengine执行的,很多ES6的语法不支持 <br>
 ![img4](../picture/dateset/img_4.png) <br>
 ![img4](../picture/dateset/img_4.png) <br>
 入参是data,返回值也必须是data,中间是JS的处理过程,注意入参返回都是List<JSONObject>,记得保存。 <br>
 入参是data,返回值也必须是data,中间是JS的处理过程,注意入参返回都是List<JSONObject>,记得保存。 <br>
 
 
 #### 字典项
 #### 字典项
 
 
-场景有限,待补充。
+![img6.png](../picture/dateset/img_6.png) <br>
+记得保存
 
 
 ## HTTP数据集
 ## HTTP数据集
 
 
-即原有http数据源的功能,原有http数据源不动
+即原有http数据源的功能,原有http数据源不动

BIN
doc/docs/picture/dateset/img_6.png


+ 1 - 1
report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/ReportDashboardController.java

@@ -101,7 +101,7 @@ public class ReportDashboardController {
 
 
     @PostMapping("/share")
     @PostMapping("/share")
     @GaeaAuditLog(pageTitle = "分享")
     @GaeaAuditLog(pageTitle = "分享")
-    @Permission(code = "bigScreenManage", name = "分享报表")
+    @Permission(code = "share", name = "分享报表")
     public ResponseBean share(@Validated @RequestBody ReportShareDto dto) {
     public ResponseBean share(@Validated @RequestBody ReportShareDto dto) {
         return ResponseBean.builder().data(reportShareService.insertShare(dto)).build();
         return ResponseBean.builder().data(reportShareService.insertShare(dto)).build();
     }
     }

+ 1 - 1
report-ui/src/views/layout/components/Sidebar/index.vue

@@ -3,7 +3,7 @@
     <div class="admin-title" @click="goBigScreen">
     <div class="admin-title" @click="goBigScreen">
       <div class="con">
       <div class="con">
         <img src="../../../../../static/logo-dp.png" width="50" />
         <img src="../../../../../static/logo-dp.png" width="50" />
-        <span class="version">V0.9.8.5</span>
+        <span class="version">V0.9.8.6</span>
       </div>
       </div>
     </div>
     </div>
     <el-menu
     <el-menu