diff --git a/.env.development b/.env.development index 9055fe8..7b7173f 100644 --- a/.env.development +++ b/.env.development @@ -15,7 +15,6 @@ VITE_DROP_CONSOLE = true # 跨域代理,可以配置多个,请注意不要换行 #VITE_PROXY = [["/appApi","http://localhost:8001"],["/upload","http://localhost:8001/upload"]] -# VITE_PROXY=[["/api","https://naive-ui-admin"]] VITE_PROXY=[["/api","http://192.168.124.203:8081/api"]] # API 接口地址 diff --git a/package.json b/package.json index 173c2a6..20d9c8f 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,6 @@ "keywords": [ "vue", "naive-ui", - "naive-ui-admin", "vue3", "ts", "tsx", diff --git a/src/components/Cropper/src/CropperImage.vue b/src/components/Cropper/src/CropperImage.vue index 22ffa59..179105e 100644 --- a/src/components/Cropper/src/CropperImage.vue +++ b/src/components/Cropper/src/CropperImage.vue @@ -65,7 +65,7 @@ const cropper = ref>(); const isReady = ref(false); - const prefixCls = 'naive-ui-admin'; + const prefixCls = 'naive-ui'; const debounceRealTimeCroppered = useDebounceFn(realTimeCroppered, 80); const getImageStyle = computed((): CSSProperties => { diff --git a/src/views/about/index.vue b/src/views/about/index.vue index adec848..d7b086c 100644 --- a/src/views/about/index.vue +++ b/src/views/about/index.vue @@ -38,7 +38,7 @@ diff --git a/src/views/content/ad/index.vue b/src/views/content/ad/index.vue index 1040914..49ff24c 100644 --- a/src/views/content/ad/index.vue +++ b/src/views/content/ad/index.vue @@ -76,7 +76,6 @@ const editVisible = ref(false); const adId = ref(0); const rowKeys = ref([]); - const showModal = ref(false); /** * 定义查询参数 diff --git a/src/views/content/adSort/edit.vue b/src/views/content/adSort/edit.vue index f9d6e8b..3d8f6b0 100644 --- a/src/views/content/adSort/edit.vue +++ b/src/views/content/adSort/edit.vue @@ -60,6 +60,9 @@ import { useMessage } from 'naive-ui'; import { useModal } from '@/components/Modal'; + /** + * 定义参数 + */ const emit = defineEmits(['success', 'update:visible']); const formRef = ref(); const message = useMessage(); diff --git a/src/views/content/adSort/index.vue b/src/views/content/adSort/index.vue index 205cd7e..f643780 100644 --- a/src/views/content/adSort/index.vue +++ b/src/views/content/adSort/index.vue @@ -76,7 +76,6 @@ const editVisible = ref(false); const adSortId = ref(0); const rowKeys = ref([]); - const showModal = ref(false); /** * 定义查询参数 diff --git a/src/views/content/article/edit.vue b/src/views/content/article/edit.vue index aaa5a3e..9d6b543 100644 --- a/src/views/content/article/edit.vue +++ b/src/views/content/article/edit.vue @@ -130,11 +130,11 @@ const editorRef = ref(); const categoryList = ref([]); const fwbHeight = document.body.clientHeight - 180; + const message = useMessage(); /** * 定义表单参数 */ - const message = useMessage(); const formData = reactive({ id: '', categoryId: '', diff --git a/src/views/content/article/index.vue b/src/views/content/article/index.vue index 407b007..deb239c 100644 --- a/src/views/content/article/index.vue +++ b/src/views/content/article/index.vue @@ -76,7 +76,6 @@ const editVisible = ref(false); const articleId = ref(0); const rowKeys = ref([]); - const showModal = ref(false); /** * 定义查询参数 diff --git a/src/views/content/layoutItem/edit.vue b/src/views/content/layoutItem/edit.vue index 927a7ec..04cc917 100644 --- a/src/views/content/layoutItem/edit.vue +++ b/src/views/content/layoutItem/edit.vue @@ -184,6 +184,11 @@ const handleClose = () => { emit('update:visible', false); }; + + /** + * 执行更新 + * @param show 参数 + */ const handleUpdate = (show) => { if (!show) { handleClose(); diff --git a/src/views/content/layoutItem/index.vue b/src/views/content/layoutItem/index.vue index ebff107..7a50612 100644 --- a/src/views/content/layoutItem/index.vue +++ b/src/views/content/layoutItem/index.vue @@ -76,7 +76,6 @@ const editVisible = ref(false); const layoutId = ref(0); const rowKeys = ref([]); - const showModal = ref(false); /** * 定义查询参数 diff --git a/src/views/content/tag/index.vue b/src/views/content/tag/index.vue index c341e67..409ba38 100644 --- a/src/views/content/tag/index.vue +++ b/src/views/content/tag/index.vue @@ -76,7 +76,6 @@ const editVisible = ref(false); const tagId = ref(0); const rowKeys = ref([]); - const showModal = ref(false); /** * 定义查询参数 diff --git a/src/views/data/city/edit.vue b/src/views/data/city/edit.vue index 4ab96a3..e22e925 100644 --- a/src/views/data/city/edit.vue +++ b/src/views/data/city/edit.vue @@ -182,6 +182,10 @@ lng: '', lat: '', }); + + /** + * 定义模态 + */ const [modalRegister, { openModal, setSubLoading }] = useModal({ title: props.cityId ? '编辑' : '添加', subBtuText: '确定', diff --git a/src/views/data/param/index.vue b/src/views/data/param/index.vue index 7f65870..963b97f 100644 --- a/src/views/data/param/index.vue +++ b/src/views/data/param/index.vue @@ -66,6 +66,9 @@ import { schemas } from './querySchemas'; import { renderIcon } from '@/utils'; + /** + * 定义参数 + */ const message = useMessage(); const dialog = useDialog(); const basicTableRef = ref(); diff --git a/src/views/file/emailTemplate/edit.vue b/src/views/file/emailTemplate/edit.vue index 2857276..fa19341 100644 --- a/src/views/file/emailTemplate/edit.vue +++ b/src/views/file/emailTemplate/edit.vue @@ -94,11 +94,11 @@ const emit = defineEmits(['success', 'update:visible']); const formRef = ref(); + const message = useMessage(); /** * 定义表单参数 */ - const message = useMessage(); const formData = reactive({ id: '', title: '', diff --git a/src/views/file/fileTemplate/edit.vue b/src/views/file/fileTemplate/edit.vue index cbd2c5b..76672bd 100644 --- a/src/views/file/fileTemplate/edit.vue +++ b/src/views/file/fileTemplate/edit.vue @@ -69,13 +69,16 @@ import { useModal } from '@/components/Modal'; import UploadFile from '@/components/Upload/file.vue'; + /** + * 定义参数 + */ const emit = defineEmits(['success', 'update:visible']); const formRef = ref(); + const message = useMessage(); /** * 定义表单参数 */ - const message = useMessage(); const formData = reactive({ id: '', name: '', diff --git a/src/views/file/messageTemplate/edit.vue b/src/views/file/messageTemplate/edit.vue index 74a8f6e..f81512d 100644 --- a/src/views/file/messageTemplate/edit.vue +++ b/src/views/file/messageTemplate/edit.vue @@ -89,13 +89,16 @@ import { useMessage } from 'naive-ui'; import { useModal } from '@/components/Modal'; + /** + * 定义参数 + */ const emit = defineEmits(['success', 'update:visible']); const formRef = ref(); + const message = useMessage(); /** * 定义表单参数 */ - const message = useMessage(); const formData = reactive({ id: '', title: '', diff --git a/src/views/file/smsTemplate/edit.vue b/src/views/file/smsTemplate/edit.vue index 7aec351..44c53dc 100644 --- a/src/views/file/smsTemplate/edit.vue +++ b/src/views/file/smsTemplate/edit.vue @@ -85,13 +85,16 @@ import { useMessage } from 'naive-ui'; import { useModal } from '@/components/Modal'; + /** + * 定义参数 + */ const emit = defineEmits(['success', 'update:visible']); const formRef = ref(); + const message = useMessage(); /** * 定义表单参数 */ - const message = useMessage(); const formData = reactive({ id: '', title: '', diff --git a/src/views/file/smsTemplate/index.vue b/src/views/file/smsTemplate/index.vue index e9d56cd..110ad1b 100644 --- a/src/views/file/smsTemplate/index.vue +++ b/src/views/file/smsTemplate/index.vue @@ -70,6 +70,9 @@ import { schemas } from './querySchemas'; import { renderIcon } from '@/utils'; + /** + * 定义参数 + */ const message = useMessage(); const dialog = useDialog(); const basicTableRef = ref(); @@ -77,7 +80,6 @@ const editVisible = ref(false); const smsId = ref(0); const rowKeys = ref([]); - const showModal = ref(false); /** * 定义查询参数 diff --git a/src/views/logger/emailLog/index.vue b/src/views/logger/emailLog/index.vue index 00e4629..bc709e7 100644 --- a/src/views/logger/emailLog/index.vue +++ b/src/views/logger/emailLog/index.vue @@ -67,7 +67,6 @@ const editVisible = ref(false); const emailLogId = ref(0); const rowKeys = ref([]); - const showModal = ref(false); /** * 定义查询参数 diff --git a/src/views/logger/fileLog/index.vue b/src/views/logger/fileLog/index.vue index 935d974..2f9fcf3 100644 --- a/src/views/logger/fileLog/index.vue +++ b/src/views/logger/fileLog/index.vue @@ -67,7 +67,6 @@ const editVisible = ref(false); const fileLogId = ref(0); const rowKeys = ref([]); - const showModal = ref(false); /** * 定义查询参数 diff --git a/src/views/logger/smsLog/index.vue b/src/views/logger/smsLog/index.vue index 73dcc37..03c6191 100644 --- a/src/views/logger/smsLog/index.vue +++ b/src/views/logger/smsLog/index.vue @@ -67,7 +67,6 @@ const editVisible = ref(false); const smsLogId = ref(0); const rowKeys = ref([]); - const showModal = ref(false); /** * 定义查询参数 diff --git a/src/views/login/PhoneForm.vue b/src/views/login/PhoneForm.vue index fba847f..1f904a7 100644 --- a/src/views/login/PhoneForm.vue +++ b/src/views/login/PhoneForm.vue @@ -61,29 +61,39 @@ key: string; } + /** + * 定义参数 + */ const formRef = ref(); - const loading = ref(false); const message = useMessage(); const codeMsg: any = ref('获取验证码'); const isGetCode = ref(false); - const autoLogin = ref(true); const LOGIN_NAME = PageEnum.BASE_LOGIN_NAME; + const userStore = useUserStore(); + const router = useRouter(); + const route = useRoute(); + /** + * 定义表单参数 + */ const formInline = reactive({ mobile: '', code: '', key: '', }); + /** + * 定义验证规则 + */ const rules: FormRules = { mobile: { key: 'a', required: true, message: '请输入手机号码', trigger: 'blur' }, code: { required: true, message: '请输入验证码', trigger: 'blur' }, }; - const userStore = useUserStore(); - const router = useRouter(); - const route = useRoute(); + /** + * 获取验证码 + */ function getCode() { if (!formInline.mobile) { formRef.value?.validate( @@ -105,6 +115,10 @@ } }, 1000); } + + /** + * 执行提交表单 + */ const handleSubmit = () => { if (!formRef.value) return; formRef.value.validate(async (valid) => { @@ -146,7 +160,6 @@ formInline.key = key; captchaImg.value = captcha; }; - getCaptcha(); diff --git a/src/views/login/RegisterForm.vue b/src/views/login/RegisterForm.vue index 8a5fe55..5d71e55 100644 --- a/src/views/login/RegisterForm.vue +++ b/src/views/login/RegisterForm.vue @@ -92,6 +92,9 @@ LockOutlined, } from '@vicons/antd'; + /** + * 定义参数 + */ const formRef = ref(); const message = useMessage(); const loading = ref(false); @@ -100,6 +103,9 @@ const emit = defineEmits(['backLogin']); + /** + * 定义表单参数 + */ const formInline = reactive({ username: '', password: '', @@ -109,6 +115,11 @@ agreement: false, }); + /** + * 验证码手机号 + * @param _rule 规则 + * @param value 参数值 + */ const validatePhone = async (_rule, value: string) => { var isPhone = /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/; if (!value) { @@ -119,6 +130,10 @@ return Promise.resolve(); } }; + + /** + * 自定义验证规则 + */ const rules = { username: { required: true, message: '请输入用户名', trigger: 'blur' }, mobile: [{ key: 'a', required: true, validator: validatePhone, trigger: 'blur' }], @@ -139,6 +154,9 @@ }, }; + /** + * 执行提交表单 + */ const handleSubmit = () => { formRef.value .validate() @@ -152,10 +170,16 @@ }); }; + /** + * 返回登录 + */ const backLogin = () => { emit('backLogin', true); }; + /** + * 获取验证码 + */ function getCode() { if (!formInline.mobile) { formRef.value?.validate( diff --git a/src/views/login/newLogin.vue b/src/views/login/newLogin.vue deleted file mode 100644 index 6789692..0000000 --- a/src/views/login/newLogin.vue +++ /dev/null @@ -1,155 +0,0 @@ - - - - - diff --git a/src/views/monitor/caches/index.vue b/src/views/monitor/caches/index.vue index 17a4dfc..4ecc823 100644 --- a/src/views/monitor/caches/index.vue +++ b/src/views/monitor/caches/index.vue @@ -11,8 +11,7 @@ :row-key="(row) => row.cacheName" :checked-row-keys="cacheName" @update:checked-row-keys="handleNameChange" - > - + /> - + />