diff --git a/src/font/ui-font.eot b/src/font/ui-font.eot
index 02b3321..b4d3763 100644
Binary files a/src/font/ui-font.eot and b/src/font/ui-font.eot differ
diff --git a/src/font/ui-font.js b/src/font/ui-font.js
index 2bb0387..7dc9667 100644
--- a/src/font/ui-font.js
+++ b/src/font/ui-font.js
@@ -1 +1 @@
-(function(window){var svgSprite='';var script=function(){var scripts=document.getElementsByTagName("script");return scripts[scripts.length-1]}();var shouldInjectCss=script.getAttribute("data-injectcss");var ready=function(fn){if(document.addEventListener){if(~["complete","loaded","interactive"].indexOf(document.readyState)){setTimeout(fn,0)}else{var loadFn=function(){document.removeEventListener("DOMContentLoaded",loadFn,false);fn()};document.addEventListener("DOMContentLoaded",loadFn,false)}}else if(document.attachEvent){IEContentLoaded(window,fn)}function IEContentLoaded(w,fn){var d=w.document,done=false,init=function(){if(!done){done=true;fn()}};var polling=function(){try{d.documentElement.doScroll("left")}catch(e){setTimeout(polling,50);return}init()};polling();d.onreadystatechange=function(){if(d.readyState=="complete"){d.onreadystatechange=null;init()}}}};var before=function(el,target){target.parentNode.insertBefore(el,target)};var prepend=function(el,target){if(target.firstChild){before(el,target.firstChild)}else{target.appendChild(el)}};function appendSvg(){var div,svg;div=document.createElement("div");div.innerHTML=svgSprite;svgSprite=null;svg=div.getElementsByTagName("svg")[0];if(svg){svg.setAttribute("aria-hidden","true");svg.style.position="absolute";svg.style.width=0;svg.style.height=0;svg.style.overflow="hidden";prepend(svg,document.body)}}if(shouldInjectCss&&!window.__iconfont__svg__cssinject__){window.__iconfont__svg__cssinject__=true;try{document.write("")}catch(e){console&&console.log(e)}}ready(appendSvg)})(window)
\ No newline at end of file
+(function(window){var svgSprite='';var script=function(){var scripts=document.getElementsByTagName("script");return scripts[scripts.length-1]}();var shouldInjectCss=script.getAttribute("data-injectcss");var ready=function(fn){if(document.addEventListener){if(~["complete","loaded","interactive"].indexOf(document.readyState)){setTimeout(fn,0)}else{var loadFn=function(){document.removeEventListener("DOMContentLoaded",loadFn,false);fn()};document.addEventListener("DOMContentLoaded",loadFn,false)}}else if(document.attachEvent){IEContentLoaded(window,fn)}function IEContentLoaded(w,fn){var d=w.document,done=false,init=function(){if(!done){done=true;fn()}};var polling=function(){try{d.documentElement.doScroll("left")}catch(e){setTimeout(polling,50);return}init()};polling();d.onreadystatechange=function(){if(d.readyState=="complete"){d.onreadystatechange=null;init()}}}};var before=function(el,target){target.parentNode.insertBefore(el,target)};var prepend=function(el,target){if(target.firstChild){before(el,target.firstChild)}else{target.appendChild(el)}};function appendSvg(){var div,svg;div=document.createElement("div");div.innerHTML=svgSprite;svgSprite=null;svg=div.getElementsByTagName("svg")[0];if(svg){svg.setAttribute("aria-hidden","true");svg.style.position="absolute";svg.style.width=0;svg.style.height=0;svg.style.overflow="hidden";prepend(svg,document.body)}}if(shouldInjectCss&&!window.__iconfont__svg__cssinject__){window.__iconfont__svg__cssinject__=true;try{document.write("")}catch(e){console&&console.log(e)}}ready(appendSvg)})(window)
\ No newline at end of file
diff --git a/src/font/ui-font.ttf b/src/font/ui-font.ttf
index b0dcb34..8568230 100644
Binary files a/src/font/ui-font.ttf and b/src/font/ui-font.ttf differ
diff --git a/src/js/anot.shim.js b/src/js/anot.shim.js
index 9909885..d4baa6e 100644
--- a/src/js/anot.shim.js
+++ b/src/js/anot.shim.js
@@ -182,6 +182,9 @@
},
check: function(val) {
return Anot.type(val) === this.checkType
+ },
+ call: function() {
+ return this.toString()
}
}
diff --git a/src/js/datepicker/index.js b/src/js/datepicker/index.js
index eff355b..01ee533 100644
--- a/src/js/datepicker/index.js
+++ b/src/js/datepicker/index.js
@@ -237,10 +237,10 @@ export default Anot.component('datepicker', {
},
props: {
showTime: false, //对话框上显示时间
- color: 'grey',
+ radius: 3,
format: '', // 日期显示格式
onCreated: Anot.PropsTypes.isFunction(),
- onDateChange: Anot.PropsTypes.isFunction()
+ onDatePicked: Anot.PropsTypes.isFunction()
},
skip: ['max', 'min', 'last', 'timer'],
watch: {
@@ -358,8 +358,8 @@ export default Anot.component('datepicker', {
onConfirm: function() {
this.updateTime()
this.close()
- if (typeof this.props.onDateChange === 'function') {
- this.props.onDateChange(this.value, this.last.pick)
+ if (typeof this.props.onDatePicked === 'function') {
+ this.props.onDatePicked(this.value, this.last.pick)
}
}
}
diff --git a/src/js/datepicker/main.htm b/src/js/datepicker/main.htm
index 9c27451..5f9a2bf 100644
--- a/src/js/datepicker/main.htm
+++ b/src/js/datepicker/main.htm
@@ -1,11 +1,16 @@
-
+
+