From 1f93137b80b24e411ccdbd1279fee1e8fee8b8e6 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 13 十二月 2024 14:49:24 +0800
Subject: [PATCH] fix 修复 oss配置页 展示配置key 隐藏主键id
---
src/views/system/oss/config.vue | 460 +++++++++++++++++++++++++-------------------------------
1 files changed, 206 insertions(+), 254 deletions(-)
diff --git a/src/views/system/oss/config.vue b/src/views/system/oss/config.vue
index 4f2efa1..0563a02 100644
--- a/src/views/system/oss/config.vue
+++ b/src/views/system/oss/config.vue
@@ -1,114 +1,88 @@
<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
- <el-form-item label="閰嶇疆key" prop="configKey">
- <el-input
- v-model="queryParams.configKey"
- placeholder="閰嶇疆key"
- clearable
- style="width: 200px"
- @keyup.enter="handleQuery"
- />
- </el-form-item>
- <el-form-item label="妗跺悕绉�" prop="bucketName">
- <el-input
- v-model="queryParams.bucketName"
- placeholder="璇疯緭鍏ユ《鍚嶇О"
- clearable
- style="width: 200px"
- @keyup.enter="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鏄惁榛樿" prop="status">
- <el-select v-model="queryParams.status" placeholder="璇烽�夋嫨鐘舵��" clearable style="width: 200px">
- <el-option key="0" label="鏄�" value="0"/>
- <el-option key="1" label="鍚�" value="1"/>
- </el-select>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="search" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
+ <div class="p-2">
+ <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+ <div v-show="showSearch" class="mb-[10px]">
+ <el-card shadow="hover">
+ <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+ <el-form-item label="閰嶇疆key" prop="configKey">
+ <el-input v-model="queryParams.configKey" placeholder="閰嶇疆key" clearable @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item label="妗跺悕绉�" prop="bucketName">
+ <el-input v-model="queryParams.bucketName" placeholder="璇疯緭鍏ユ《鍚嶇О" clearable @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鏄惁榛樿" prop="status">
+ <el-select v-model="queryParams.status" placeholder="璇烽�夋嫨鐘舵��" clearable>
+ <el-option key="0" label="鏄�" value="0" />
+ <el-option key="1" label="鍚�" value="1" />
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ </el-card>
+ </div>
+ </transition>
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="Plus"
- @click="handleAdd"
- v-hasPermi="['system:oss:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="Edit"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['system:oss:edit']"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="Delete"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['system:oss:remove']"
- >鍒犻櫎</el-button>
- </el-col>
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
+ <el-card shadow="hover">
+ <template #header>
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button v-hasPermi="['system:ossConfig:add']" type="primary" plain icon="Plus" @click="handleAdd">鏂板</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button v-hasPermi="['system:ossConfig:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
+ >淇敼</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button v-hasPermi="['system:ossConfig:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
+ 鍒犻櫎
+ </el-button>
+ </el-col>
+ <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
+ </el-row>
+ </template>
- <el-table v-loading="loading" :data="ossConfigList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="涓诲缓" align="center" prop="ossConfigId" v-if="columns[0].visible"/>
- <el-table-column label="閰嶇疆key" align="center" prop="configKey" v-if="columns[1].visible" />
- <el-table-column label="璁块棶绔欑偣" align="center" prop="endpoint" v-if="columns[2].visible" width="200" />
- <el-table-column label="鑷畾涔夊煙鍚�" align="center" prop="domain" v-if="columns[3].visible" width="200" />
- <el-table-column label="妗跺悕绉�" align="center" prop="bucketName" v-if="columns[4].visible" />
- <el-table-column label="鍓嶇紑" align="center" prop="prefix" v-if="columns[5].visible" />
- <el-table-column label="鍩�" align="center" prop="region" v-if="columns[6].visible" />
- <el-table-column label="妗舵潈闄愮被鍨�" align="center" prop="accessPolicy" v-if="columns[7].visible" >
- <template #default="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" v-if="columns[8].visible">
- <template #default="scope">
- <el-switch
- v-model="scope.row.status"
- active-value="0"
- inactive-value="1"
- @change="handleStatusChange(scope.row)"
- ></el-switch>
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="150" class-name="small-padding fixed-width">
- <template #default="scope">
- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:oss:edit']">淇敼</el-button>
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:oss:remove']">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
+ <el-table v-loading="loading" :data="ossConfigList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column v-if="columns[0].visible" label="涓诲缓" align="center" prop="ossConfigId" />
+ <el-table-column v-if="columns[1].visible" label="閰嶇疆key" align="center" prop="configKey" />
+ <el-table-column v-if="columns[2].visible" label="璁块棶绔欑偣" align="center" prop="endpoint" width="200" />
+ <el-table-column v-if="columns[3].visible" label="鑷畾涔夊煙鍚�" align="center" prop="domain" width="200" />
+ <el-table-column v-if="columns[4].visible" label="妗跺悕绉�" align="center" prop="bucketName" />
+ <el-table-column v-if="columns[5].visible" label="鍓嶇紑" align="center" prop="prefix" />
+ <el-table-column v-if="columns[6].visible" label="鍩�" align="center" prop="region" />
+ <el-table-column v-if="columns[7].visible" label="妗舵潈闄愮被鍨�" align="center" prop="accessPolicy">
+ <template #default="scope">
+ <el-tag v-if="scope.row.accessPolicy === '0'" type="warning">private</el-tag>
+ <el-tag v-if="scope.row.accessPolicy === '1'" type="success">public</el-tag>
+ <el-tag v-if="scope.row.accessPolicy === '2'" type="info">custom</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column v-if="columns[8].visible" label="鏄惁榛樿" align="center" prop="status">
+ <template #default="scope">
+ <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" fixed="right" align="center" width="150" class-name="small-padding">
+ <template #default="scope">
+ <el-tooltip content="淇敼" placement="top">
+ <el-button v-hasPermi="['system:ossConfig:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+ </el-tooltip>
+ <el-tooltip content="鍒犻櫎" placement="top">
+ <el-button v-hasPermi="['system:ossConfig:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+ </el-tooltip>
+ </template>
+ </el-table-column>
+ </el-table>
- <pagination
- v-show="total > 0"
- :total="total"
- v-model:page="queryParams.pageNum"
- v-model:limit="queryParams.pageSize"
- @pagination="getList"
- />
-
+ <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
+ </el-card>
<!-- 娣诲姞鎴栦慨鏀瑰璞″瓨鍌ㄩ厤缃璇濇 -->
- <el-dialog :title="title" v-model="open" width="800px" append-to-body>
- <el-form ref="ossConfigRef" :model="form" :rules="rules" label-width="120px">
+ <el-dialog v-model="dialog.visible" :title="dialog.title" width="800px" append-to-body>
+ <el-form ref="ossConfigFormRef" :model="form" :rules="rules" label-width="120px">
<el-form-item label="閰嶇疆key" prop="configKey">
<el-input v-model="form.configKey" placeholder="璇疯緭鍏ラ厤缃甼ey" />
</el-form-item>
@@ -132,18 +106,14 @@
</el-form-item>
<el-form-item label="鏄惁HTTPS">
<el-radio-group v-model="form.isHttps">
- <el-radio
- v-for="dict in sys_yes_no"
- :key="dict.value"
- :label="dict.value"
- >{{dict.label}}</el-radio>
+ <el-radio v-for="dict in sys_yes_no" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="妗舵潈闄愮被鍨�">
<el-radio-group v-model="form.accessPolicy">
- <el-radio label="0">private</el-radio>
- <el-radio label="1">public</el-radio>
- <el-radio label="2">custom</el-radio>
+ <el-radio value="0">private</el-radio>
+ <el-radio value="1">public</el-radio>
+ <el-radio value="2">custom</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="鍩�" prop="region">
@@ -163,35 +133,34 @@
</div>
</template>
-<script setup name="OssConfig">
+<script setup name="OssConfig" lang="ts">
+import { listOssConfig, getOssConfig, delOssConfig, addOssConfig, updateOssConfig, changeOssConfigStatus } from '@/api/system/ossConfig';
+import { OssConfigForm, OssConfigQuery, OssConfigVO } from '@/api/system/ossConfig/types';
-import {
- listOssConfig,
- getOssConfig,
- delOssConfig,
- addOssConfig,
- updateOssConfig,
- changeOssConfigStatus
-} from "@/api/system/ossConfig";
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { sys_yes_no } = toRefs<any>(proxy?.useDict('sys_yes_no'));
-const { proxy } = getCurrentInstance();
-const { sys_yes_no } = proxy.useDict("sys_yes_no");
-
-const ossConfigList = ref([]);
-const open = ref(false);
+const ossConfigList = ref<OssConfigVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
-const ids = ref([]);
+const ids = ref<Array<number | string>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
-const title = ref("");
+
+const queryFormRef = ref<ElFormInstance>();
+const ossConfigFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+ visible: false,
+ title: ''
+});
// 鍒楁樉闅愪俊鎭�
-const columns = ref([
- { key: 0, label: `涓诲缓`, visible: true },
- { key: 1, label: `閰嶇疆key`, visible: false },
+const columns = ref<FieldOption[]>([
+ { key: 0, label: `涓诲缓`, visible: false },
+ { key: 1, label: `閰嶇疆key`, visible: true },
{ key: 2, label: `璁块棶绔欑偣`, visible: true },
{ key: 3, label: `鑷畾涔夊煙鍚峘, visible: true },
{ key: 4, label: `妗跺悕绉癭, visible: true },
@@ -201,182 +170,165 @@
{ key: 8, label: `鐘舵�乣, visible: true }
]);
-const data = reactive({
- form: {},
+const initFormData: OssConfigForm = {
+ ossConfigId: undefined,
+ configKey: '',
+ accessKey: '',
+ secretKey: '',
+ bucketName: '',
+ prefix: '',
+ endpoint: '',
+ domain: '',
+ isHttps: 'N',
+ accessPolicy: '1',
+ region: '',
+ status: '1',
+ remark: ''
+};
+const data = reactive<PageData<OssConfigForm, OssConfigQuery>>({
+ form: { ...initFormData },
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
pageSize: 10,
- configKey: undefined,
- bucketName: undefined,
- status: undefined,
+ configKey: '',
+ bucketName: '',
+ status: ''
},
rules: {
- configKey: [
- { required: true, message: "configKey涓嶈兘涓虹┖", trigger: "blur" },
- ],
+ configKey: [{ required: true, message: 'configKey涓嶈兘涓虹┖', trigger: 'blur' }],
accessKey: [
- { required: true, message: "accessKey涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, message: 'accessKey涓嶈兘涓虹┖', trigger: 'blur' },
{
min: 2,
max: 200,
- message: "accessKey闀垮害蹇呴』浠嬩簬 2 鍜� 100 涔嬮棿",
- trigger: "blur",
- },
+ message: 'accessKey闀垮害蹇呴』浠嬩簬 2 鍜� 100 涔嬮棿',
+ trigger: 'blur'
+ }
],
secretKey: [
- { required: true, message: "secretKey涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, message: 'secretKey涓嶈兘涓虹┖', trigger: 'blur' },
{
min: 2,
max: 100,
- message: "secretKey闀垮害蹇呴』浠嬩簬 2 鍜� 100 涔嬮棿",
- trigger: "blur",
- },
+ message: 'secretKey闀垮害蹇呴』浠嬩簬 2 鍜� 100 涔嬮棿',
+ trigger: 'blur'
+ }
],
bucketName: [
- { required: true, message: "bucketName涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, message: 'bucketName涓嶈兘涓虹┖', trigger: 'blur' },
{
min: 2,
max: 100,
- message: "bucketName闀垮害蹇呴』浠嬩簬 2 鍜� 100 涔嬮棿",
- trigger: "blur",
- },
+ message: 'bucketName闀垮害蹇呴』浠嬩簬 2 鍜� 100 涔嬮棿',
+ trigger: 'blur'
+ }
],
endpoint: [
- { required: true, message: "endpoint涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, message: 'endpoint涓嶈兘涓虹┖', trigger: 'blur' },
{
min: 2,
max: 100,
- message: "endpoint鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 100 涔嬮棿",
- trigger: "blur",
- },
+ message: 'endpoint鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 100 涔嬮棿',
+ trigger: 'blur'
+ }
],
- accessPolicy:[
- { required: true, message: "accessPolicy涓嶈兘涓虹┖", trigger: "blur" }
- ]
+ accessPolicy: [{ required: true, message: 'accessPolicy涓嶈兘涓虹┖', trigger: 'blur' }]
}
});
const { queryParams, form, rules } = toRefs(data);
/** 鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃 */
-function getList() {
+const getList = async () => {
loading.value = true;
- listOssConfig(queryParams.value).then((response) => {
- ossConfigList.value = response.rows;
- total.value = response.total;
- loading.value = false;
- });
-}
+ const res = await listOssConfig(queryParams.value);
+ ossConfigList.value = res.rows;
+ total.value = res.total;
+ loading.value = false;
+};
/** 鍙栨秷鎸夐挳 */
-function cancel() {
- open.value = false;
+const cancel = () => {
+ dialog.visible = false;
reset();
-}
+};
/** 琛ㄥ崟閲嶇疆 */
-function reset() {
- form.value = {
- ossConfigId: undefined,
- configKey: undefined,
- accessKey: undefined,
- secretKey: undefined,
- bucketName: undefined,
- prefix: undefined,
- endpoint: undefined,
- domain: undefined,
- isHttps: "N",
- accessPolicy: "1",
- region: undefined,
- status: "1",
- remark: undefined,
- };
- proxy.resetForm("ossConfigRef");
-}
+const reset = () => {
+ form.value = { ...initFormData };
+ ossConfigFormRef.value?.resetFields();
+};
/** 鎼滅储鎸夐挳鎿嶄綔 */
-function handleQuery() {
+const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
-}
+};
/** 閲嶇疆鎸夐挳鎿嶄綔 */
-function resetQuery() {
- proxy.resetForm("queryRef");
+const resetQuery = () => {
+ queryFormRef.value?.resetFields();
handleQuery();
-}
+};
/** 閫夋嫨鏉℃暟 */
-function handleSelectionChange(selection) {
- ids.value = selection.map(item => item.ossConfigId);
+const handleSelectionChange = (selection: OssConfigVO[]) => {
+ ids.value = selection.map((item) => item.ossConfigId);
single.value = selection.length != 1;
multiple.value = !selection.length;
-}
+};
/** 鏂板鎸夐挳鎿嶄綔 */
-function handleAdd() {
+const handleAdd = () => {
reset();
- open.value = true;
- title.value = "娣诲姞瀵硅薄瀛樺偍閰嶇疆";
-}
+ dialog.visible = true;
+ dialog.title = '娣诲姞瀵硅薄瀛樺偍閰嶇疆';
+};
/** 淇敼鎸夐挳鎿嶄綔 */
-function handleUpdate(row) {
- loading.value = true;
+const handleUpdate = async (row?: OssConfigVO) => {
reset();
- const ossConfigId = row.ossConfigId || ids.value;
- getOssConfig(ossConfigId).then((response) => {
- loading.value = false;
- form.value = response.data;
- open.value = true;
- title.value = "淇敼瀵硅薄瀛樺偍閰嶇疆";
- });
-}
+ const ossConfigId = row?.ossConfigId || ids.value[0];
+ const res = await getOssConfig(ossConfigId);
+ Object.assign(form.value, res.data);
+ dialog.visible = true;
+ dialog.title = '淇敼瀵硅薄瀛樺偍閰嶇疆';
+};
/** 鎻愪氦鎸夐挳 */
-function submitForm() {
- proxy.$refs["ossConfigRef"].validate(valid => {
+const submitForm = () => {
+ ossConfigFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
- if (form.value.ossConfigId != null) {
- updateOssConfig(form.value).then(response => {
- proxy.$modal.msgSuccess("淇敼鎴愬姛");
- open.value = false;
- getList();
- }).finally(() => {
- buttonLoading.value = false;
- });
+ if (form.value.ossConfigId) {
+ await updateOssConfig(form.value).finally(() => (buttonLoading.value = false));
} else {
- addOssConfig(this.form).then(response => {
- proxy.$modal.msgSuccess("鏂板鎴愬姛");
- open.value = false;
- getList();
- }).finally(() => {
- buttonLoading.value = false;
- });
+ await addOssConfig(form.value).finally(() => (buttonLoading.value = false));
}
+ proxy?.$modal.msgSuccess('鏂板鎴愬姛');
+ dialog.visible = false;
+ await getList();
}
});
-}
-/** 鐢ㄦ埛鐘舵�佷慨鏀� */
-function handleStatusChange(row) {
- let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
- proxy.$modal.confirm('纭瑕�"' + text + '""' + row.configKey + '"閰嶇疆鍚�?').then(() => {
- return changeOssConfigStatus(row.ossConfigId, row.status, row.configKey);
- }).then(() => {
- getList()
- proxy.$modal.msgSuccess(text + "鎴愬姛");
- }).catch(function () {
- row.status = row.status === "0" ? "1" : "0";
- });
-}
+};
+/** 鐘舵�佷慨鏀� */
+const handleStatusChange = async (row: OssConfigVO) => {
+ let text = row.status === '0' ? '鍚敤' : '鍋滅敤';
+ try {
+ await proxy?.$modal.confirm('纭瑕�"' + text + '""' + row.configKey + '"閰嶇疆鍚�?');
+ await changeOssConfigStatus(row.ossConfigId, row.status, row.configKey);
+ await getList();
+ proxy?.$modal.msgSuccess(text + '鎴愬姛');
+ } catch {
+ return;
+ } finally {
+ row.status = row.status === '0' ? '1' : '0';
+ }
+};
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
-function handleDelete(row) {
- const ossConfigIds = row.ossConfigId || ids.value;
- proxy.$modal.confirm('鏄惁纭鍒犻櫎OSS閰嶇疆缂栧彿涓�"' + ossConfigIds + '"鐨勬暟鎹」?').then(() => {
- loading.value = true;
- return delOssConfig(ossConfigIds);
- }).then(() => {
- loading.value = false;
- getList();
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).finally(() => {
- loading.value = false;
- });
-}
+const handleDelete = async (row?: OssConfigVO) => {
+ const ossConfigIds = row?.ossConfigId || ids.value;
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎OSS閰嶇疆缂栧彿涓�"' + ossConfigIds + '"鐨勬暟鎹」?');
+ loading.value = true;
+ await delOssConfig(ossConfigIds).finally(() => (loading.value = false));
+ await getList();
+ proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
+};
-getList();
+onMounted(() => {
+ getList();
+});
</script>
--
Gitblit v1.9.3