Merge branch 'master' of http://www.finedevelop.com:2015/scm/~guy/fineui

7 years ago · c0fc09dd99
9 changed files with 147 additions and 17 deletions
--- a/bi/case.js
+++ b/bi/case.js
@ -11053,6 +11053,37 @@ BI.extend(BI.DynamicSummaryTreeTable, {
 });

 BI.shortcut("bi.dynamic_summary_tree_table", BI.DynamicSummaryTreeTable);/**
+ * Created by GUY on 2016/5/7.
+ * @class BI.LayerTreeTableCell
+ * @extends BI.Single
+ */
+BI.LayerTreeTableCell = BI.inherit(BI.Widget, {
+    _defaultConfig: function () {
+        return BI.extend(BI.LayerTreeTableCell.superclass._defaultConfig.apply(this, arguments), {
+            baseCls: "bi-layer-tree-table-cell",
+            layer: 0,
+            text: ""
+        })
+    },
+
+    _init: function () {
+        BI.LayerTreeTableCell.superclass._init.apply(this, arguments);
+        var o = this.options;
+        BI.createWidget({
+            type: "bi.label",
+            element: this.element,
+            textAlign: "left",
+            whiteSpace: "nowrap",
+            height: o.height,
+            text: o.text,
+            value: o.value,
+            lgap: 5 + 30 * o.layer,
+            rgap: 5
+        })
+    }
+});
+
+BI.shortcut("bi.layer_tree_table_cell", BI.LayerTreeTableCell);/**
 *
 * 层级树状结构的表格
 *
--- a/demo/version.js
+++ b/demo/version.js
@ -28,5 +28,6 @@ BI.i18n = {
    "BI-Quarter_4": "第4季度",
    "BI-Basic_Value": "值",
    "BI-Load_More": "加载更多",
-    "BI-Select_All": "全选"
+    "BI-Select_All": "全选",
+    "BI-No_More_Data": "无更多数据"
 };
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -26,7 +26,9 @@ BI.i18n = {
    "BI-Quarter_4": "第4季度",
    "BI-Basic_Value": "值",
    "BI-Load_More": "加载更多",
-    "BI-Select_All": "全选"
+    "BI-Select_All": "全选",
+    "BI-Basic_Auto": "自动",
+    "BI-No_More_Data": "无更多数据"
 };/*!
 * jQuery JavaScript Library v1.9.1
 * http://jquery.com/
@ -75338,6 +75340,37 @@ BI.extend(BI.DynamicSummaryTreeTable, {
 });

 BI.shortcut("bi.dynamic_summary_tree_table", BI.DynamicSummaryTreeTable);/**
+ * Created by GUY on 2016/5/7.
+ * @class BI.LayerTreeTableCell
+ * @extends BI.Single
+ */
+BI.LayerTreeTableCell = BI.inherit(BI.Widget, {
+    _defaultConfig: function () {
+        return BI.extend(BI.LayerTreeTableCell.superclass._defaultConfig.apply(this, arguments), {
+            baseCls: "bi-layer-tree-table-cell",
+            layer: 0,
+            text: ""
+        })
+    },
+
+    _init: function () {
+        BI.LayerTreeTableCell.superclass._init.apply(this, arguments);
+        var o = this.options;
+        BI.createWidget({
+            type: "bi.label",
+            element: this.element,
+            textAlign: "left",
+            whiteSpace: "nowrap",
+            height: o.height,
+            text: o.text,
+            value: o.value,
+            lgap: 5 + 30 * o.layer,
+            rgap: 5
+        })
+    }
+});
+
+BI.shortcut("bi.layer_tree_table_cell", BI.LayerTreeTableCell);/**
 *
 * 层级树状结构的表格
 *
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/case.js
+++ b/dist/case.js
@ -11053,6 +11053,37 @@ BI.extend(BI.DynamicSummaryTreeTable, {
 });

 BI.shortcut("bi.dynamic_summary_tree_table", BI.DynamicSummaryTreeTable);/**
+ * Created by GUY on 2016/5/7.
+ * @class BI.LayerTreeTableCell
+ * @extends BI.Single
+ */
+BI.LayerTreeTableCell = BI.inherit(BI.Widget, {
+    _defaultConfig: function () {
+        return BI.extend(BI.LayerTreeTableCell.superclass._defaultConfig.apply(this, arguments), {
+            baseCls: "bi-layer-tree-table-cell",
+            layer: 0,
+            text: ""
+        })
+    },
+
+    _init: function () {
+        BI.LayerTreeTableCell.superclass._init.apply(this, arguments);
+        var o = this.options;
+        BI.createWidget({
+            type: "bi.label",
+            element: this.element,
+            textAlign: "left",
+            whiteSpace: "nowrap",
+            height: o.height,
+            text: o.text,
+            value: o.value,
+            lgap: 5 + 30 * o.layer,
+            rgap: 5
+        })
+    }
+});
+
+BI.shortcut("bi.layer_tree_table_cell", BI.LayerTreeTableCell);/**
 *
 * 层级树状结构的表格
 *
--- a/dist/demo.js
+++ b/dist/demo.js
@ -28,7 +28,8 @@ BI.i18n = {
    "BI-Quarter_4": "第4季度",
    "BI-Basic_Value": "值",
    "BI-Load_More": "加载更多",
-    "BI-Select_All": "全选"
+    "BI-Select_All": "全选",
+    "BI-No_More_Data": "无更多数据"
 };$(function () {
    var ref;
    BI.createWidget({
--- a/public/js/index.js
+++ b/public/js/index.js
@ -27,5 +27,6 @@ BI.i18n = {
    "BI-Basic_Value": "值",
    "BI-Load_More": "加载更多",
    "BI-Select_All": "全选",
-    "BI-Basic_Auto": "自动"
+    "BI-Basic_Auto": "自动",
+    "BI-No_More_Data": "无更多数据"
 };
--- a/src/case/table/table.layertree.cell.js
+++ b/src/case/table/table.layertree.cell.js
@ -0,0 +1,32 @@
+/**
+ * Created by GUY on 2016/5/7.
+ * @class BI.LayerTreeTableCell
+ * @extends BI.Single
+ */
+BI.LayerTreeTableCell = BI.inherit(BI.Widget, {
+    _defaultConfig: function () {
+        return BI.extend(BI.LayerTreeTableCell.superclass._defaultConfig.apply(this, arguments), {
+            baseCls: "bi-layer-tree-table-cell",
+            layer: 0,
+            text: ""
+        })
+    },
+
+    _init: function () {
+        BI.LayerTreeTableCell.superclass._init.apply(this, arguments);
+        var o = this.options;
+        BI.createWidget({
+            type: "bi.label",
+            element: this.element,
+            textAlign: "left",
+            whiteSpace: "nowrap",
+            height: o.height,
+            text: o.text,
+            value: o.value,
+            lgap: 5 + 30 * o.layer,
+            rgap: 5
+        })
+    }
+});
+
+BI.shortcut("bi.layer_tree_table_cell", BI.LayerTreeTableCell);
--- a/uidoc/core/combination/bi.combo.md
+++ b/uidoc/core/combination/bi.combo.md
@ -10,7 +10,7 @@

 BI.createWidget({
   type: "bi.combo",
-   element: “body”,
+   element: "body",
   adjustLength: 2,
   el: {
 	   type: "bi.button",