更新--报表分享功能

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/controller/param/ReportShareParam.java

@@ -23,4 +23,8 @@ public class ReportShareParam extends PageParam implements Serializable {
     /** 报表编码 */
     @Query(value = QueryEnum.LIKE)
     private String reportCode;
+
+    /** 分享有效期类型 */
+    @Query(value = QueryEnum.EQ)
+    private String shareValidType;
 }

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportshare/dao/entity/ReportShare.java

@@ -40,7 +40,6 @@ public class ReportShare extends GaeaBaseEntity {
     private Integer deleteFlag;
 
     /** 分享码 */
-    @TableField(exist = false)
     private String sharePassword;
 
     @TableField(exist = false)

report-core/src/main/resources/db/migration/V1.0.22__add_report_share.sql

@@ -6,3 +6,5 @@ INSERT INTO `aj_report`.`access_role_authority`(`role_code`, `target`, `action`)
 INSERT INTO `aj_report`.`access_role_authority`(`role_code`, `target`, `action`) VALUES ('root', 'reportShareManage', 'detail');
 INSERT INTO `aj_report`.`access_role_authority`(`role_code`, `target`, `action`) VALUES ('root', 'reportShareManage', 'shareDelay');
 INSERT INTO `aj_report`.`access_role_authority`(`role_code`, `target`, `action`) VALUES ('root', 'reportShareManage', 'delete');
+
+ALTER TABLE `aj_report`.`gaea_report_share` ADD COLUMN share_password varchar(10) DEFAULT NULL COMMENT '分享码' AFTER share_url;

report-ui/src/router/index.js

@@ -182,7 +182,7 @@ export const constantRouterMap = [
         component: () => import('@/views/reportShare/index'),
         meta: {
           title: '报表分享',
-          icon: 'iconliebiao',
+          icon: 'iconfenxiang1',
           keepAlive: true,
           requireAuth: true,
           permission: 'reportShareManage'

report-ui/src/views/bigScreenReport/index.vue

@@ -180,8 +180,8 @@ export default {
     },
     openDesign(val) {
       let routeUrl = this.$router.resolve({
-        path: "/screenDesigner",
+        //path: "/screenDesigner",
-        // path: "/bigscreen/designer",
+        path: "/bigscreen/designer",
         query: {
           reportCode: val.reportCode
         }

report-ui/src/views/reportShare/index.vue

@@ -36,6 +36,14 @@ export default {
             label: "报表编码",
             field: "reportCode"
           },
+          {
+            inputType: "anji-select",
+            anjiSelectOption: {
+              dictCode: "SHARE_VAILD"
+            },
+            label: "分享类型",
+            field: "shareValidType"
+          },
         ],
         // 表头按钮
         tableButtons: [
@@ -83,7 +91,9 @@ export default {
         buttons: {
           query: {
             api: reportShareList,
-            permission: 'ReportShare:query'
+            permission: 'ReportShare:query',
+            sort: "create_time",
+            order: "DESC"
           },
           queryByPrimarykey: {
             api: reportShareDetail,
@@ -127,7 +137,7 @@ export default {
             disabled: false,
           },
           {
-            label: '分享有效期类型',//分享有效期类型，DIC_NAME=SHARE_VAILD
+            label: '分享类型',//分享有效期类型，DIC_NAME=SHARE_VAILD
             placeholder: '',
             field: 'shareValidType',
             fieldTableRowRenderer: row => {
@@ -140,7 +150,7 @@ export default {
             disabled: false,
           },
           {
-            label: '分享有效期',//分享有效期
+            label: '分享过期时间',//分享有效期
             placeholder: '',
             field: 'shareValidTime',
             editField: 'shareValidTime',
@@ -154,6 +164,7 @@ export default {
             placeholder: '',
             field: 'shareToken',
             editField: 'shareToken',
+            tableHide: true,
             inputType: 'input',
             rules: [
               { min: 1, max: 255, message: '不超过255个字符', trigger: 'blur' }
@@ -171,6 +182,16 @@ export default {
             ],
             disabled: false,
           },
+          {
+            label: '分享码',
+            placeholder: '',
+            field: 'sharePassword',
+            editField: 'sharePassword',
+            inputType: 'input',
+            rules: [
+            ],
+            disabled: false,
+          },
         ],
         // 弹出框表单对应的值有改动时
         // formData 整个表单，通过编辑打开弹出框，根据主键查询数据时，fieldName, fieldVal, fieldExtend为空