Skip to content

Commit b5ea516

Browse files
Add TimePicker
1 parent 0a69723 commit b5ea516

File tree

14 files changed

+143
-73
lines changed

14 files changed

+143
-73
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## 0.0.67
2+
3+
- Add TimePicker
4+
- Fix bugs
5+
- Date/Time Picker render error
6+
- Form not support props error
7+
- Select need set showSearch error
8+
19
## 0.0.66
210

311
- Add withMount in subscribe

dist/index.es.js

Lines changed: 30 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.es.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js

Lines changed: 32 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/components/Base/index.js

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,16 @@ import "antd/es/button/style";
44
import _Button from "antd/es/button";
55
import "antd/es/typography/style";
66
import _Typography from "antd/es/typography";
7+
import "antd/es/time-picker/style";
8+
import _TimePicker from "antd/es/time-picker";
79
import "antd/es/date-picker/style";
810
import _DatePicker from "antd/es/date-picker";
911

1012
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
1113

12-
import React from "react";
14+
function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
15+
16+
import React, { useEffect } from "react";
1317
import moment from "moment";
1418

1519
import { getISO, toFormat } from "../utils/datesUtils";
@@ -19,21 +23,27 @@ import { renderClassic, renderClassicWithLabel } from "../declarative";
1923

2024
/** Компонент выбора даты */
2125
var DatePicker = function DatePicker(props) {
22-
// console.log("DatePickerHOC => ", props);
23-
if (props.value) {
24-
if (typeof props.value === 'string') {
25-
// console.log("DatePickerHOC => onChange => string");
26-
props.onChange(moment(props.value), props.value);
27-
}
28-
// else {
29-
// console.log("DatePickerHOC => onChange => moment");
30-
// props.onChange(props.value, props.format ? toFormat(props.value,props.format) : getISO(props.value));
31-
// }
32-
}
33-
var value = props.value ? typeof props.value === 'string' ? moment(props.value) : props.value : undefined;
34-
var style = _extends({ width: '100%' }, props && props.style); // locale={locale}
26+
return React.createElement(DateTimePicker, _extends({ Component: _DatePicker }, props));
27+
};
28+
29+
var TimePicker = function TimePicker(props) {
30+
return React.createElement(DateTimePicker, _extends({ Component: _TimePicker }, props));
31+
};
32+
var DateTimePicker = function DateTimePicker(props) {
33+
var Component = props.Component,
34+
value = props.value,
35+
onChange = props.onChange,
36+
restProps = _objectWithoutProperties(props, ["Component", "value", "onChange"]);
37+
38+
useEffect(function () {
39+
// console.log("DatePickerHOC => onChange => string");
40+
value && typeof value === 'string' && onChange(moment(value), value);
41+
}, []);
42+
43+
var _value = value ? typeof value === 'string' ? moment(value) : value : undefined;
44+
var style = _extends({ width: '100%' }, props && props.style);
3545
// console.log("DatePickerHOC value => ", value);
36-
return React.createElement(_DatePicker, _extends({}, props, { style: style, value: value }));
46+
return React.createElement(Component, _extends({}, restProps, { style: style, value: _value, onChange: onChange }));
3747
};
3848

3949
/** Компонент вывода даты в текстовом виде */
@@ -129,4 +139,4 @@ var TabPane = function TabPane(props) {
129139
);
130140
};
131141

132-
export { DatePicker, TypographyDate, Button, Custom, FormHeader, FormBody, FormFooter, TabPane, withStore };
142+
export { DatePicker, TimePicker, TypographyDate, Button, Custom, FormHeader, FormBody, FormFooter, TabPane, withStore };

lib/components/Form/Form.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { dispatchToStore, getObjectExcludedProps, noop, notificationError } from
1717
import { rtPrefix } from "../utils/variables";
1818
import { setDateStore } from "../../redux/rtd.actions";
1919

20-
var excludeProps = ["componentType", "noPadding", "scrollable", "header", "body", "footer", "loadInitData", "autoSaveForm", "requestSaveForm", "methodSaveForm", "processBeforeSaveForm"];
20+
var excludeProps = ["dispatch", "setDateStore", "componentType", "noPadding", "scrollable", "header", "body", "footer", "loadInitData", "autoSaveForm", "requestSaveForm", "methodSaveForm", "processBeforeSaveForm"];
2121

2222
/** Компонент формы */
2323
var Form = function Form(props) {

lib/components/Select/Select.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ var Select = function Select(props) {
277277
return React.createElement(
278278
_Select,
279279
_extends({}, childProps, {
280+
showSearch: true,
280281
searchValue: _searchValue,
281282
style: { width: widthControl }
282283
// listHeight={heightPopup}

lib/components/declarative.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import "antd/es/transfer/style";
2+
import _Transfer from "antd/es/transfer";
13
import "antd/es/radio/style";
24
import _Radio from "antd/es/radio";
35
import "antd/es/switch/style";
@@ -32,7 +34,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
3234
function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
3335

3436
import React from "react";
35-
import { DatePicker as RtDatePicker, TypographyDate, Button as RtButton, Custom, FormHeader, FormBody, FormFooter, TabPane as RtTabPane, withStore } from "./Base";
37+
import { DatePicker as RtDatePicker, TimePicker as RtTimePicker, TypographyDate, Button as RtButton, Custom, FormHeader, FormBody, FormFooter, TabPane as RtTabPane, withStore } from "./Base";
3638

3739
import RtForm from "./Form/Form";
3840
import RtLayout from "./Layout/Layout";
@@ -175,6 +177,7 @@ var withComponentType = {
175177
Divider: ComponentClassicWithLabel(_Divider),
176178
Checkbox: ComponentClassicWithLabel(_Checkbox),
177179
DatePicker: ComponentClassicWithPlaceholder(RtDatePicker, 'Выберите дату'),
180+
TimePicker: ComponentClassicWithPlaceholder(RtTimePicker, 'Выберите время'),
178181
DateText: ComponentClassic(TypographyDate),
179182
Input: ComponentClassicWithPlaceholder(_Input, 'Введите значение'),
180183
Search: ComponentClassicWithPlaceholder(_Input.Search, 'Поиск'),
@@ -191,7 +194,8 @@ var withComponentType = {
191194
Modal: ComponentClassicWithOutStore(RtModal),
192195
Custom: ComponentClassic(Custom),
193196
Switcher: ComponentClassic(RtSwitcher),
194-
UploadFile: ComponentClassic(RtUploadFile)
197+
UploadFile: ComponentClassic(RtUploadFile),
198+
Transfer: ComponentClassic(_Transfer)
195199
};
196200

197201
export var classic = _extends({}, classicComponents, Object.keys(withComponentType).reduce(function (obj, key) {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "rt-design",
3-
"version": "0.0.66",
3+
"version": "0.0.67",
44
"description": "React technical design library",
55
"author": "Iron tech space",
66
"license": "MIT",

0 commit comments

Comments
 (0)