mirror of
https://github.com/XiaoDaiGua-Ray/ray-template.git
synced 2025-04-05 07:03:00 +08:00
version: v5.0.1
This commit is contained in:
XiaoDaiGua-Ray
parent
2f42571b3b
commit
707300774d
19
CHANGELOG.md
19
CHANGELOG.md
@ -1,5 +1,22 @@
|
||||
# CHANGE LOG
|
||||
|
||||
## 5.0.1
|
||||
|
||||
本次更新灵感来自于 `vben admin 5` 项目。
|
||||
|
||||
## Feats
|
||||
|
||||
- 更新了 `Menu`, `MenuTag`, `SiderBar` 样式细节
|
||||
- 调整 `components`, `components-pro` 分包，现在都统一到 `components` 下，以 `base`, `pro` 进行区分，避免导出导入麻烦
|
||||
- `MenuTag` 新增了一些操作方式
|
||||
- `SiderBarLogo` 样式调整
|
||||
|
||||
## Fixes
|
||||
|
||||
- 新增 `tableFlexHeight` 配置项属性修复 `RTable` 组件因为不再透传至 `Table` 导致设置 `flexHeight` 进行动态高度设置失败的问题
|
||||
- 修复 `RTable` 错误的 `title` 属性注入问题
|
||||
- 修复 `MenuTag` 频繁右键会导致闪烁出现右键菜单的问题
|
||||
|
||||
## 5.0.0
|
||||
|
||||
## Feats
|
||||
@ -123,7 +140,7 @@
|
||||
- `RChart` 组件 `setOptions` 方法配置项默认不启用 `merge` 模式
|
||||
- 调整 `header` 的样式，增加了一点点间隙
|
||||
- `useDevice` 新增 `observer` 配置项，可以自定义观察回调
|
||||
- 新增 `components-pro` 包，助力简化业务开发
|
||||
- 新增 `components` 包，助力简化业务开发
|
||||
- 新增 `RTablePro` 组件，大幅简化中后台带有过滤请求条件的表格显示业务
|
||||
- 新增 `RCollapse` 组件，允许折叠过滤条件
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { RModal } from '../../src/components/RModal/index'
|
||||
import { RModal } from '../../src/components/base/RModal/index'
|
||||
import { mount } from '@vue/test-utils'
|
||||
|
||||
describe('RModal', () => {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "ray-template",
|
||||
"private": false,
|
||||
"version": "5.0.0",
|
||||
"version": "5.0.1",
|
||||
"type": "module",
|
||||
"engines": {
|
||||
"node": "^18.0.0 || >=20.0.0",
|
||||
|
||||
@ -46,7 +46,7 @@ const AppAvatar = defineComponent({
|
||||
const { getSigningCallback, avatarSize, spaceSize, $props, vertical } = this
|
||||
|
||||
return (
|
||||
<NButton quaternary strong>
|
||||
<NButton quaternary strong focusable={false}>
|
||||
<NFlex align="center" size={spaceSize} vertical={vertical}>
|
||||
<NAvatar
|
||||
{...($props as AvatarProps)}
|
||||
|
||||
@ -8,4 +8,12 @@ export const APP_REGEX: Record<string, RegExp> = {
|
||||
/** css 尺寸单位匹配 */
|
||||
cssUnit:
|
||||
/^\d+(\.\d+)?(px|em|rem|%|vw|vh|vmin|vmax|cm|mm|in|pt|pc|ch|ex|q|s|ms|deg|rad|turn|grad|hz|khz|dpi|dpcm|dppx|fr|auto)$/,
|
||||
/**
|
||||
*
|
||||
* @description
|
||||
* 匹配 css 单位是否为 auto, unset, fit-content, max-content, min-content, initial, inherit, revert, revert-layer, -webkit-fill-available,
|
||||
* -webkit-max-content, -webkit-min-content, -webkit-revert, -webkit-revert-layer, -webkit-fill-available。
|
||||
*/
|
||||
cssSize:
|
||||
/^auto|unset|fit-content|max-content|min-content|initial|inherit|revert|revert-layer|[-\w]+-webkit-fill-available$/,
|
||||
}
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
import RCollapse from './RCollapse/Collapse'
|
||||
|
||||
export * from './RTablePro'
|
||||
export { RCollapse }
|
||||
@ -1,7 +1,7 @@
|
||||
import type {
|
||||
ChartThemeRawArray,
|
||||
ChartThemeRawModules,
|
||||
} from '@/components/RChart/src/types'
|
||||
} from '@/components/base/RChart/src/types'
|
||||
|
||||
/**
|
||||
*
|
||||
@ -1,6 +1,6 @@
|
||||
import { useTheme } from '@/hooks'
|
||||
|
||||
import type { LoadingOptions } from '@/components/RChart/src/types'
|
||||
import type { LoadingOptions } from '@/components/base/RChart/src/types'
|
||||
|
||||
/**
|
||||
*
|
||||
@ -8,7 +8,7 @@ import Print from './components/Print'
|
||||
import TablePropsSelect from './components/Props'
|
||||
|
||||
import props from './props'
|
||||
import { call, renderNode, uuid } from '@/utils'
|
||||
import { call, renderNode, uuid, completeSize } from '@/utils'
|
||||
import { config } from './shared'
|
||||
import { pick } from 'lodash-es'
|
||||
import { useTemplateRef } from 'vue'
|
||||
@ -20,6 +20,7 @@ import type {
|
||||
PropsComponentPopselectKeys,
|
||||
RTableInst,
|
||||
} from './types'
|
||||
import type { ExtractPublicPropTypes } from 'vue'
|
||||
|
||||
export default defineComponent({
|
||||
name: 'RTable',
|
||||
@ -235,24 +236,29 @@ export default defineComponent({
|
||||
const {
|
||||
$props,
|
||||
$attrs,
|
||||
wrapperBordered,
|
||||
$slots,
|
||||
uuidTable,
|
||||
contextMenuReactive,
|
||||
uuidWrapper,
|
||||
privateReactive,
|
||||
disabledContextMenu,
|
||||
contextMenuReactive,
|
||||
contextMenuOptions,
|
||||
uuidTable,
|
||||
title,
|
||||
$slots,
|
||||
propsPopselectValue,
|
||||
renderWrapperHeader,
|
||||
} = this
|
||||
const { class: className, ...restAttrs } = $attrs
|
||||
const { tool, combineRowProps, contextMenuSelect } = this
|
||||
const {
|
||||
renderWrapperHeader,
|
||||
wrapperBordered,
|
||||
disabledContextMenu,
|
||||
contextMenuOptions,
|
||||
title,
|
||||
tableFlexHeight,
|
||||
cardProps,
|
||||
...restProps
|
||||
} = $props as ExtractPublicPropTypes<typeof props>
|
||||
|
||||
return (
|
||||
<NCard
|
||||
{...$props.cardProps}
|
||||
{...cardProps}
|
||||
{...{
|
||||
id: uuidWrapper,
|
||||
}}
|
||||
@ -268,11 +274,17 @@ export default defineComponent({
|
||||
{...{
|
||||
id: uuidTable,
|
||||
}}
|
||||
{...($props as DataTableProps)}
|
||||
{...(restProps as DataTableProps)}
|
||||
{...propsPopselectValue}
|
||||
rowProps={combineRowProps.bind(this)}
|
||||
size={privateReactive.size}
|
||||
ref="rTableInst"
|
||||
style={{
|
||||
height:
|
||||
tableFlexHeight !== null && tableFlexHeight !== void 0
|
||||
? completeSize(tableFlexHeight)
|
||||
: null,
|
||||
}}
|
||||
>
|
||||
{{
|
||||
...$slots,
|
||||
@ -14,6 +14,17 @@ import type { Recordable } from '@/types'
|
||||
|
||||
const props = {
|
||||
...dataTableProps,
|
||||
/**
|
||||
*
|
||||
* @description
|
||||
* 当设置表格高度为弹性高度时，手动设置表格的高度。
|
||||
*
|
||||
* @default undefined
|
||||
*/
|
||||
tableFlexHeight: {
|
||||
type: [String, Number] as PropType<string | number>,
|
||||
default: void 0,
|
||||
},
|
||||
/**
|
||||
*
|
||||
* @description
|
||||
@ -1,23 +1,27 @@
|
||||
import RCollapse from '../components/pro/RCollapse/Collapse'
|
||||
|
||||
// 导出所有自定义组件
|
||||
export * from './RChart'
|
||||
export * from './RCollapseGrid'
|
||||
export * from './RIcon'
|
||||
export * from './RIframe'
|
||||
export * from './RModal'
|
||||
export * from './RMoreDropdown'
|
||||
export * from './RTable'
|
||||
export * from './RTransitionComponent'
|
||||
export * from './RForm'
|
||||
export * from './RSegment'
|
||||
export * from './RBarcode'
|
||||
export * from './base/RChart'
|
||||
export * from './base/RCollapseGrid'
|
||||
export * from './base/RIcon'
|
||||
export * from './base/RIframe'
|
||||
export * from './base/RModal'
|
||||
export * from './base/RMoreDropdown'
|
||||
export * from './base/RTable'
|
||||
export * from './base/RTransitionComponent'
|
||||
export * from './base/RForm'
|
||||
export * from './base/RSegment'
|
||||
export * from './base/RBarcode'
|
||||
export * from '../components/pro/RTablePro'
|
||||
export { RCollapse }
|
||||
|
||||
// 导出自定义组件类型
|
||||
export type * from './RChart/src/types'
|
||||
export type * from './RCollapseGrid/src/types'
|
||||
export type * from './RIframe/src/types'
|
||||
export type * from './RTable/src/types'
|
||||
export type * from './RTransitionComponent/src/types'
|
||||
export type * from './RForm/src/types'
|
||||
export type * from './RModal/src/types'
|
||||
export type * from './RSegment/src/types'
|
||||
export type * from './RBarcode/src/types'
|
||||
export type * from './base/RChart/src/types'
|
||||
export type * from './base/RCollapseGrid/src/types'
|
||||
export type * from './base/RIframe/src/types'
|
||||
export type * from './base/RTable/src/types'
|
||||
export type * from './base/RTransitionComponent/src/types'
|
||||
export type * from './base/RForm/src/types'
|
||||
export type * from './base/RModal/src/types'
|
||||
export type * from './base/RSegment/src/types'
|
||||
export type * from './base/RBarcode/src/types'
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
import { RCollapseGrid, RForm } from '@/components'
|
||||
|
||||
import { collapseGridProps, formProps } from '@/components'
|
||||
import formProps from '../../base/RForm/src/props'
|
||||
import collapseGridProps from '../../base/RCollapseGrid/src/props'
|
||||
|
||||
import type { FormProps, GridProps } from 'naive-ui'
|
||||
|
||||
@ -7,7 +7,7 @@ import type {
|
||||
ScrollToOptions,
|
||||
ColumnKey,
|
||||
SortOrder,
|
||||
} from '@/components/RTable/src/types'
|
||||
} from '@/components/base/RTable/src/types'
|
||||
import type { PrintDomOptions } from '@/utils'
|
||||
|
||||
/**
|
||||
12
src/icons/action/close_other.svg
Normal file
12
src/icons/action/close_other.svg
Normal file
@ -0,0 +1,12 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
|
||||
stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
|
||||
>
|
||||
<path d="M2 12h6"></path>
|
||||
<path d="M22 12h-6"></path>
|
||||
<path d="M12 2v2"></path>
|
||||
<path d="M12 8v2"></path>
|
||||
<path d="M12 14v2"></path>
|
||||
<path d="M12 20v2"></path>
|
||||
<path d="m19 9-3 3 3 3"></path>
|
||||
<path d="m5 15 3-3-3-3"></path>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 431 B |
@ -1,5 +1,9 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" width="1em" height="1em"
|
||||
viewBox="0 0 16 16" class="iconify iconify--codicon">
|
||||
<path fill="currentColor"
|
||||
d="M3 12h10V4H3v8zm2-6h6v4H5V6zM2 6H1V2.5l.5-.5H5v1H2v3zm13-3.5V6h-1V3h-3V2h3.5l.5.5zM14 10h1v3.5l-.5.5H11v-1h3v-3zM2 13h3v1H1.5l-.5-.5V10h1v3z"></path>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
|
||||
stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
|
||||
>
|
||||
<path d="M3 7V5a2 2 0 0 1 2-2h2"></path>
|
||||
<path d="M17 3h2a2 2 0 0 1 2 2v2"></path>
|
||||
<path d="M21 17v2a2 2 0 0 1-2 2h-2"></path>
|
||||
<path d="M7 21H5a2 2 0 0 1-2-2v-2"></path>
|
||||
<rect width="10" height="8" x="7" y="8" rx="1"></rect>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 342 B After Width: | Height: | Size: 426 B |
@ -1,4 +1,6 @@
|
||||
<svg class="inline-block text-22px" viewBox="0 0 24 24" width="1em" height="1em">
|
||||
<path fill="currentColor"
|
||||
d="M17.65 6.35A7.958 7.958 0 0 0 12 4a8 8 0 0 0-8 8a8 8 0 0 0 8 8c3.73 0 6.84-2.55 7.73-6h-2.08A5.99 5.99 0 0 1 12 18a6 6 0 0 1-6-6a6 6 0 0 1 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35Z"></path>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
|
||||
stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
|
||||
>
|
||||
<path d="M21 12a9 9 0 1 1-9-9c2.52 0 4.93 1 6.74 2.74L21 8"></path>
|
||||
<path d="M21 3v5h-5"></path>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 322 B After Width: | Height: | Size: 292 B |
@ -1,6 +1,6 @@
|
||||
<svg t="1681648912704" class="icon" viewBox="0 0 1024 1024" version="1.1"
|
||||
xmlns="http://www.w3.org/2000/svg" p-id="8713" width="64" height="64">
|
||||
<path
|
||||
d="M907.4 906.4c-29 29-76 29-105 0L657.7 761.7c-57.6 38.4-126.8 60.9-201.3 60.9-200.5 0-363.1-162.6-363.1-363.2S255.9 96.2 456.5 96.2s363.2 162.6 363.2 363.2c0 72.4-21.2 139.9-57.7 196.5l145.5 145.5c28.9 29 28.9 76-0.1 105zM456.4 231C330.3 231 228 333.3 228 459.4c0 126.1 102.3 228.4 228.4 228.4s228.4-102.3 228.4-228.4C684.9 333.3 582.6 231 456.4 231z m118.1 379.4c-1.4 2.1-3.5 3.6-6.2 4.2-5.5 1.3-11.1-2.2-12.3-7.7-1.2-5.2 1.7-10.3 6.7-12 59-46.5 80.8-126.4 53.6-196.1-0.7-1.4-1-2.9-1-4.5 0-5.7 4.6-10.3 10.3-10.3 4.2 0 7.8 2.5 9.4 6.1h0.1c30.7 78.3 6.1 168.4-60.6 220.3z"
|
||||
p-id="8714" fill="currentColor"></path>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
|
||||
stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
|
||||
>
|
||||
<circle cx="11" cy="11" r="8"></circle>
|
||||
<path d="m21 21-4.3-4.3"></path>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 784 B After Width: | Height: | Size: 268 B |
@ -1,4 +1,7 @@
|
||||
<svg t="1669083002473" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4842" width="200" height="200">
|
||||
<path d="M924.8 625.7l-65.5-56c3.1-19 4.7-38.4 4.7-57.8s-1.6-38.8-4.7-57.8l65.5-56c10.1-8.6 13.8-22.6 9.3-35.2l-0.9-2.6c-18.1-50.5-44.9-96.9-79.7-137.9l-1.8-2.1c-8.6-10.1-22.5-13.9-35.1-9.5l-81.3 28.9c-30-24.6-63.5-44-99.7-57.6l-15.7-85c-2.4-13.1-12.7-23.3-25.8-25.7l-2.7-0.5c-52.1-9.4-106.9-9.4-159 0l-2.7 0.5c-13.1 2.4-23.4 12.6-25.8 25.7l-15.8 85.4c-35.9 13.6-69.2 32.9-99 57.4l-81.9-29.1c-12.5-4.4-26.5-0.7-35.1 9.5l-1.8 2.1c-34.8 41.1-61.6 87.5-79.7 137.9l-0.9 2.6c-4.5 12.5-0.8 26.5 9.3 35.2l66.3 56.6c-3.1 18.8-4.6 38-4.6 57.1 0 19.2 1.5 38.4 4.6 57.1L99 625.5c-10.1 8.6-13.8 22.6-9.3 35.2l0.9 2.6c18.1 50.4 44.9 96.9 79.7 137.9l1.8 2.1c8.6 10.1 22.5 13.9 35.1 9.5l81.9-29.1c29.8 24.5 63.1 43.9 99 57.4l15.8 85.4c2.4 13.1 12.7 23.3 25.8 25.7l2.7 0.5c26.1 4.7 52.8 7.1 79.5 7.1 26.7 0 53.5-2.4 79.5-7.1l2.7-0.5c13.1-2.4 23.4-12.6 25.8-25.7l15.7-85c36.2-13.6 69.7-32.9 99.7-57.6l81.3 28.9c12.5 4.4 26.5 0.7 35.1-9.5l1.8-2.1c34.8-41.1 61.6-87.5 79.7-137.9l0.9-2.6c4.5-12.3 0.8-26.3-9.3-35zM788.3 465.9c2.5 15.1 3.8 30.6 3.8 46.1s-1.3 31-3.8 46.1l-6.6 40.1 74.7 63.9c-11.3 26.1-25.6 50.7-42.6 73.6L721 702.8l-31.4 25.8c-23.9 19.6-50.5 35-79.3 45.8l-38.1 14.3-17.9 97c-28.1 3.2-56.8 3.2-85 0l-17.9-97.2-37.8-14.5c-28.5-10.8-55-26.2-78.7-45.7l-31.4-25.9-93.4 33.2c-17-22.9-31.2-47.6-42.6-73.6l75.5-64.5-6.5-40c-2.4-14.9-3.7-30.3-3.7-45.5 0-15.3 1.2-30.6 3.7-45.5l6.5-40-75.5-64.5c11.3-26.1 25.6-50.7 42.6-73.6l93.4 33.2 31.4-25.9c23.7-19.5 50.2-34.9 78.7-45.7l37.9-14.3 17.9-97.2c28.1-3.2 56.8-3.2 85 0l17.9 97 38.1 14.3c28.7 10.8 55.4 26.2 79.3 45.8l31.4 25.8 92.8-32.9c17 22.9 31.2 47.6 42.6 73.6L781.8 426l6.5 39.9z" p-id="4843" fill="currentColor"></path>
|
||||
<path d="M512 326c-97.2 0-176 78.8-176 176s78.8 176 176 176 176-78.8 176-176-78.8-176-176-176z m79.2 255.2C570 602.3 541.9 614 512 614c-29.9 0-58-11.7-79.2-32.8C411.7 560 400 531.9 400 502c0-29.9 11.7-58 32.8-79.2C454 401.6 482.1 390 512 390c29.9 0 58 11.6 79.2 32.8C612.3 444 624 472.1 624 502c0 29.9-11.7 58-32.8 79.2z" p-id="4844" fill="currentColor"></path>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
|
||||
stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
|
||||
>
|
||||
<path
|
||||
d="M12.22 2h-.44a2 2 0 0 0-2 2v.18a2 2 0 0 1-1 1.73l-.43.25a2 2 0 0 1-2 0l-.15-.08a2 2 0 0 0-2.73.73l-.22.38a2 2 0 0 0 .73 2.73l.15.1a2 2 0 0 1 1 1.72v.51a2 2 0 0 1-1 1.74l-.15.09a2 2 0 0 0-.73 2.73l.22.38a2 2 0 0 0 2.73.73l.15-.08a2 2 0 0 1 2 0l.43.25a2 2 0 0 1 1 1.73V20a2 2 0 0 0 2 2h.44a2 2 0 0 0 2-2v-.18a2 2 0 0 1 1-1.73l.43-.25a2 2 0 0 1 2 0l.15.08a2 2 0 0 0 2.73-.73l.22-.39a2 2 0 0 0-.73-2.73l-.15-.08a2 2 0 0 1-1-1.74v-.5a2 2 0 0 1 1-1.74l.15-.09a2 2 0 0 0 .73-2.73l-.22-.38a2 2 0 0 0-2.73-.73l-.15.08a2 2 0 0 1-2 0l-.43-.25a2 2 0 0 1-1-1.73V4a2 2 0 0 0-2-2z"></path>
|
||||
<circle cx="12" cy="12" r="3"></circle>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 823 B |
7
src/icons/action/shared.svg
Normal file
7
src/icons/action/shared.svg
Normal file
@ -0,0 +1,7 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
|
||||
stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
|
||||
>
|
||||
<path d="M15 3h6v6"></path>
|
||||
<path d="M10 14 21 3"></path>
|
||||
<path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 330 B |
@ -1,15 +1,7 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" width="1em" height="1em"
|
||||
viewBox="0 0 24 24">
|
||||
<g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
|
||||
stroke-width="2">
|
||||
<path stroke-dasharray="20" stroke-dashoffset="20" d="M3 3V21">
|
||||
<animate fill="freeze" attributeName="stroke-dashoffset" dur="0.3s" values="20;0"></animate>
|
||||
</path>
|
||||
<path stroke-dasharray="15" stroke-dashoffset="15" d="M21 12H7.5">
|
||||
<animate fill="freeze" attributeName="stroke-dashoffset" begin="0.4s" dur="0.2s" values="15;0"></animate>
|
||||
</path>
|
||||
<path stroke-dasharray="12" stroke-dashoffset="12" d="M7 12L14 19M7 12L14 5">
|
||||
<animate fill="freeze" attributeName="stroke-dashoffset" begin="0.6s" dur="0.2s" values="12;0"></animate>
|
||||
</path>
|
||||
</g>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
|
||||
stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
|
||||
>
|
||||
<path d="M3 19V5"></path>
|
||||
<path d="m13 6-6 6 6 6"></path>
|
||||
<path d="M7 12h14"></path>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 819 B After Width: | Height: | Size: 282 B |
@ -1,19 +1,7 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" width="1em" height="1em"
|
||||
viewBox="0 0 24 24">
|
||||
<g transform="translate(24 0) scale(-1 1)">
|
||||
<g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
|
||||
stroke-width="2">
|
||||
<path stroke-dasharray="20" stroke-dashoffset="20" d="M3 3V21">
|
||||
<animate fill="freeze" attributeName="stroke-dashoffset" dur="0.3s" values="20;0"></animate>
|
||||
</path>
|
||||
<path stroke-dasharray="15" stroke-dashoffset="15" d="M21 12H7.5">
|
||||
<animate fill="freeze" attributeName="stroke-dashoffset" begin="0.4s" dur="0.2s"
|
||||
values="15;0"></animate>
|
||||
</path>
|
||||
<path stroke-dasharray="12" stroke-dashoffset="12" d="M7 12L14 19M7 12L14 5">
|
||||
<animate fill="freeze" attributeName="stroke-dashoffset" begin="0.6s" dur="0.2s"
|
||||
values="12;0"></animate>
|
||||
</path>
|
||||
</g>
|
||||
</g>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
|
||||
stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
|
||||
>
|
||||
<path d="M17 12H3"></path>
|
||||
<path d="m11 18 6-6-6-6"></path>
|
||||
<path d="M21 5v14"></path>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 916 B After Width: | Height: | Size: 284 B |
@ -1,6 +1,6 @@
|
||||
<svg t="1679235208726" class="icon" viewBox="0 0 1024 1024" version="1.1"
|
||||
xmlns="http://www.w3.org/2000/svg" p-id="7558" width="64" height="64">
|
||||
<path
|
||||
d="M212.898909 130.792727l270.522182 270.522182 270.522182-270.522182a58.181818 58.181818 0 1 1 82.292363 82.292364L565.713455 483.607273 836.235636 754.036364a58.181818 58.181818 0 1 1-82.292363 82.292363L483.421091 565.899636 212.898909 836.421818a58.181818 58.181818 0 0 1-82.292364-82.292363L401.221818 483.607273 130.606545 213.085091a58.181818 58.181818 0 0 1 82.292364-82.292364z"
|
||||
fill="currentColor" p-id="7559"></path>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
|
||||
stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
|
||||
>
|
||||
<path d="M18 6 6 18"></path>
|
||||
<path d="m6 6 12 12"></path>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 597 B After Width: | Height: | Size: 253 B |
@ -1,7 +1,10 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false" viewBox="0 0 24 24"
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
|
||||
stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
|
||||
>
|
||||
<path d="M0 0h24v24H0z" fill="none"></path>
|
||||
<path
|
||||
d=" M12.87 15.07l-2.54-2.51.03-.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 17h-3.24z "
|
||||
></path>
|
||||
<path d="m5 8 6 6"></path>
|
||||
<path d="m4 14 6-6 2-3"></path>
|
||||
<path d="M2 5h12"></path>
|
||||
<path d="M7 2h1"></path>
|
||||
<path d="m22 22-5-10-5 10"></path>
|
||||
<path d="M14 18h6"></path>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 477 B After Width: | Height: | Size: 375 B |
@ -1,16 +1,11 @@
|
||||
import './index.scss'
|
||||
|
||||
import { NEllipsis, NTooltip } from 'naive-ui'
|
||||
import { NEllipsis, NTooltip, NGradientText } from 'naive-ui'
|
||||
import { RIcon } from '@/components'
|
||||
|
||||
import { isValueType, renderNode } from '@/utils'
|
||||
import { useSettingGetters } from '@/store'
|
||||
|
||||
/**
|
||||
*
|
||||
* @description
|
||||
* 侧边栏菜单 Logo 元素 ref。
|
||||
*/
|
||||
export const SIDER_BAR_LOGO = ref<HTMLElement>()
|
||||
|
||||
export default defineComponent({
|
||||
@ -106,15 +101,17 @@ export default defineComponent({
|
||||
}}
|
||||
</NTooltip>
|
||||
) : null}
|
||||
<h1
|
||||
<NGradientText
|
||||
class={[
|
||||
!collapsed ? 'ray-menu__logo-title--open' : null,
|
||||
'ray-menu__logo-title',
|
||||
'class="n-menu-item-content"',
|
||||
]}
|
||||
type="primary"
|
||||
size={18}
|
||||
>
|
||||
<NEllipsis>{sideBarLogo.title}</NEllipsis>
|
||||
</h1>
|
||||
</NGradientText>
|
||||
</div>
|
||||
) : null
|
||||
},
|
||||
|
||||
@ -90,7 +90,9 @@ export default defineComponent({
|
||||
updateMenuState('collapsed', true)
|
||||
}}
|
||||
>
|
||||
<SiderBarLogo collapsed={getCollapsed.value} />
|
||||
{getMenuConfig.value.menuSiderBarLogo ? (
|
||||
<SiderBarLogo collapsed={getCollapsed.value} />
|
||||
) : null}
|
||||
<NMenu
|
||||
ref={menuRef}
|
||||
class="r-menu--app"
|
||||
@ -105,6 +107,7 @@ export default defineComponent({
|
||||
changeMenuModelValue(key, op as unknown as AppMenuOption)
|
||||
}}
|
||||
accordion={getMenuConfig.value.accordion}
|
||||
iconSize={getMenuConfig.value.iconSize}
|
||||
/>
|
||||
</NLayoutSider>
|
||||
)
|
||||
|
||||
@ -2,14 +2,13 @@ $space: calc($layoutRouterViewContainer / 2);
|
||||
$menuTagWrapperWidth: 76px;
|
||||
|
||||
.menu-tag {
|
||||
height: $layoutMenuHeight;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 6px 0;
|
||||
|
||||
& .menu-tag-space {
|
||||
width: calc(100% - $space * 2);
|
||||
padding: $space;
|
||||
padding: 0px 18px;
|
||||
|
||||
& .menu-tag-wrapper {
|
||||
width: calc(100% - $space * 2 - $menuTagWrapperWidth);
|
||||
@ -18,17 +17,6 @@ $menuTagWrapperWidth: 76px;
|
||||
& .ray-icon {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
& .menu-tag__right-wrapper {
|
||||
& .menu-tag__right-arrow {
|
||||
transform: rotate(180deg);
|
||||
}
|
||||
|
||||
& .menu-tag__right-setting {
|
||||
width: 28px;
|
||||
height: 20px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
& .n-tag {
|
||||
@ -39,8 +27,6 @@ $menuTagWrapperWidth: 76px;
|
||||
// 激活标签页关闭按钮样式
|
||||
.menu-tag {
|
||||
.menu-tag__btn {
|
||||
padding: 7px 10px;
|
||||
|
||||
.menu-tag__btn-icon--hidden {
|
||||
display: none !important;
|
||||
}
|
||||
@ -82,8 +68,8 @@ $menuTagWrapperWidth: 76px;
|
||||
// 设置 dropdown animate svg 尺寸
|
||||
.menu-tag__dropdown {
|
||||
& .menu-tag__icon {
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -98,3 +84,7 @@ $menuTagWrapperWidth: 76px;
|
||||
.ray-template--dark .menu-tag {
|
||||
box-shadow: 0 2px 2px $layoutShadowColorDark;
|
||||
}
|
||||
|
||||
.override-button__menu-tag {
|
||||
padding: 0 6px;
|
||||
}
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* 该模板中引入了 Root Path 概念，在 MenuTag 中除了关闭左右侧标签操作能主动移除 Root Tag 之外其余的操作都不允许。
|
||||
*
|
||||
* outsideClick 方法优先级不如 contextmenu 事件高，所以可能会出现重复右键菜单时，闪烁问题；
|
||||
* 虽然使用 throttle 方法进行优化，但是该问题本质并没有解决。
|
||||
* 虽然使用 throttle 方法进行优化，但是该问题本质并没有解决（v5.0.1 版本修复了该问题）。
|
||||
*/
|
||||
|
||||
import './index.scss'
|
||||
@ -31,9 +31,6 @@ import {
|
||||
} from 'naive-ui'
|
||||
import { RIcon, RMoreDropdown } from '@/components'
|
||||
|
||||
import CloseRight from '@/icons/directional/close_right.svg?component'
|
||||
import CloseLeft from '@/icons/directional/close_left.svg?component'
|
||||
|
||||
import { useMenuGetters, useMenuActions } from '@/store'
|
||||
import { hasClass, uuid, queryElements } from '@/utils'
|
||||
import { useMaximize, useSpinning, useAppRoot, useSiderBar } from '@/hooks'
|
||||
@ -51,7 +48,7 @@ export default defineComponent({
|
||||
const { getMenuKey, getMenuTagOptions } = useMenuGetters()
|
||||
const { changeMenuModelValue } = useMenuActions()
|
||||
const { getRootPath } = useAppRoot()
|
||||
const { maximize, isLayoutContentMaximized } = useMaximize()
|
||||
const { maximize } = useMaximize()
|
||||
const { reload } = useSpinning()
|
||||
const {
|
||||
close,
|
||||
@ -78,14 +75,24 @@ export default defineComponent({
|
||||
// 下拉菜单
|
||||
const moreOptions = ref([
|
||||
{
|
||||
label: '刷新页面',
|
||||
label: '关闭当前页面',
|
||||
key: 'closeCurrentPage',
|
||||
icon: () => <RIcon name="close" size={iconConfig.size} />,
|
||||
},
|
||||
{
|
||||
label: '最大化当前页面',
|
||||
key: 'maximizeLayoutContent',
|
||||
icon: () => <RIcon name="fullscreen_fold" size={iconConfig.size} />,
|
||||
},
|
||||
{
|
||||
label: '刷新当前页面',
|
||||
key: 'reloadCurrentPage',
|
||||
icon: () => <RIcon name="reload" size={iconConfig.size} />,
|
||||
},
|
||||
{
|
||||
label: '关闭当前页面',
|
||||
key: 'closeCurrentPage',
|
||||
icon: () => <RIcon name="close" size={iconConfig.size} />,
|
||||
label: '新窗口打开',
|
||||
key: 'windowOpenTab',
|
||||
icon: () => <RIcon name="shared" size={iconConfig.size} />,
|
||||
},
|
||||
{
|
||||
type: 'divider',
|
||||
@ -94,12 +101,12 @@ export default defineComponent({
|
||||
{
|
||||
label: '关闭左侧标签页',
|
||||
key: 'closeLeft',
|
||||
icon: () => <CloseLeft class="menu-tag__icon" />,
|
||||
icon: () => <RIcon name="close_left" size={iconConfig.size} />,
|
||||
},
|
||||
{
|
||||
label: '关闭右侧标签页',
|
||||
key: 'closeRight',
|
||||
icon: () => <CloseRight class="menu-tag__icon" />,
|
||||
icon: () => <RIcon name="close_right" size={iconConfig.size} />,
|
||||
},
|
||||
{
|
||||
type: 'divider',
|
||||
@ -108,7 +115,7 @@ export default defineComponent({
|
||||
{
|
||||
label: '关闭其他标签页',
|
||||
key: 'closeOther',
|
||||
icon: () => <RIcon name="other" size={iconConfig.size} />,
|
||||
icon: () => <RIcon name="close_other" size={iconConfig.size} />,
|
||||
},
|
||||
{
|
||||
label: '关闭所有标签页',
|
||||
@ -138,6 +145,26 @@ export default defineComponent({
|
||||
closeOther: () => {
|
||||
$closeOther(currentContextmenuIndex)
|
||||
},
|
||||
windowOpenTab: () => {
|
||||
const option = getMenuTagOptions.value[currentContextmenuIndex]
|
||||
|
||||
if (!option?.fullPath) {
|
||||
return
|
||||
}
|
||||
|
||||
// 兼容配置 hash 前缀的情况
|
||||
const path = option.fullPath.startsWith('#')
|
||||
? option.fullPath
|
||||
: `#${option.fullPath}`
|
||||
|
||||
window.open(path, '_blank')
|
||||
},
|
||||
maximizeLayoutContent: () => {
|
||||
const option = getMenuTagOptions.value[currentContextmenuIndex]
|
||||
|
||||
maximize(true)
|
||||
option && menuTagClick(option)
|
||||
},
|
||||
}
|
||||
// 右键菜单
|
||||
const actionState = reactive({
|
||||
@ -229,8 +256,8 @@ export default defineComponent({
|
||||
const menuTagContextMenu = (idx: number, e: MouseEvent) => {
|
||||
e.preventDefault()
|
||||
|
||||
actionState.actionDropdownShow = false
|
||||
currentContextmenuIndex = idx
|
||||
actionState.actionDropdownShow = false
|
||||
|
||||
nextTick(() => {
|
||||
actionState.actionDropdownShow = true
|
||||
@ -368,7 +395,7 @@ export default defineComponent({
|
||||
}
|
||||
})
|
||||
|
||||
expose({})
|
||||
expose()
|
||||
|
||||
return {
|
||||
getMenuTagOptions,
|
||||
@ -386,10 +413,7 @@ export default defineComponent({
|
||||
menuTagMouseenter,
|
||||
menuTagMouseleave,
|
||||
MENU_TAG_DATA,
|
||||
iconConfig: {
|
||||
width: 22,
|
||||
height: 22,
|
||||
},
|
||||
iconConfig,
|
||||
maximize,
|
||||
reload,
|
||||
globalMainLayoutLoad,
|
||||
@ -430,9 +454,6 @@ export default defineComponent({
|
||||
trigger="manual"
|
||||
placement="bottom-start"
|
||||
onSelect={actionDropdownSelect.bind(this)}
|
||||
onClickoutside={() => {
|
||||
this.actionState.actionDropdownShow = false
|
||||
}}
|
||||
/>
|
||||
<NFlex
|
||||
class="menu-tag-space"
|
||||
@ -440,15 +461,24 @@ export default defineComponent({
|
||||
align="center"
|
||||
justify="space-between"
|
||||
inline
|
||||
size={[16, 0]}
|
||||
>
|
||||
<RIcon
|
||||
name="expanded"
|
||||
width={iconConfig.width}
|
||||
height={iconConfig.height}
|
||||
customClassName="menu-tag__left-arrow"
|
||||
<NButton
|
||||
quaternary
|
||||
class="override-button__menu-tag"
|
||||
focusable={false}
|
||||
onClick={this.scrollX.bind(this, 'left')}
|
||||
/>
|
||||
>
|
||||
{{
|
||||
icon: () => (
|
||||
<RIcon
|
||||
name="expanded"
|
||||
width={iconConfig.size}
|
||||
height={iconConfig.size}
|
||||
customClassName="menu-tag__left-arrow"
|
||||
/>
|
||||
),
|
||||
}}
|
||||
</NButton>
|
||||
<NScrollbar
|
||||
xScrollable
|
||||
ref="scrollRef"
|
||||
@ -480,6 +510,9 @@ export default defineComponent({
|
||||
onContextmenu: menuTagContextMenu.bind(this, idx),
|
||||
onMouseenter: menuTagMouseenter.bind(this, curr),
|
||||
onMouseleave: menuTagMouseleave.bind(this, curr),
|
||||
onBlur: () => {
|
||||
this.actionState.actionDropdownShow = false
|
||||
},
|
||||
[MENU_TAG_DATA]: curr.fullPath,
|
||||
}}
|
||||
size="small"
|
||||
@ -514,55 +547,89 @@ export default defineComponent({
|
||||
))}
|
||||
</NFlex>
|
||||
</NScrollbar>
|
||||
<NFlex
|
||||
class="menu-tag__right-wrapper"
|
||||
align="center"
|
||||
inline
|
||||
wrap={false}
|
||||
size={[8, 0]}
|
||||
>
|
||||
<RIcon
|
||||
name="expanded"
|
||||
width={iconConfig.width}
|
||||
height={iconConfig.height}
|
||||
customClassName="menu-tag__right-arrow"
|
||||
<NFlex align="center" inline wrap={false} size={[0, 0]}>
|
||||
<NButton
|
||||
quaternary
|
||||
class="override-button__menu-tag"
|
||||
focusable={false}
|
||||
onClick={scrollX.bind(this, 'right')}
|
||||
/>
|
||||
<RIcon
|
||||
name="fullscreen_fold"
|
||||
width={iconConfig.width}
|
||||
height={iconConfig.height}
|
||||
customClassName="menu-tag__right-setting"
|
||||
>
|
||||
{{
|
||||
icon: () => (
|
||||
<RIcon
|
||||
name="expanded"
|
||||
width={iconConfig.size}
|
||||
height={iconConfig.size}
|
||||
style={{
|
||||
transform: 'rotate(180deg)',
|
||||
}}
|
||||
/>
|
||||
),
|
||||
}}
|
||||
</NButton>
|
||||
<NButton
|
||||
quaternary
|
||||
class="override-button__menu-tag"
|
||||
focusable={false}
|
||||
onClick={maximizeBtnClick}
|
||||
/>
|
||||
<RIcon
|
||||
name="reload"
|
||||
width={iconConfig.width}
|
||||
height={iconConfig.height}
|
||||
customClassName={`menu-tag__right-setting ${
|
||||
!globalMainLayoutLoad
|
||||
? 'menu-tag__right-setting--spinning'
|
||||
: ''
|
||||
}`}
|
||||
>
|
||||
{{
|
||||
icon: () => (
|
||||
<RIcon
|
||||
name="fullscreen_fold"
|
||||
width={iconConfig.size}
|
||||
height={iconConfig.size}
|
||||
/>
|
||||
),
|
||||
}}
|
||||
</NButton>
|
||||
<NButton
|
||||
quaternary
|
||||
class="override-button__menu-tag"
|
||||
focusable={false}
|
||||
onClick={() => {
|
||||
reload()
|
||||
}}
|
||||
/>
|
||||
>
|
||||
{{
|
||||
icon: () => (
|
||||
<RIcon
|
||||
name="reload"
|
||||
width={iconConfig.size}
|
||||
height={iconConfig.size}
|
||||
customClassName={`${
|
||||
!globalMainLayoutLoad
|
||||
? 'menu-tag__right-setting--spinning'
|
||||
: ''
|
||||
}`}
|
||||
/>
|
||||
),
|
||||
}}
|
||||
</NButton>
|
||||
<RMoreDropdown
|
||||
class="menu-tag__dropdown"
|
||||
options={this.moreOptions}
|
||||
trigger="click"
|
||||
onSelect={this.actionDropdownSelect.bind(this)}
|
||||
iconSize={20}
|
||||
iconSize={18}
|
||||
keyboard={false}
|
||||
>
|
||||
<RIcon
|
||||
name="more"
|
||||
width={iconConfig.width}
|
||||
height={iconConfig.height}
|
||||
customClassName="menu-tag__right-setting"
|
||||
<NButton
|
||||
quaternary
|
||||
class="override-button__menu-tag"
|
||||
focusable={false}
|
||||
onClick={this.setCurrentContextmenuIndex.bind(this)}
|
||||
/>
|
||||
>
|
||||
{{
|
||||
icon: () => (
|
||||
<RIcon
|
||||
name="more"
|
||||
width={iconConfig.size}
|
||||
height={iconConfig.size}
|
||||
/>
|
||||
),
|
||||
}}
|
||||
</NButton>
|
||||
</RMoreDropdown>
|
||||
</NFlex>
|
||||
</NFlex>
|
||||
|
||||
@ -49,9 +49,11 @@ export default defineComponent({
|
||||
|
||||
return (
|
||||
<NButton
|
||||
class="global-search__btn-wrapper"
|
||||
bordered={false}
|
||||
onClick={click.bind(this)}
|
||||
round
|
||||
tertiary
|
||||
style="margin-right: 16px"
|
||||
>
|
||||
{{
|
||||
icon: () => <RIcon name="search" size="16" />,
|
||||
|
||||
@ -10,9 +10,11 @@ export const defaultSettingConfig: Partial<SettingState> = {
|
||||
menuConfig: {
|
||||
collapsedWidth: 64,
|
||||
collapsedMode: 'width',
|
||||
collapsedIconSize: 22,
|
||||
collapsedIconSize: 16,
|
||||
collapsedIndent: 24,
|
||||
accordion: false,
|
||||
menuSiderBarLogo: true,
|
||||
iconSize: 16,
|
||||
},
|
||||
menuTagSwitch: true,
|
||||
breadcrumbSwitch: true,
|
||||
|
||||
@ -159,6 +159,18 @@ export default defineComponent({
|
||||
/>
|
||||
<NDivider titlePlacement="center">系统设置</NDivider>
|
||||
<NDescriptions labelPlacement="left" column={1}>
|
||||
<NDescriptionsItem label="菜单页头">
|
||||
<NSwitch
|
||||
v-model:value={
|
||||
this.modelReactive.getMenuConfig.menuSiderBarLogo
|
||||
}
|
||||
onUpdateValue={(bool: boolean) =>
|
||||
updateSettingState('menuConfig', {
|
||||
menuSiderBarLogo: bool,
|
||||
})
|
||||
}
|
||||
/>
|
||||
</NDescriptionsItem>
|
||||
<NDescriptionsItem label="菜单手风琴">
|
||||
<NSwitch
|
||||
v-model:value={this.modelReactive.getMenuConfig.accordion}
|
||||
@ -205,7 +217,7 @@ export default defineComponent({
|
||||
}
|
||||
/>
|
||||
</NDescriptionsItem>
|
||||
<NDescriptionsItem label="版权信息">
|
||||
<NDescriptionsItem label="页底信息">
|
||||
<NSwitch
|
||||
v-model:value={this.modelReactive.getCopyrightSwitch}
|
||||
onUpdateValue={(bool: boolean) =>
|
||||
@ -221,7 +233,7 @@ export default defineComponent({
|
||||
v-model:value={
|
||||
this.modelReactive.getMenuConfig.collapsedIndent
|
||||
}
|
||||
min={24}
|
||||
min={0}
|
||||
precision={0}
|
||||
onUpdateValue={(value) => {
|
||||
if (value !== null) {
|
||||
@ -232,12 +244,26 @@ export default defineComponent({
|
||||
}}
|
||||
/>
|
||||
</NFormItem>
|
||||
<NFormItem label="菜单图标尺寸">
|
||||
<NInputNumber
|
||||
v-model:value={this.modelReactive.getMenuConfig.iconSize}
|
||||
min={0}
|
||||
precision={0}
|
||||
onUpdateValue={(value) => {
|
||||
if (value !== null) {
|
||||
updateSettingState('menuConfig', {
|
||||
iconSize: value,
|
||||
})
|
||||
}
|
||||
}}
|
||||
/>
|
||||
</NFormItem>
|
||||
<NFormItem label="折叠菜单图标尺寸">
|
||||
<NInputNumber
|
||||
v-model:value={
|
||||
this.modelReactive.getMenuConfig.collapsedIconSize
|
||||
}
|
||||
min={22}
|
||||
min={0}
|
||||
precision={0}
|
||||
onUpdateValue={(value) => {
|
||||
if (value !== null) {
|
||||
@ -253,7 +279,7 @@ export default defineComponent({
|
||||
v-model:value={
|
||||
this.modelReactive.getMenuConfig.collapsedWidth
|
||||
}
|
||||
min={64}
|
||||
min={0}
|
||||
precision={0}
|
||||
onUpdateValue={(value) => {
|
||||
if (value !== null) {
|
||||
|
||||
@ -151,7 +151,7 @@ export default defineComponent({
|
||||
))}
|
||||
{getBreadcrumbSwitch ? <Breadcrumb /> : null}
|
||||
</NFlex>
|
||||
<NFlex justify="end" align="center" size={[4, 0]} wrap={false}>
|
||||
<NFlex justify="end" align="center" size={[0, 0]} wrap={false}>
|
||||
{isRenderVNode(
|
||||
<GlobalSearchButton
|
||||
onClick={(e) => {
|
||||
@ -168,8 +168,9 @@ export default defineComponent({
|
||||
size="medium"
|
||||
key={curr.name}
|
||||
onClick={toolIconClick.bind(this, curr.name)}
|
||||
focusable={false}
|
||||
>
|
||||
<RIcon name={curr.name} size={18} cursor="pointer" />
|
||||
<RIcon name={curr.name} size={16} cursor="pointer" />
|
||||
</NButton>
|
||||
))}
|
||||
<NDropdown
|
||||
@ -177,11 +178,15 @@ export default defineComponent({
|
||||
onSelect={(key: string | number) => updateLocale(String(key))}
|
||||
trigger="click"
|
||||
>
|
||||
<NButton quaternary class="override-button__layout">
|
||||
<NButton
|
||||
quaternary
|
||||
class="override-button__layout"
|
||||
focusable={false}
|
||||
>
|
||||
<RIcon
|
||||
customClassName="layout-header__method--icon"
|
||||
name="language"
|
||||
size="18"
|
||||
size="16"
|
||||
cursor="pointer"
|
||||
/>
|
||||
</NButton>
|
||||
|
||||
@ -7,6 +7,7 @@ import { getStorage, isValueType } from '@/utils'
|
||||
import { useAppRoot, useI18n } from '@/hooks'
|
||||
import { NTag } from 'naive-ui'
|
||||
import { piniaSettingStore } from '../setting'
|
||||
import { piniaMenuStore } from '.'
|
||||
|
||||
import type { AppMenuOption, AppMenuKey } from '@/types/modules/app'
|
||||
import type { TagProps } from 'naive-ui'
|
||||
@ -144,11 +145,12 @@ export const createMenuIcon = (option: AppMenuOption) => {
|
||||
}
|
||||
|
||||
const { menuConfig } = piniaSettingStore()
|
||||
const { collapsed } = piniaMenuStore()
|
||||
const _icon = h(
|
||||
RIcon,
|
||||
{
|
||||
name: icon,
|
||||
size: menuConfig.collapsedIconSize,
|
||||
size: collapsed ? menuConfig.collapsedIconSize : menuConfig.iconSize,
|
||||
cursor: 'pointer',
|
||||
},
|
||||
{},
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user