From 29d24b49e366cdb89595be4ba21036882ee360e4 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Fri, 20 Sep 2024 08:39:21 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=94=B9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/oss-config/data.tsx       | 18 ++++--------------
 .../system/oss-config/oss-config-drawer.vue    |  5 ++++-
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/apps/web-antd/src/views/system/oss-config/data.tsx b/apps/web-antd/src/views/system/oss-config/data.tsx
index 2b949351..ed3b2268 100644
--- a/apps/web-antd/src/views/system/oss-config/data.tsx
+++ b/apps/web-antd/src/views/system/oss-config/data.tsx
@@ -49,12 +49,10 @@ export const drawerSchema: FormSchemaGetter = () => [
       addonBefore: () => (formModel.isHttps === 'Y' ? 'https://' : 'http://'),
     }),
     rules: z
-      .string({ message: '请输入服务地址' })
-      .refine(
-        (domain) =>
-          !(domain.startsWith('http://') || domain.startsWith('https://')),
-        { message: '请输入正确的域名, 不需要http(s)' },
-      ),
+      .string()
+      .refine((domain) => domain && !/^https?:\/\/.*/.test(domain), {
+        message: '请输入正确的域名, 不需要http(s)',
+      }),
   },
   {
     component: 'Input',
@@ -63,14 +61,6 @@ export const drawerSchema: FormSchemaGetter = () => [
     },
     fieldName: 'domain',
     label: '自定义域名',
-    rules: z
-      .string()
-      .refine(
-        (domain) =>
-          !(domain.startsWith('http://') || domain.startsWith('https://')),
-        { message: '请输入正确的域名, 不需要http(s)' },
-      )
-      .optional(),
   },
   {
     component: 'Divider',
diff --git a/apps/web-antd/src/views/system/oss-config/oss-config-drawer.vue b/apps/web-antd/src/views/system/oss-config/oss-config-drawer.vue
index 8bd5f630..aea078f4 100644
--- a/apps/web-antd/src/views/system/oss-config/oss-config-drawer.vue
+++ b/apps/web-antd/src/views/system/oss-config/oss-config-drawer.vue
@@ -53,12 +53,15 @@ const [BasicDrawer, drawerApi] = useVbenDrawer({
 async function handleConfirm() {
   try {
     drawerApi.drawerLoading(true);
+    /**
+     * 这里解构出来的values只能获取到自定义校验参数的值
+     * 需要自行调用formApi.getValues()获取表单值
+     */
     const { valid } = await formApi.validate();
     if (!valid) {
       return;
     }
     const data = await formApi.getValues();
-    console.log(data);
     await (isUpdate.value ? ossConfigUpdate(data) : ossConfigAdd(data));
     emit('reload');
     await handleCancel();