Skip to content

Commit 0dfc37a

Browse files
authored
Merge pull request #469 from kne-union/release
Release
2 parents 9f559ba + f2c304c commit 0dfc37a

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@kne-components/components-core",
3-
"version": "0.4.0",
3+
"version": "0.4.1",
44
"files": [
55
"build"
66
],

src/components/FormInfo/fields/ColorPicker.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
import {hooks} from "@kne/react-form-antd";
2-
import {ColorPicker as ColorPickerField} from 'antd';
2+
import {ColorPicker as ColorPickerFieldAntd} from 'antd';
33

44
const {useOnChange} = hooks;
55

6+
const ColorPickerField = (props) => {
7+
return <ColorPickerFieldAntd {...props} onChange={(value) => {
8+
return props.onChange(value.toHexString());
9+
}}/>;
10+
};
11+
612
const ColorPicker = (props) => {
7-
const render = useOnChange(Object.assign({}, {placeholder: "请选择" + props.label}, props));
13+
const render = useOnChange(Object.assign({}, props));
814
return render(ColorPickerField);
915
};
1016

src/components/FormInfo/style.module.scss

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
&.react-form--inner--large .react-form__field,
55
&.react-form--inner--small .react-form__field {
66
margin-bottom: 16px;
7+
8+
.react-form__field-label {
9+
line-height: 20px;
10+
height: 20px;
11+
margin-bottom: 8px;
12+
}
713
}
814
}
915

@@ -37,9 +43,8 @@
3743

3844
color: var(--font-color-grey);
3945
font-size: 14px;
40-
line-height: 20px;
41-
height: 20px;
42-
margin-bottom: 8px;
46+
line-height: 32px;
47+
height: 32px;
4348
font-weight: normal !important;
4449
}
4550

@@ -48,7 +53,7 @@
4853
}
4954

5055
.ant-input-number,
51-
.ant-input-number-group-wrapper {
56+
.ant-input-number-group-wrapper, .ant-input-number-affix-wrapper {
5257
width: 100%;
5358
}
5459

0 commit comments

Comments
 (0)