From 0c80efe6d2cb1ca2df27126f56a2598fb92b1f86 Mon Sep 17 00:00:00 2001
From: easy <1358086367@qq.com>
Date: Fri, 10 Mar 2023 10:49:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=87=AA=E6=B5=8B=E5=8F=8A=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/Basis/index.vue              | 88 ++++++++-----------
 src/views/system/Basis/service.ts             | 18 ----
 .../system/Basis/{index.d.ts => typing.d.ts}  |  2 +-
 yarn.lock                                     |  4 +-
 4 files changed, 42 insertions(+), 70 deletions(-)
 delete mode 100644 src/views/system/Basis/service.ts
 rename src/views/system/Basis/{index.d.ts => typing.d.ts} (93%)

diff --git a/src/views/system/Basis/index.vue b/src/views/system/Basis/index.vue
index 8fdde837..4a4a501b 100644
--- a/src/views/system/Basis/index.vue
+++ b/src/views/system/Basis/index.vue
@@ -12,7 +12,6 @@
                         <j-form-item label="系统名称" name="title">
                             <j-input
                                 v-model:value="formValue.title"
-                                :maxlength="64"
                                 placeholder="请输入系统名称"
                             />
                         </j-form-item>
@@ -43,7 +42,7 @@
                                 placeholder="请输入高德API Key"
                             />
                         </j-form-item>
-                        <j-form-item name="'base-path'">
+                        <j-form-item name="base-path">
                             <template #label>
                                 <span>base-path</span>
                                 <j-tooltip title="系统后台访问的url">
@@ -221,7 +220,7 @@
                                         :action="action"
                                         :headers="headers"
                                         :beforeUpload="
-                                            uploader.beforeBackUpload
+                                            uploader.beforeLogoUpload
                                         "
                                         :showUploadList="false"
                                         @change="uploader.changeBackUpload"
@@ -286,7 +285,7 @@
 </template>
 
 <script setup lang="ts" name="Basis">
-import { formType, uploaderType } from './index';
+import { formType, uploaderType } from './typing';
 import { getImage } from '@/utils/comm.ts';
 import { message } from 'ant-design-vue';
 import { BASE_API_PATH, TOKEN_KEY } from '@/utils/variable';
@@ -312,7 +311,16 @@ const form = reactive<formType>({
         title: [
             {
                 required: true,
-                message: '请选择本地地址',
+                message: '名称必填',
+                trigger: 'blur',
+            },
+            {
+                max: 64,
+                message: '最多可输入64个字符',
+            },
+            {
+                max: 64,
+                message: '最多可输入64个字符',
                 trigger: 'blur',
             },
         ],
@@ -411,21 +419,34 @@ const form = reactive<formType>({
 const { formValue, rulesFrom } = toRefs(form);
 
 const uploader: uploaderType = {
-    imageTypes: ['image/jpeg', 'image/png'],
+    imageTypes: ['jpg', 'jpeg', 'png', 'jfif', 'pjp', 'pjpeg'],
     iconTypes: ['image/x-icon'],
     // logo格式校验
-    beforeLogoUpload: (file) => {
-        const isType = uploader.imageTypes.includes(file.type);
-        if (!isType) {
+    beforeLogoUpload: ({ size, type }: File) => {
+        const typeBool =
+            uploader.imageTypes.filter((typeStr) => type.includes(typeStr))
+                .length > 0;
+        const sizeBool = size / 1024 / 1024 < 4;
+
+        if (!typeBool) {
             message.error(`请上传.jpg.png.jfif.pjp.pjpeg.jpeg格式的图片`);
-            return false;
+        } else if (!sizeBool) {
+            message.error(`图片大小必须小于4M`);
         }
-        const isSize = file.size / 1024 / 1024 < 4;
-        if (!isSize) {
-            message.error(`图片大小必须小于${4}M`);
-        }
-        return isType && isSize;
+        return typeBool && sizeBool;
     },
+    // 浏览器页签格式校验
+    beforeIconUpload: (file) => {
+        const typeBool = uploader.iconTypes.includes(file.type);
+        const sizeBool = file.size / 1024 / 1024 < 1;
+        if (!typeBool) {
+            message.error(`请上传ico格式的图片`);
+        } else if (!sizeBool) {
+            message.error(`图片大小必须小于${1}M`);
+        }
+        return typeBool && sizeBool;
+    },
+
     // logo上传改变事件
     handleChangeLogo: (info) => {
         if (info.file.status === 'uploading') {
@@ -435,63 +456,32 @@ const uploader: uploaderType = {
             form.logoLoading = false;
             form.formValue.logo = info.file.response?.result;
         } else if (info.file.status === 'error') {
-            console.log(info.file);
             form.logoLoading = false;
             message.error('系统logo上传失败，请稍后再试');
         }
     },
-    // 背景图片上传之前
-    beforeBackUpload: (file) => {
-        const isType = uploader.imageTypes.includes(file.type);
-        if (!isType) {
-            message.error(`请上传.jpg.png.jfif.pjp.pjpeg.jpeg格式的图片`);
-            return false;
-        }
-        const isSize = file.size / 1024 / 1024 < 4;
-        if (!isSize) {
-            message.error(`图片大小必须小于${4}M`);
-        }
-        return isType && isSize;
-    },
-    // 背景图片发生改变
+    // 背景上传改变事件
     changeBackUpload: (info) => {
         if (info.file.status === 'uploading') {
             form.backLoading = true;
         } else if (info.file.status === 'done') {
-            console.log(info);
-
             info.file.url = info.file.response?.result;
             form.backLoading = false;
             form.formValue.backgroud = info.file.response?.result;
         } else if (info.file.status === 'error') {
-            console.log(info.file);
             form.logoLoading = false;
             message.error('背景图上传失败，请稍后再试');
         }
     },
-    // 上传之前
-    beforeIconUpload: (file) => {
-        const isType = uploader.iconTypes.includes(file.type);
-        if (!isType) {
-            message.error(`请上传ico格式的图片`);
-            return false;
-        }
-        const isSize = file.size / 1024 / 1024 < 1;
-        if (!isSize) {
-            message.error(`图片大小必须小于${1}M`);
-        }
-        return isType && isSize;
-    },
-    // 图标发生改变
+    // 浏览器页签上传改变事件
     changeIconUpload: (info) => {
         if (info.file.status === 'uploading') {
             form.iconLoading = true;
         } else if (info.file.status === 'done') {
             info.file.url = info.file.response?.result;
-            form.iconLoading = true;
+            form.iconLoading = false;
             form.formValue.ico = info.file.response?.result;
         } else if (info.file.status === 'error') {
-            console.log(info.file);
             form.logoLoading = false;
             message.error('浏览器页签上传失败，请稍后再试');
         }
diff --git a/src/views/system/Basis/service.ts b/src/views/system/Basis/service.ts
deleted file mode 100644
index 968279a8..00000000
--- a/src/views/system/Basis/service.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import BaseService from '@/utils/BaseService';
-import { request } from 'umi';
-import SystemConst from '@/utils/const';
-
-class Service extends BaseService<ReationItem> {
-  getTypes = () =>
-    request(`/${SystemConst.API_BASE}/relation/types`, {
-      method: 'GET',
-    });
-
-  validator = (params: any) =>
-    request(`/${SystemConst.API_BASE}/relation/_validate?`, {
-      method: 'GET',
-      params,
-    });
-}
-
-export default Service;
diff --git a/src/views/system/Basis/index.d.ts b/src/views/system/Basis/typing.d.ts
similarity index 93%
rename from src/views/system/Basis/index.d.ts
rename to src/views/system/Basis/typing.d.ts
index 29c40c1d..1cfadcea 100644
--- a/src/views/system/Basis/index.d.ts
+++ b/src/views/system/Basis/typing.d.ts
@@ -30,7 +30,7 @@ export interface uploaderType {
     iconTypes: Array<string>,
     beforeLogoUpload: (file: UploadProps['beforeUpload']) => void
     handleChangeLogo: (info: UploadChangeParam) => void
-    beforeBackUpload: (file: UploadProps['beforeUpload']) => void
+    beforeBackUpload?: (file: UploadProps['beforeUpload']) => void
     changeBackUpload: (info: UploadChangeParam) => void
     beforeIconUpload: (file: UploadProps['beforeUpload']) => void
     changeIconUpload: (info: UploadChangeParam) => void
diff --git a/yarn.lock b/yarn.lock
index 70a480de..53119446 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3695,8 +3695,8 @@ jetlinks-store@^0.0.3:
 
 jetlinks-ui-components@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.4.tgz#34b70f75dcc4ea679f0da6674a3f372dfc4acab4"
-  integrity sha512-ffDi9NyD51hPzu6iRBhibxlI36In5igUciMugm+Lui2LxnYdGbXGvB0i4y6xKaGg4jRDJ/lDX+b6AvuIrlb1lg==
+  resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.4.tgz#cd080b2d8320c7a03ed20f4c4c22e9a5c920a3c8"
+  integrity sha512-8xzDFH6jSGNrkbCMb+/FL/g9vB0c2GdsDq6QPUzgKFwzPiS+cPbpSxL0RNHez9MF7/NSSuY8wL4VaujiVXTpfg==
   dependencies:
     "@vueuse/core" "^9.12.0"
     ant-design-vue "^3.2.15"