From 92dfeb71a63c7e5a8c086af8fd4655d93d83b0a4 Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 23 Sep 2014 16:17:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B0=86formatter=E7=9A=84=E6=89=A7?= =?UTF-8?q?=E8=A1=8Cscope=E6=8C=87=E5=90=91=E5=BD=93=E5=89=8D=E7=9A=84UIMo?= =?UTF-8?q?del=E5=AE=9E=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/UIModel.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/UIModel.js b/src/UIModel.js index 4cf4544..6829ef7 100644 --- a/src/UIModel.js +++ b/src/UIModel.js @@ -49,7 +49,7 @@ define( * @return {string} 逗号分隔2个日期,均为YYYY-MM-dd格式 */ dateRange: function (range) { - return formatters.date(range.begin) + return formatters.date(range.begin) + ',' + formatters.date(range.end); }, /** @@ -71,7 +71,7 @@ define( * @return {string} 逗号分隔2个时间,均为YYYY-MM-dd HH:mm:ss格式 */ timeRange: function (range) { - return formatters.time(range.begin) + return formatters.time(range.begin) + ',' + formatters.time(range.end); } }; @@ -96,7 +96,7 @@ define( */ UIModel.prototype.set = function (name, value, options) { if (this.formatters.hasOwnProperty(name)) { - value = this.formatters[name](value); + value = this.formatters[name].call(this, value); } Model.prototype.set.call(this, name, value, options); }; @@ -116,7 +116,7 @@ define( ) { var formatter = this.formatters[name]; var value = extension[name]; - extension[name] = formatter(value); + extension[name] = formatter.call(this, value); } } @@ -145,4 +145,4 @@ define( require('er/util').inherits(UIModel, Model); return UIModel; } -); \ No newline at end of file +); From 96a0c519853df7678e1d9275d4129e882fabd9de Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 23 Sep 2014 16:40:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0`#`=E8=AF=AD=E6=B3=95?= =?UTF-8?q?=E7=B3=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/UIView.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/UIView.js b/src/UIView.js index c156a77..a008c60 100644 --- a/src/UIView.js +++ b/src/UIView.js @@ -50,6 +50,9 @@ define( ? getProperty(value, path.slice(1)) : value; } + else if (prefix === '#' && u.isFunction(this[actualValue])) { + return this[actualValue](); + } else { return value; }