Skip to content

Commit 4516b14

Browse files
lanjingling0510lanjingling0510
committed
[changed] 修改finish-btn行高
1 parent e0176af commit 4516b14

5 files changed

+98
-25
lines changed

‎config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module.exports = {
2-
name: 'mobile-datepicker'
2+
name: 'mobile-datepicker',
33
};

‎dist/mobile-datepicker.js

+94-20
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
(function webpackUniversalModuleDefinition(root, factory) {
22
if(typeof exports === 'object' && typeof module === 'object')
3-
module.exports = factory(require("react"));
3+
module.exports = factory(require("React"));
44
else if(typeof define === 'function' && define.amd)
5-
define(["react"], factory);
5+
define(["React"], factory);
66
else if(typeof exports === 'object')
7-
exports["InfiniteScroll"] = factory(require("react"));
7+
exports["DatePicker"] = factory(require("React"));
88
else
9-
root["InfiniteScroll"] = factory(root["react"]);
9+
root["DatePicker"] = factory(root["React"]);
1010
})(this, function(__WEBPACK_EXTERNAL_MODULE_3__) {
1111
return /******/ (function(modules) { // webpackBootstrap
1212
/******/ // The module cache
@@ -60,7 +60,9 @@ return /******/ (function(modules) { // webpackBootstrap
6060
value: true
6161
});
6262

63-
var _DatePicker = __webpack_require__(1);
63+
__webpack_require__(1);
64+
65+
var _DatePicker = __webpack_require__(2);
6466

6567
var _DatePicker2 = _interopRequireDefault(_DatePicker);
6668

@@ -70,6 +72,12 @@ return /******/ (function(modules) { // webpackBootstrap
7072

7173
/***/ },
7274
/* 1 */
75+
/***/ function(module, exports) {
76+
77+
// removed by extract-text-webpack-plugin
78+
79+
/***/ },
80+
/* 2 */
7381
/***/ function(module, exports, __webpack_require__) {
7482

7583
'use strict';
@@ -80,8 +88,6 @@ return /******/ (function(modules) { // webpackBootstrap
8088

8189
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
8290

83-
__webpack_require__(2);
84-
8591
var _react = __webpack_require__(3);
8692

8793
var _react2 = _interopRequireDefault(_react);
@@ -104,7 +110,6 @@ return /******/ (function(modules) { // webpackBootstrap
104110
* @module DatePicker组件
105111
*/
106112

107-
108113
/**
109114
* Class DatePicker组件类
110115
* @extends Component
@@ -127,9 +132,9 @@ return /******/ (function(modules) { // webpackBootstrap
127132
};
128133
});
129134

130-
_this.animating = false;
131-
_this.touchY = 0;
132-
_this.angle = 0;
135+
_this.animating = false; // 判断是否在transition过渡动画之中
136+
_this.touchY = 0; // 保存touchstart的pageY
137+
_this.angle = 0; // 容器转过的角度
133138
_this.state = {
134139
angle: 0,
135140
dates: dates
@@ -143,16 +148,37 @@ return /******/ (function(modules) { // webpackBootstrap
143148
return _this;
144149
}
145150

151+
/**
152+
* 根据角度返回透明度(0-1之间)
153+
* @param {number} angle 角度
154+
* @return
155+
*/
156+
157+
146158
_createClass(DatePicker, [{
147159
key: '_setOpacity',
148160
value: function _setOpacity(angle) {
149161
return angle > 0 ? ((40 - angle) / 40 * 100 | 0) / 100 : ((40 + angle) / 40 * 100 | 0) / 100;
150162
}
163+
164+
/**
165+
* 清除对象的transition样式
166+
* @param {Dom} obj 指定的对象
167+
* @return {undefined}
168+
*/
169+
151170
}, {
152171
key: '_clearTransition',
153172
value: function _clearTransition(obj) {
154173
obj.style[_transition.TRANSITION] = ''; // eslint-disable-line
155174
}
175+
176+
/**
177+
* 滑动到下一日期
178+
* @param {number} direction 滑动方向
179+
* @return {undefined}
180+
*/
181+
156182
}, {
157183
key: '_moveToNext',
158184
value: function _moveToNext(direction) {
@@ -174,6 +200,14 @@ return /******/ (function(modules) { // webpackBootstrap
174200
this._moveTo(scroll, angle + direction * 22.5);
175201
}
176202
}
203+
204+
/**
205+
* 添加滑动动画
206+
* @param {DOM} obj DOM对象
207+
* @param {number} angle 角度
208+
* @return {undefined}
209+
*/
210+
177211
}, {
178212
key: '_moveTo',
179213
value: function _moveTo(obj, angle) {
@@ -183,6 +217,12 @@ return /******/ (function(modules) { // webpackBootstrap
183217
angle: angle
184218
});
185219
}
220+
221+
/**
222+
* 点击完成按钮事件
223+
* @return {undefined}
224+
*/
225+
186226
}, {
187227
key: 'handleFinishBtnClick',
188228
value: function handleFinishBtnClick() {
@@ -193,6 +233,13 @@ return /******/ (function(modules) { // webpackBootstrap
193233
});
194234
this.props.onSelect(date.value);
195235
}
236+
237+
/**
238+
* 滑动日期选择器事件
239+
* @param {Object} event 事件对象
240+
* @return {undefined}
241+
*/
242+
196243
}, {
197244
key: 'handleContentTouch',
198245
value: function handleContentTouch(event) {
@@ -217,6 +264,12 @@ return /******/ (function(modules) { // webpackBootstrap
217264
}
218265
}
219266
}
267+
268+
/**
269+
* transition过渡完成事件
270+
* @return {undefined}
271+
*/
272+
220273
}, {
221274
key: 'handleContentTransitionEnd',
222275
value: function handleContentTransitionEnd() {
@@ -242,6 +295,13 @@ return /******/ (function(modules) { // webpackBootstrap
242295
angle: 0
243296
});
244297
}
298+
299+
/**
300+
* 渲染一个日期DOM对象
301+
* @param {Object} date date数据
302+
* @return {Object} JSX对象
303+
*/
304+
245305
}, {
246306
key: 'renderDatepickerItem',
247307
value: function renderDatepickerItem(date) {
@@ -256,6 +316,12 @@ return /******/ (function(modules) { // webpackBootstrap
256316
date.name
257317
);
258318
}
319+
320+
/**
321+
* render函数
322+
* @return {Object} JSX对象
323+
*/
324+
259325
}, {
260326
key: 'render',
261327
value: function render() {
@@ -339,17 +405,11 @@ return /******/ (function(modules) { // webpackBootstrap
339405

340406
exports.default = DatePicker;
341407

342-
/***/ },
343-
/* 2 */
344-
/***/ function(module, exports) {
345-
346-
// removed by extract-text-webpack-plugin
347-
348408
/***/ },
349409
/* 3 */
350410
/***/ function(module, exports) {
351411

352-
module.exports = __WEBPACK_EXTERNAL_MODULE_3__;
412+
module.exports = React;
353413

354414
/***/ },
355415
/* 4 */
@@ -365,6 +425,10 @@ return /******/ (function(modules) { // webpackBootstrap
365425

366426
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
367427

428+
/**
429+
* @module time工具
430+
*/
431+
368432
function convertDate(timestamp, formate) {
369433
var date = new Date(timestamp);
370434
var year = date.getFullYear();
@@ -377,6 +441,11 @@ return /******/ (function(modules) { // webpackBootstrap
377441
return formate.replace(/Y+/, year).replace(/M+/, month).replace(/D+/, day).replace(/h+/, hour).replace(/m+/, minute).replace(/s+/, second);
378442
}
379443

444+
/**
445+
* 获取相对日期的偏移日期
446+
* @param {Date} 日期
447+
* @return {number} 相对的天数
448+
*/
380449
function nextTime() {
381450
var now = arguments.length <= 0 || arguments[0] === undefined ? new Date() : arguments[0];
382451
var index = arguments.length <= 1 || arguments[1] === undefined ? 1 : arguments[1];
@@ -390,6 +459,11 @@ return /******/ (function(modules) { // webpackBootstrap
390459
return date;
391460
}
392461

462+
/**
463+
* 获取指定日期的格式化日期名称
464+
* @param {Date} 日期
465+
* @return {String} 格式化日期名称
466+
*/
393467
function getTimeName(now) {
394468
var _expection;
395469

@@ -425,7 +499,7 @@ return /******/ (function(modules) { // webpackBootstrap
425499
exports.TRANSITIONEND = TRANSITIONEND = 'transitionend';
426500
exports.TRANSITION_CSS = TRANSITION_CSS = 'transition';
427501
} else if (typeof document.body.style.webkitTransition === 'string') {
428-
exports.TRANSITION = TRANSITION = 'webkitTransition';
502+
exports.TRANSITION = TRANSITION = 'WebkitTransition';
429503
exports.TRANSITION_CSS = TRANSITION_CSS = '-webkit-transition';
430504
exports.TRANSITIONEND = TRANSITIONEND = 'webkitTransitionEnd';
431505
}
@@ -436,7 +510,7 @@ return /******/ (function(modules) { // webpackBootstrap
436510
exports.TRANSFORM = TRANSFORM = 'transform';
437511
exports.TRANSFORM_CSS = TRANSFORM_CSS = 'transform';
438512
} else if (typeof document.body.style.webkitTransform === 'string') {
439-
exports.TRANSFORM = TRANSFORM = 'webkitTransform';
513+
exports.TRANSFORM = TRANSFORM = 'WebkitTransform';
440514
exports.TRANSFORM_CSS = TRANSFORM_CSS = '-webkit-transform';
441515
}
442516

0 commit comments

Comments
 (0)