Ver Fonte

分享优化

qianming há 3 anos atrás
pai
commit
9c250c5d73

+ 5 - 1
report-ui/src/views/excelreport/components/share.vue

@@ -54,7 +54,11 @@
         <el-form-item label="链接" prop="reportShareUrl">
           <el-input v-model="reportShareUrl" :disabled="true" />
         </el-form-item>
-        <el-form-item label="分享码" prop="sharePassword">
+        <el-form-item
+          v-if="dialogForm.sharePasswordFlag"
+          label="分享码"
+          prop="sharePassword"
+        >
           <el-input v-model="dialogForm.sharePassword" :disabled="true" />
         </el-form-item>
 

+ 9 - 2
report-ui/src/views/reportManage/components/share.vue

@@ -114,6 +114,13 @@ export default {
       default: () => {
         return "";
       }
+    },
+    reportType: {
+      required: true,
+      type: String,
+      default:() =>{
+        return "";
+      }
     }
   },
   data() {
@@ -124,6 +131,7 @@ export default {
       dialogForm: {
         shareValidType: 0,
         reportCode: "",
+        reportType: "",
         shareUrl: "",
         shareCode: "",
         sharePassword: "",
@@ -164,12 +172,11 @@ export default {
       this.dialogForm.sharePassword = "";
     },
     async createShare() {
+      this.dialogForm.reportType = this.reportType;
       this.dialogForm.reportCode = this.reportCode;
       this.dialogForm.shareUrl = window.location.href;
-      // console.log(this.dialogForm)
       const { code, data } = await reportShareAdd(this.dialogForm);
       if (code != "200") return;
-      // console.log(data)
       this.shareLinkFlag1 = false;
       this.$message({
         message: "创建链接成功!",

+ 3 - 5
report-ui/src/views/reportManage/index.vue

@@ -13,6 +13,7 @@
         :visib="visibleForShareDialog"
         :reportCode="reportCodeForShareDialog"
         :reportName="reportNameForShareDialog"
+        :reportType="reportTypeForShareDialog"
         @handleClose="visibleForShareDialog = false"
       />
       <copyDialog :visib.sync="copyVisible" :rowData="rowData" @close="close" />
@@ -45,6 +46,7 @@ export default {
       visibleForShareDialog: false,
       reportCodeForShareDialog: "",
       reportNameForShareDialog: "",
+      reportTypeForShareDialog: "",
       crudOption: {
         // 使用菜单做为页面标题
         title: "报表管理",
@@ -354,13 +356,9 @@ export default {
     },
     //分享
     shareReport(val) {
-      if (val.reportType == "report_excel") {
-        //excel暂不支持
-        this.$message.warning("暂不支持excel报表分享");
-        return;
-      }
       this.reportCodeForShareDialog = val.reportCode;
       this.reportNameForShareDialog = val.reportName;
+      this.reportTypeForShareDialog = val.reportType;
       this.visibleForShareDialog = true;
     },
     //复制