From f801f4fb11ff8ca08417a9ddf0231fb570fa26e3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 24 七月 2023 16:47:51 +0800
Subject: [PATCH] fix 修复 固定页面header穿模问题
---
src/views/system/oss/config.vue | 301 ++++++++++++++++++++++++-------------------------
1 files changed, 148 insertions(+), 153 deletions(-)
diff --git a/src/views/system/oss/config.vue b/src/views/system/oss/config.vue
index 7b31987..1fd14fc 100644
--- a/src/views/system/oss/config.vue
+++ b/src/views/system/oss/config.vue
@@ -1,3 +1,136 @@
+<template>
+ <div class="p-2">
+ <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+ <div class="mb-[10px]" v-show="showSearch">
+ <el-card shadow="hover">
+ <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+ <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>
+ </el-card>
+ </div>
+ </transition>
+
+ <el-card shadow="hover">
+ <template #header>
+ <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>
+ </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="鎿嶄綔" fixed="right" align="center" width="150" class-name="small-padding">
+ <template #default="scope">
+ <el-tooltip content="淇敼" placement="top">
+ <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:oss:edit']"></el-button>
+ </el-tooltip>
+ <el-tooltip content="鍒犻櫎" placement="top">
+ <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:oss:remove']"></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" />
+ </el-card>
+ <!-- 娣诲姞鎴栦慨鏀瑰璞″瓨鍌ㄩ厤缃璇濇 -->
+ <el-dialog :title="dialog.title" v-model="dialog.visible" 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>
+ <el-form-item label="璁块棶绔欑偣" prop="endpoint">
+ <el-input v-model="form.endpoint" placeholder="璇疯緭鍏ヨ闂珯鐐�" />
+ </el-form-item>
+ <el-form-item label="鑷畾涔夊煙鍚�" prop="domain">
+ <el-input v-model="form.domain" placeholder="璇疯緭鍏ヨ嚜瀹氫箟鍩熷悕" />
+ </el-form-item>
+ <el-form-item label="accessKey" prop="accessKey">
+ <el-input v-model="form.accessKey" placeholder="璇疯緭鍏ccessKey" />
+ </el-form-item>
+ <el-form-item label="secretKey" prop="secretKey">
+ <el-input v-model="form.secretKey" placeholder="璇疯緭鍏ョ閽�" show-password />
+ </el-form-item>
+ <el-form-item label="妗跺悕绉�" prop="bucketName">
+ <el-input v-model="form.bucketName" placeholder="璇疯緭鍏ユ《鍚嶇О" />
+ </el-form-item>
+ <el-form-item label="鍓嶇紑" prop="prefix">
+ <el-input v-model="form.prefix" placeholder="璇疯緭鍏ュ墠缂�" />
+ </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-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-group>
+ </el-form-item>
+ <el-form-item label="鍩�" prop="region">
+ <el-input v-model="form.region" placeholder="璇疯緭鍏ュ煙" />
+ </el-form-item>
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ </div>
+</template>
+
<script setup name="OssConfig" lang="ts">
import {
listOssConfig,
@@ -7,9 +140,7 @@
updateOssConfig,
changeOssConfigStatus
} from "@/api/system/ossConfig";
-import { ComponentInternalInstance } from "vue";
import { OssConfigForm, OssConfigQuery, OssConfigVO } from "@/api/system/ossConfig/types";
-import { ElForm } from 'element-plus';
const { proxy } = getCurrentInstance() as ComponentInternalInstance
@@ -24,8 +155,8 @@
const multiple = ref(true);
const total = ref(0);
-const queryFormRef = ref(ElForm);
-const ossConfigFormRef = ref(ElForm);
+const queryFormRef = ref<ElFormInstance>();
+const ossConfigFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
@@ -131,7 +262,7 @@
/** 琛ㄥ崟閲嶇疆 */
const reset = () => {
form.value = { ...initFormData };
- ossConfigFormRef.value.resetFields();
+ ossConfigFormRef.value?.resetFields();
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
@@ -140,7 +271,7 @@
}
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
- queryFormRef.value.resetFields();
+ queryFormRef.value?.resetFields();
handleQuery();
}
/** 閫夋嫨鏉℃暟 */
@@ -151,28 +282,22 @@
}
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
+ reset();
dialog.visible = true;
dialog.title = "娣诲姞瀵硅薄瀛樺偍閰嶇疆";
- nextTick(() => {
- reset();
- })
}
/** 淇敼鎸夐挳鎿嶄綔 */
-const handleUpdate = (row?: OssConfigVO) => {
- loading.value = true;
+const handleUpdate = async (row?: OssConfigVO) => {
+ reset();
+ const ossConfigId = row?.ossConfigId || ids.value[0];
+ const res = await getOssConfig(ossConfigId);
+ Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "淇敼瀵硅薄瀛樺偍閰嶇疆";
- const ossConfigId = row?.ossConfigId || ids.value[0];
- nextTick(async () => {
- reset();
- const res = await getOssConfig(ossConfigId);
- loading.value = false;
- form.value = res.data;
- })
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
- ossConfigFormRef.value.validate(async (valid: boolean) => {
+ ossConfigFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.ossConfigId) {
@@ -182,17 +307,17 @@
}
proxy?.$modal.msgSuccess("鏂板鎴愬姛");
dialog.visible = false;
- getList();
+ await getList();
}
});
}
/** 鐘舵�佷慨鏀� */
-const handleStatusChange = async (row: OssConfigVO) => {
+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);
- getList()
+ await getList()
proxy?.$modal.msgSuccess(text + "鎴愬姛");
} catch { return } finally {
row.status = row.status === "0" ? "1" : "0";
@@ -205,7 +330,7 @@
await proxy?.$modal.confirm('鏄惁纭鍒犻櫎OSS閰嶇疆缂栧彿涓�"' + ossConfigIds + '"鐨勬暟鎹」?');
loading.value = true;
await delOssConfig(ossConfigIds).finally(() => loading.value = false);
- getList();
+ await getList();
proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}
@@ -214,133 +339,3 @@
getList();
})
</script>
-<template>
- <div class="p-2">
- <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
- <div class="search" v-show="showSearch">
- <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
- <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>
- </transition>
-
- <el-card shadow="never">
- <template #header>
- <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>
- </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-tooltip content="淇敼" placement="top">
- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:oss:edit']"></el-button>
- </el-tooltip>
- <el-tooltip content="鍒犻櫎" placement="top">
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:oss:remove']"></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" />
- </el-card>
- <!-- 娣诲姞鎴栦慨鏀瑰璞″瓨鍌ㄩ厤缃璇濇 -->
- <el-dialog :title="dialog.title" v-model="dialog.visible" 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>
- <el-form-item label="璁块棶绔欑偣" prop="endpoint">
- <el-input v-model="form.endpoint" placeholder="璇疯緭鍏ヨ闂珯鐐�" />
- </el-form-item>
- <el-form-item label="鑷畾涔夊煙鍚�" prop="domain">
- <el-input v-model="form.domain" placeholder="璇疯緭鍏ヨ嚜瀹氫箟鍩熷悕" />
- </el-form-item>
- <el-form-item label="accessKey" prop="accessKey">
- <el-input v-model="form.accessKey" placeholder="璇疯緭鍏ccessKey" />
- </el-form-item>
- <el-form-item label="secretKey" prop="secretKey">
- <el-input v-model="form.secretKey" placeholder="璇疯緭鍏ョ閽�" show-password />
- </el-form-item>
- <el-form-item label="妗跺悕绉�" prop="bucketName">
- <el-input v-model="form.bucketName" placeholder="璇疯緭鍏ユ《鍚嶇О" />
- </el-form-item>
- <el-form-item label="鍓嶇紑" prop="prefix">
- <el-input v-model="form.prefix" placeholder="璇疯緭鍏ュ墠缂�" />
- </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-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-group>
- </el-form-item>
- <el-form-item label="鍩�" prop="region">
- <el-input v-model="form.region" placeholder="璇疯緭鍏ュ煙" />
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
- </el-form-item>
- </el-form>
- <template #footer>
- <div class="dialog-footer">
- <el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </template>
- </el-dialog>
- </div>
-</template>
--
Gitblit v1.9.3