rc-table - npm Package Compare versions

Comparing version 4.0.6 to 4.1.0

HISTORY.md

 # History
 ----
 
+## 4.1.0 / 2016-06-01
+
+- Support nested string of `dataIndex`
+- Fix fixed Table with expand row
+
 ## 4.0.0 / 2016-04-18
@@ -5,0 +10,0 @@

lib/Table.js

@@ -21,6 +21,2 @@ 'use strict';
 
-var _objectAssign = require('object-assign');
-
-var _objectAssign2 = _interopRequireDefault(_objectAssign);
-
 var Table = _react2['default'].createClass({
@@ -211,8 +207,11 @@ displayName: 'Table',
 
-  getExpandedRow: function getExpandedRow(key, content, visible, className) {
+  getExpandedRow: function getExpandedRow(key, content, visible, className, fixed) {
     var prefixCls = this.props.prefixCls;
     return _react2['default'].createElement(
       'tr',
-      { key: key + '-extra-row', style: { display: visible ? '' : 'none' }, className: prefixCls + '-expanded-row ' + className },
-      this.props.expandIconAsCell ? _react2['default'].createElement('td', { key: 'rc-table-expand-icon-placeholder' }) : '',
+      {
+        key: key + '-extra-row',
+        style: { display: visible ? '' : 'none' },
+        className: prefixCls + '-expanded-row ' + className },
+      this.props.expandIconAsCell && fixed !== 'right' ? _react2['default'].createElement('td', { key: 'rc-table-expand-icon-placeholder' }) : null,
       _react2['default'].createElement(
@@ -289,3 +288,3 @@ 'td',
       if (expandedRowContent && isRowExpanded) {
-        rst.push(this.getExpandedRow(key, expandedRowContent, subVisible, expandedRowClassName(record, i)));
+        rst.push(this.getExpandedRow(key, expandedRowContent, subVisible, expandedRowClassName(record, i), fixed));
       }
@@ -332,3 +331,3 @@ if (childrenColumn) {
     return columns.map(function (column, i) {
-      var newColumn = (0, _objectAssign2['default'])({}, column);
+      var newColumn = _extends({}, column);
       if (i >= columnsPageRange[0] && i <= columnsPageRange[1]) {
@@ -406,3 +405,8 @@ var pageIndexStart = columnsPageRange[0] + currentColumnsPage * columnsPageSize;
       if (!columns && scroll.x) {
-        tableStyle.width = scroll.x;
+        // not set width, then use content fixed width
+        if (scroll.x === true) {
+          tableStyle.tableLayout = 'fixed';
+        } else {
+          tableStyle.width = scroll.x;
+        }
       }
@@ -409,0 +413,0 @@ return _react2['default'].createElement(

lib/TableRow.js

@@ -13,2 +13,6 @@ 'use strict';
 
+var _objectPath = require('object-path');
+
+var _objectPath2 = _interopRequireDefault(_objectPath);
+
 var TableRow = _react2['default'].createClass({
@@ -63,3 +67,3 @@ displayName: 'TableRow',
       var render = col.render;
-      var text = record[col.dataIndex];
+      var text = _objectPath2['default'].get(record, col.dataIndex);
 
@@ -66,0 +70,0 @@ var expandIcon = undefined;

package.json

 {
   "name": "rc-table",
-  "version": "4.0.6",
+  "version": "4.1.0",
   "description": "table ui component for react",
@@ -41,2 +41,5 @@ "keywords": [
   },
+  "dependencies": {
+    "object-path": "^0.9.2"
+  },
   "devDependencies": {
@@ -56,6 +59,3 @@ "expect.js": "~0.3.1",
     "lint"
-  ],
-  "dependencies": {
-    "object-assign": "^4.0.1"
-  }
+  ]
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

41416

increased by1.43%

Lines of code

886

increased by2.43%

Dependency changes

• + Addedobject-path@^0.9.2

• + Addedobject-path@0.9.2(transitive)

• - Removedobject-assign@^4.0.1

• - Removedobject-assign@4.1.1(transitive)