Merge branch 'main_dev' of http://git.yunteng.com/yunteng/thingskit-front into fix/DEFECT-1362

@@ -38,7 +38,7 @@ export const schemas: FormSchema[] = [
   {
   {
     field: 'icon',
     field: 'icon',
     component: 'Upload',
     component: 'Upload',
-    label: '浏览器Icon图标',
+    label: '浏览器ico图标',
     colProps: {
     colProps: {
       span: 24,
       span: 24,
     },
     },

@@ -149,16 +149,16 @@
         }
         }
       }
       }
       const beforeUploadIconPic = (file: FileItem) => {
       const beforeUploadIconPic = (file: FileItem) => {
-        console.log(file);
-        const isJpgOrPng = file.type === 'image/vnd.microsoft.icon';
-        if (!isJpgOrPng) {
+        const reg = /.(icon|ico)$/i;
+        if (!reg.test(file.name)) {
           createMessage.error('只能上传.ico图片文件!');
           createMessage.error('只能上传.ico图片文件!');
+          return false;
         }
         }
         const isLt2M = (file.size as number) / 1024 < 500;
         const isLt2M = (file.size as number) / 1024 < 500;
         if (!isLt2M) {
         if (!isLt2M) {
           createMessage.error('图片大小不能超过500KB!');
           createMessage.error('图片大小不能超过500KB!');
         }
         }
-        return isJpgOrPng && isLt2M;
+        return isLt2M;
       };
       };
       // 更新
       // 更新
       const handleUpdateInfo = async () => {
       const handleUpdateInfo = async () => {