Home Explore Help
Sign In
framework
/
fs-admin
3
1
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

适配移动端

tongshangming 1 year ago
parent
d12b8afe80
commit
629a52a2fd
7 changed files with 26 additions and 19 deletions
Split View Show Diff Stats
  1. 1 1
      index.html
  2. 1 1
      package.json
  3. 6 1
      src/components/core/form/ProForm.vue
  4. 0 10
      src/hooks/useValidator.ts
  5. 16 0
      src/utils/validator.ts
  6. 1 3
      src/views/form/Basic.vue
  7. 1 3
      src/views/form/Step.vue

+ 1 - 1
index.html
View File 

@@ -3,7 +3,7 @@
 
   <head>
 
     <meta charset="UTF-8" />
 
     <link rel="icon" href="/logo.png" />
 
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
+    <!-- <meta name="viewport" content="width=device-width, initial-scale=1.0" /> -->
 
     <title></title>
 
   </head>
 
   <body>

+ 1 - 1
package.json
View File 

@@ -1,6 +1,6 @@
 
 {
 
   "name": "fs-admin",
 
-  "version": "1.7.6",
 
+  "version": "1.7.7",
 
   "scripts": {
 
     "dev": "vite --host",
 
     "build": "run-p type-check build-only",

+ 6 - 1
src/components/core/form/ProForm.vue
View File 

@@ -1,6 +1,6 @@
 
 <script setup lang="ts">
 
 import type { BasicForm, FormSlot } from '@/types/form'
 
-import { ElMessage } from 'element-plus'
 
+import { ElMessage, ElLoading } from 'element-plus'
 
 import { buildFormSlots } from '@/utils/utils'
 
 
 interface Props {
 
@@ -34,6 +34,7 @@ if (!props.formSlots) {
 
 const submit = async () => {
 
   let message
 
   return formRef.value.validate().then(async () => {
 
+    const loading = ElLoading.service()
 
     try {
 
       if (formInitData.value.id) {
 
         await props.update(formInitData.value)
 
@@ -43,12 +44,16 @@ const submit = async () => {
 
         message = '新增成功'
 
       }
 
 
+      loading.close()
 
+
 
       ElMessage({
 
         type: 'success',
 
         message
 
       })
 
+
 
       return true
 
     } catch (error) {
 
+      loading.close()
 
       return false
 
     }
 
   })

+ 0 - 10
src/hooks/useValidator.ts
View File 

@@ -1,10 +0,0 @@
 
-export default () => {
 
-  return {
 
-    mobile(rule: any, value: any) {
 
-      if (!/^1\d{10}$/.test(value)) {
 
-        return new Error('请输入正确的手机号')
 
-      }
 
-      return true
 
-    }
 
-  }
 
-}

+ 16 - 0
src/utils/validator.ts
View File 

@@ -0,0 +1,16 @@
 
+const validator = {
 
+  mobile(rule: any, value: any, callback: any) {
 
+    if (!/^1\d{10}$/.test(value)) {
 
+      return new Error('请输入正确的手机号')
 
+    }
 
+    callback()
 
+  },
 
+  email(rule: any, value: any, callback: any) {
 
+    if (!/^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/.test(value)) {
 
+      callback(new Error('请输入正确的邮箱'))
 
+    }
 
+    callback()
 
+  }
 
+}
 
+
 
+export default validator

+ 1 - 3
src/views/form/Basic.vue
View File 

@@ -1,9 +1,7 @@
 
 <script lang="ts" setup>
 
 import type { BasicForm } from '@/types/form'
 
 import { ElInput } from 'element-plus'
 
-import useValidator from '@/hooks/useValidator'
 
-
 
-const validator = useValidator()
 
+import validator from '@/utils/validator'
 
 
 const formData = reactive<any>({})
 
 const formConfig = reactive<BasicForm>({

+ 1 - 3
src/views/form/Step.vue
View File 

@@ -1,8 +1,6 @@
 
 <script lang="ts" setup>
 
 import type { BasicForm } from '@/types/form'
 
-import useValidator from '@/hooks/useValidator'
 
-
 
-const validator = useValidator()
 
+import validator from '@/utils/validator'
 
 
 const proFormRef = ref<any>()
 
 const handleSave = () => {