dragon-ui - npm Package Compare versions

Comparing version 0.0.59 to 0.0.60

CHANGELOG.md

 # 版本更新日志  
 
+## 0.0.60  
+  * Table组件增加单元格分组功能
+
 ## 0.0.59  
@@ -4,0 +7,0 @@ * Table组件增加表头分组功能

components/Table/Table.jsx

@@ -183,5 +183,26 @@
 
+    // 渲染需合并的单元格
+    if (typeof render === 'object' && ('colSpan' in render || 'rowSpan' in render)) {
+      return this.renderMergedCell(column, columnIndex, render);
+    }
     return <td key={column.dataIndex + columnIndex}>{render}</td>;
   }
 
+  // 合并单元格
+  renderMergedCell(column, columnIndex, render) {
+    const { colSpan, rowSpan, value } = render;
+    if (colSpan === 0 || rowSpan === 0) {
+      return null;
+    }
+    return (
+      <td
+        key={column.dataIndex + columnIndex}
+        colSpan={colSpan}
+        rowSpan={rowSpan}
+        >
+        {value}
+      </td>
+    );
+  }
+
   onSort(column) {
@@ -188,0 +209,0 @@ const { dataSource } = this.props;

examples/pages/Page1.jsx

@@ -1073,3 +1073,3 @@ /* eslint-disable */
 
-          <div>表头分组</div>
+          <div>表头分组和单元格合并</div>
           <Table
@@ -1091,3 +1091,3 @@ striped
               render: (value, row, index) => {
-                return <a href="javascript:;">{value}</a>;
+                return <a href="javascript:;">{value}</a>; 
               },
@@ -1107,7 +1107,26 @@ sorter: (a, b) => {
                       title: 'iphone',
-                      dataIndex: 'iphone'
+                      dataIndex: 'iphone',
+                      render: (value, row, index) => {
+                        {/* colSpan例子 */}
+                        if (index === 1) {
+                          return {
+                            value,
+                            colSpan: 2
+                          }
+                        }
+                        return value;
+                      }
                     },
                     {
                       title: 'android',
-                      dataIndex: 'android'
+                      dataIndex: 'android',
+                      render: (value, row, index) => {
+                        {/* colSpan例子 */}
+                        if (index === 1) {
+                          return {
+                            colSpan: 0
+                          }
+                        }
+                        return value;
+                      }
                     }
@@ -1125,2 +1144,14 @@ ]
               render: (value, row, index) => {
+                {/* rowSpan例子 */}
+                if (index === 2) {
+                  return {
+                    value: value.home,
+                    rowSpan: 2
+                  }
+                }
+                if (index === 3) {
+                  return {
+                    rowSpan: 0
+                  }
+                }
                 return value.home
@@ -1127,0 +1158,0 @@ }

lib/Table/Table.js

@@ -256,2 +256,6 @@ 'use strict';
 
+      // 渲染需合并的单元格
+      if (typeof render === 'object' && ('colSpan' in render || 'rowSpan' in render)) {
+        return this.renderMergedCell(column, columnIndex, render);
+      }
       return _react2['default'].createElement(
@@ -263,3 +267,25 @@ 'td',
     }
+
+    // 合并单元格
   }, {
+    key: 'renderMergedCell',
+    value: function renderMergedCell(column, columnIndex, render) {
+      var colSpan = render.colSpan;
+      var rowSpan = render.rowSpan;
+      var value = render.value;
+
+      if (colSpan === 0 || rowSpan === 0) {
+        return null;
+      }
+      return _react2['default'].createElement(
+        'td',
+        {
+          key: column.dataIndex + columnIndex,
+          colSpan: colSpan,
+          rowSpan: rowSpan
+        },
+        value
+      );
+    }
+  }, {
     key: 'onSort',
@@ -266,0 +292,0 @@ value: function onSort(column) {

package.json

 {
   "name": "dragon-ui",
-  "version": "0.0.59",
+  "version": "0.0.60",
   "main": "lib/index.js",
@@ -5,0 +5,0 @@ "scripts": {

No alert changes

Improved metrics

Lines of code

23955

increased by0.25%

Worsened metrics

Total package byte prevSize

1343742

decreased by-0.22%

No dependency changes