Skip to content

Commit ef4fd11

Browse files
gimmyhehegimmyhehe
authored
refactor: inline all x-design design config (#2317)
* refactor(action-menu): inline action-menu design config * refactor(alert): inline alert design config * refactor(breadcrumb-item): inline breadcrumb-item design config * refactor(drawer): inline drawer design config * refactor(dropdown): inline dropdown design config * refactor(dropdown-item): inline dropdown-item design config * refactor(filter-box): inline filter-box design config * refactor(guide): inline guide design config * refactor(popconfirm): inline popconfirm design config * refactor(select): inline select design config * refactor(split): inline split design config * refactor(time-range): inline split time-range config * refactor(time-spinner): inline split time-spinner config * refactor(transfer-panel): inline transfer-panel design config * refactor(upload-list): inline upload-list design config * refactor(tree-node): inline tree-node design config * refactor(milestone): inline milestone design config
1 parent 2aa0222 commit ef4fd11

File tree

69 files changed

+336
-351
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+336
-351
lines changed

‎packages/design/aurora/index.ts

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
11
import Alert from './src/alert'
2+
import BreadcrumbItem from './src/breadcrumb-item'
23
import CollapseItem from './src/collapse-item'
34
import Drawer from './src/drawer'
45
import Dropdown from './src/dropdown'
56
import DropdownMenu from './src/dropdown-menu'
67
import DropdownItem from './src/dropdown-item'
8+
import FilterBox from './src/filter-box'
79
import Form from './src/form'
10+
import Guide from './src/guide'
811
import Grid from './src/grid'
12+
import Milestone from './src/milestone'
13+
import Popconfirm from './src/popconfirm'
14+
import Popover from './src/popover'
915
import Switch from './src/switch'
1016
import Select from './src/select'
17+
import Split from './src/split'
18+
import Time from './src/time'
19+
import TimeRange from './src/time-range'
20+
import TimeSpinner from './src/time-spinner'
21+
import TransferPanel from './src/transfer-panel'
22+
import UploadList from './src/upload-list'
1123
import Loading from './src/loading'
12-
import Popover from './src/popover'
1324
import Input from './src/input'
1425
import DateRange from './src/date-range'
1526
import Pager from './src/pager'
@@ -23,16 +34,27 @@ export default {
2334
version,
2435
components: {
2536
Alert,
37+
BreadcrumbItem,
2638
CollapseItem,
2739
Drawer,
2840
Dropdown,
2941
DropdownMenu,
3042
DropdownItem,
43+
FilterBox,
3144
Form,
45+
Guide,
3246
Grid,
47+
Milestone,
48+
Popconfirm,
49+
Popover,
3350
Switch,
3451
Select,
35-
Popover,
52+
Split,
53+
Time,
54+
TimeRange,
55+
TimeSpinner,
56+
TransferPanel,
57+
UploadList,
3658
Loading,
3759
Input,
3860
DateRange,

‎packages/design/aurora/src/alert/index.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,5 @@ import { iconWarning } from '@opentiny/vue-icon'
33
export default {
44
icons: {
55
warning: iconWarning()
6-
},
7-
renderless: (props, hooks, { emit }, api) => {
8-
const state = api.state
9-
return {
10-
close() {
11-
state.show = false
12-
emit('close')
13-
}
14-
}
156
}
167
}

‎packages/design/smb/src/breadcrumb-item/index.ts renamed to ‎packages/design/aurora/src/breadcrumb-item/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export default {
2-
separator: '/'
2+
separator: '>'
33
}

‎packages/design/aurora/src/filter-box/index.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { iconArrowBottom } from '@opentiny/vue-icon'
2+
3+
export default {
4+
icons: {
5+
expandButton: iconArrowBottom()
6+
}
7+
}

‎packages/design/smb/src/guide/index.ts renamed to ‎packages/design/aurora/src/guide/index.ts

File renamed without changes.

‎packages/design/aurora/src/milestone/index.ts

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
export default {
2+
renderless: (props, hooks, { constants }, api) => {
3+
return {
4+
getMileIcon: (node) => {
5+
const status = props.milestonesStatus[node[props.statusField]] || constants.DEFAULT_COLOR
6+
7+
const isCompleted = node[props.statusField] === props.completedField
8+
const switchColor = isCompleted && !props.solid
9+
const { r, g, b } = api.hexToRgb(status)
10+
11+
return {
12+
background: (switchColor ? constants.DEFAULT_BACK_COLOR : status) + '!important',
13+
color: (switchColor ? status : constants.DEFAULT_BACK_COLOR) + '!important',
14+
boxShadow: `rgba(${r},${g},${b},.4) ${constants.BOX_SHADOW_PX}`
15+
}
16+
},
17+
getFlagStyle: ({ index, idx }) => {
18+
return {
19+
left: `calc(${
20+
(100 / (props.data[props.flagBefore ? index : index + 1][props.flagField].length + 1)) * (idx + 1)
21+
}% - 29px)`
22+
}
23+
}
24+
}
25+
}
26+
}

‎packages/design/aurora/src/popconfirm/index.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { iconWarning } from '@opentiny/vue-icon'
2+
3+
export default {
4+
icons: {
5+
warning: iconWarning()
6+
}
7+
}

‎packages/design/aurora/src/split/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export default {
2+
triggerBarConWithLine: false
3+
}

‎packages/design/smb/src/time-range/index.ts renamed to ‎packages/design/aurora/src/time-range/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
export default {
22
// 控制time-picker组件时间范围button显示和样式
3-
showTimePickerRangeButton: true
3+
showTimePickerRangeButton: false
44
}

‎packages/design/aurora/src/time-spinner/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export default {
2+
// 时间选择器单个item的margin为0px.
3+
itemMarginSpace: 0
4+
}

‎packages/design/aurora/src/time/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export default {
2+
// 控制time-picker组件button显示和样式
3+
showTimePickerButton: false
4+
}

‎packages/design/aurora/src/transfer-panel/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export default {
2+
inputBoxType: 'normal',
3+
showInputSearch: false
4+
}

‎packages/design/aurora/src/upload-list/index.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
export default {
2+
state: {
3+
progressType: 'circle',
4+
progressWidth: null,
5+
progressStrokeWidth: 6,
6+
tooltipDisabled: true
7+
},
8+
icons: {
9+
closeComponent: 'icon-close',
10+
preViewComponent: ''
11+
}
12+
}

‎packages/design/saas/index.ts

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
11
import Alert from './src/alert'
22
import Badge from './src/badge'
3+
import BreadcrumbItem from './src/breadcrumb-item'
34
import CollapseItem from './src/collapse-item'
45
import Drawer from './src/drawer'
56
import Dropdown from './src/dropdown'
67
import DropdownMenu from './src/dropdown-menu'
78
import DropdownItem from './src/dropdown-item'
9+
import FilterBox from './src/filter-box'
810
import Form from './src/form'
11+
import Guide from './src/guide'
912
import Grid from './src/grid'
13+
import Milestone from './src/milestone'
14+
import Popconfirm from './src/popconfirm'
15+
import Popover from './src/popover'
1016
import Switch from './src/switch'
1117
import Select from './src/select'
12-
import Popover from './src/popover'
18+
import Split from './src/split'
19+
import Time from './src/time'
20+
import TimeRange from './src/time-range'
21+
import TimeSpinner from './src/time-spinner'
22+
import TransferPanel from './src/transfer-panel'
23+
import UploadList from './src/upload-list'
1324
import Loading from './src/loading'
1425
import Input from './src/input'
1526
import DateRange from './src/date-range'
@@ -25,22 +36,33 @@ export default {
2536
components: {
2637
Alert,
2738
Badge,
39+
BreadcrumbItem,
2840
CollapseItem,
2941
Drawer,
3042
Dropdown,
3143
DropdownMenu,
3244
DropdownItem,
45+
FilterBox,
3346
Form,
47+
Guide,
3448
Grid,
49+
Milestone,
50+
Pager,
51+
Popconfirm,
52+
Popeditor,
53+
Popover,
3554
Switch,
3655
Select,
37-
Popover,
56+
Split,
57+
Time,
58+
TimeRange,
59+
TimeSpinner,
60+
TransferPanel,
61+
UploadList,
3862
Loading,
3963
Input,
4064
DateRange,
41-
Pager,
4265
DialogBox,
43-
Popeditor,
4466
DatePanel
4567
}
4668
}

‎packages/design/saas/src/alert/index.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,5 @@ import { iconWarning } from '@opentiny/vue-icon'
33
export default {
44
icons: {
55
warning: iconWarning()
6-
},
7-
renderless: (props, hooks, { emit }, api) => {
8-
const state = api.state
9-
return {
10-
close() {
11-
state.show = false
12-
emit('close')
13-
}
14-
}
156
}
167
}

‎packages/design/saas/src/breadcrumb-item/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export default {
2+
separator: '>'
3+
}

‎packages/design/saas/src/filter-box/index.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { iconArrowBottom } from '@opentiny/vue-icon'
2+
3+
export default {
4+
icons: {
5+
expandButton: iconArrowBottom()
6+
}
7+
}

‎packages/design/smb/src/drawer/index.ts renamed to ‎packages/design/saas/src/guide/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default {
22
state: {
3-
btnOrderReversed: true
3+
isUseModalOverlay: true
44
}
55
}

‎packages/design/saas/src/milestone/index.ts

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
export default {
2+
renderless: (props, hooks, { constants }, api) => {
3+
return {
4+
getMileIcon: (node) => {
5+
const status = props.milestonesStatus[node[props.statusField]] || constants.DEFAULT_COLOR
6+
7+
const isCompleted = node[props.statusField] === props.completedField
8+
const switchColor = isCompleted && !props.solid
9+
const { r, g, b } = api.hexToRgb(status)
10+
11+
return {
12+
background: (switchColor ? constants.DEFAULT_BACK_COLOR : status) + '!important',
13+
color: (switchColor ? status : constants.DEFAULT_BACK_COLOR) + '!important',
14+
boxShadow: `rgba(${r},${g},${b},.4) ${constants.BOX_SHADOW_PX}`
15+
}
16+
},
17+
getFlagStyle: ({ index, idx }) => {
18+
return {
19+
left: `calc(${
20+
(100 / (props.data[props.flagBefore ? index : index + 1][props.flagField].length + 1)) * (idx + 1)
21+
}% - 29px)`
22+
}
23+
}
24+
}
25+
}
26+
}

‎packages/design/saas/src/popconfirm/index.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { iconWarning } from '@opentiny/vue-icon'
2+
3+
export default {
4+
icons: {
5+
warning: iconWarning()
6+
}
7+
}

‎packages/design/saas/src/split/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export default {
2+
triggerBarConWithLine: false
3+
}

‎packages/design/saas/src/time-range/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export default {
2+
// 控制time-picker组件时间范围button显示和样式
3+
showTimePickerRangeButton: false
4+
}

‎packages/design/saas/src/time-spinner/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export default {
2+
// 时间选择器单个item的margin为0px.
3+
itemMarginSpace: 0
4+
}

‎packages/design/saas/src/time/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export default {
2+
// 控制time-picker组件button显示和样式
3+
showTimePickerButton: false
4+
}

‎packages/design/saas/src/transfer-panel/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export default {
2+
inputBoxType: 'normal',
3+
showInputSearch: false
4+
}

‎packages/design/saas/src/upload-list/index.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
export default {
2+
state: {
3+
progressType: 'circle',
4+
progressWidth: null,
5+
progressStrokeWidth: 6,
6+
tooltipDisabled: true
7+
},
8+
icons: {
9+
closeComponent: 'icon-close',
10+
preViewComponent: ''
11+
}
12+
}

‎packages/design/smb/index.ts

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,7 @@
1-
import Alert from './src/alert'
2-
import ActionMenu from './src/action-menu'
3-
import Popconfirm from './src/popconfirm'
4-
import Drawer from './src/drawer'
5-
import Dropdown from './src/dropdown'
6-
import DropdownItem from './src/dropdown-item'
7-
import FilterBox from './src/filter-box'
8-
import Guide from './src/guide'
9-
import Select from './src/select'
10-
import TreeNode from './src/tree-node'
11-
import TimeSpinner from './src/time-spinner'
12-
import TimeRange from './src/time-range'
13-
import Time from './src/time-spinner'
14-
import UploadList from './src/upload-list'
15-
import BreadcrumbItem from './src/breadcrumb-item'
16-
import Milestone from './src/milestone'
17-
import Split from './src/split'
18-
import TransferPanel from './src/transfer-panel'
191
import { version } from './package.json'
202

213
export default {
224
name: 'smb',
235
version,
24-
components: {
25-
Alert,
26-
ActionMenu,
27-
Popconfirm,
28-
Drawer,
29-
Dropdown,
30-
DropdownItem,
31-
FilterBox,
32-
Guide,
33-
Select,
34-
TreeNode,
35-
TimeSpinner,
36-
TimeRange,
37-
Time,
38-
BreadcrumbItem,
39-
UploadList,
40-
Milestone,
41-
Split,
42-
TransferPanel
43-
}
6+
components: {}
447
}

‎packages/design/smb/src/action-menu/index.ts

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎packages/design/smb/src/alert/index.ts

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)