Skip to content

Commit 5b54f6a

Browse files
author
cole
committed
workflow: cssinjs
1 parent d02096c commit 5b54f6a

File tree

18 files changed

+110
-95
lines changed

18 files changed

+110
-95
lines changed

‎packages/_utils/util.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export function toPx (value) {
4242
if (value && isNumber(value)) {
4343
return `${value}px`
4444
}
45-
return undefined
45+
return value
4646
}
4747

4848
export function namePathToString (namePath) {

‎packages/table/__tests__/ColumnSetting.test.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { describe } from 'vitest'
2-
import ColumnSetting from '../components/column-setting'
3-
import TreeList from '../components/column-setting/TreeList'
4-
import TreeNode from '../components/column-setting/TreeNode'
5-
import Tooltip from '../components/column-setting/Tooltip'
2+
import ColumnSetting from '../components/setting'
3+
import TreeList from '@packages/table/components/setting/TreeList'
4+
import TreeNode from '@packages/table/components/setting/TreeNode'
5+
import Tooltip from '@packages/table/components/setting/Tooltip'
66
import mountTest from '../../_tests/shared/mountTest'
77

88
describe('ColumnSetting', () => {

‎packages/table/compatible/toolbar/index.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
VerticalAlignBottomOutlined
88
} from '@ant-design/icons-vue'
99
import Density from '../../components/density'
10-
import ColumnSetting from '../../components/column-setting'
10+
import Setting from '../../components/setting'
1111
import { useSharedContext } from '../../hooks/useSharedContext'
1212
import { useLocaleReceiver } from '../../../locale-provider'
1313
import { getSlotVNode } from '../../../_utils/props-util'
@@ -107,7 +107,7 @@ export default defineComponent({
107107
setting: (
108108
<Tooltip title={t('columnSetting')}>
109109
<Popover trigger={'click'} placement={'bottomRight'} v-slots={{
110-
content: () => <ColumnSetting/>
110+
content: () => <Setting/>
111111
}}>
112112
<Button>
113113
<SettingOutlined/>

‎packages/table/components/column-setting/DraggableOutlined.jsx renamed to ‎packages/table/components/setting/DraggableOutlined.jsx

File renamed without changes.

‎packages/table/components/column-setting/Tooltip.jsx renamed to ‎packages/table/components/setting/Tooltip.jsx

File renamed without changes.

‎packages/table/components/column-setting/TreeList.jsx renamed to ‎packages/table/components/setting/TreeList.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export default defineComponent({
4747
},
4848
emits: ['checkChange', 'dropChange', 'fixedChange'],
4949
setup (props, { emit }) {
50-
const { prefixCls } = useConfigInject('pro-table-column-setting-tree-list', props)
50+
const { prefixCls } = useConfigInject('pro-table-setting-list', props)
5151
const [wrapSSR, hashId] = useStyle(prefixCls)
5252
const { token } = theme.useToken()
5353

‎packages/table/components/column-setting/TreeNode.jsx renamed to ‎packages/table/components/setting/TreeNode.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default defineComponent({
3636
},
3737
emits: ['change'],
3838
setup (props, { emit }) {
39-
const { prefixCls } = useConfigInject('pro-table-column-setting-tree-node', props)
39+
const { prefixCls } = useConfigInject('pro-table-setting-node', props)
4040
const [wrapSSR, hashId] = useStyle(prefixCls)
4141
const { token } = theme.useToken()
4242
const { t } = useLocaleReceiver(['Table', 'toolbar'])

‎packages/table/components/column-setting/index.jsx renamed to ‎packages/table/components/setting/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export default defineComponent({
2020
}
2121
},
2222
setup (props, { attrs }) {
23-
const { prefixCls } = useConfigInject('pro-table-column-setting', props)
23+
const { prefixCls } = useConfigInject('pro-table-setting', props)
2424
const [wrapSSR, hashId] = useStyle(prefixCls)
2525
const { token } = theme.useToken()
2626
const { t } = useLocaleReceiver(['Table', 'toolbar'])

‎packages/table/components/column-setting/style/index.js renamed to ‎packages/table/components/setting/style/index.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { genComponentStyleHook, mergeToken } from '../../../../_utils/extend'
22

33
function genBaseStyle (token) {
4-
const { componentCls, treeListMinWidth } = token
4+
const { componentCls, listMinWidth } = token
55
return {
66
[componentCls]: {
77
position: 'relative',
@@ -15,19 +15,19 @@ function genBaseStyle (token) {
1515
fontWeight: token.fontWeightStrong
1616
},
1717
[`${componentCls}-tree-list-group`]: {
18-
minWidth: treeListMinWidth,
18+
minWidth: listMinWidth,
1919
display: 'flex',
2020
flexDirection: 'column'
2121
}
2222
}
2323
}
2424
}
2525

26-
export default genComponentStyleHook('ProTableColumnSetting', (token) => {
27-
const treeListMinWidth = token.controlHeightSM * 8
26+
export default genComponentStyleHook('ProTableSetting', (token) => {
27+
const listMinWidth = token.controlHeightSM * 8
2828

2929
const columnSettingToken = mergeToken(token, {
30-
treeListMinWidth
30+
listMinWidth
3131
})
3232
return [genBaseStyle(columnSettingToken)]
3333
})

‎packages/table/components/column-setting/style/tree-list.js renamed to ‎packages/table/components/setting/style/tree-list.js

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,35 @@
11
import { genComponentStyleHook, mergeToken } from '../../../../_utils/extend'
22

33
function genBaseStyle (token) {
4-
const {
5-
componentCls,
6-
antCls,
7-
treeListTitleMargin,
8-
treeListHolderPadding,
9-
treeCheckboxMargin
10-
} = token
4+
const { componentCls, antCls, listTitleMargin, listHolderPadding, listCheckboxMargin } = token
115
return {
126
[componentCls]: {
137
paddingBlockStart: token.paddingXS,
148
[`${componentCls}-title`]: {
159
fontSize: token.fontSizeSM,
1610
color: token.colorTextSecondary,
1711
lineHeight: token.lineHeightSM,
18-
marginBlock: treeListTitleMargin,
12+
marginBlock: listTitleMargin,
1913
paddingInlineStart: token.controlHeightSM
2014
},
2115
[`${antCls}-tree`]: {
2216
background: token.colorFillQuaternary,
2317
[`${antCls}-tree-list-holder`]: {
24-
paddingBlockStart: treeListHolderPadding
18+
paddingBlockStart: listHolderPadding
2519
},
2620
[`${antCls}-tree-node-content-wrapper`]: {
2721
backgroundColor: 'transparent !important',
2822
[`&:hover`]: {
2923
// Tree Node
30-
[`${antCls}-pro-table-column-setting-tree-node-option-icon`]: {
24+
[`${antCls}-pro-table-setting-node-option-icon`]: {
3125
display: 'block'
3226
}
3327
}
3428
},
3529
[`${antCls}-tree-treenode`]: {
3630
alignItems: 'center',
3731
[`${antCls}-tree-checkbox`]: {
38-
margin: `0 ${treeCheckboxMargin}px 0 0`,
32+
margin: `0 ${listCheckboxMargin}px 0 0`,
3933
top: 0
4034
}
4135
},
@@ -48,15 +42,15 @@ function genBaseStyle (token) {
4842
}
4943
}
5044

51-
export default genComponentStyleHook('ProTableColumnSettingTreeList', (token) => {
52-
const treeListTitleMargin = token.controlHeightSM - token.fontSizeSM * token.lineHeightSM
53-
const treeListHolderPadding = token.sizeXS / 2
54-
const treeCheckboxMargin = (token.controlHeightSM - token.controlHeight / 2) / 2
45+
export default genComponentStyleHook('ProTableSettingList', (token) => {
46+
const listTitleMargin = token.controlHeightSM - token.fontSizeSM * token.lineHeightSM
47+
const listHolderPadding = token.sizeXS / 2
48+
const listCheckboxMargin = (token.controlHeightSM - token.controlHeight / 2) / 2
5549

5650
const treeListToken = mergeToken(token, {
57-
treeListTitleMargin,
58-
treeListHolderPadding,
59-
treeCheckboxMargin
51+
listTitleMargin,
52+
listHolderPadding,
53+
listCheckboxMargin
6054
})
6155
return [genBaseStyle(treeListToken)]
6256
})

‎packages/table/components/column-setting/style/tree-node.js renamed to ‎packages/table/components/setting/style/tree-node.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { genComponentStyleHook, mergeToken } from '../../../../_utils/extend'
22

33
function genBaseStyle (token) {
4-
const { componentCls, iconCls, treeNodeTitleMaxWidth, treeNodeOptionWidth } = token
4+
const { componentCls, iconCls, nodeTitleMaxWidth, nodeOptionWidth } = token
55
return {
66
[componentCls]: {
77
display: 'flex',
88
alignItems: 'center',
99
justifyContent: 'space-between',
1010
[`${componentCls}-title`]: {
11-
maxWidth: treeNodeTitleMaxWidth,
11+
maxWidth: nodeTitleMaxWidth,
1212
fontSize: token.fontSize,
1313
color: token.colorText,
1414
lineHeight: `${token.controlHeightSM}px`,
@@ -17,13 +17,13 @@ function genBaseStyle (token) {
1717
overflow: 'hidden'
1818
},
1919
[`${componentCls}-option`]: {
20-
width: `${treeNodeOptionWidth}px`,
20+
width: nodeOptionWidth,
2121
[`${componentCls}-option-icon`]: {
2222
paddingInline: token.sizeXS,
2323
display: 'none',
2424
[`${iconCls}`]: {
25-
width: `${token.fontSize}px`,
26-
height: `${token.fontSize}px`,
25+
width: token.fontSize,
26+
height: token.fontSize,
2727
lineHeight: `${token.fontSize}px`,
2828
fontSize: token.fontSize,
2929
textAlign: 'center',
@@ -36,13 +36,13 @@ function genBaseStyle (token) {
3636
}
3737
}
3838

39-
export default genComponentStyleHook('ProTableColumnSettingTreeNode', (token) => {
40-
const treeNodeTitleMaxWidth = token.controlHeightSM * 7
41-
const treeNodeOptionWidth = token.fontSize * 2 + token.sizeXS * 2 + token.sizeXXS
39+
export default genComponentStyleHook('ProTableSettingNode', (token) => {
40+
const nodeTitleMaxWidth = token.controlHeightSM * 7
41+
const nodeOptionWidth = token.fontSize * 2 + token.sizeXS * 2 + token.sizeXXS
4242

4343
const treeNodeToken = mergeToken(token, {
44-
treeNodeTitleMaxWidth,
45-
treeNodeOptionWidth
44+
nodeTitleMaxWidth,
45+
nodeOptionWidth
4646
})
4747
return [genBaseStyle(treeNodeToken)]
4848
})

‎src/layout/compatible/base-layout/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export default defineComponent({
2222
}
2323
},
2424
setup (props, { slots, attrs }) {
25-
const { prefixCls } = useConfigInject('pro-layout', props)
25+
const { prefixCls } = useConfigInject('pro-base-layout', props)
2626
const [wrapSSR, hashId] = useStyle(prefixCls)
2727
const { screen } = useMediaQuery()
2828

‎src/layout/compatible/base-layout/style/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function genBaseStyle (token) {
2424
}
2525
}
2626

27-
export default genComponentStyleHook('ProLayout', (token) => {
27+
export default genComponentStyleHook('ProBaseLayout', (token) => {
2828
const layoutBgColor = token.colorBgLayout
2929

3030
const layoutToken = mergeToken(token, {

‎src/layout/compatible/navbar/style/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ function genBaseStyle (token) {
44
const { componentCls, navbarHeight, navbarPaddingInline, navbarCollapseSize } = token
55
return {
66
[componentCls]: {
7-
height: `${navbarHeight}px`,
7+
height: navbarHeight,
88
display: 'flex',
99
justifyContent: 'space-between',
1010
paddingInline: navbarPaddingInline,

‎src/layout/compatible/tags/Tag.jsx renamed to ‎src/layout/compatible/tags/Node.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { defineComponent, withModifiers } from 'vue'
22
import { CloseOutlined } from '@ant-design/icons-vue'
33
import { preventDefault } from '@utils/event'
44
import { useConfigInject } from '@utils/extend'
5-
import useStyle from './style/tag'
5+
import useStyle from './style/node.js'
66

77
export default defineComponent({
88
props: {
@@ -25,7 +25,7 @@ export default defineComponent({
2525
},
2626
emits: ['click', 'close'],
2727
setup (props, { emit, slots, attrs }) {
28-
const { prefixCls } = useConfigInject('pro-layout-tag', props)
28+
const { prefixCls } = useConfigInject('pro-layout-tags-node', props)
2929
const [wrapSSR, hashId] = useStyle(prefixCls)
3030

3131
function onClick (evt) {

0 commit comments

Comments
 (0)