Skip to content

Commit

Permalink
Fixed:修复值修改未变化的问题
Browse files Browse the repository at this point in the history
  • Loading branch information
zhaoyuu committed Oct 25, 2018
1 parent 62154f4 commit 1690c9d
Show file tree
Hide file tree
Showing 11 changed files with 180 additions and 75 deletions.
3 changes: 2 additions & 1 deletion build/DatePicker.css
Expand Up @@ -474,7 +474,8 @@
box-shadow: 0 1px 5px #ccc;
background-clip: padding-box;
border: 1px solid #ccc;
line-height: 1.5; }
line-height: 1.5;
z-index: 1800; }

.rc-calendar-date-panel,
.rc-calendar-panel {
Expand Down
78 changes: 55 additions & 23 deletions build/YearPicker.js
Expand Up @@ -30,10 +30,16 @@ var _beeIcon = require("bee-icon");

var _beeIcon2 = _interopRequireDefault(_beeIcon);

var _moment = require("moment");

var _moment2 = _interopRequireDefault(_moment);

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

function _defaults(obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; }

function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure undefined"); }

function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }

function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
Expand All @@ -50,38 +56,35 @@ var YearPicker = function (_Component) {

var _this = _possibleConstructorReturn(this, _Component.call(this, props, context));

_this.onChange = function (value) {
_this.setState({
value: value
});
};

_this.onOpenChange = function (open) {
_this.setState({
open: open
});
};

_this.onTypeChange = function (type) {
_this.setState({
type: type
});
};
_initialiseProps.call(_this);

_this.state = {
type: "year",
value: props.value || props.defaultValue,
open: false
value: props.value || props.defaultValue || '',
open: props.open || false
};
return _this;
}

YearPicker.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
if ("value" in nextProps) {
this.setState({
value: nextProps.value
});
}
this.setState({
renderIcon: nextProps.renderIcon,
open: nextProps.open
});
};

YearPicker.prototype.render = function render() {
var _this2 = this;

var state = this.state;

var props = this.props;
var value = state.value;

var Calendar = _react2["default"].createElement(_YearPanel2["default"], _extends({ prefixCls: 'rc-calendar-picker', rootPrefixCls: 'rc-calendar' }, props));

Expand All @@ -90,15 +93,16 @@ var YearPicker = function (_Component) {
null,
_react2["default"].createElement(
_Picker2["default"],
{
_extends({}, props, {
onOpenChange: this.onOpenChange,
onChange: this.handleChange,
animation: "slide-up",
calendar: Calendar,
prefixCls: 'rc-calendar',
className: 'rc-calendar-year'
},
value: state.value || (0, _moment2["default"])()
}),
function (_ref) {
var value = _ref.value;
_objectDestructuringEmpty(_ref);

return _react2["default"].createElement(
_beeInputGroup2["default"],
Expand All @@ -122,6 +126,34 @@ var YearPicker = function (_Component) {
return YearPicker;
}(_react.Component);

var _initialiseProps = function _initialiseProps() {
var _this3 = this;

this.onChange = function (value) {
_this3.setState({
value: value
});
};

this.onOpenChange = function (open) {
_this3.setState({
open: open
});
};

this.onTypeChange = function (type) {
_this3.setState({
type: type
});
};

this.handleChange = function (value) {
var props = _this3.props;
_this3.setState({ value: value });
props.onChange(value, value && value.format(props.format) || '');
};
};

YearPicker.defaultProps = {
renderIcon: function renderIcon() {
return _react2["default"].createElement(_beeIcon2["default"], { type: "uf-calendar" });
Expand Down
25 changes: 16 additions & 9 deletions demo/demolist/Demo10.js
Expand Up @@ -26,20 +26,27 @@ function onChange(d) {
}

class Demo10 extends Component {

getCalendarContainer() {
return this.d || document.getElementById('d');
}
render() {
return (
<div>
<Row>
<Col md={12}>
<YearPicker
format={format2}
onSelect={onSelect}
onChange={onChange}
locale={zhCN}
value={moment()}
placeholder={"选择年"}
/>
<div id={"d"}>
<YearPicker
format={format2}

onChange={onChange}

locale={zhCN}

className = {'rc-calendar-year'}

placeholder={"选择年"}
/>
</div>
</Col>
</Row>
</div>
Expand Down

0 comments on commit 1690c9d

Please sign in to comment.