Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev
This commit is contained in:
commit
6fc2c4e3cc
@ -21,15 +21,6 @@ export const overridesPreferences = defineOverridesPreferences({
|
|||||||
*/
|
*/
|
||||||
// defaultAvatar: '',
|
// defaultAvatar: '',
|
||||||
name: import.meta.env.VITE_APP_TITLE,
|
name: import.meta.env.VITE_APP_TITLE,
|
||||||
/**
|
|
||||||
* 这里需要设置为0 因为Page组件已经自带了padding
|
|
||||||
* TODO: 不确定官方后续会不会更新
|
|
||||||
*/
|
|
||||||
contentPadding: 0,
|
|
||||||
contentPaddingTop: 0,
|
|
||||||
contentPaddingBottom: 0,
|
|
||||||
contentPaddingLeft: 0,
|
|
||||||
contentPaddingRight: 0,
|
|
||||||
/**
|
/**
|
||||||
* 不支持modal模式 需要改动的地方太多
|
* 不支持modal模式 需要改动的地方太多
|
||||||
* 1. 正常重新登录后不会再触发接口请求 即触发登录超时的页面为空数据
|
* 1. 正常重新登录后不会再触发接口请求 即触发登录超时的页面为空数据
|
||||||
|
@ -187,11 +187,11 @@ const defaultPreferences: Preferences = {
|
|||||||
compact: false,
|
compact: false,
|
||||||
contentCompact: 'wide',
|
contentCompact: 'wide',
|
||||||
contentCompactWidth: 1200,
|
contentCompactWidth: 1200,
|
||||||
contentPadding: 16,
|
contentPadding: 0,
|
||||||
contentPaddingBottom: 16,
|
contentPaddingBottom: 0,
|
||||||
contentPaddingLeft: 16,
|
contentPaddingLeft: 0,
|
||||||
contentPaddingRight: 16,
|
contentPaddingRight: 0,
|
||||||
contentPaddingTop: 16,
|
contentPaddingTop: 0,
|
||||||
defaultAvatar:
|
defaultAvatar:
|
||||||
'https://unpkg.com/@vbenjs/static-source@0.1.7/source/avatar-v1.webp',
|
'https://unpkg.com/@vbenjs/static-source@0.1.7/source/avatar-v1.webp',
|
||||||
defaultHomePath: '/analytics',
|
defaultHomePath: '/analytics',
|
||||||
|
@ -186,11 +186,11 @@ const defaultPreferences: Preferences = {
|
|||||||
compact: false,
|
compact: false,
|
||||||
contentCompact: 'wide',
|
contentCompact: 'wide',
|
||||||
contentCompactWidth: 1200,
|
contentCompactWidth: 1200,
|
||||||
contentPadding: 16,
|
contentPadding: 0,
|
||||||
contentPaddingBottom: 16,
|
contentPaddingBottom: 0,
|
||||||
contentPaddingLeft: 16,
|
contentPaddingLeft: 0,
|
||||||
contentPaddingRight: 16,
|
contentPaddingRight: 0,
|
||||||
contentPaddingTop: 16,
|
contentPaddingTop: 0,
|
||||||
defaultAvatar:
|
defaultAvatar:
|
||||||
'https://unpkg.com/@vbenjs/static-source@0.1.7/source/avatar-v1.webp',
|
'https://unpkg.com/@vbenjs/static-source@0.1.7/source/avatar-v1.webp',
|
||||||
defaultHomePath: '/analytics',
|
defaultHomePath: '/analytics',
|
||||||
|
@ -11,11 +11,11 @@ exports[`defaultPreferences immutability test > should not modify the config obj
|
|||||||
"compact": false,
|
"compact": false,
|
||||||
"contentCompact": "wide",
|
"contentCompact": "wide",
|
||||||
"contentCompactWidth": 1200,
|
"contentCompactWidth": 1200,
|
||||||
"contentPadding": 16,
|
"contentPadding": 0,
|
||||||
"contentPaddingBottom": 16,
|
"contentPaddingBottom": 0,
|
||||||
"contentPaddingLeft": 16,
|
"contentPaddingLeft": 0,
|
||||||
"contentPaddingRight": 16,
|
"contentPaddingRight": 0,
|
||||||
"contentPaddingTop": 16,
|
"contentPaddingTop": 0,
|
||||||
"defaultAvatar": "https://unpkg.com/@vbenjs/static-source@0.1.7/source/avatar-v1.webp",
|
"defaultAvatar": "https://unpkg.com/@vbenjs/static-source@0.1.7/source/avatar-v1.webp",
|
||||||
"defaultHomePath": "/analytics",
|
"defaultHomePath": "/analytics",
|
||||||
"dynamicTitle": true,
|
"dynamicTitle": true,
|
||||||
|
@ -10,11 +10,11 @@ const defaultPreferences: Preferences = {
|
|||||||
compact: false,
|
compact: false,
|
||||||
contentCompact: 'wide',
|
contentCompact: 'wide',
|
||||||
contentCompactWidth: 1200,
|
contentCompactWidth: 1200,
|
||||||
contentPadding: 16,
|
contentPadding: 0,
|
||||||
contentPaddingBottom: 16,
|
contentPaddingBottom: 0,
|
||||||
contentPaddingLeft: 16,
|
contentPaddingLeft: 0,
|
||||||
contentPaddingRight: 16,
|
contentPaddingRight: 0,
|
||||||
contentPaddingTop: 16,
|
contentPaddingTop: 0,
|
||||||
defaultAvatar:
|
defaultAvatar:
|
||||||
'https://unpkg.com/@vbenjs/static-source@0.1.7/source/avatar-v1.webp',
|
'https://unpkg.com/@vbenjs/static-source@0.1.7/source/avatar-v1.webp',
|
||||||
defaultHomePath: '/analytics',
|
defaultHomePath: '/analytics',
|
||||||
|
Loading…
Reference in New Issue
Block a user