Merge pull request #892 in VISUAL/fineui from ~DAILER/fineui:master to master

* commit 'c1ca16a5992eedddada2dde80b07979ef5133e34':
  无JIRA任务 添加一个路由,方便一些
  无jira任务 fix: multi_select_combo 和 multi_select_insert_combo 统一逻辑,只有勾选了全选才认为是全选.

Gruntfile.js

@@ -223,7 +223,6 @@ module.exports = function (grunt) {
         },
 
 
-
         less: {
             demo: {
                 expand: true,
@@ -332,7 +331,7 @@ module.exports = function (grunt) {
         },
         watch: {
             scripts: {
-                files: ["src/**/*.js", "src/**/*.less", "demo/js/**/*.js", "demo/version.js", "demo/config.js", "demo/less/**/*.less"],
+                files: ["src/**/*.js", "src/**/*.less", "demo/js/**/*.js", "demo/app.js", "demo/version.js", "demo/config.js", "demo/less/**/*.less"],
                 tasks: ["less", "concat"],
                 options: {
                     spanw: true,

demo/app.js

@@ -3,21 +3,40 @@ Demo = {
 };
 $(function () {
     var ref;
-    var AppRouter = BI.inherit(BI.Router, {
+
+    BI.each(Demo.CONFIG, function (index, item) {
+        !item.id && (item.id = item.value || item.text);
+    });
+    var tree = BI.Tree.transformToTreeFormat(Demo.CONFIG);
+
+    var obj = {
         routes: {
             "": "index"
         },
         index: function () {
-            BI.createWidget({
+            Demo.showIndex = "demo.face";
-                type: "demo.main",
+        }
-                ref: function (_ref) {
+    };
-                    console.log(_ref);
+
-                    ref = _ref;
+    BI.Tree.traversal(tree, function (index, node) {
-                },
+        if (!node.children || BI.isEmptyArray(node.children)) {
-                element: "#wrapper"
+            obj.routes[node.text] = node.text;
-            });
+            obj[node.text] = function () {
+                Demo.showIndex = node.value;
+            };
         }
     });
+
+    var AppRouter = BI.inherit(BI.Router, obj);
     new AppRouter;
     BI.history.start();
+
+    BI.createWidget({
+        type: "demo.main",
+        ref: function (_ref) {
+            console.log(_ref);
+            ref = _ref;
+        },
+        element: "#wrapper"
+    });
 });

demo/js/center.js

@@ -10,7 +10,7 @@ Demo.Center = BI.inherit(BI.Widget, {
                 self.tab = this;
             },
             single: true,
-            showIndex: "demo.face",
+            showIndex: Demo.showIndex,
             cardCreator: function (v) {
                 return BI.createWidget({
                     type: v

demo/js/main.js

@@ -2,8 +2,23 @@ Demo.Main = BI.inherit(BI.Widget, {
     props: {
         baseCls: "demo-main bi-background"
     },
+
+    _store: function () {
+        return BI.Stores.getStore("demo.store.main");
+    },
+
+    watch: {
+        activeCard: function (v) {
+            this.center.setValue(v);
+        }
+    },
+
+    beforeInit: function (cb) {
+        this.store.init(cb);
+    },
+
     render: function () {
-        var center;
+        var self = this;
         return {
             type: "bi.border",
             items: {
@@ -14,7 +29,7 @@ Demo.Main = BI.inherit(BI.Widget, {
                         listeners: [{
                             eventName: Demo.North.EVENT_VALUE_CHANGE,
                             action: function (v) {
-                                center.setValue(v);
+                                self.store.handleTreeSelectChange(v);
                             }
                         }]
                     }
@@ -26,7 +41,7 @@ Demo.Main = BI.inherit(BI.Widget, {
                         listeners: [{
                             eventName: Demo.West.EVENT_VALUE_CHANGE,
                             action: function (v) {
-                                center.setValue(v);
+                                self.store.handleTreeSelectChange(v);
                             }
                         }]
                     }
@@ -35,7 +50,7 @@ Demo.Main = BI.inherit(BI.Widget, {
                     el: {
                         type: "demo.center",
                         ref: function (_ref) {
-                            center = _ref;
+                            self.center = _ref;
                         }
                     }
                 }

demo/js/main.store.js

@@ -0,0 +1,65 @@
+!(function () {
+    var Store = BI.inherit(Fix.Model, {
+        _init: function () {
+
+        },
+
+        state: function () {
+            return {
+                activeCard: Demo.showIndex
+            };
+        },
+
+        computed: {},
+
+        watch: {},
+
+        actions: {
+            init: function (cb) {
+                var tree = BI.Tree.transformToTreeFormat(Demo.CONFIG);
+                var traversal = function (array, callback) {
+                    var t = [];
+                    BI.some(array, function (i, item) {
+                        var match = callback(i, item);
+                        if (match) {
+                            t.push(item.id);
+                        }
+                        var b = traversal(item.children, callback);
+                        if (BI.isNotEmptyArray(b)) {
+                            t = BI.concat([item.id], b);
+                        }
+                    });
+                    return t;
+                };
+                var paths = traversal(tree, function (index, node) {
+                    if (!node.children || BI.isEmptyArray(node.children)) {
+                        if (node.value === Demo.showIndex) {
+                            return true;
+                        }
+                    }
+                });
+                BI.each(Demo.CONFIG, function (index, item) {
+                    if (BI.contains(paths, item.id)) {
+                        item.open = true;
+                    }
+                });
+
+                cb();
+            },
+
+            handleTreeSelectChange: function (v) {
+                this.model.activeCard = v;
+                var matched = BI.some(Demo.CONFIG, function (index, item) {
+                    if (item.value === v) {
+                        BI.history.navigate(item.text, {trigger: true});
+                        return true;
+                    }
+                });
+                if (!matched) {
+                    BI.history.navigate("", {trigger: true});
+                }
+            }
+        }
+    });
+    BI.store("demo.store.main", Store);
+})();

demo/js/west.js

@@ -2,9 +2,11 @@ Demo.West = BI.inherit(BI.Widget, {
     props: {
         baseCls: "demo-west bi-border-right bi-card"
     },
+
     mounted: function () {
         this.searcher.setAdapter(this.tree);
     },
+
     render: function () {
         var self = this;
         return {
@@ -48,6 +50,7 @@ Demo.West = BI.inherit(BI.Widget, {
                         self.fireEvent(Demo.West.EVENT_VALUE_CHANGE, v);
                     }
                 }],
+                value: Demo.showIndex,
                 items: Demo.CONFIG,
                 ref: function (ref) {
                     self.tree = ref;

src/widget/multiselect/multiselect.combo.js

@@ -299,32 +299,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
 
     _adjust: function (callback) {
         var self = this, o = this.options;
-        if (!this._count) {
+        adjust();
-            o.itemsCreator({
+        callback();
-                type: BI.MultiSelectCombo.REQ_GET_DATA_LENGTH
-            }, function (res) {
-                self._count = res.count;
-                adjust();
-                callback();
-            });
-        } else {
-            adjust();
-            callback();
-
-        }
-
         function adjust () {
-            if (self.storeValue.type === BI.Selection.All && self.storeValue.value.length >= self._count) {
-                self.storeValue = {
-                    type: BI.Selection.Multi,
-                    value: []
-                };
-            } else if (self.storeValue.type === BI.Selection.Multi && self.storeValue.value.length >= self._count) {
-                self.storeValue = {
-                    type: BI.Selection.All,
-                    value: []
-                };
-            }
             if (self.wants2Quit === true) {
                 self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM);
                 self.wants2Quit = false;
@@ -377,7 +354,6 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
     },
 
     populate: function () {
-        this._count = null;
         this.combo.populate.apply(this.combo, arguments);
     }
 });