diff --git a/resources/admin/composables/upload.ts b/resources/admin/composables/upload.ts index b4a79ba..c93482e 100644 --- a/resources/admin/composables/upload.ts +++ b/resources/admin/composables/upload.ts @@ -1,7 +1,7 @@ import { ref } from 'vue' -import { getFileExt, getFilename } from '@/form/support/helper' -import { Code } from '@/form/enum/app' -import Message from '@/form/support/message' +import { getFileExt, getFilename } from '/admin/support/helper' +import { Code } from '/admin/enum/app' +import Message from '/admin/support/message' import { genFileId } from 'element-plus' import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus' diff --git a/resources/admin/i18n/languages/en.ts b/resources/admin/i18n/languages/en.ts index b8955b1..bb95f23 100644 --- a/resources/admin/i18n/languages/en.ts +++ b/resources/admin/i18n/languages/en.ts @@ -14,6 +14,8 @@ const en = { finish: 'Finish', back: 'Back', update: 'Update', + search: 'Search', + reset: 'Reset' }, login: { diff --git a/resources/admin/i18n/languages/zh.ts b/resources/admin/i18n/languages/zh.ts index ad1168c..a26361f 100644 --- a/resources/admin/i18n/languages/zh.ts +++ b/resources/admin/i18n/languages/zh.ts @@ -15,6 +15,8 @@ const zh = { finish: '完成', back: '返回', update: '更新', + search: '搜索', + reset: '重置' }, login: { diff --git a/resources/admin/support/catchAdmin.ts b/resources/admin/support/catchAdmin.ts index f34af22..99aa4ec 100644 --- a/resources/admin/support/catchAdmin.ts +++ b/resources/admin/support/catchAdmin.ts @@ -12,6 +12,8 @@ import { bootstrapI18n } from '/admin/i18n' import guard from '/admin/router/guard' import { bootstrapDirectives } from '/admin/directives' import { Language } from 'element-plus/es/locale' +import { bootstrapCatchForm } from '/admin/components/catchForm' +import http from '/admin/support/http' /** * catchadmin @@ -35,7 +37,7 @@ export default class CatchAdmin { * admin boot */ bootstrap(): void { - this.useElementPlus().usePinia().useI18n().installDirectives().useRouter().mount() + this.useElementPlus().usePinia().useI18n().installDirectives().bootstrapCatchForm().useRouter().mount() } /** @@ -105,4 +107,10 @@ export default class CatchAdmin { return this } + + protected bootstrapCatchForm(): CatchAdmin { + bootstrapCatchForm(this.app, {http: http}) + + return this + } } diff --git a/resources/admin/support/helper.ts b/resources/admin/support/helper.ts index 77abda4..a141e0e 100644 --- a/resources/admin/support/helper.ts +++ b/resources/admin/support/helper.ts @@ -100,3 +100,29 @@ export function _window(key: string) { export function getBaseUrl() { return _window('BASE_URL') ? _window('BASE_URL') : env('VITE_BASE_URL') } + +/** + * is boolean + * @param value + * @returns + */ +export function isBoolean(value: any): boolean { + return typeof value === 'boolean' +} + +/** + * + * @param value + * @returns + */ +export function isNumber(value: any): boolean { + return typeof value === 'number' +} +export const getFileExt = (filename: string): string => { + return filename.substring(filename.lastIndexOf('.')).toLowerCase() +} + +// 获取文件名 +export const getFilename = (filename: string): string => { + return filename.substring(filename.lastIndexOf('/') + 1) +}