🌈 yudao-ui-admin-vue3
+# 🌈 yudao-ui-admin-vue3 # -
- 
+ 
+
+
+
+
+
diff --git a/yudao-ui-admin-vue3/src/components/Cropper/src/Cropper.vue b/yudao-ui-admin-vue3/src/components/Cropper/src/Cropper.vue
new file mode 100644
index 000000000..2e38e06d0
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/components/Cropper/src/Cropper.vue
@@ -0,0 +1,190 @@
+
+
+ ![]()
+
+
+
+
diff --git a/yudao-ui-admin-vue3/src/components/Cropper/src/CropperAvatar.vue b/yudao-ui-admin-vue3/src/components/Cropper/src/CropperAvatar.vue
new file mode 100644
index 000000000..455f9f005
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/components/Cropper/src/CropperAvatar.vue
@@ -0,0 +1,136 @@
+
+
+ ![avatar]()
+
+ {{ btnText ? btnText : t('cropper.selectImage') }}
+
+
+
+
+
diff --git a/yudao-ui-admin-vue3/src/components/Cropper/src/types.ts b/yudao-ui-admin-vue3/src/components/Cropper/src/types.ts
new file mode 100644
index 000000000..bcad3b450
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/components/Cropper/src/types.ts
@@ -0,0 +1,8 @@
+import type Cropper from 'cropperjs'
+
+export interface CropendResult {
+ imgBase64: string
+ imgInfo: Cropper.Data
+}
+
+export type { Cropper }
diff --git a/yudao-ui-admin-vue3/src/components/Editor/src/Editor.vue b/yudao-ui-admin-vue3/src/components/Editor/src/Editor.vue
index 00f636e2c..7a264d31e 100644
--- a/yudao-ui-admin-vue3/src/components/Editor/src/Editor.vue
+++ b/yudao-ui-admin-vue3/src/components/Editor/src/Editor.vue
@@ -23,6 +23,7 @@ const props = defineProps({
type: Object as PropType
+
+ ![]()
+
+
+
+
+
+
diff --git a/yudao-ui-admin-vue3/src/config/axios/index.ts b/yudao-ui-admin-vue3/src/config/axios/index.ts
index c2a3344bf..e6c6af8d7 100644
--- a/yudao-ui-admin-vue3/src/config/axios/index.ts
+++ b/yudao-ui-admin-vue3/src/config/axios/index.ts
@@ -44,7 +44,7 @@ export default {
},
upload: async
+
+
+
+
+
+
+
+
+
+
+
+ 
-
+
- {{ title }}
-
-
+
+ {{ title }}
+
+
+
diff --git a/yudao-ui-admin-vue3/src/layout/components/Menu/src/Menu.vue b/yudao-ui-admin-vue3/src/layout/components/Menu/src/Menu.vue
index 40718d093..99a7c0033 100644
--- a/yudao-ui-admin-vue3/src/layout/components/Menu/src/Menu.vue
+++ b/yudao-ui-admin-vue3/src/layout/components/Menu/src/Menu.vue
@@ -161,6 +161,7 @@ $prefix-cls: #{$namespace}-menu;
// 设置子菜单悬停的高亮和背景色
.#{$elNamespace}-sub-menu__title,
.#{$elNamespace}-menu-item {
+ height: 59px;
&:hover {
color: var(--left-menu-text-active-color) !important;
background-color: var(--left-menu-bg-color) !important;
@@ -170,6 +171,7 @@ $prefix-cls: #{$namespace}-menu;
// 设置选中时的高亮背景和高亮颜色
.#{$elNamespace}-sub-menu.is-active,
.#{$elNamespace}-menu-item.is-active {
+ height: 59px;
color: var(--left-menu-text-active-color) !important;
background-color: var(--left-menu-bg-active-color) !important;
diff --git a/yudao-ui-admin-vue3/src/locales/en.ts b/yudao-ui-admin-vue3/src/locales/en.ts
index af7a9314f..9733d9c93 100644
--- a/yudao-ui-admin-vue3/src/locales/en.ts
+++ b/yudao-ui-admin-vue3/src/locales/en.ts
@@ -426,5 +426,19 @@ export default {
cfPwdMsg: 'Please Enter Confirm Password',
diffPwd: 'The Passwords Entered Twice No Match'
}
+ },
+ cropper: {
+ selectImage: 'Select Image',
+ uploadSuccess: 'Uploaded success!',
+ modalTitle: 'Avatar upload',
+ okText: 'Confirm and upload',
+ btn_reset: 'Reset',
+ btn_rotate_left: 'Counterclockwise rotation',
+ btn_rotate_right: 'Clockwise rotation',
+ btn_scale_x: 'Flip horizontal',
+ btn_scale_y: 'Flip vertical',
+ btn_zoom_in: 'Zoom in',
+ btn_zoom_out: 'Zoom out',
+ preview: 'Preivew'
}
}
diff --git a/yudao-ui-admin-vue3/src/locales/zh-CN.ts b/yudao-ui-admin-vue3/src/locales/zh-CN.ts
index 4c4c47154..71e2c3427 100644
--- a/yudao-ui-admin-vue3/src/locales/zh-CN.ts
+++ b/yudao-ui-admin-vue3/src/locales/zh-CN.ts
@@ -419,5 +419,19 @@ export default {
pwdRules: '长度在 6 到 20 个字符',
diffPwd: '两次输入密码不一致'
}
+ },
+ cropper: {
+ selectImage: '选择图片',
+ uploadSuccess: '上传成功',
+ modalTitle: '头像上传',
+ okText: '确认并上传',
+ btn_reset: '重置',
+ btn_rotate_left: '逆时针旋转',
+ btn_rotate_right: '顺时针旋转',
+ btn_scale_x: '水平翻转',
+ btn_scale_y: '垂直翻转',
+ btn_zoom_in: '放大',
+ btn_zoom_out: '缩小',
+ preview: '预览'
}
}
diff --git a/yudao-ui-admin-vue3/src/plugins/vxeTable/index.ts b/yudao-ui-admin-vue3/src/plugins/vxeTable/index.ts
index 95316e4ad..0d4bdc72c 100644
--- a/yudao-ui-admin-vue3/src/plugins/vxeTable/index.ts
+++ b/yudao-ui-admin-vue3/src/plugins/vxeTable/index.ts
@@ -56,7 +56,7 @@ watch(
import('./theme/light.scss')
}
},
- { immediate: true }
+ { deep: true }
)
// 全局默认参数
VXETable.setup({
diff --git a/yudao-ui-admin-vue3/src/router/index.ts b/yudao-ui-admin-vue3/src/router/index.ts
index 4d2d079ea..4fe42b515 100644
--- a/yudao-ui-admin-vue3/src/router/index.ts
+++ b/yudao-ui-admin-vue3/src/router/index.ts
@@ -14,7 +14,7 @@ import { usePermissionStoreWithOut } from '@/store/modules/permission'
import { getInfoApi } from '@/api/login'
import { listSimpleDictDataApi } from '@/api/system/dict/dict.data'
-const { wsCache } = useCache('sessionStorage')
+const { wsCache } = useCache()
const { start, done } = useNProgress()
diff --git a/yudao-ui-admin-vue3/src/router/modules/remaining.ts b/yudao-ui-admin-vue3/src/router/modules/remaining.ts
index 290941657..d26cd11fd 100644
--- a/yudao-ui-admin-vue3/src/router/modules/remaining.ts
+++ b/yudao-ui-admin-vue3/src/router/modules/remaining.ts
@@ -64,7 +64,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
meta: {
title: t('router.home'),
icon: 'ep:home-filled',
- noCache: true,
+ noCache: false,
affix: true
}
}
@@ -85,7 +85,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
meta: {
canTo: true,
hidden: true,
- noTagsView: true,
+ noTagsView: false,
icon: 'ep:user',
title: t('common.profile')
}
diff --git a/yudao-ui-admin-vue3/src/types/components.d.ts b/yudao-ui-admin-vue3/src/types/components.d.ts
index 65c4ad1b7..8de1f3352 100644
--- a/yudao-ui-admin-vue3/src/types/components.d.ts
+++ b/yudao-ui-admin-vue3/src/types/components.d.ts
@@ -22,6 +22,7 @@ export type ComponentName =
| 'InputPassword'
| 'Editor'
| 'UploadImg'
+ | 'UploadImgs'
| 'UploadFile'
export type ColProps = {
diff --git a/yudao-ui-admin-vue3/src/utils/index.ts b/yudao-ui-admin-vue3/src/utils/index.ts
index 246de698b..b413a2b5a 100644
--- a/yudao-ui-admin-vue3/src/utils/index.ts
+++ b/yudao-ui-admin-vue3/src/utils/index.ts
@@ -69,7 +69,7 @@ export const trim = (str: string) => {
* @param {Date | number | string} time 需要转换的时间
* @param {String} fmt 需要转换的格式 如 yyyy-MM-dd、yyyy-MM-dd HH:mm:ss
*/
-export function formatTime(time: Date | number | string, fmt: string) {
+export const formatTime = (time: Date | number | string, fmt: string) => {
if (!time) return ''
else {
const date = new Date(time)
@@ -100,7 +100,7 @@ export function formatTime(time: Date | number | string, fmt: string) {
/**
* 生成随机字符串
*/
-export function toAnyString() {
+export const toAnyString = () => {
const str: string = 'xxxxx-xxxxx-4xxxx-yxxxx-xxxxx'.replace(/[xy]/g, (c: string) => {
const r: number = (Math.random() * 16) | 0
const v: number = c === 'x' ? r : (r & 0x3) | 0x8
@@ -108,3 +108,34 @@ export function toAnyString() {
})
return str
}
+
+export const generateUUID = () => {
+ if (typeof crypto === 'object') {
+ if (typeof crypto.randomUUID === 'function') {
+ return crypto.randomUUID()
+ }
+ if (typeof crypto.getRandomValues === 'function' && typeof Uint8Array === 'function') {
+ const callback = (c: any) => {
+ const num = Number(c)
+ return (num ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (num / 4)))).toString(
+ 16
+ )
+ }
+ return '10000000-1000-4000-8000-100000000000'.replace(/[018]/g, callback)
+ }
+ }
+ let timestamp = new Date().getTime()
+ let performanceNow =
+ (typeof performance !== 'undefined' && performance.now && performance.now() * 1000) || 0
+ return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
+ let random = Math.random() * 16
+ if (timestamp > 0) {
+ random = (timestamp + random) % 16 | 0
+ timestamp = Math.floor(timestamp / 16)
+ } else {
+ random = (performanceNow + random) % 16 | 0
+ performanceNow = Math.floor(performanceNow / 16)
+ }
+ return (c === 'x' ? random : (random & 0x3) | 0x8).toString(16)
+ })
+}
diff --git a/yudao-ui-admin-vue3/src/utils/routerHelper.ts b/yudao-ui-admin-vue3/src/utils/routerHelper.ts
index 996406104..d3a2b2283 100644
--- a/yudao-ui-admin-vue3/src/utils/routerHelper.ts
+++ b/yudao-ui-admin-vue3/src/utils/routerHelper.ts
@@ -56,7 +56,13 @@ export const generateRoute = (routes: AppCustomRouteRecordRaw[]): AppRouteRecord
title: route.name,
icon: route.icon,
hidden: !route.visible,
- noCache: !route.keepAlive
+ noCache: !route.keepAlive,
+ alwaysShow:
+ route.children &&
+ route.children.length === 1 &&
+ import.meta.env.VITE_ROUTE_ALWAYSSHOW_ENABLE === 'true'
+ ? true
+ : false
}
// 路由地址转首字母大写驼峰，作为路由名称，适配keepAlive
let data: AppRouteRecordRaw = {
@@ -71,6 +77,7 @@ export const generateRoute = (routes: AppCustomRouteRecordRaw[]): AppRouteRecord
data.meta = {}
data.name = toCamelCase(route.path, true) + 'Parent'
data.redirect = ''
+ meta.alwaysShow = true
const childrenData: AppRouteRecordRaw = {
path: '',
name: toCamelCase(route.path, true),
diff --git a/yudao-ui-admin-vue3/src/views/Profile/components/UserAvatar.vue b/yudao-ui-admin-vue3/src/views/Profile/components/UserAvatar.vue
index 4e80faf21..d879d5b87 100644
--- a/yudao-ui-admin-vue3/src/views/Profile/components/UserAvatar.vue
+++ b/yudao-ui-admin-vue3/src/views/Profile/components/UserAvatar.vue
@@ -1,245 +1,40 @@
-
- ![]( "点击上传头像")
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 提 交
-
-
-
-
-
diff --git a/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/index.vue b/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/index.vue
index d838ec6ec..6a05f063d 100644
--- a/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/index.vue
@@ -95,9 +95,8 @@ const handleProcessClick = (
message
.confirm('确认标记为' + type + '?', t('common.reminder'))
.then(async () => {
- ApiErrorLogApi.updateApiErrorLogPageApi(row.id, processSttatus).then(() => {
- message.success(t('common.updateSuccess'))
- })
+ await ApiErrorLogApi.updateApiErrorLogPageApi(row.id, processSttatus)
+ message.success(t('common.updateSuccess'))
})
.finally(async () => {
// 刷新列表
diff --git a/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue b/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue
index 8312a2f96..e50905e8b 100644
--- a/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue
+++ b/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue
@@ -64,8 +64,8 @@
() // 表单 Ref
const detailData = ref() // 详情 Ref
-let form = ref({
+const form = ref({
id: 0,
name: '',
storage: 0,
@@ -230,6 +230,28 @@ const setDialogTile = (type: string) => {
const handleCreate = (formEl: FormInstance | undefined) => {
setDialogTile('create')
formEl?.resetFields()
+ form.value = {
+ id: 0,
+ name: '',
+ storage: 0,
+ master: false,
+ visible: false,
+ config: {
+ basePath: '',
+ host: '',
+ port: 0,
+ username: '',
+ password: '',
+ mode: '',
+ endpoint: '',
+ bucket: '',
+ accessKey: '',
+ accessSecret: '',
+ domain: ''
+ },
+ remark: '',
+ createTime: new Date()
+ }
}
// 修改操作
diff --git a/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts b/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts
index f199c3e43..2515266f5 100644
--- a/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts
@@ -12,8 +12,7 @@ export const rules = reactive({
email: [required],
phone: [
{
- min: 11,
- max: 11,
+ len: 11,
trigger: 'blur',
message: '请输入正确的手机号码'
}
diff --git a/yudao-ui-admin-vue3/src/views/system/dept/index.vue b/yudao-ui-admin-vue3/src/views/system/dept/index.vue
index d03f2124a..6a5b50e66 100644
--- a/yudao-ui-admin-vue3/src/views/system/dept/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/dept/index.vue
@@ -75,16 +75,15 @@
diff --git a/yudao-ui-admin-vue3/src/views/system/menu/menu.data.ts b/yudao-ui-admin-vue3/src/views/system/menu/menu.data.ts
new file mode 100644
index 000000000..cf496a19d
--- /dev/null
+++ b/yudao-ui-admin-vue3/src/views/system/menu/menu.data.ts
@@ -0,0 +1,75 @@
+import { reactive } from 'vue'
+import { useI18n } from '@/hooks/web/useI18n'
+import { DICT_TYPE } from '@/utils/dict'
+import { required } from '@/utils/formRules'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
+const { t } = useI18n() // 国际化
+
+// 新增和修改的表单校验
+export const rules = reactive({
+ name: [required],
+ sort: [required],
+ path: [required],
+ status: [required]
+})
+
+// CrudSchema
+const crudSchemas = reactive({
+ primaryKey: 'id',
+ primaryType: null,
+ action: true,
+ columns: [
+ {
+ title: '上级菜单',
+ field: 'parentId',
+ isTable: false
+ },
+ {
+ title: '菜单名称',
+ field: 'name',
+ isSearch: true,
+ table: {
+ treeNode: true,
+ align: 'left',
+ width: '200px',
+ slots: {
+ default: 'name_default'
+ }
+ }
+ },
+ {
+ title: '菜单类型',
+ field: 'type',
+ dictType: DICT_TYPE.SYSTEM_MENU_TYPE
+ },
+ {
+ title: '路由地址',
+ field: 'path'
+ },
+ {
+ title: '组件路径',
+ field: 'component'
+ },
+ {
+ title: '权限标识',
+ field: 'permission'
+ },
+ {
+ title: '排序',
+ field: 'sort'
+ },
+ {
+ title: t('common.status'),
+ field: 'status',
+ dictType: DICT_TYPE.COMMON_STATUS,
+ dictClass: 'number',
+ isSearch: true
+ },
+ {
+ title: t('common.createTime'),
+ field: 'createTime',
+ formatter: 'formatDate'
+ }
+ ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/yudao-ui-admin-vue3/src/views/system/notice/index.vue b/yudao-ui-admin-vue3/src/views/system/notice/index.vue
index eeed4c4f4..239c0b414 100644
--- a/yudao-ui-admin-vue3/src/views/system/notice/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/notice/index.vue
@@ -53,7 +53,7 @@
:data="detailData"
>
- ({
}
},
form: {
- component: 'UploadImg',
- componentProps: {
- limit: 1
- }
+ component: 'UploadImg'
}
},
{
diff --git a/yudao-ui-admin-vue3/src/views/system/user/index.vue b/yudao-ui-admin-vue3/src/views/system/user/index.vue
index 6d61a5c42..f694486f0 100644
--- a/yudao-ui-admin-vue3/src/views/system/user/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/user/index.vue
@@ -145,7 +145,7 @@
v-for="item in postOptions"
:key="item.id"
:label="item.name"
- :value="item.id"
+ :value="(item.id as unknown as number)"
/>
diff --git a/yudao-ui-admin-vue3/src/views/system/user/user.data.ts b/yudao-ui-admin-vue3/src/views/system/user/user.data.ts
index 4fbf3583c..d06745c06 100644
--- a/yudao-ui-admin-vue3/src/views/system/user/user.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/user/user.data.ts
@@ -10,12 +10,10 @@ export const rules = reactive({
username: [required],
nickname: [required],
email: [required],
- postIds: [required],
status: [required],
mobile: [
{
- min: 11,
- max: 11,
+ len: 11,
trigger: 'blur',
message: '请输入正确的手机号码'
}
diff --git a/yudao-ui-admin-vue3/tsconfig.json b/yudao-ui-admin-vue3/tsconfig.json
index 33095aa6b..97f0654da 100644
--- a/yudao-ui-admin-vue3/tsconfig.json
+++ b/yudao-ui-admin-vue3/tsconfig.json
@@ -24,7 +24,7 @@
"@/*": ["src/*"]
},
"types": [
- "@intlify/vite-plugin-vue-i18n/client",
+ "@intlify/unplugin-vue-i18n/types",
"vite/client",
"element-plus/global",
"@types/intro.js",
diff --git a/yudao-ui-admin-vue3/types/env.d.ts b/yudao-ui-admin-vue3/types/env.d.ts
index b8cff557a..33e1f40b8 100644
--- a/yudao-ui-admin-vue3/types/env.d.ts
+++ b/yudao-ui-admin-vue3/types/env.d.ts
@@ -10,7 +10,8 @@ declare module '*.vue' {
interface ImportMetaEnv {
readonly VITE_APP_TITLE: string
readonly VITE_PORT: number
- readonly VITE_OPEN: boolean
+ readonly VITE_OPEN: string
+ readonly VITE_ROUTE_ALWAYSSHOW_ENABLE: string
readonly VITE_APP_CAPTCHA_ENABLE: string
readonly VITE_APP_TENANT_ENABLE: string
readonly VITE_BASE_URL: string
diff --git a/yudao-ui-admin-vue3/vite.config.ts b/yudao-ui-admin-vue3/vite.config.ts
index 6531be705..e5572436a 100644
--- a/yudao-ui-admin-vue3/vite.config.ts
+++ b/yudao-ui-admin-vue3/vite.config.ts
@@ -30,7 +30,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
// 端口号
port: env.VITE_PORT,
host: "0.0.0.0",
- open: env.VITE_OPEN,
+ open: env.VITE_OPEN === 'true',
// 本地跨域代理
proxy: {
['/admin-api']: {
+
-
-
-
- ![]()
-
-