Comparing version 0.8.0-beta2 to 0.8.0-beta3
@@ -30,3 +30,2 @@ 'use strict'; | ||
}, | ||
render: function render() { | ||
@@ -33,0 +32,0 @@ var props = (0, _objectAssign2['default'])({}, this.props); |
@@ -21,4 +21,7 @@ 'use strict'; | ||
getDefaultProps: function getDefaultProps() { | ||
return { prefixCls: 'ant-checkbox' }; | ||
}, render: function render() { | ||
return { | ||
prefixCls: 'ant-checkbox' | ||
}; | ||
}, | ||
render: function render() { | ||
return _react2['default'].createElement(_rcCheckbox2['default'], this.props); | ||
@@ -25,0 +28,0 @@ } |
@@ -44,5 +44,4 @@ 'use strict'; | ||
AntEnterAnimation.to = _enterAnimation2['default'].to; | ||
exports['default'] = AntEnterAnimation; | ||
AntEnterAnimation.to = _enterAnimation2['default'].to; | ||
module.exports = exports['default']; |
require('./index.css'); | ||
var antd = { | ||
// matchMedia polyfill for | ||
// https://github.com/WickyNilliams/enquire.js/issues/82 | ||
window.matchMedia = window.matchMedia || function() { | ||
return { | ||
matches: false, | ||
addListener: function() {}, | ||
removeListener: function() {} | ||
}; | ||
}; | ||
const antd = { | ||
Affix: require('./affix'), | ||
@@ -40,2 +50,2 @@ Datepicker: require('./datepicker'), | ||
antd.version = '0.8.0-beta2'; | ||
antd.version = '0.8.0-beta3'; |
@@ -13,5 +13,5 @@ 'use strict'; | ||
var _rcDialog = require('rc-dialog'); | ||
var _index = require('./index'); | ||
var _rcDialog2 = _interopRequireDefault(_rcDialog); | ||
var _index2 = _interopRequireDefault(_index); | ||
@@ -108,7 +108,6 @@ var div; | ||
_react2['default'].render(_react2['default'].createElement( | ||
_rcDialog2['default'], | ||
_index2['default'], | ||
{ | ||
prefixCls: 'ant-modal', | ||
className: 'ant-confirm', | ||
renderToBody: false, | ||
visible: true, | ||
@@ -118,2 +117,3 @@ closable: false, | ||
transitionName: 'zoom', | ||
footer: '', | ||
maskTransitionName: 'fade', width: width }, | ||
@@ -120,0 +120,0 @@ _react2['default'].createElement( |
@@ -19,11 +19,24 @@ 'use strict'; | ||
var _rcUtil = require('rc-util'); | ||
function noop() {} | ||
var mousePosition = undefined; | ||
var mousePositionEventBinded = undefined; | ||
exports['default'] = _react2['default'].createClass({ | ||
displayName: 'index', | ||
getDefaultProps: function getDefaultProps() { | ||
return { | ||
prefixCls: 'ant-modal', | ||
onOk: noop, | ||
onCancel: noop | ||
}; | ||
}, | ||
getInitialState: function getInitialState() { | ||
return { | ||
visible: false, | ||
confirmLoading: false | ||
confirmLoading: false, | ||
visible: this.props.visible | ||
}; | ||
@@ -33,14 +46,8 @@ }, | ||
handleCancel: function handleCancel() { | ||
var d = this.refs.d; | ||
d.requestClose(); | ||
this.props.onCancel(); | ||
this.setState({ | ||
visible: false | ||
}); | ||
}, | ||
getDefaultProps: function getDefaultProps() { | ||
return { | ||
prefixCls: 'ant-modal', | ||
onOk: noop, | ||
onCancel: noop | ||
}; | ||
}, | ||
handleOk: function handleOk() { | ||
@@ -50,5 +57,3 @@ this.setState({ | ||
}); | ||
if (typeof this.props.onOk === 'function') { | ||
this.props.onOk(); | ||
} | ||
this.props.onOk(); | ||
}, | ||
@@ -58,15 +63,37 @@ | ||
if ('visible' in nextProps) { | ||
var newState = { | ||
visible: nextProps.visible | ||
}; | ||
// 隐藏后去除按钮 loading 效果 | ||
if (!nextProps.visible) { | ||
this.setState({ | ||
confirmLoading: false | ||
}); | ||
newState.confirmLoading = false; | ||
} | ||
this.setState(newState); | ||
} | ||
}, | ||
componentDidMount: function componentDidMount() { | ||
if (mousePositionEventBinded) { | ||
return; | ||
} | ||
// 只有点击事件支持从鼠标位置动画展开 | ||
_rcUtil.Dom.addEventListener(document.body, 'click', function onDocumentMousemove(e) { | ||
mousePosition = { | ||
x: e.pageX, | ||
y: e.pageY | ||
}; | ||
// 20ms 内发生过点击事件,则从点击位置动画展示 | ||
// 否则直接 zoom 展示 | ||
// 这样可以兼容非点击方式展开 | ||
setTimeout(function () { | ||
return mousePosition = null; | ||
}, 20); | ||
}); | ||
mousePositionEventBinded = true; | ||
}, | ||
render: function render() { | ||
var loadingIcon = this.state.confirmLoading ? _react2['default'].createElement('i', { className: 'anticon anticon-loading' }) : ''; | ||
var loadingClass = this.state.confirmLoading ? ' ant-btn-loading' : ''; | ||
var props = this.props; | ||
var footer = props.footer || [_react2['default'].createElement( | ||
var defaultFooter = [_react2['default'].createElement( | ||
'button', | ||
@@ -77,9 +104,15 @@ { key: 'cancel', type: 'button', className: 'ant-btn ant-btn-lg', onClick: this.handleCancel }, | ||
'button', | ||
{ key: 'confirm', type: 'button', className: 'ant-btn ant-btn-primary ant-btn-lg', onClick: this.handleOk }, | ||
'确 定 ', | ||
loadingIcon | ||
{ key: 'confirm', | ||
type: 'button', | ||
className: 'ant-btn ant-btn-primary ant-btn-lg' + loadingClass, | ||
onClick: this.handleOk }, | ||
'确 定' | ||
)]; | ||
return _react2['default'].createElement(_rcDialog2['default'], _extends({ transitionName: 'zoom', onBeforeClose: props.onCancel, visible: this.state.visible, maskAnimation: 'fade', width: '500', footer: footer }, props, { ref: 'd' })); | ||
var footer = props.footer || defaultFooter; | ||
var visible = this.state.visible; | ||
return _react2['default'].createElement(_rcDialog2['default'], _extends({ transitionName: 'zoom', onClose: this.handleCancel, | ||
maskAnimation: 'fade', width: '500', footer: footer }, props, { | ||
visible: visible, mousePosition: mousePosition })); | ||
} | ||
}); | ||
module.exports = exports['default']; |
@@ -24,10 +24,7 @@ 'use strict'; | ||
function callback(key, btnCose) { | ||
if (btnCose) { | ||
api.close(key); | ||
function getNotificationInstance() { | ||
if (notificationInstance) { | ||
return notificationInstance; | ||
} | ||
} | ||
function getNotificationInstance() { | ||
notificationInstance = notificationInstance || _rcNotification2['default'].newInstance({ | ||
notificationInstance = _rcNotification2['default'].newInstance({ | ||
prefixCls: 'ant-notification', | ||
@@ -115,3 +112,2 @@ style: { | ||
} else { | ||
var key = 'manual' + new Date().getTime(); | ||
getNotificationInstance().notice({ | ||
@@ -133,3 +129,3 @@ content: _react2['default'].createElement( | ||
'span', | ||
{ onClick: callback.bind(null, key, args.btnClose), className: prefixCls + 'btn' }, | ||
{ className: prefixCls + 'btn' }, | ||
args.btn | ||
@@ -141,3 +137,3 @@ ) | ||
onClose: args.onClose, | ||
key: key, | ||
key: args.key, | ||
style: {} | ||
@@ -144,0 +140,0 @@ }); |
@@ -21,5 +21,5 @@ 'use strict'; | ||
var _jquery = require('jquery'); | ||
var _reqwest = require('reqwest'); | ||
var _jquery2 = _interopRequireDefault(_jquery); | ||
var _reqwest2 = _interopRequireDefault(_reqwest); | ||
@@ -30,6 +30,2 @@ var _rcTable = require('rc-table'); | ||
var _dropdown = require('../dropdown'); | ||
var _dropdown2 = _interopRequireDefault(_dropdown); | ||
var _checkbox = require('../checkbox'); | ||
@@ -39,5 +35,5 @@ | ||
var _filterMenu = require('./filterMenu'); | ||
var _filterDropdown = require('./filterDropdown'); | ||
var _filterMenu2 = _interopRequireDefault(_filterMenu); | ||
var _filterDropdown2 = _interopRequireDefault(_filterDropdown); | ||
@@ -338,19 +334,8 @@ var _pagination = require('../pagination'); | ||
var filterDropdown = undefined, | ||
menus = undefined, | ||
sortButton = undefined; | ||
if (column.filters && column.filters.length > 0) { | ||
var colFilters = _this4.state.filters[key] || []; | ||
menus = _react2['default'].createElement(_filterMenu2['default'], { column: column, | ||
filterDropdown = _react2['default'].createElement(_filterDropdown2['default'], { column: column, | ||
selectedKeys: colFilters, | ||
confirmFilter: _this4.handleFilter }); | ||
var dropdownSelectedClass = ''; | ||
if (colFilters.length > 0) { | ||
dropdownSelectedClass = 'ant-table-filter-selected'; | ||
} | ||
filterDropdown = _react2['default'].createElement( | ||
_dropdown2['default'], | ||
{ trigger: 'click', | ||
overlay: menus }, | ||
_react2['default'].createElement('i', { title: '筛选', className: 'anticon anticon-bars ' + dropdownSelectedClass }) | ||
); | ||
} | ||
@@ -449,7 +434,8 @@ if (column.sorter) { | ||
return { | ||
v: _jquery2['default'].ajax({ | ||
v: (0, _reqwest2['default'])({ | ||
url: dataSource.url, | ||
method: 'get', | ||
data: (0, _objectAssign3['default'])(buildInParams, dataSource.data), | ||
headers: dataSource.headers, | ||
dataType: 'json', | ||
type: 'json', | ||
success: function success(result) { | ||
@@ -456,0 +442,0 @@ if (_this6.isMounted()) { |
@@ -7,2 +7,4 @@ 'use strict'; | ||
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; }; | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } | ||
@@ -21,6 +23,11 @@ | ||
getDefaultProps: function getDefaultProps() { | ||
return { | ||
prefixCls: 'ant-tree' | ||
}; | ||
}, | ||
render: function render() { | ||
return _react2['default'].createElement( | ||
_rcTree2['default'], | ||
this.props, | ||
_extends({}, this.props, { showIcon: false }), | ||
this.props.children | ||
@@ -27,0 +34,0 @@ ); |
@@ -134,8 +134,3 @@ 'use strict'; | ||
props, | ||
_react2['default'].createElement( | ||
'button', | ||
{ className: 'ant-btn ant-btn-ghost' }, | ||
_react2['default'].createElement('i', { className: 'anticon anticon-upload' }), | ||
' 点击上传' | ||
) | ||
this.props.children | ||
), | ||
@@ -142,0 +137,0 @@ _react2['default'].createElement(_uploadList2['default'], { items: this.state.downloadList }) |
@@ -58,3 +58,2 @@ 'use strict'; | ||
var statusIcon = file.status === 'done' ? _react2['default'].createElement('i', { className: 'anticon anticon-check ' + prefixCls + '-success-icon' }) : _react2['default'].createElement('i', { className: 'anticon anticon-loading' }); | ||
var closeIcon = file.status === 'done' ? _react2['default'].createElement('i', { className: 'anticon anticon-cross', ref: 'theCloseBtn', onClick: _this.handleClose.bind(_this, file) }) : ''; | ||
return _react2['default'].createElement( | ||
@@ -69,3 +68,4 @@ 'div', | ||
), | ||
closeIcon | ||
_react2['default'].createElement('i', { className: 'anticon anticon-cross', ref: 'theCloseBtn', | ||
onClick: _this.handleClose.bind(_this, file) }) | ||
); | ||
@@ -72,0 +72,0 @@ }; |
{ | ||
"name": "antd", | ||
"version": "0.8.0-beta2", | ||
"version": "0.8.0-beta3", | ||
"stableVersion": "0.7.3", | ||
@@ -41,6 +41,6 @@ "title": "Ant Design", | ||
"object-assign": "3.x", | ||
"rc-calendar": "~3.12.3", | ||
"rc-checkbox": "~1.0.6", | ||
"rc-calendar": "~3.13.0", | ||
"rc-checkbox": "~1.1.1", | ||
"rc-collapse": "~1.2.3", | ||
"rc-dialog": "~4.5.0", | ||
"rc-dialog": "~5.0.1", | ||
"rc-dropdown": "~1.2.0", | ||
@@ -54,3 +54,3 @@ "rc-form-validation": "~2.4.7", | ||
"rc-radio": "~2.0.0", | ||
"rc-select": "~4.6.3", | ||
"rc-select": "~4.7.1", | ||
"rc-slider": "~1.4.0", | ||
@@ -62,6 +62,7 @@ "rc-steps": "~1.1.4", | ||
"rc-tooltip": "~2.5.0", | ||
"rc-tree": "~0.10.0", | ||
"rc-upload": "~1.3.0", | ||
"rc-tree": "~0.14.3", | ||
"rc-upload": "~1.3.1", | ||
"rc-util": "~2.0.3", | ||
"react-slick": "~0.6.4" | ||
"react-slick": "~0.6.4", | ||
"reqwest": "~2.0.1" | ||
}, | ||
@@ -75,4 +76,4 @@ "devDependencies": { | ||
"css-loader": "^0.14.1", | ||
"eslint": "^0.24.1", | ||
"eslint-plugin-react": "~2.5.0", | ||
"eslint": "^1.1.0", | ||
"eslint-plugin-react": "~3.2.2", | ||
"extract-text-webpack-plugin": "^0.8.1", | ||
@@ -79,0 +80,0 @@ "gh-pages": "~0.3.1", |
Sorry, the diff of this file is not supported yet
323590
41
11629
30
+ Addedreqwest@~2.0.1
+ Addedrc-calendar@3.13.0(transitive)
+ Addedrc-checkbox@1.1.2(transitive)
+ Addedrc-dialog@5.0.3(transitive)
+ Addedrc-select@4.7.3(transitive)
+ Addedrc-tree@0.14.4(transitive)
+ Addedreqwest@2.0.5(transitive)
- Removedclassnames@2.1.5(transitive)
- Removedrc-calendar@3.12.4(transitive)
- Removedrc-checkbox@1.0.6(transitive)
- Removedrc-dialog@4.5.0(transitive)
- Removedrc-select@4.6.3(transitive)
- Removedrc-tree@0.10.0(transitive)
Updatedrc-calendar@~3.13.0
Updatedrc-checkbox@~1.1.1
Updatedrc-dialog@~5.0.1
Updatedrc-select@~4.7.1
Updatedrc-tree@~0.14.3
Updatedrc-upload@~1.3.1