new column option

bizdevfe · Dec 4, 2017 · 4d0213b · 4d0213b
1 parent 3545ff9
commit 4d0213b
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 1.6.4 (Dec 4, 2017)
+* Table: new column option `customClass`.
+
+## 1.6.3 (Nov 10, 2017)
+* Dialog: new option `canClose`.
+
+## 1.6.2 (Aug 30, 2017)
+* Update homepage.
+
 ## 1.6.1 (July 19, 2017)
 * Update Table demo.
 

diff --git a/dist/jquery.bizui.js b/dist/jquery.bizui.js
@@ -12925,7 +12925,8 @@
                             }
                             var td = $('<td></td>').attr({
                                     align: col.align,
-                                    width: col.width
+                                    width: col.width,
+                                    class: col.customClass
                                 });
                             if (col.editable && col.content.length === 1) {
                                 td.attr('editable', '');
@@ -12955,7 +12956,11 @@
                                     if (typeof _col.visible !== 'undefined' && !_col.visible || _col.content.length === 1) {
                                         continue;
                                     }
-                                    var _td = $('<td></td>').attr('align', _col.align), _content = _col.content[m].apply(this, [
+                                    var _td = $('<td></td>').attr({
+                                            align: _col.align,
+                                            class: _col.customClass
+                                        });
+                                    var _content = _col.content[m].apply(this, [
                                             item,
                                             index,
                                             _col.field
@@ -12983,7 +12988,8 @@
                         }
                         var td = $('<td></td>').attr({
                                 align: col.align,
-                                width: col.width
+                                width: col.width,
+                                class: col.customClass
                             });
                         if (options.flexible) {
                             td.removeAttr('width');

diff --git a/dist/jquery.bizui.min.js b/dist/jquery.bizui.min.js
diff --git a/index.html b/index.html
@@ -12,7 +12,7 @@
     <a href="#" class="active">BizUI</a>
     <a href="pages/tutorial.html">起步</a>
     <a href="pages/components.html">组件</a>
-    <a class="github" href="https://github.com/bizdevfe/biz-ui/releases" target="_blank">GitHub&nbsp;&nbsp;v1.6.3</a>
+    <a class="github" href="https://github.com/bizdevfe/biz-ui/releases" target="_blank">GitHub&nbsp;&nbsp;v1.6.4</a>
 </nav>
 
 <div class="container">

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "biz-ui",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "description": "A jQuery plugin for business UI components",
   "author": "BizFE",
   "main": "dist/jquery.bizui.js",

diff --git a/pages/components.html b/pages/components.html
@@ -18,7 +18,7 @@
     <a href="../index.html">BizUI</a>
     <a href="tutorial.html">起步</a>
     <a href="#" class="active">组件</a>
-    <a class="github" href="https://github.com/bizdevfe/biz-ui/releases" target="_blank">GitHub&nbsp;&nbsp;v1.6.3</a>
+    <a class="github" href="https://github.com/bizdevfe/biz-ui/releases" target="_blank">GitHub&nbsp;&nbsp;v1.6.4</a>
 </nav>
 
 <div class="container components">

diff --git a/pages/src/components/Table/table.html b/pages/src/components/Table/table.html
@@ -246,6 +246,10 @@ <h4>Options</h4>
         <td>[column.visible]<td>Boolean</td>
         <td>此列可见，默认 true</td>
     </tr>
+    <tr>
+        <td>[column.customClass]<td>String</td>
+        <td>自定义 class</td>
+    </tr>
     <tr>
         <td>data</td>
         <td>Array</td>

diff --git a/pages/tutorial.html b/pages/tutorial.html
@@ -14,7 +14,7 @@
     <a href="../index.html">BizUI</a>
     <a href="#" class="active">起步</a>
     <a href="components.html">组件</a>
-    <a class="github" href="https://github.com/bizdevfe/biz-ui/releases" target="_blank">GitHub&nbsp;&nbsp;v1.6.3</a>
+    <a class="github" href="https://github.com/bizdevfe/biz-ui/releases" target="_blank">GitHub&nbsp;&nbsp;v1.6.4</a>
 </nav>
 
 <div class="container">

diff --git a/src/ui/Table.js b/src/ui/Table.js
@@ -18,6 +18,7 @@ require('../deps/jquery.editabletable');
  * @param {Boolean}        [options.column.sortable]           此列排序, 默认 false
  * @param {String}         [options.column.currentSort]        排序方式（des-降序 | asc-升序），仅 sortable 为 true 时生效
  * @param {Boolean}        [options.column.visible]            此列可见，默认 true
+ * @param {Boolean}        [options.column.customClass]        自定义 class
  * @param {Array}          options.data                    数据，data[i].disabledSelect = true 时此行不可选中，默认 false
  * @param {String}         [options.customClass]           自定义 class
  * @param {String}         [options.foot]                  总计行位置（top | bottom），默认无总计行
@@ -266,7 +267,8 @@ Table.prototype = {
 
                 var td = $('<td></td>').attr({
                     align: col.align,
-                    width: col.width
+                    width: col.width,
+                    class: col.customClass
                 });
                 if (col.editable && col.content.length === 1) {
                     td.attr('editable', '');
@@ -299,8 +301,11 @@ Table.prototype = {
                             continue;
                         }
 
-                        var _td = $('<td></td>').attr('align', _col.align),
-                            _content = _col.content[m].apply(this, [item, index, _col.field]).toString();
+                        var _td = $('<td></td>').attr({
+                            align: _col.align,
+                            class: _col.customClass
+                        });
+                        var _content = _col.content[m].apply(this, [item, index, _col.field]).toString();
                         _td.html((_col.escapeContent === false) ? _content : escapeHTML(_content)).appendTo(_tr);
 
                         if (options.flexible) {
@@ -339,7 +344,8 @@ Table.prototype = {
 
             var td = $('<td></td>').attr({
                 align: col.align,
-                width: col.width
+                width: col.width,
+                class: col.customClass
             });
 
             if (options.flexible) {