Skip to content

Commit dfc7430

Browse files
committed
fix(steps): 根据metaerp新规范设计稿修改多端渲染逻辑和样式
1 parent ac4e06a commit dfc7430

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

packages/vue/src/steps/src/mobile-first/mobile-first-normal.vue

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,7 @@
7676
},
7777
{ 'sm:hidden sm:min-w-[theme(spacing.6)] sm:ml-4': !vertical },
7878
{
79-
'border-color-brand':
80-
data[index - 1] &&
81-
data[index - 1][statusField] === 'done' &&
82-
['done', 'disabled', 'error', ''].includes(node[statusField])
79+
'border-color-brand': data[index - 1] && 'done' === data[index - 1][statusField]
8380
}
8481
)
8582
"
@@ -147,7 +144,7 @@
147144
'opacity-0': index === data.length - 1
148145
},
149146
{ 'sm:min-w-[theme(spacing.6)] sm:ml-4': !vertical },
150-
{ 'border-color-brand': node[statusField] === 'done' }
147+
{ 'border-color-brand': 'done' === node[statusField] }
151148
)
152149
"
153150
></div>
@@ -197,7 +194,7 @@
197194
'border-t-0.5 sm:border-t flex-auto',
198195
{ 'sm:hidden sm:min-w-[theme(spacing.6)] sm:ml-4': !vertical },
199196
{
200-
'border-color-brand': data[state.endIndex] && ['done', 'doing'].includes(data[state.endIndex].status)
197+
'border-color-brand': data[state.endIndex] && 'done' === data[state.endIndex].status
201198
}
202199
]"
203200
></div>

packages/vue/src/steps/src/mobile-first/token/normal-token.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export const classes = {
1212
'icon-error': 'text-color-error bg-color-bg-1',
1313
'icon-doing': 'text-color-brand bg-color-info-primary-subtler',
1414
'icon-done': 'text-color-brand bg-color-bg-1',
15-
'icon-disabled': 'bg-color-bg-3 text-color-border',
15+
'icon-disabled': 'bg-color-bg-3 text-color-icon-disabled border-color-fill-1',
1616
'icon-error-active': 'bg-color-error-subtler border-color-error',
1717
'icon-doing-active': 'bg-color-brand border-color-brand text-color-text-inverse',
1818
'icon-done-active': 'bg-color-brand border-color-brand text-color-text-inverse',

0 commit comments

Comments
 (0)