Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

修复SearchTree组件验证样式问题 #846

Merged
merged 4 commits into from May 26, 2022
Merged

修复SearchTree组件验证样式问题 #846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c08629f
fix(tipTool):英文字符超出换行#624
Mar 8, 2022
6eff0de
fix:SearchTree validation style problem
wj0990 May 26, 2022
c2eb1d8
Merge branch 'master' of github.com:wj0990/uiw
wj0990 May 26, 2022
61c418f
fix:steps component icon display style #836
wj0990 May 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 12 additions & 1 deletion packages/react-form/src/style/form-item.less
View file
Open in desktop
@@ -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,
Expand All @@ -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;
Expand Down
6 changes: 2 additions & 4 deletions packages/react-search-tree/README.md
View file
Open in desktop
Expand Up @@ -191,9 +191,7 @@ ReactDOM.render(<Demo />, _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()

Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-steps/README.md
View file
Open in desktop
Expand Up @@ -209,7 +209,7 @@ function Demo() {
<Steps.Step title="步骤一" description="这里是步骤一的说明，可以很长很长哦。" />
<Steps.Step title="步骤二" description="这里是步骤一的说明，可以很长很长哦。" />
<Steps.Step title="步骤三" description="这里是步骤一的说明，可以很长很长哦。" />
<Steps.Step title="步骤四" description="这里是步骤一的说明，可以很长很长哦。" />
<Steps.Step icon={<Icon type="user"/>} title="步骤四" description="这里是步骤一的说明，可以很长很长哦。" />
</Steps>
</Col>
</Row>
Expand Down
4 changes: 2 additions & 2 deletions packages/react-steps/src/Step.tsx
View file
Open in desktop
Expand Up @@ -50,7 +50,7 @@ export default function Step(props: StepProps) {
}
}
let iconNode = null;
if (progressDot) {
if (progressDot && !icon) {
iconNode = <span className={`${prefixCls}-dot`} />;
} else if (icon && typeof icon !== 'string') {
iconNode = <span className={`${prefixCls}-icon`}>{icon}</span>;
Expand Down Expand Up @@ -82,7 +82,7 @@ export default function Step(props: StepProps) {
{iconNode}
</div>
</div>
<div className={`${prefixCls}-item-main`}>
<div className={[`${prefixCls}-item-main`, !!icon && 'is-icon-main'].filter(Boolean).join(' ').trim()}>
<div className={`${prefixCls}-item-title`}>{title}</div>
{description && <div className={`${prefixCls}-item-description`}>{description}</div>}
</div>
Expand Down
7 changes: 7 additions & 0 deletions packages/react-steps/src/style/index.less
View file
Open in desktop
Expand Up @@ -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 {
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions website/src/routes/components/search-tree/index.tsx
View file
Open in desktop
@@ -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 () => (
<Markdown
path="https://github.com/uiwjs/uiw/tree/master/packages/react-search-tree/README.md"
dependencies={{ Form, Button, TreeChecked, SearchTree, Row, Col, Card, Icon, useRef, useState, React }}
dependencies={{ Form, Button, TreeChecked, SearchTree, Row, Col, Card, Icon, Notify, useRef, useState, React }}
renderPage={async () => {
const md = await import('uiw/node_modules/@uiw/react-search-tree/README.md');
return md.default || md;
Expand Down