Pre Merge pull request !81 from David Wei/feature/aws-s3_v2

src/views/system/oss/config.vue

@@ -51,9 +51,9 @@
         <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[4].visible" label="域" align="center" prop="region" />
-        <el-table-column v-if="columns[5].visible" label="前缀" align="center" prop="prefix" />
+        <el-table-column v-if="columns[5].visible" label="桶名称" align="center" prop="bucketName" />
-        <el-table-column v-if="columns[6].visible" label="域" align="center" prop="region" />
+        <el-table-column v-if="columns[6].visible" label="前缀" align="center" prop="prefix" />
         <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>
@@ -86,17 +86,25 @@
         <el-form-item label="配置key" prop="configKey">
           <el-input v-model="form.configKey" placeholder="请输入配置key" />
         </el-form-item>
+        <el-form-item label="accessKey" prop="accessKey">
+          <el-input v-model="form.accessKey" placeholder="请输入accessKey" />
+        </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="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-form-item label="域" prop="region">
-          <el-input v-model="form.accessKey" placeholder="请输入accessKey" />
+          <el-input v-model="form.region" placeholder="请输入域" />
         </el-form-item>
-        <el-form-item label="secretKey" prop="secretKey">
+        <el-form-item label="是否HTTPS">
-          <el-input v-model="form.secretKey" placeholder="请输入秘钥" show-password />
+          <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="桶名称" prop="bucketName">
           <el-input v-model="form.bucketName" placeholder="请输入桶名称" />
@@ -104,11 +112,6 @@
         <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>
@@ -116,9 +119,6 @@
             <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>
@@ -163,9 +163,9 @@ const columns = ref<FieldOption[]>([
   { key: 1, label: `配置key`, visible: false },
   { key: 2, label: `访问站点`, visible: true },
   { key: 3, label: `自定义域名`, visible: true },
-  { key: 4, label: `桶名称`, visible: true },
+  { key: 4, label: `域`, visible: true },
-  { key: 5, label: `前缀`, visible: true },
+  { key: 5, label: `桶名称`, visible: true },
-  { key: 6, label: `域`, visible: true },
+  { key: 6, label: `前缀`, visible: true },
   { key: 7, label: `桶权限类型`, visible: true },
   { key: 8, label: `状态`, visible: true }
 ]);
@@ -175,13 +175,13 @@ const initFormData: OssConfigForm = {
   configKey: '',
   accessKey: '',
   secretKey: '',
-  bucketName: '',
-  prefix: '',
   endpoint: '',
   domain: '',
-  isHttps: 'N',
-  accessPolicy: '1',
   region: '',
+  isHttps: 'N',
+  bucketName: '',
+  prefix: '',
+  accessPolicy: '1',
   status: '1',
   remark: ''
 };
@@ -215,15 +215,6 @@ const data = reactive<PageData<OssConfigForm, OssConfigQuery>>({
         trigger: 'blur'
       }
     ],
-    bucketName: [
-      { required: true, message: 'bucketName不能为空', trigger: 'blur' },
-      {
-        min: 2,
-        max: 100,
-        message: 'bucketName长度必须介于 2 和 100 之间',
-        trigger: 'blur'
-      }
-    ],
     endpoint: [
       { required: true, message: 'endpoint不能为空', trigger: 'blur' },
       {
@@ -233,6 +224,24 @@ const data = reactive<PageData<OssConfigForm, OssConfigQuery>>({
         trigger: 'blur'
       }
     ],
+    region: [
+      { required: true, message: 'region不能为空', trigger: 'blur' },
+      {
+        min: 2,
+        max: 100,
+        message: 'region名称长度必须介于 2 和 100 之间',
+        trigger: 'blur'
+      }
+    ],
+    bucketName: [
+      { required: true, message: 'bucketName不能为空', trigger: 'blur' },
+      {
+        min: 2,
+        max: 100,
+        message: 'bucketName长度必须介于 2 和 100 之间',
+        trigger: 'blur'
+      }
+    ],
     accessPolicy: [{ required: true, message: 'accessPolicy不能为空', trigger: 'blur' }]
   }
 });