From 9de0e9157aff1661e9e4d0471cbe1ca997c82cd9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 26 十一月 2021 15:07:35 +0800
Subject: [PATCH] fix 接口重复鉴权BUG修复
---
ruoyi-ui/src/views/system/oss/index.vue | 87 +++++++++++++++++++++++++++++++++----------
1 files changed, 66 insertions(+), 21 deletions(-)
diff --git a/ruoyi-ui/src/views/system/oss/index.vue b/ruoyi-ui/src/views/system/oss/index.vue
index 5ce6575..fdfed16 100644
--- a/ruoyi-ui/src/views/system/oss/index.vue
+++ b/ruoyi-ui/src/views/system/oss/index.vue
@@ -96,22 +96,43 @@
v-hasPermi="['system:oss:remove']"
>鍒犻櫎</el-button>
</el-col>
+ <el-col :span="1.5">
+ <el-button
+ :type="previewListResource ? 'danger' : 'warning'"
+ plain
+ size="mini"
+ @click="handlePreviewListResource(!previewListResource)"
+ v-hasPermi="['system:oss:edit']"
+ >棰勮寮�鍏� : {{previewListResource ? "绂佺敤" : "鍚敤"}}</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="info"
+ plain
+ icon="el-icon-s-operation"
+ size="mini"
+ @click="handleOssConfig"
+ v-hasPermi="['system:oss:list']"
+ >閰嶇疆绠＄悊</el-button>
+ </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="ossList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="浜戝瓨鍌ㄤ富閿�" align="center" prop="ossId" v-if="false"/>
+ <el-table-column label="瀵硅薄瀛樺偍涓婚敭" align="center" prop="ossId" v-if="false"/>
<el-table-column label="鏂囦欢鍚�" align="center" prop="fileName" />
<el-table-column label="鍘熷悕" align="center" prop="originalName" />
<el-table-column label="鏂囦欢鍚庣紑" align="center" prop="fileSuffix" />
- <el-table-column label="鏂囦欢灞曠ず" align="center" prop="url" >
+ <el-table-column label="鏂囦欢灞曠ず" align="center" prop="url">
<template slot-scope="scope">
<el-image
- v-if="scope.row.fileSuffix.indexOf('png','jpg','jpeg') > 0"
+ v-if="previewListResource && checkFileSuffix(scope.row.fileSuffix)"
style="width: 100px; height: 100px;"
:src="scope.row.url"
:preview-src-list="[scope.row.url]"/>
+ <span v-text="scope.row.url"
+ v-if="!checkFileSuffix(scope.row.fileSuffix) || !previewListResource"/>
</template>
</el-table-column>
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
@@ -149,7 +170,7 @@
@pagination="getList"
/>
- <!-- 娣诲姞鎴栦慨鏀筄SS浜戝瓨鍌ㄥ璇濇 -->
+ <!-- 娣诲姞鎴栦慨鏀筄SS瀵硅薄瀛樺偍瀵硅瘽妗� -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="鏂囦欢鍚�">
@@ -166,8 +187,7 @@
</template>
<script>
-import { listOss, delOss } from "@/api/system/oss";
-import { downLoadOss } from "@/utils/ossdownload";
+import { listOss, delOss, changePreviewListResource } from "@/api/system/oss";
export default {
name: "Oss",
@@ -189,7 +209,7 @@
showSearch: true,
// 鎬绘潯鏁�
total: 0,
- // OSS浜戝瓨鍌ㄨ〃鏍兼暟鎹�
+ // OSS瀵硅薄瀛樺偍琛ㄦ牸鏁版嵁
ossList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
@@ -197,6 +217,8 @@
type: 0,
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
+ // 棰勮鍒楄〃鍥剧墖
+ previewListResource: true,
// 鍒涘缓鏃堕棿鏃堕棿鑼冨洿
daterangeCreateTime: [],
// 鏌ヨ鍙傛暟
@@ -225,7 +247,7 @@
this.getList();
},
methods: {
- /** 鏌ヨOSS浜戝瓨鍌ㄥ垪琛� */
+ /** 鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃 */
getList() {
this.loading = true;
this.queryParams.params = {};
@@ -233,10 +255,19 @@
this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
}
+ this.getConfigKey("sys.oss.previewListResource").then(response => {
+ this.previewListResource = response.msg === undefined ? true : response.msg === 'true';
+ });
listOss(this.queryParams).then(response => {
this.ossList = response.rows;
this.total = response.total;
this.loading = false;
+ });
+ },
+ checkFileSuffix(fileSuffix) {
+ let arr = ["png", "jpg", "jpeg"];
+ return arr.some(type => {
+ return fileSuffix.indexOf(type) > -1;
});
},
// 鍙栨秷鎸夐挳
@@ -268,6 +299,10 @@
this.single = selection.length!==1
this.multiple = !selection.length
},
+ /** 浠诲姟鏃ュ織鍒楄〃鏌ヨ */
+ handleOssConfig() {
+ this.$router.push({ path: '/system/oss-config/index'})
+ },
/** 鏂囦欢鎸夐挳鎿嶄綔 */
handleFile() {
this.reset();
@@ -289,23 +324,33 @@
},
/** 涓嬭浇鎸夐挳鎿嶄綔 */
handleDownload(row) {
- downLoadOss(row.ossId)
+ this.$download.oss(row.ossId)
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ossIds = row.ossId || this.ids;
- this.$confirm('鏄惁纭鍒犻櫎OSS浜戝瓨鍌ㄧ紪鍙蜂负"' + ossIds + '"鐨勬暟鎹」?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(() => {
- this.loading = true;
- return delOss(ossIds);
- }).then(() => {
- this.loading = false;
- this.getList();
- this.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ this.$modal.confirm('鏄惁纭鍒犻櫎OSS瀵硅薄瀛樺偍缂栧彿涓�"' + ossIds + '"鐨勬暟鎹」?').then(() => {
+ this.loading = true;
+ return delOss(ossIds);
+ }).then(() => {
+ this.loading = false;
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).finally(() => {
+ this.loading = false;
+ });
+ },
+ // 棰勮鍒楄〃鍥剧墖鐘舵�佷慨鏀�
+ handlePreviewListResource(previewListResource) {
+ let text = previewListResource ? "鍚敤" : "鍋滅敤";
+ this.$modal.confirm('纭瑕�"' + text + '""棰勮鍒楄〃鍥剧墖"閰嶇疆鍚�?').then(() => {
+ return changePreviewListResource(previewListResource);
+ }).then(() => {
+ this.getList()
+ this.$modal.msgSuccess(text + "鎴愬姛");
+ }).catch(() => {
+ this.previewListResource = previewListResource !== true;
+ })
}
}
};
--
Gitblit v1.9.3