diff --git a/example/docs/zh-CN/components/step.md b/example/docs/zh-CN/components/step.md index 61313e05..b34c0dbb 100644 --- a/example/docs/zh-CN/components/step.md +++ b/example/docs/zh-CN/components/step.md @@ -15,8 +15,50 @@ -下一步 -上一步 +
+ 上一步 + 下一步 +
+ + + + + +::: + +::: title composition 为row 的排版 +::: + + +::: demo + + @@ -96,8 +138,8 @@ export default { -下一步 上一步 +下一步 @@ -139,8 +181,8 @@ export default { -下一步 上一步 +下一步 @@ -180,8 +222,8 @@ export default { -下一步 上一步 +下一步 @@ -221,8 +263,8 @@ export default { -下一步 上一步 +下一步 @@ -266,8 +308,8 @@ export default { -下一步 上一步 +下一步 @@ -337,6 +379,50 @@ export default { ::: +::: title 简洁版 +::: + +简洁版不支持`垂直``横向``描述``排版` + +::: demo + + + + + +::: + ::: title step步骤条属性 ::: @@ -348,7 +434,10 @@ export default { | center | 居中布局 | boolean | `true` `false` | `false` | | direction | 垂直/平行布局 | string |`horizontal` `vertical` | `horizontal` | | space | 宽度 | string | - | `auto` | -| currentStatus | 当前状态显示 | string | `primary` `success` `fail` `warning` | `primary` | +| currentStatus | 当前状态显示 | string | `primary` `success` `fail` `warning` | `success` | +| composition | 排版 | string | `default` `row` | `default` | +| simple | 简洁版 | boolean | `true` `false` |`false`| +| onChange | 点击切换时监听 | function | - |function(index){}| ::: diff --git a/example/src/view/component.vue b/example/src/view/component.vue index 7fdcb70d..d0ad42e8 100644 --- a/example/src/view/component.vue +++ b/example/src/view/component.vue @@ -365,7 +365,7 @@ export default { { id: 99, title: "分步", - subTitle: "setup", + subTitle: "step", path: "/zh-CN/components/step", }, ], diff --git a/src/module/step/index.less b/src/module/step/index.less index 95e78172..942831f9 100644 --- a/src/module/step/index.less +++ b/src/module/step/index.less @@ -1,11 +1,16 @@ -@width-height-pace: 20px; -@step-color: #5FB878; +@width-height-pace: 24px; +@step-color: @step-success-color; +@step-fail-color: #FF5722; +@step-primary-color: #1E9FFF; +@step-warning-color: #FFB800; +@step-success-color: #5FB878; .lay-step{ display: flex; flex-wrap: nowrap; .lay-step-item{ flex-grow: 1; + position: relative; } .is-item-center{ @@ -16,9 +21,10 @@ flex-grow: 0 !important; } .lay-step-item-pace{ + cursor: pointer; width: @width-height-pace; height: @width-height-pace; - border: 2px #8D8D8D solid; + border: 1px #8D8D8D solid; border-radius: 50%; text-align: center; line-height: @width-height-pace; @@ -28,69 +34,88 @@ margin: 0 auto; } .lay-step-item-active{ - border: 2px @step-color solid; - color: #FFFFFF; - background: @step-color; + border: 1px @step-color solid; + color: @step-color; } + .lay-step-item-wait{ - border: 2px #000000 solid; + border: 1px #000000 solid; color: #000000; } .lay-step-item--success { - border: 2px @step-color solid; + border: 1px @step-color solid; color: #FFFFFF; background: @step-color; } .lay-step-item--fail{ - border: 2px #FF5722 solid; + border: 1px @step-fail-color solid; color: #FFFFFF; - background: #FF5722; + background: @step-fail-color; } .lay-step-item--warning{ - border: 2px #FFB800 solid; + border: 1px @step-warning-color solid; color: #FFFFFF; - background: #FFB800; + background: @step-warning-color; } .lay-step-item--primary{ - border: 2px #1E9FFF solid; + border: 1px @step-primary-color solid; color: #FFFFFF; - background: #1E9FFF; + background: @step-primary-color; } .lay-step-item-success { - border: 2px @step-color solid; + border: 1px @step-color solid; color: #FFFFFF; background: @step-color; } .lay-step-item-fail{ - border: 2px #FF5722 solid; + border: 1px @step-fail-color solid; color: #FFFFFF; - background: #FF5722; + background: @step-fail-color; } .lay-step-item-warning{ - border: 2px #FFB800 solid; + border: 1px @step-warning-color solid; color: #FFFFFF; - background: #FFB800; + background: @step-warning-color; } .lay-step-item-primary{ - border: 2px #1E9FFF solid; + border: 1px @step-primary-color solid; color: #FFFFFF; - background: #1E9FFF; + background: @step-primary-color; } .lay-step-item-content{ color: #8D8D8D; + cursor: pointer; .lay-step-item-content-title{ font-weight: bold; font-size: 16px; } } + .lay-step-item-content-row { + color: #8D8D8D; + position: absolute; + top: 5px; + left: 24px; + width: calc( 100% - 26px ); + .lay-step-item-content-title{ + word-wrap:break-word; + max-width: calc(100% - 8px); + font-weight: bold; + display: inline-block; + margin-left: 2px; + background: #ffffff; + padding: 0 8px; + font-size: 16px; + } + } + .lay-step-item-content-active{ color: @step-color; } @@ -99,13 +124,13 @@ color: @step-color; } .lay-step-item-content--fail{ - color: #FF5722; + color: @step-fail-color; } .lay-step-item-content--warning{ - color: #FFB800; + color: @step-warning-color; } .lay-step-item-content--primary{ - color: #1E9FFF; + color: @step-primary-color; } .lay-step-item-content-wait{ @@ -115,13 +140,13 @@ color: @step-color; } .lay-step-item-content-fail{ - color: #FF5722; + color: @step-fail-color; } .lay-step-item-content-warning{ - color: #FFB800; + color: @step-warning-color; } .lay-step-item-content-primary{ - color: #1E9FFF; + color: @step-primary-color; } @@ -134,9 +159,9 @@ content: ""; position: absolute; top: 50%; - transform: translateY(-50%); + // transform: translateY(-50%); display: block; - height: 2px; + height: 1px; width: 100%; background: #C9C5C5; } @@ -146,22 +171,99 @@ .lay-step-item-line-active:before { transition: background 150ms; - background: #5FB878 !important; + background: @step-success-color !important; } .lay-step-item-line-fail:before { transition: background 150ms; - background: #FF5722 !important; + background: @step-fail-color !important; } .lay-step-item-line-warning:before { transition: background 150ms; - background: #FFB800 !important; + background: @step-warning-color !important; } .lay-step-item-line-primary:before { transition: background 150ms; - background: #1E9FFF !important; + background: @step-primary-color !important; + } + + .lay-step-simple{ + height: 30px; + padding: 0 8px; + line-height: 30px; + color: #ffffff; + background-color: #cecece; + cursor: pointer; + } + .lay-step-item-simple{ + padding: 0 18px; + } + .lay-step-item-simple:after{ + content: ""; + position: absolute; + top: 0; + left: 0; + right: auto; + bottom: auto; + border: 15px solid; + border-color: transparent transparent transparent #cecece; + background-color: transparent; + border-radius: 0; + display: block; + height: auto; + width: auto; + } + .lay-step-item-simple:before{ + content: ""; + position: absolute; + top: 0; + left: 0; + right: auto; + bottom: auto; + border: 15px solid; + border-color: transparent transparent transparent #cecece; + background-color: transparent; + border-radius: 0; + display: block; + height: auto; + width: auto; + } + .lay-step-item-simple-border:before{ + left: 1px; + border-color: transparent transparent transparent #ffffff; + } + + .lay-step-item-simple-active { + background-color: #9fd4ae; + } + .lay-step-item-simple-success { + background-color: @step-color; + } + .lay-step-item-simple-fail { + background-color: @step-fail-color; + } + .lay-step-item-simple-warning { + background-color: @step-warning-color; + } + .lay-step-item-simple-primary { + background-color: @step-primary-color; + } + .lay-step-item-simple-active-border:after{ + border-color: transparent transparent transparent #9fd4ae !important; + } + .lay-step-item-simple-success-border:after{ + border-color: transparent transparent transparent @step-success-color!important; + } + .lay-step-item-simple-fail-border:after{ + border-color: transparent transparent transparent @step-fail-color!important; + } + .lay-step-item-simple-warning-border:after{ + border-color: transparent transparent transparent @step-warning-color!important; + } + .lay-step-item-simple-primary-border:after{ + border-color: transparent transparent transparent @step-primary-color!important; } } @@ -179,12 +281,15 @@ position: absolute; top: 0; left: 50%; - transform: translateX(-50%); + // transform: translateX(-50%); display: block; - width: 2px; + width: 1px; height: 100%; background: #C9C5C5; } + .lay-step-item-content{ + margin-left: 8px; + } .is-vertical{ display: flex; } diff --git a/src/module/step/index.vue b/src/module/step/index.vue index 9dc9d4cf..989fc478 100644 --- a/src/module/step/index.vue +++ b/src/module/step/index.vue @@ -5,7 +5,14 @@ diff --git a/src/module/stepItem/index.vue b/src/module/stepItem/index.vue index 912681a9..2ef8f3e1 100644 --- a/src/module/stepItem/index.vue +++ b/src/module/stepItem/index.vue @@ -1,8 +1,9 @@