Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~windy/fui

demo/config.js

@@ -1524,7 +1524,7 @@ Demo.CONSTANTS = {
         {id: 121, pId: 12, value: "第三级目录1", text: "第三级目录1"},
         {id: 122, pId: 12, value: "第三级文件1", text: "第三级文件1"},
         {id: 1211, pId: 121, value: "第四级目录1", text: "第四级目录1"},
-        {id: 12111, pId: 1211, value: "第五级文件1", text: "第五级文件1"},
+        {id: 12111, pId: 1211, value: "第五级文件1", text: "第五级文件111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"},
         {id: 2, pId: -1, value: "第一级目录2", text: "第一级目录2"},
         {id: 21, pId: 2, value: "第二级目录3", text: "第二级目录3"},
         {id: 22, pId: 2, value: "第二级文件2", text: "第二级文件2"},

dist/bundle.css

@@ -4665,6 +4665,12 @@ ul.ztree.zTreeDragUL {
 .bi-multidate-segment .bi-multidate-editor {
   font-size: 14px;
 }
+.bi-multilayer-select-level-tree .tree-view {
+  min-width: 100%;
+}
+.bi-multilayer-single-level-tree .tree-view {
+  min-width: 100%;
+}
 .bi-multi-select-check-pane .multi-select-check-selected {
   text-decoration: underline;
 }

dist/bundle.js

@@ -94243,7 +94243,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
         this._assertId(nodes);
         this.tree = BI.createWidget({
             type: "bi.custom_tree",
-            element: this,
+            cls: "tree-view display-inline",
             expander: {
                 type: "bi.select_tree_expander",
                 isDefaultInit: o.isDefaultInit,
@@ -94271,6 +94271,13 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
                 self.fireEvent(BI.MultiLayerSelectLevelTree.EVENT_CHANGE, arguments);
             }
         });
+
+        BI.createWidget({
+            type: "bi.adaptive",
+            element: this,
+            scrollable: true,
+            items: [this.tree]
+        })
     },
 
     populate: function (nodes) {
@@ -94790,7 +94797,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
         this._assertId(nodes);
         this.tree = BI.createWidget({
             type: "bi.custom_tree",
-            element: this,
+            cls: "tree-view display-inline",
             expander: {
                 isDefaultInit: o.isDefaultInit,
                 el: {},
@@ -94821,6 +94828,13 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
                 self.fireEvent(BI.MultiLayerSingleLevelTree.EVENT_CHANGE, v);
             }
         });
+
+        BI.createWidget({
+            type: "bi.adaptive",
+            element: this,
+            scrollable: true,
+            items: [this.tree]
+        })
     },
 
     populate: function (nodes) {

dist/demo.js

@@ -16202,7 +16202,7 @@ Demo.CONSTANTS = {
         {id: 121, pId: 12, value: "第三级目录1", text: "第三级目录1"},
         {id: 122, pId: 12, value: "第三级文件1", text: "第三级文件1"},
         {id: 1211, pId: 121, value: "第四级目录1", text: "第四级目录1"},
-        {id: 12111, pId: 1211, value: "第五级文件1", text: "第五级文件1"},
+        {id: 12111, pId: 1211, value: "第五级文件1", text: "第五级文件111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"},
         {id: 2, pId: -1, value: "第一级目录2", text: "第一级目录2"},
         {id: 21, pId: 2, value: "第二级目录3", text: "第二级目录3"},
         {id: 22, pId: 2, value: "第二级文件2", text: "第二级文件2"},

dist/fineui.css

@@ -4665,6 +4665,12 @@ ul.ztree.zTreeDragUL {
 .bi-multidate-segment .bi-multidate-editor {
   font-size: 14px;
 }
+.bi-multilayer-select-level-tree .tree-view {
+  min-width: 100%;
+}
+.bi-multilayer-single-level-tree .tree-view {
+  min-width: 100%;
+}
 .bi-multi-select-check-pane .multi-select-check-selected {
   text-decoration: underline;
 }

dist/widget.css

@@ -189,6 +189,12 @@
 .bi-multidate-segment .bi-multidate-editor {
   font-size: 14px;
 }
+.bi-multilayer-select-level-tree .tree-view {
+  min-width: 100%;
+}
+.bi-multilayer-single-level-tree .tree-view {
+  min-width: 100%;
+}
 .bi-multi-select-check-pane .multi-select-check-selected {
   text-decoration: underline;
 }

dist/widget.js

@@ -7756,7 +7756,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
         this._assertId(nodes);
         this.tree = BI.createWidget({
             type: "bi.custom_tree",
-            element: this,
+            cls: "tree-view display-inline",
             expander: {
                 type: "bi.select_tree_expander",
                 isDefaultInit: o.isDefaultInit,
@@ -7784,6 +7784,13 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
                 self.fireEvent(BI.MultiLayerSelectLevelTree.EVENT_CHANGE, arguments);
             }
         });
+
+        BI.createWidget({
+            type: "bi.adaptive",
+            element: this,
+            scrollable: true,
+            items: [this.tree]
+        })
     },
 
     populate: function (nodes) {
@@ -8303,7 +8310,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
         this._assertId(nodes);
         this.tree = BI.createWidget({
             type: "bi.custom_tree",
-            element: this,
+            cls: "tree-view display-inline",
             expander: {
                 isDefaultInit: o.isDefaultInit,
                 el: {},
@@ -8334,6 +8341,13 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
                 self.fireEvent(BI.MultiLayerSingleLevelTree.EVENT_CHANGE, v);
             }
         });
+
+        BI.createWidget({
+            type: "bi.adaptive",
+            element: this,
+            scrollable: true,
+            items: [this.tree]
+        })
     },
 
     populate: function (nodes) {

src/css/widget/multilayerselecttree/multilayerselecttree.css

@@ -0,0 +1,3 @@
+.bi-multilayer-select-level-tree .tree-view {
+  min-width: 100%;
+}

src/css/widget/multilayersingletree/multilayersingletree.css

@@ -0,0 +1,3 @@
+.bi-multilayer-single-level-tree .tree-view {
+  min-width: 100%;
+}

src/less/widget/multilayerselecttree/multilayerselecttree.leveltree.less

@@ -0,0 +1,5 @@
+.bi-multilayer-select-level-tree {
+  .tree-view {
+    min-width: 100%;
+  }
+}

src/less/widget/multilayersingletree/multilayersingletree.leveltree.less

@@ -0,0 +1,5 @@
+.bi-multilayer-single-level-tree {
+  .tree-view {
+    min-width: 100%;
+  }
+}

src/widget/multilayerselecttree/multilayerselecttree.leveltree.js

@@ -71,7 +71,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
         this._assertId(nodes);
         this.tree = BI.createWidget({
             type: "bi.custom_tree",
-            element: this,
+            cls: "tree-view display-inline",
             expander: {
                 type: "bi.select_tree_expander",
                 isDefaultInit: o.isDefaultInit,
@@ -99,6 +99,13 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
                 self.fireEvent(BI.MultiLayerSelectLevelTree.EVENT_CHANGE, arguments);
             }
         });
+
+        BI.createWidget({
+            type: "bi.adaptive",
+            element: this,
+            scrollable: true,
+            items: [this.tree]
+        })
     },
 
     populate: function (nodes) {

src/widget/multilayersingletree/multilayersingletree.leveltree.js

@@ -70,7 +70,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
         this._assertId(nodes);
         this.tree = BI.createWidget({
             type: "bi.custom_tree",
-            element: this,
+            cls: "tree-view display-inline",
             expander: {
                 isDefaultInit: o.isDefaultInit,
                 el: {},
@@ -101,6 +101,13 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
                 self.fireEvent(BI.MultiLayerSingleLevelTree.EVENT_CHANGE, v);
             }
         });
+
+        BI.createWidget({
+            type: "bi.adaptive",
+            element: this,
+            scrollable: true,
+            items: [this.tree]
+        })
     },
 
     populate: function (nodes) {