Merge pull request #368 from youzan/hotfix/fix-table-style

table: 修复pageInfo传null的报错和money class的对齐问题
youzan · Jul 10, 2017 · fdb1682 · fdb1682
2 parents 8a79527 + 3678bd3
commit fdb1682
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/packages/zent/src/table/README.md b/packages/zent/src/table/README.md
@@ -44,7 +44,7 @@ const columns = [{
   title: '库存',
   name: 'stock_num',
   width: '100px',
-  textAlign: 'center',
+	isMoney: true,
   isMoney: true
 }, {
   width: '3em',
@@ -55,6 +55,7 @@ const columns = [{
 ReactDOM.render(
     <Table
       columns={columns}
+			pageInfo={null}
       datasets={datasets}
       rowKey="item_id"
     />

diff --git a/packages/zent/src/table/modules/Foot.js b/packages/zent/src/table/modules/Foot.js
@@ -40,15 +40,11 @@ export default class Foot extends (PureComponent || Component) {
   };
 
   render() {
-    const {
-      pageInfo = {},
-      onPageChange,
-      batchComponents,
-      selection,
-      current
-    } = this.props;
+    const { onPageChange, batchComponents, selection, current } = this.props;
 
+    let pageInfo = this.props.pageInfo || {};
     let { totalItem, pageSize, total, limit, maxPageToShow } = pageInfo;
+
     const { needSelect, selectedRows } = selection;
     let batchClassName = 'tfoot__batchcomponents';
     const shouldRenderFoot =

diff --git a/packages/zent/src/table/modules/Head.js b/packages/zent/src/table/modules/Head.js
@@ -157,12 +157,16 @@ export default class Head extends (PureComponent || Component) {
         };
       }
 
-      cellClass += ` cell--${helper.getAlignClass(textAlign)}`;
+      if (helper.getAlignClass(textAlign) !== '') {
+        cellClass += ` cell--${helper.getAlignClass(textAlign)}`;
+      }
 
       tds.push(
         <div key={index} className={cellClass} style={styleObj}>
-          {this.renderCheckBox(index, selection)}
-          {this.getChild(item)}
+          <div className="cell__child-container">
+            {this.renderCheckBox(index, selection)}
+            {this.getChild(item)}
+          </div>
         </div>
       );
     });

diff --git a/packages/zent/src/table/modules/Td.js b/packages/zent/src/table/modules/Td.js
@@ -90,7 +90,9 @@ export default class Td extends (PureComponent || Component) {
       };
     }
 
-    className += ` cell--${helper.getAlignClass(textAlign)}`;
+    if (helper.getAlignClass(textAlign) !== '') {
+      className += ` cell--${helper.getAlignClass(textAlign)}`;
+    }
 
     return (
       <div className={className} style={styleObj}>