diff --git a/packages/react-form/src/style/form-item.less b/packages/react-form/src/style/form-item.less index 1948d1b741..e337eab2c8 100644 --- a/packages/react-form/src/style/form-item.less +++ b/packages/react-form/src/style/form-item.less @@ -1,14 +1,16 @@ -@w-form:~ "w-form"; +@w-form: ~'w-form'; .@{w-form} { &-item { margin-bottom: 10px; } + &-item-error { .@{w-form}-help, .@{w-form}-label { color: #dc3545; } + .w-input-inner, .w-select, .w-select-default, @@ -18,24 +20,33 @@ .w-input-inner:focus.w-input-inner:hover, .w-textarea, .w-textarea:hover, + .w-search-tree-inner, .w-textarea:focus.w-textarea:hover { box-shadow: 0 0 0 1px #dc3545, 0 0 0 3px rgba(220, 53, 69, 0.17), inset 0 1px 1px rgba(16, 22, 26, 0.2); } + + .w-search-tree-inner .w-input .w-input-inner { + box-shadow: none !important; + } } + &-label { line-height: 32px; min-height: 32px; font-weight: 600; font-size: 14px; padding-right: 5px; + label { display: inline-block; } } + &-row { align-items: center; display: flex; } + &-help { color: #c2c2c2; font-size: 12px; diff --git a/packages/react-search-tree/README.md b/packages/react-search-tree/README.md index 15e5cbc1bf..a1e3606e30 100644 --- a/packages/react-search-tree/README.md +++ b/packages/react-search-tree/README.md @@ -191,9 +191,7 @@ ReactDOM.render(, _mount_); ```jsx import React, { useState, useEffect, useRef } from 'react'; import ReactDOM from 'react-dom'; -import { Form, Button, SearchTree, Card, Row, Col } from 'uiw';; - - +import { Notify, Form, Button, SearchTree, Card, Row, Col,Select } from 'uiw'; const Demo = () => { const form=useRef() @@ -258,7 +256,7 @@ const form=useRef() }} onSubmit={({initial, current}) => { const errorObj = {}; - if (!current.searchTree) { + if (!current.searchTree || current.searchTree.length === 0) { errorObj.searchTree = '默认需要选择内容,选择入内容'; } if(Object.keys(errorObj).length > 0) { diff --git a/packages/react-steps/README.md b/packages/react-steps/README.md index 405d48456f..19a304b337 100644 --- a/packages/react-steps/README.md +++ b/packages/react-steps/README.md @@ -209,7 +209,7 @@ function Demo() { - + } title="步骤四" description="这里是步骤一的说明,可以很长很长哦。" /> diff --git a/packages/react-steps/src/Step.tsx b/packages/react-steps/src/Step.tsx index 9cda70ff20..112b94b361 100644 --- a/packages/react-steps/src/Step.tsx +++ b/packages/react-steps/src/Step.tsx @@ -50,7 +50,7 @@ export default function Step(props: StepProps) { } } let iconNode = null; - if (progressDot) { + if (progressDot && !icon) { iconNode = ; } else if (icon && typeof icon !== 'string') { iconNode = {icon}; @@ -82,7 +82,7 @@ export default function Step(props: StepProps) { {iconNode} -
+
{title}
{description &&
{description}
}
diff --git a/packages/react-steps/src/style/index.less b/packages/react-steps/src/style/index.less index 6a0b46fc6a..8b2b51d351 100644 --- a/packages/react-steps/src/style/index.less +++ b/packages/react-steps/src/style/index.less @@ -223,6 +223,10 @@ .@{w-steps}-item-head { background: transparent; margin-top: -4px; + .is-icon { + margin-left: -10px !important; + background-color: transparent; + } } &.@{w-steps}-vertical { .@{w-steps}-item { @@ -244,6 +248,9 @@ padding-bottom: 24px; margin-top: -21px; } + .is-icon-main { + margin-top: -35px; + } .@{w-steps}-next-error { .w-steps-item-tail i:after { background-color: #f04134; diff --git a/website/src/routes/components/search-tree/index.tsx b/website/src/routes/components/search-tree/index.tsx index d5823fb2e2..1f400c1f4b 100644 --- a/website/src/routes/components/search-tree/index.tsx +++ b/website/src/routes/components/search-tree/index.tsx @@ -1,11 +1,11 @@ import React, { useState, useRef } from 'react'; -import { Form, Button, TreeChecked, SearchTree, Row, Col, Card, Icon } from 'uiw'; +import { Form, Button, TreeChecked, SearchTree, Row, Col, Card, Icon, Notify } from 'uiw'; import Markdown from '../../../components/Markdown'; export default () => ( { const md = await import('uiw/node_modules/@uiw/react-search-tree/README.md'); return md.default || md;