Merge pull request #81 from ecomfe/dev

v0.2.7
ecomfe · Sep 16, 2015 · 6ae2208 · 6ae2208
2 parents a37ff56 + 7c9c415
commit 6ae2208
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+* 0.2.7
+    - 修正 `list.tpl.html` 遗漏了一处 batch block 的问题
+    - 增加 `.ui-item` 样式，用于在 `.ui-row` 内与控件一起正确排列
+    - 增加了在 model 中注册 API 请求方法的功能，以后不允许直接在 action 发起 API 请求，而需要调用注册在 model 上的方法
+
 * 0.2.6
     - 增加 `system/session` 模块
     - `ListView` 原型增加 `batchModify` 方法，提供批量操作在 View 层的扩展点

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "bat-ria",
-    "version": "0.2.6",
+    "version": "0.2.7",
     "description": "RIA extension for Brand Ads Team",
     "main": "main.js",
     "repository": {

diff --git a/src/css/ui.less b/src/css/ui.less
@@ -6,7 +6,8 @@
     &,
     .ui-group,
     .form-value {
-        & > [data-ctrl-id] {
+        & > [data-ctrl-id],
+        & > .ui-item {
             float: left;
             margin-left: 10px;
 

diff --git a/src/mvc/BaseAction.js b/src/mvc/BaseAction.js
@@ -29,6 +29,8 @@ define(function (require) {
             model = new BaseModel(args);
         }
 
+        model.registerRequesters();
+
         return model;
     };
 

diff --git a/src/mvc/BaseModel.js b/src/mvc/BaseModel.js
@@ -74,6 +74,31 @@ define(function (require) {
         return this.$super(arguments);
     };
 
+
+    /**
+     * api请求
+     */
+    exports.requesters = {};
+
+    /**
+     * 获取api请求，默认直接返回`this.requesters`
+     *
+     * @return {Object}
+     */
+    exports.getRequesters = function () {
+        return this.requesters;
+    };
+
+    /**
+     * 注册api，将api的名称添加`request`前缀，注册为model的方法
+     */
+    exports.registerRequesters = function () {
+        var me = this;
+        u.each(this.getRequesters(), function (requester, name) {
+            me['request' + u.pascalize(name)] = requester;
+        });
+    };
+
     var BaseModel = require('eoo').create(UIModel, exports);
     return BaseModel;
 });
diff --git a/src/tpl/list.tpl.html b/src/tpl/list.tpl.html
@@ -45,12 +45,16 @@
         <!-- block: summaryContent --><!-- /block -->
     </div>
     <!-- /block -->
-
     <!-- block: filter -->
     <form data-ui-type="Form" data-ui-id="filter" class="list-filter">
         <!-- block: filterContent --><!-- /block -->
     </form>
     <!-- /block -->
+    <!-- block: batch -->
+    <div class="list-batch">
+        <!-- block: batchContent --><!-- /block -->
+    </div>
+    <!-- /block -->
 </div>
 <!-- /block -->
 <!-- block: table -->
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,6 +29,8 @@ define(function (require) { @@
                 model = new BaseModel(args);
             }
+            model.registerRequesters();
             return model;
         };
@@ Expand Down @@