Pre Merge pull request !778 from 王祁/master

src/api/infra/fileConfig/index.ts

@@ -12,7 +12,9 @@ export interface FileClientConfig {
   accessKey?: string
   accessSecret?: string
   enablePathStyleAccess?: boolean
-  domain: string
+  domain: string,
+  relativePathPrefix?: string,
+  useRelativePath:  boolean
 }
 
 export interface FileConfigVO {

src/views/infra/fileConfig/FileConfigForm.vue

@@ -94,11 +94,23 @@
         </el-radio-group>
       </el-form-item>
       <!-- 通用 -->
-      <el-form-item v-if="formData.storage === 20" label="自定义域名">
+      <el-form-item
+        label="使用相对路径"
+        prop="config.useRelativePath"
+      >
+        <el-radio-group v-model="formData.config.useRelativePath">
+          <el-radio key="true" :value="true">是</el-radio>
+          <el-radio key="false" :value="false">否</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item v-if="formData.config.useRelativePath" label="相对路径前缀" prop="config.relativePathPrefix">
+        <el-input v-model="formData.config.relativePathPrefix" placeholder="请输入相对路径前缀 默认 /file " />
+      </el-form-item>
+      <el-form-item v-if="formData.storage === 20 && !formData.config.useRelativePath" label="自定义域名">
         <!-- 无需参数校验，所以去掉 prop -->
         <el-input v-model="formData.config.domain" placeholder="请输入自定义域名" />
       </el-form-item>
-      <el-form-item v-else-if="formData.storage" label="自定义域名" prop="config.domain">
+      <el-form-item v-else-if="formData.storage && !formData.config.useRelativePath" label="自定义域名" prop="config.domain">
         <el-input v-model="formData.config.domain" placeholder="请输入自定义域名" />
       </el-form-item>
     </el-form>
@@ -127,7 +139,9 @@ const formData = ref({
   name: '',
   storage: 0,
   remark: '',
-  config: {} as FileConfigApi.FileClientConfig
+  config: {
+    useRelativePath: false // 默认值
+  } as FileConfigApi.FileClientConfig
 })
 const formRules = reactive<FormRules>({
   name: [{ required: true, message: '配置名不能为空', trigger: 'blur' }],
@@ -143,6 +157,7 @@ const formRules = reactive<FormRules>({
     bucket: [{ required: true, message: '存储 bucket 不能为空', trigger: 'blur' }],
     accessKey: [{ required: true, message: 'accessKey 不能为空', trigger: 'blur' }],
     accessSecret: [{ required: true, message: 'accessSecret 不能为空', trigger: 'blur' }],
+    useRelativePath: [{ required: true, message: '是否使用相对路径不能为空', trigger: 'change'}],
     enablePathStyleAccess: [
       { required: true, message: '是否 PathStyle 访问不能为空', trigger: 'change' }
     ],
@@ -202,7 +217,9 @@ const resetForm = () => {
     name: '',
     storage: undefined!,
     remark: '',
-    config: {} as FileConfigApi.FileClientConfig
+    config: {
+      useRelativePath: false // 默认值
+    } as FileConfigApi.FileClientConfig
   }
   formRef.value?.resetFields()
 }

vite.config.ts

@@ -37,6 +37,14 @@ export default ({command, mode}: ConfigEnv): UserConfig => {
             //     rewrite: (path) => path.replace(new RegExp(`^/admin-api`), ''),
             //   },
             // },
+          proxy: {
+            ['/file']: {
+              target: env.VITE_BASE_URL,
+              ws: false,
+              changeOrigin: true,
+              rewrite: (path) => path.replace(new RegExp(`^/file`), ''),
+            },
+          },
         },
         // 项目使用的vite插件。 单独提取到build/vite/plugin中管理
         plugins: createVitePlugins(),