From 856f0767b4ada087e9e2cb33f373e23dbcf39b85 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 07 三月 2023 17:56:59 +0800
Subject: [PATCH] update 同步 ruoyi * update element-ui 2.15.10 => 2.15.12 * update 优化 tagsView右选框，首页不应该存在关闭左侧选项 * update copyright 2023 * update 优化 监控页面图标显示 * update 优化 日志注解支持排除指定的请求参数 * update 优化 业务校验优化代码 * fix 修复 优化文件下载出现的异常 * fix 修复 修改密码日志存储明文问题 * add 新增 操作日志消耗时间属性 * update 优化 日志管理使用索引提升查询性能 * update 优化 框架时间检索使用时间默认值 00:00:00 - 23:59:59
---
ruoyi-ui/src/views/system/oss/config.vue | 34 +++++++++++++---------------------
1 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/ruoyi-ui/src/views/system/oss/config.vue b/ruoyi-ui/src/views/system/oss/config.vue
index 51f9913..d045715 100644
--- a/ruoyi-ui/src/views/system/oss/config.vue
+++ b/ruoyi-ui/src/views/system/oss/config.vue
@@ -19,14 +19,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鐘舵��" prop="status">
+ <el-form-item label="鏄惁榛樿" prop="status">
<el-select v-model="queryParams.status" placeholder="璇烽�夋嫨鐘舵��" clearable size="small">
- <el-option
- v-for="dict in dict.type.sys_normal_disable"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-option key="0" label="鏄�" value="0"/>
+ <el-option key="1" label="鍚�" value="1"/>
</el-select>
</el-form-item>
<el-form-item>
@@ -80,8 +76,14 @@
<el-table-column label="妗跺悕绉�" align="center" prop="bucketName" />
<el-table-column label="鍓嶇紑" align="center" prop="prefix" />
<el-table-column label="鍩�" align="center" prop="region" />
- <el-table-column label="妗舵潈闄愮被鍨�" align="center" prop="accessPolicy" :formatter="accessPolicyStateFormat" />
- <el-table-column label="鐘舵��" align="center" prop="status">
+ <el-table-column label="妗舵潈闄愮被鍨�" align="center" prop="accessPolicy">
+ <template slot-scope="scope">
+ <el-tag type="warning" v-if="scope.row.accessPolicy === '0'">private</el-tag>
+ <el-tag type="success" v-if="scope.row.accessPolicy === '1'">public</el-tag>
+ <el-tag type="info" v-if="scope.row.accessPolicy === '2'">custom</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏄惁榛樿" align="center" prop="status">
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
@@ -187,7 +189,7 @@
export default {
name: "OssConfig",
- dicts: ['sys_yes_no', 'sys_normal_disable'],
+ dicts: ['sys_yes_no'],
data() {
return {
// 鎸夐挳loading
@@ -394,17 +396,7 @@
}).catch(() => {
row.status = row.status === "0" ? "1" : "0";
})
- },
- accessPolicyStateFormat(row) {
- if (row.accessPolicy === "0") {
- return <span class="el-tag el-tag--warning el-tag--medium el-tag--light">private</span>
- } else if (row.accessPolicy === "1") {
- return <span class="el-tag el-tag--success el-tag--medium el-tag--light">public</span>
- } else if (row.accessPolicy === "2") {
- return <span class="el-tag el-tag--medium el-tag--light">custom</span>
- }
-
- }
+ }
}
};
</script>
--
Gitblit v1.9.3