同步 master 代码

demo/demolist/Demo0505.js

@@ -446,6 +446,214 @@ class Demo0505 extends Component {
           />
         )
       },
+      {
+        title: "名字",
+        dataIndex: "b",
+        key: "b",
+        render: (text, record, index) => (
+          <StringEditCell
+            colName={"名字"}
+            editable={this.state.isEditingAll}
+            isEdited={record.isEdited.b || false}
+            required
+            value={text}
+            onChange={this.onCellChange(index, "b")}
+            throwError={this.throwError}
+          />
+        )
+      },
+      {
+        title: "名字",
+        dataIndex: "b",
+        key: "b",
+        render: (text, record, index) => (
+          <StringEditCell
+            colName={"名字"}
+            editable={this.state.isEditingAll}
+            isEdited={record.isEdited.b || false}
+            required
+            value={text}
+            onChange={this.onCellChange(index, "b")}
+            throwError={this.throwError}
+          />
+        )
+      },
+      {
+        title: "名字",
+        dataIndex: "b",
+        key: "b",
+        render: (text, record, index) => (
+          <StringEditCell
+            colName={"名字"}
+            editable={this.state.isEditingAll}
+            isEdited={record.isEdited.b || false}
+            required
+            value={text}
+            onChange={this.onCellChange(index, "b")}
+            throwError={this.throwError}
+          />
+        )
+      },
+      {
+        title: "名字",
+        dataIndex: "b",
+        key: "b",
+        render: (text, record, index) => (
+          <StringEditCell
+            colName={"名字"}
+            editable={this.state.isEditingAll}
+            isEdited={record.isEdited.b || false}
+            required
+            value={text}
+            onChange={this.onCellChange(index, "b")}
+            throwError={this.throwError}
+          />
+        )
+      },
+      {
+        title: "名字",
+        dataIndex: "b",
+        key: "b",
+        render: (text, record, index) => (
+          <StringEditCell
+            colName={"名字"}
+            editable={this.state.isEditingAll}
+            isEdited={record.isEdited.b || false}
+            required
+            value={text}
+            onChange={this.onCellChange(index, "b")}
+            throwError={this.throwError}
+          />
+        )
+      },
+      {
+        title: "名字",
+        dataIndex: "b",
+        key: "b",
+        render: (text, record, index) => (
+          <StringEditCell
+            colName={"名字"}
+            editable={this.state.isEditingAll}
+            isEdited={record.isEdited.b || false}
+            required
+            value={text}
+            onChange={this.onCellChange(index, "b")}
+            throwError={this.throwError}
+          />
+        )
+      },
+      {
+        title: "名字",
+        dataIndex: "b",
+        key: "b",
+        render: (text, record, index) => (
+          <StringEditCell
+            colName={"名字"}
+            editable={this.state.isEditingAll}
+            isEdited={record.isEdited.b || false}
+            required
+            value={text}
+            onChange={this.onCellChange(index, "b")}
+            throwError={this.throwError}
+          />
+        )
+      },
+      {
+        title: "名字",
+        dataIndex: "b",
+        key: "b",
+        render: (text, record, index) => (
+          <StringEditCell
+            colName={"名字"}
+            editable={this.state.isEditingAll}
+            isEdited={record.isEdited.b || false}
+            required
+            value={text}
+            onChange={this.onCellChange(index, "b")}
+            throwError={this.throwError}
+          />
+        )
+      },
+      {
+        title: "名字",
+        dataIndex: "b",
+        key: "b",
+        render: (text, record, index) => (
+          <StringEditCell
+            colName={"名字"}
+            editable={this.state.isEditingAll}
+            isEdited={record.isEdited.b || false}
+            required
+            value={text}
+            onChange={this.onCellChange(index, "b")}
+            throwError={this.throwError}
+          />
+        )
+      },
+      {
+        title: "名字",
+        dataIndex: "b",
+        key: "b",
+        render: (text, record, index) => (
+          <StringEditCell
+            colName={"名字"}
+            editable={this.state.isEditingAll}
+            isEdited={record.isEdited.b || false}
+            required
+            value={text}
+            onChange={this.onCellChange(index, "b")}
+            throwError={this.throwError}
+          />
+        )
+      },
+      {
+        title: "名字",
+        dataIndex: "b",
+        key: "b",
+        render: (text, record, index) => (
+          <StringEditCell
+            colName={"名字"}
+            editable={this.state.isEditingAll}
+            isEdited={record.isEdited.b || false}
+            required
+            value={text}
+            onChange={this.onCellChange(index, "b")}
+            throwError={this.throwError}
+          />
+        )
+      },
+      {
+        title: "名字",
+        dataIndex: "b",
+        key: "b",
+        render: (text, record, index) => (
+          <StringEditCell
+            colName={"名字"}
+            editable={this.state.isEditingAll}
+            isEdited={record.isEdited.b || false}
+            required
+            value={text}
+            onChange={this.onCellChange(index, "b")}
+            throwError={this.throwError}
+          /> 
+        )
+      },
+      {
+        title: "名字",
+        dataIndex: "b",
+        key: "b",
+        render: (text, record, index) => (
+          <StringEditCell
+            colName={"名字"}
+            editable={this.state.isEditingAll}
+            isEdited={record.isEdited.b || false}
+            required
+            value={text}
+            onChange={this.onCellChange(index, "b")}
+            throwError={this.throwError}
+          />
+        )
+      },
       // 只是用来占位占宽度的
       {
         key: "placeholder"

demo/demolist/Demo1101.js

@@ -92,15 +92,16 @@ class Demo16 extends Component {
 
   render() {
     return (
-      <MultiSelectTable
+      <Table
         className="expanded-table"
         columns={columns16}
         data={data16}
         onExpand={this.getData}
         expandedRowRender={this.expandedRowRender}
-        expandIconAsCell={true}
+        // expandIconAsCell={true}
-        collapsedIcon={<Icon type='uf-anglearrowpointingtoright'/>}
+        expandIconColumnIndex={2}
-        expandedIcon={<Icon type='uf-treearrow-down'/>}
+        // collapsedIcon={<Icon type='uf-anglearrowpointingtoright'/>}
+        // expandedIcon={<Icon type='uf-treearrow-down'/>}
       />
     );
   }

demo/demolist/Demo1401.js

@@ -83,6 +83,9 @@ class Demo30 extends Component {
           onBodyScroll={this.handleBodyScroll}
         />
       </div>
+        
+
+     
     );
   }
 }

demo/demolist/Demo1403.js

@@ -13,16 +13,71 @@ import BigData from "../../src/lib/bigData";
 import multiSelect from '../../src/lib/multiSelect';
 import filterColumn from '../../src/lib/filterColumn';
 
-let  ComplexTable = filterColumn(multiSelect(BigData(Table), Checkbox), Popover, Icon);
+let  ComplexTable = filterColumn(BigData(Table), Popover, Icon);
 
 const columns = [
+    {
+      className: 'u-table-multiSelect-column',
+      title: (
+        <Checkbox
+          className="table-checkbox"
+        />
+      ),
+      key: "checkbox",
+      dataIndex: "checkbox",
+      fixed:"left",
+      width: 49, 
+      render: (text, record, index) => {
+        const obj = {
+          children: <Checkbox
+                      key={index}
+                      className="table-checkbox"
+                    />,
+          props: {},
+        };
+        if (index === 0) {
+          obj.props.rowSpan = 100;
+        } else {
+          obj.props.rowSpan = 0;
+        }
+        obj.props.mergeEndIndex = 100;
+        // if (index < 50 ) {
+        //   obj.props.mergeEndIndex = 50;
+        // } else if (index > 50 && index < 100) {
+        //   obj.props.mergeEndIndex = 100;
+        // } else if (index > 100) {
+        //   obj.props.mergeEndIndex = 150;
+        // }
+        return obj;
+      }
+    },
     {
         title:'序号',
         dataIndex:'index',
         width:'80',
         key:'index',
+        fixed:'left',
         render:(text,record,index)=>{
-            return index
+            // return index
+            const obj = {
+              children: index,
+              props: {},
+            };
+            if (index === 0) {
+              obj.props.rowSpan = 100;
+            } else {
+              obj.props.rowSpan = 0;
+            }
+            obj.props.mergeEndIndex = 100;
+            // if (index < 50 ) {
+            //   obj.props.mergeEndIndex = 50;
+            // } else if (index > 50 && index < 100) {
+            //   obj.props.mergeEndIndex = 100;
+            // } else if (index > 100) {
+            //   obj.props.mergeEndIndex = 150;
+            // }
+            // mergeEndIndex: 滚动加载场景，合并表行时，设置合并结束位置的行 index 值
+            return obj;
         }
     },
     {
@@ -46,7 +101,7 @@ const columns = [
   { title: "年龄", dataIndex: "c", key: "c", width: 200 }
 ];
 
-const data = [ ...new Array(10000) ].map((e, i) => {
+const data = [ ...new Array(100) ].map((e, i) => {
     const rs = { a: i + 'a', b: i + 'b', c: i + 'c', d: i + 'd', key: i };
     if(i%3==0){
         rs.b = '女';

demo/demolist/Demo1404.js

@@ -47,6 +47,9 @@ const data = [ ...new Array(1000) ].map((e, i) => {
     if(i%3==0){
         rs.b = '女';
         rs.children = [];
+        // for(let subi=0;subi<3;subi++){
+        //   rs.children.push({a: i +subi + 'asub', b: i +subi + 'bsub', c: i + subi +'csub', d: i + subi +'dsub', key: i+ `${subi} sub`});
+        // }
         for(let subi=0;subi<3;subi++){
           rs.children.push({a: i +subi + 'asub', b: i +subi + 'bsub', c: i + subi +'csub', d: i + subi +'dsub', key: i+ `${subi} sub`});
           rs.children[subi].children = []

src/lib/bigData.js

@@ -558,6 +558,10 @@ export default function bigData(Table) {
         lazyLoad.sufHeight = this.getSumHeight(endIndex, data.length);
       }
       // console.log('*******expandedRowKeys*****'+expandedRowKeys);
+      // console.log(
+      //   "**startIndex**" , startIndex,
+      //   "**endIndex**" , endIndex
+      // );
       return (
         <Table
           {...this.props}