发布 v3.0.0

ruoyi-ui/src/views/system/oss/index.vue

@@ -96,7 +96,25 @@
           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>
 
@@ -109,12 +127,12 @@
       <el-table-column label="文件展示" align="center" prop="url">
         <template slot-scope="scope">
           <el-image
-            v-if="previewListResource && 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="scope.row.fileSuffix.indexOf('png','jpg','jpeg') < 0 || !previewListResource"/>
+                v-if="!checkFileSuffix(scope.row.fileSuffix) || !previewListResource"/>
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
@@ -169,10 +187,8 @@
 </template>
 
 <script>
-import { listOss, delOss } from "@/api/system/oss";
-import { downLoadOss } from "@/utils/ossdownload";
-import { updateConfig } from "@/api/system/config";
-
+import { listOss, delOss, changePreviewListResource } from "@/api/system/oss";
+import { downLoadOss } from "@/utils/download";
 
 export default {
   name: "Oss",
@@ -249,6 +265,12 @@ export default {
         this.loading = false;
       });
     },
+    checkFileSuffix(fileSuffix) {
+      let arr = ["png", "jpg", "jpeg"];
+      return arr.some(type => {
+        return fileSuffix.indexOf(type) > -1;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -278,6 +300,10 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
+    /** 任务日志列表查询 */
+    handleOssConfig() {
+      this.$router.push({ path: '/system/oss-config/index'})
+    },
     /** 文件按钮操作 */
     handleFile() {
       this.reset();
@@ -308,14 +334,33 @@ export default {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
-        }).then(() => {
-          this.loading = true;
-          return delOss(ossIds);
-        }).then(() => {
-          this.loading = false;
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(() => {});
+      }).then(() => {
+        this.loading = true;
+        return delOss(ossIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    // 预览列表图片状态修改
+    handlePreviewListResource(previewListResource) {
+      let text = previewListResource ? "启用" : "停用";
+      this.$confirm(
+        '确认要"' + text + '""预览列表图片"配置吗?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+      }).then(() => {
+        return changePreviewListResource(previewListResource);
+      }).then(() => {
+        this.getList()
+        this.msgSuccess(text + "成功");
+      }).catch(() => {
+        this.previewListResource = previewListResource !== true;
+      })
     }
   }
 };