diff --git a/examples/sites/demos/pc/app/milestone/basic-usage-composition-api.vue b/examples/sites/demos/pc/app/milestone/basic-usage-composition-api.vue index 14937676dc..e7f4a1bf0e 100644 --- a/examples/sites/demos/pc/app/milestone/basic-usage-composition-api.vue +++ b/examples/sites/demos/pc/app/milestone/basic-usage-composition-api.vue @@ -23,15 +23,15 @@ import { Milestone as TinyMilestone } from '@opentiny/vue' // statusMap 对应 milestoneData的status;显示的背景色样式(可以是旗,可以是步骤条) const statusMap = ref({ // 对应 status = completed - completed: 'var(--ti-common-color-line-active)', + completed: '#1890ff', // 对应 status = doing - doing: '#9ec591', + doing: '#7eb7fc', // 对应 status = back - back: '#97a7db', + back: '#ff8800', // 对应 status = end end: '#faad14', // 对应 status = cancel - cancel: '#d9d9d9' + cancel: '#fce2e0' }) // 数据源 diff --git a/examples/sites/demos/pc/app/milestone/basic-usage.spec.ts b/examples/sites/demos/pc/app/milestone/basic-usage.spec.ts index 02b2aa4a4a..181d6e3d62 100644 --- a/examples/sites/demos/pc/app/milestone/basic-usage.spec.ts +++ b/examples/sites/demos/pc/app/milestone/basic-usage.spec.ts @@ -25,27 +25,27 @@ test('基本用法', async ({ page }) => { const iconStyles = [ { 'background-color': 'rgb(255, 255, 255)', - 'color': 'rgb(25, 25, 25)', + 'color': 'rgb(24, 144, 255)', 'box-shadow': 'none' }, { 'background-color': 'rgb(255, 255, 255)', - 'color': 'rgb(25, 25, 25)', + 'color': 'rgb(24, 144, 255)', 'box-shadow': 'none' }, { - 'background-color': 'rgb(158, 197, 145)', + 'background-color': 'rgb(126, 183, 252)', 'color': 'rgb(255, 255, 255)', 'box-shadow': 'none' }, { 'background-color': 'rgb(255, 255, 255)', - 'color': 'rgb(217, 217, 217)', + 'color': 'rgb(252, 226, 224)', 'box-shadow': 'none' }, { 'background-color': 'rgb(255, 255, 255)', - 'color': 'rgb(151, 167, 219)', + 'color': 'rgb(255, 136, 0)', 'box-shadow': 'none' }, { @@ -56,7 +56,7 @@ test('基本用法', async ({ page }) => { ] const titles = ['completed 状态', 'completed 状态', 'doing 状态', 'cancel 状态', 'back 状态', 'end 状态'] const flagContents = [/引导用户按照流程完成任务/, /test7欢迎使用vui/, /test8/, /test6/] - const flagLineColors = ['rgb(151, 167, 219)', 'rgb(151, 167, 219)', 'rgb(158, 197, 145)', 'rgb(217, 217, 217)'] + const flagLineColors = ['rgb(255, 136, 0)', 'rgb(255, 136, 0)', 'rgb(126, 183, 252)', 'rgb(252, 226, 224)'] await expect(nodes).toHaveCount(nodeCount) await expect(nodeLines).toHaveCount(nodeCount) diff --git a/examples/sites/demos/pc/app/milestone/basic-usage.vue b/examples/sites/demos/pc/app/milestone/basic-usage.vue index e60233b195..b978651484 100644 --- a/examples/sites/demos/pc/app/milestone/basic-usage.vue +++ b/examples/sites/demos/pc/app/milestone/basic-usage.vue @@ -30,13 +30,13 @@ export default { // 对应 status = completed completed: '#1890ff', // 对应 status = doing - doing: '#9ec591', + doing: '#7eb7fc', // 对应 status = back - back: '#97a7db', + back: '#ff8800', // 对应 status = end end: '#faad14', // 对应 status = cancel - cancel: '#d9d9d9' + cancel: '#fce2e0' }, // 数据源 milestoneData: [ diff --git a/examples/sites/demos/pc/app/milestone/flag-before.spec.ts b/examples/sites/demos/pc/app/milestone/flag-before.spec.ts index b9a70fc50e..3b4820c48f 100644 --- a/examples/sites/demos/pc/app/milestone/flag-before.spec.ts +++ b/examples/sites/demos/pc/app/milestone/flag-before.spec.ts @@ -12,8 +12,8 @@ test('旗子数据来源', async ({ page }) => { const flagAfterContents = [/引导用户按照流程完成任务/, /test7欢迎使用vui/, /test8/, /test6/] const flagBeforeContents = [/test1已完成/, /引导用户按照流程完成任务/, /test7欢迎使用vui/, /test8/] const button = page.getByRole('button').filter({ hasText: '设置flag-before值为true' }) - const flagAfterLineColors = ['rgb(245, 34, 45)', 'rgb(245, 34, 45)', 'rgb(126, 211, 33)', 'rgb(25, 25, 25)'] - const flagBeforeLineColors = ['rgb(25, 25, 25)', 'rgb(245, 34, 45)', 'rgb(245, 34, 45)', 'rgb(126, 211, 33)'] + const flagAfterLineColors = ['rgb(245, 34, 45)', 'rgb(245, 34, 45)', 'rgb(126, 211, 33)', 'rgba(0, 0, 0, 0)'] + const flagBeforeLineColors = ['rgba(0, 0, 0, 0)', 'rgb(245, 34, 45)', 'rgb(245, 34, 45)', 'rgb(126, 211, 33)'] for (let i = 0; i < flagCount; i++) { const { x, y, width, height } = await flags.nth(i).boundingBox() diff --git a/examples/sites/demos/pc/app/milestone/show-number.spec.ts b/examples/sites/demos/pc/app/milestone/show-number.spec.ts index fbd474f450..dbde80d035 100644 --- a/examples/sites/demos/pc/app/milestone/show-number.spec.ts +++ b/examples/sites/demos/pc/app/milestone/show-number.spec.ts @@ -23,12 +23,12 @@ test('序号显示', async ({ page }) => { const iconStyles = [ { 'background-color': 'rgb(255, 255, 255)', - 'color': 'rgb(25, 25, 25)', + 'color': 'rgb(0, 0, 0)', 'box-shadow': 'none' }, { 'background-color': 'rgb(255, 255, 255)', - 'color': 'rgb(25, 25, 25)', + 'color': 'rgb(0, 0, 0)', 'box-shadow': 'none' }, { diff --git a/examples/sites/demos/pc/app/milestone/solid-style.spec.ts b/examples/sites/demos/pc/app/milestone/solid-style.spec.ts index 51bb509842..251f266647 100644 --- a/examples/sites/demos/pc/app/milestone/solid-style.spec.ts +++ b/examples/sites/demos/pc/app/milestone/solid-style.spec.ts @@ -23,12 +23,12 @@ test('实心显示', async ({ page }) => { const iconStyles = [ { 'background-color': 'rgb(255, 255, 255)', - 'color': 'rgb(25, 25, 25)', + 'color': 'rgb(0, 0, 0)', 'box-shadow': 'none' }, { 'background-color': 'rgb(255, 255, 255)', - 'color': 'rgb(25, 25, 25)', + 'color': 'rgb(0, 0, 0)', 'box-shadow': 'none' }, { @@ -98,6 +98,6 @@ test('实心显示', async ({ page }) => { await button.click() for (let i = 0; i < 2; i++) { - await expect(nodeIcons.nth(i)).toHaveCSS('background-color', 'rgb(25, 25, 25)') + await expect(nodeIcons.nth(i)).toHaveCSS('background-color', 'rgba(0, 0, 0, 0)') } }) diff --git a/packages/theme/src/milestone/index.less b/packages/theme/src/milestone/index.less index 54be53a13d..95dd3ecfca 100644 --- a/packages/theme/src/milestone/index.less +++ b/packages/theme/src/milestone/index.less @@ -134,7 +134,6 @@ left: ~'calc(50% - 29px)'; bottom: 5px; width: 58px; - text-align: center; z-index: 1; &:hover {