From 541c2df8db727245ba5e322985d761fca006b962 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 02 九月 2022 18:55:25 +0800
Subject: [PATCH] fix 修复 运行配置错误命名
---
ruoyi-ui/src/views/system/oss/config.vue | 59 +++++++++++++++++++----------------------------------------
1 files changed, 19 insertions(+), 40 deletions(-)
diff --git a/ruoyi-ui/src/views/system/oss/config.vue b/ruoyi-ui/src/views/system/oss/config.vue
index 04363f9..54ad98c 100644
--- a/ruoyi-ui/src/views/system/oss/config.vue
+++ b/ruoyi-ui/src/views/system/oss/config.vue
@@ -2,14 +2,13 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="閰嶇疆key" prop="configKey">
- <el-select v-model="queryParams.configKey" placeholder="璇烽�夋嫨閰嶇疆key" clearable size="small">
- <el-option
- v-for="configKey in configKeyOptions"
- :key="configKey.configKey"
- :label="configKey.label"
- :value="configKey.configKey"
- />
- </el-select>
+ <el-input
+ v-model="queryParams.configKey"
+ placeholder="閰嶇疆key"
+ clearable
+ size="small"
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<el-form-item label="妗跺悕绉�" prop="bucketName">
<el-input
@@ -77,6 +76,7 @@
<el-table-column label="涓诲缓" align="center" prop="ossConfigId" v-if="false"/>
<el-table-column label="閰嶇疆key" align="center" prop="configKey" />
<el-table-column label="璁块棶绔欑偣" align="center" prop="endpoint" width="200" />
+ <el-table-column label="鑷畾涔夊煙鍚�" align="center" prop="domain" width="200" />
<el-table-column label="妗跺悕绉�" align="center" prop="bucketName" />
<el-table-column label="鍓嶇紑" align="center" prop="prefix" />
<el-table-column label="鍩�" align="center" prop="region" />
@@ -122,17 +122,13 @@
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="閰嶇疆key" prop="configKey">
- <el-select v-model="form.configKey" placeholder="璇烽�夋嫨閰嶇疆key">
- <el-option
- v-for="configKey in configKeyOptions"
- :key="configKey.configKey"
- :label="configKey.label"
- :value="configKey.configKey"
- />
- </el-select>
+ <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" />
@@ -204,14 +200,6 @@
total: 0,
// 瀵硅薄瀛樺偍閰嶇疆琛ㄦ牸鏁版嵁
ossConfigList: [],
- // configKeyOptions
- configKeyOptions: [],
- configKeyDatas: [
- { configKey: "minio", label: "Minio" },
- { configKey: "qiniu", label: "涓冪墰浜�" },
- { configKey: "aliyun", label: "闃块噷浜�" },
- { configKey: "qcloud", label: "鑵捐浜�" },
- ],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -276,7 +264,6 @@
},
created() {
this.getList();
- this.configKeyOptions = this.configKeyDatas;
},
methods: {
/** 鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃 */
@@ -303,6 +290,7 @@
bucketName: undefined,
prefix: undefined,
endpoint: undefined,
+ domain: undefined,
isHttps: "N",
region: undefined,
status: "1",
@@ -351,7 +339,7 @@
this.buttonLoading = true;
if (this.form.ossConfigId != null) {
updateOssConfig(this.form).then(response => {
- this.msgSuccess("淇敼鎴愬姛");
+ this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
this.getList();
}).finally(() => {
@@ -359,7 +347,7 @@
});
} else {
addOssConfig(this.form).then(response => {
- this.msgSuccess("鏂板鎴愬姛");
+ this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
}).finally(() => {
@@ -372,17 +360,13 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ossConfigIds = row.ossConfigId || this.ids;
- this.$confirm('鏄惁纭鍒犻櫎瀵硅薄瀛樺偍閰嶇疆缂栧彿涓�"' + ossConfigIds + '"鐨勬暟鎹」?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎瀵硅薄瀛樺偍閰嶇疆缂栧彿涓�"' + ossConfigIds + '"鐨勬暟鎹」?').then(() => {
this.loading = true;
return delOssConfig(ossConfigIds);
}).then(() => {
this.loading = false;
this.getList();
- this.msgSuccess("鍒犻櫎鎴愬姛");
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}).finally(() => {
this.loading = false;
});
@@ -390,16 +374,11 @@
// 瀵硅薄瀛樺偍閰嶇疆鐘舵�佷慨鏀�
handleStatusChange(row) {
let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
- this.$confirm(
- '纭瑕�"' + text + '""' + row.configKey + '"閰嶇疆鍚�?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- }).then(() => {
+ this.$modal.confirm('纭瑕�"' + text + '""' + row.configKey + '"閰嶇疆鍚�?').then(() => {
return changeOssConfigStatus(row.ossConfigId, row.status, row.configKey);
}).then(() => {
this.getList()
- this.msgSuccess(text + "鎴愬姛");
+ this.$modal.msgSuccess(text + "鎴愬姛");
}).catch(() => {
row.status = row.status === "0" ? "1" : "0";
})
--
Gitblit v1.9.3