表格编辑-行弹框编辑完成

demo/demolist/Demo0501.js

@@ -497,7 +497,7 @@ class Demo0501 extends Component {
     const { dataSource } = this.state;
     const columns = this.columns;
     return (
-      <div className="demo0501">
+      <div className="demo0501 u-editable-table">
         <Table
           data={dataSource}
           columns={columns}

demo/demolist/Demo0501.scss

@@ -31,7 +31,6 @@
     box-sizing: border-box;
     line-height: 20px;
     border-radius: 3px;
-    padding-left: 0
   }
 
   .required {

demo/demolist/Demo0503.js

@@ -0,0 +1,575 @@
+/**
+ *
+ * @title 行编辑 - 弹框编辑
+ * @parent 编辑 Editor
+ * @description 以弹框形式以对行进行编辑的表格
+ *
+ */
+
+import React, { Component, PureComponent } from "react";
+import Table from "../../src";
+import {
+  Select, Form, FormControl, Button, Icon,
+  Tooltip, Modal, FormGroup, Label, Row, Col
+} from "tinper-bee";
+const Option = Select.Option;
+import { RefTreeWithInput } from "ref-tree";
+
+function handleFormValueChange(WarpCompProps, field, allFields) {
+  const { onChange, throwError } = WarpCompProps;
+  if (field.value === "") return throwError && throwError(true);
+  throwError && throwError(false);
+  onChange && onChange(field.value);
+}
+
+const StringEditCell = Form.createForm({
+  onValuesChange: handleFormValueChange
+})(PureStringEditCell);
+
+function PureStringEditCell(props) {
+  const { getFieldProps, getFieldError } = props.form;
+  const { value, required } = props;
+  let cls = "editable-cell";
+  if (required) cls += " required";
+  return (
+    <div className={cls}>
+      <FormControl
+        {...getFieldProps("value", {
+          initialValue: value,
+          validateTrigger: "onBlur",
+          rules: [
+            {
+              required: true,
+              message: (
+                <Tooltip
+                  inverse
+                  className="u-editable-table-tp"
+                  placement="bottom"
+                  overlay={
+                    <div className="tp-content">
+                      {"请输入" + props.colName}
+                    </div>
+                  }
+                >
+                  <Icon className="uf-exc-t required-icon" />
+                </Tooltip>
+              )
+            }
+          ]
+        })}
+      />
+      <span className="error">{getFieldError("value")}</span>
+    </div>
+  );
+}
+
+const SELECT_SOURCE = ["男", "女"];
+
+class SelectEditCell extends PureComponent {
+  constructor(props, context) {
+    super(props);
+  }
+
+  handleSelect = value => {
+    this.props.onChange && this.props.onChange(value);
+  };
+
+  render() {
+    return (
+      <div className="editable-cell">
+          <Select value={this.props.value} onSelect={this.handleSelect}>
+            {SELECT_SOURCE.map((item, index) => (
+              <Option key={index} value={item}>
+                {item}
+              </Option>
+            ))}
+          </Select>
+      </div>
+    );
+  }
+}
+
+const option = {
+  title: "树",
+  searchable: true,
+  multiple: false,
+  param: {
+    refCode: "neworganizition_tree"
+  },
+  checkStrictly: true,
+  disabled: false,
+  nodeDisplay: record => {
+    return record.refname;
+  },
+  displayField: record => {
+    return record.refname;
+  }, //显示内容的键
+  valueField: "refpk", //真实 value 的键
+  refModelUrl: {
+    treeUrl: "https://mock.yonyoucloud.com/mock/358/blobRefTree",
+    treeUrl: "/pap_basedoc/common-ref/blobRefTree"
+  },
+  matchUrl: "/pap_basedoc/common-ref/matchPKRefJSON",
+  filterUrl: "/pap_basedoc/common-ref/filterRefJSON",
+  lazyModal: false,
+  strictMode: true,
+  lang: "zh_CN",
+  treeData: [
+    {
+      code: "org1",
+      children: [
+        {
+          code: "bj",
+          entityType: "mainEntity",
+          name: "北京总部-简",
+          pid: "a4cf0601-51e6-4012-9967-b7a64a4b2d47",
+          refcode: "bj",
+          refpk: "5305416e-e7b4-4051-90bd-12d12942295b",
+          id: "5305416e-e7b4-4051-90bd-12d12942295b",
+          isLeaf: "true",
+          refname: "北京总部-简"
+        },
+        {
+          code: "xd",
+          entityType: "mainEntity",
+          name: "新道-简",
+          pid: "a4cf0601-51e6-4012-9967-b7a64a4b2d47",
+          refcode: "xd",
+          refpk: "b691afff-ea83-4a3f-affa-beb2be9cba52",
+          id: "b691afff-ea83-4a3f-affa-beb2be9cba52",
+          isLeaf: "true",
+          refname: "新道-简"
+        },
+        {
+          code: "yy3",
+          entityType: "mainEntity",
+          name: "test3",
+          pid: "a4cf0601-51e6-4012-9967-b7a64a4b2d47",
+          refcode: "yy3",
+          refpk: "e75694d9-7c00-4e9e-9573-d29465ae79a9",
+          id: "e75694d9-7c00-4e9e-9573-d29465ae79a9",
+          isLeaf: "true",
+          refname: "test3"
+        },
+        {
+          code: "yy1",
+          entityType: "mainEntity",
+          name: "test1",
+          pid: "a4cf0601-51e6-4012-9967-b7a64a4b2d47",
+          refcode: "yy1",
+          refpk: "fd32ceeb-57a8-4f44-816e-fa660f5715ab",
+          id: "fd32ceeb-57a8-4f44-816e-fa660f5715ab",
+          isLeaf: "true",
+          refname: "test1"
+        },
+        {
+          code: "dept2",
+          children: [
+            {
+              code: "cs",
+              entityType: "subEntity",
+              organization_id: "a4cf0601-51e6-4012-9967-b7a64a4b2d47",
+              name: "测试部-简",
+              pid: "0ebbb6d8-250a-4d1d-a019-7ae951629a2c",
+              refcode: "cs",
+              refpk: "cc43a66a-438d-4106-937f-bec44406f771",
+              id: "cc43a66a-438d-4106-937f-bec44406f771",
+              isLeaf: "true",
+              refname: "测试部-简"
+            },
+            {
+              code: "qd",
+              entityType: "subEntity",
+              organization_id: "a4cf0601-51e6-4012-9967-b7a64a4b2d47",
+              name: "前端部-简",
+              pid: "0ebbb6d8-250a-4d1d-a019-7ae951629a2c",
+              refcode: "qd",
+              refpk: "73a10edd-aae8-4f31-af25-1f48f0a3b344",
+              id: "73a10edd-aae8-4f31-af25-1f48f0a3b344",
+              isLeaf: "true",
+              refname: "前端部-简"
+            }
+          ],
+          entityType: "subEntity",
+          organization_id: "a4cf0601-51e6-4012-9967-b7a64a4b2d47",
+          name: "生产处",
+          refcode: "dept2",
+          refpk: "0ebbb6d8-250a-4d1d-a019-7ae951629a2c",
+          id: "0ebbb6d8-250a-4d1d-a019-7ae951629a2c",
+          refname: "生产处"
+        },
+        {
+          code: "dept1",
+          children: [
+            {
+              code: "dept1_2",
+              entityType: "subEntity",
+              organization_id: "a4cf0601-51e6-4012-9967-b7a64a4b2d47",
+              name: "财务二科",
+              pid: "95b60f35-ed0b-454e-b948-fb45ae30b911",
+              refcode: "dept1_2",
+              refpk: "55b7fff1-6579-4ca9-92b7-3271d288b9f3",
+              id: "55b7fff1-6579-4ca9-92b7-3271d288b9f3",
+              isLeaf: "true",
+              refname: "财务二科"
+            },
+            {
+              code: "dept1_1",
+              entityType: "subEntity",
+              organization_id: "a4cf0601-51e6-4012-9967-b7a64a4b2d47",
+              name: "财务一科",
+              pid: "95b60f35-ed0b-454e-b948-fb45ae30b911",
+              refcode: "dept1_1",
+              refpk: "9711d912-3184-4063-90c5-1facc727813c",
+              id: "9711d912-3184-4063-90c5-1facc727813c",
+              isLeaf: "true",
+              refname: "财务一科"
+            }
+          ],
+          entityType: "subEntity",
+          organization_id: "a4cf0601-51e6-4012-9967-b7a64a4b2d47",
+          name: "财务处",
+          refcode: "dept1",
+          refpk: "95b60f35-ed0b-454e-b948-fb45ae30b911",
+          id: "95b60f35-ed0b-454e-b948-fb45ae30b911",
+          refname: "财务处"
+        }
+      ],
+      entityType: "mainEntity",
+      name: "用友集团",
+      refcode: "org1",
+      refpk: "a4cf0601-51e6-4012-9967-b7a64a4b2d47",
+      id: "a4cf0601-51e6-4012-9967-b7a64a4b2d47",
+      refname: "用友集团"
+    }
+  ]
+};
+
+const RefEditCell = Form.createForm()(
+  class RefComponentWarpper extends PureComponent {
+    constructor(props, context) {
+      super(props);
+    }
+
+    handleSelect = values => {
+      const { form, throwError, onChange } = this.props
+      if (form.getFieldError("refValue")) return throwError && throwError(true);
+      throwError && throwError(false);
+      onChange && onChange(values[0]);
+    };
+
+    render() {
+      const { getFieldProps, getFieldError } = this.props.form;
+      const { value, required } = this.props;
+      let cls = "editable-cell";
+      if (required) cls += " required";
+      return (
+        <div className={cls}>
+          <RefTreeWithInput
+            {...option}
+            onSave={this.handleSelect}
+            getRefTreeData={this.getRefTreeData}
+            {...getFieldProps("refValue", {
+              initialValue: JSON.stringify(value),
+              rules: [
+                {
+                  message: (
+                    <Tooltip
+                      inverse
+                      className="u-editable-table-tp"
+                      placement="bottom"
+                      overlay={
+                        <div className="tp-content">
+                          {"请输入" + this.props.colName}
+                        </div>
+                      }
+                    >
+                      <Icon className="uf-exc-t required-icon" />
+                    </Tooltip>
+                  ),
+                  pattern: /[^{"refname":"","refpk":""}|{"refpk":"","refname":""}]/
+                }
+              ]
+            })}
+          />
+          <span className="error">{getFieldError("refValue")}</span>
+        </div>
+      );
+    }
+  }
+);
+
+class EditModal extends Component {
+  constructor(props, context) {
+    super(props);
+    this.state = {
+      data: this.props.data,
+      errorEditFlag: false
+    };
+
+    // 属性名对应 columns 属性中的 key 值
+    this.renderElm = {
+      b: (record, index) => (
+        <StringEditCell
+          colName={"名字"}
+          required={true}
+          value={record.b}
+          onChange={this.onFieldChange("b")}
+          throwError={this.throwError}
+        />
+      ),
+
+      c: (record, index) => (
+        <SelectEditCell
+          value={record.c}
+          onChange={this.onFieldChange("c")}
+        />
+      ),
+      d: (record, index) => (
+        <RefEditCell
+          colName={"部门"}
+          required={true}
+          value={record.d}
+          onChange={this.onFieldChange("d")}
+          throwError={this.throwError}
+        />
+      )
+    }
+  }
+
+  onFieldChange = field => value => {
+    let data = { ...this.state.data };
+    data[field] = value;
+    this.setState({ data });
+  }
+
+  submitChange = () => {
+    if (this.state.errorEditFlag) return;
+    const { onSubmit, onHide, currentIndex } = this.props;
+    onSubmit && onSubmit(this.state.data, currentIndex);
+    onHide && onHide();
+  }
+
+  throwError = isError => {
+    if (isError !== this.state.errorEditFlag)
+      this.setState({ errorEditFlag: isError });
+  };
+
+  render() {
+    const { show, onHide, columns, currentIndex } = this.props;
+    const { data } = this.state;
+    return (
+      <Modal
+        show={show}
+        onHide={onHide}
+        style={{ width: 700 }}
+        className="demo0503-m-b"
+      >
+        <Modal.Header closeButton>
+          <Modal.Title>编辑行</Modal.Title>
+        </Modal.Header>
+        <Modal.Body >
+          <Row style={{ width: 660, margin: "0 auto" }}>
+            {
+              columns.map((item, index) => {
+                return (
+                  <Col sm={6} md={6} lg={6} style={{ padding: 0 }} key={index}>
+                    <FormGroup>
+                      <Label>{item.title}</Label>
+                      {this.renderElm[item.key] &&
+                        this.renderElm[item.key](
+                          data,
+                          currentIndex
+                        )}
+                      {!this.renderElm[item.key] && (
+                        <div className="editable-cell">
+                          <FormControl
+                            defaultValue={data[item.dataIndex]}
+                            disabled={true}
+                          />
+                        </div>
+                      )}
+                    </FormGroup>
+                  </Col>
+                );
+              })
+            }
+          </Row>
+        </Modal.Body>
+        <Modal.Footer style={{textAlign: "center"}}>
+          <Button
+            colors="secondary"
+            style={{ marginRight: 15 }}
+            onClick={onHide}
+          >
+            取消
+          </Button>
+          <Button colors="primary" onClick={this.submitChange}>
+            确认
+          </Button>
+        </Modal.Footer>
+      </Modal>
+    );
+  }
+}
+
+let dataSource = [
+  {
+    a: "ASVAL_201903280005",
+    b: "小张",
+    c: "男",
+    d: {
+      code: "dept1_2",
+      entityType: "subEntity",
+      organization_id: "a4cf0601-51e6-4012-9967-b7a64a4b2d47",
+      name: "财务二科",
+      pid: "95b60f35-ed0b-454e-b948-fb45ae30b911",
+      refcode: "dept1_2",
+      refpk: "55b7fff1-6579-4ca9-92b7-3271d288b9f3",
+      id: "55b7fff1-6579-4ca9-92b7-3271d288b9f3",
+      isLeaf: "true",
+      refname: "财务二科"
+    },
+    key: "1"
+  },
+  {
+    a: "ASVAL_201903200004",
+    b: "小明",
+    c: "男",
+    d: {
+      code: "dept1_2",
+      entityType: "subEntity",
+      organization_id: "a4cf0601-51e6-4012-9967-b7a64a4b2d47",
+      name: "财务二科",
+      pid: "95b60f35-ed0b-454e-b948-fb45ae30b911",
+      refcode: "dept1_2",
+      refpk: "55b7fff1-6579-4ca9-92b7-3271d288b9f3",
+      id: "55b7fff1-6579-4ca9-92b7-3271d288b9f3",
+      isLeaf: "true",
+      refname: "财务二科"
+    },
+    key: "2"
+  },
+  {
+    a: "ASVAL_201903120002",
+    b: "小红",
+    c: "女",
+    d: {
+      code: "dept1_1",
+      entityType: "subEntity",
+      organization_id: "a4cf0601-51e6-4012-9967-b7a64a4b2d47",
+      name: "财务一科",
+      pid: "95b60f35-ed0b-454e-b948-fb45ae30b911",
+      refcode: "dept1_1",
+      refpk: "9711d912-3184-4063-90c5-1facc727813c",
+      id: "9711d912-3184-4063-90c5-1facc727813c",
+      isLeaf: "true",
+      refname: "财务一科"
+    },
+    key: "3"
+  }
+];
+
+class Demo0503 extends Component {
+  constructor(props, context) {
+    super(props);
+    // 编辑态下每个单元格对应的编辑模式组件写在 EditModal 组件中，以 key 值对应
+    this.columns = [
+      {
+        title: "员工编号",
+        dataIndex: "a",
+        key: "a"
+      },
+      {
+        title: "名字",
+        dataIndex: "b",
+        key: "b"
+      },
+      {
+        title: "性别",
+        dataIndex: "c",
+        key: "c",
+        width: 100
+      },
+      {
+        title: "部门",
+        dataIndex: "d",
+        key: "d",
+        width: 215,
+        render: (text, record, index) => record.d.name
+      }
+    ];
+
+    this.state = {
+      dataSource: dataSource,
+      isEditing: false,
+      currentIndex: null
+    };
+  }
+
+  edit = () => {
+    if (this.state.currentIndex === null) return;
+    this.setState({ isEditing: true });
+  };
+
+  abortEdit = () => {
+    this.setState({ isEditing: false });
+  };
+
+  commitChange = (editedRowData, rowIndex) => {
+    console.log(editedRowData)
+    console.log(rowIndex)
+    let dataSource = [...this.state.dataSource];
+    dataSource[rowIndex] = editedRowData;
+    this.setState({ dataSource });
+  };
+
+  handleRowHover = (index, record) => {
+    this.setState({ currentIndex: index });
+  };
+
+  hideEditModal = () => {
+    this.setState({ isEditing: false });
+  }
+
+  renderRowHover = () => {
+    return (
+      <div className={"opt-btns"}>
+        <Button colors="dark" onClick={this.edit}>
+          编辑
+        </Button>
+      </div>
+    );
+  };
+
+
+  render() {
+    const { dataSource, isEditing, currentIndex } = this.state;
+    const columns = this.columns;
+    return (
+      <div className="demo0503 u-editable-table">
+        <Table
+          data={dataSource}
+          columns={columns}
+          height={40}
+          onRowHover={this.handleRowHover}
+          hoverContent={this.renderRowHover}
+        />
+        {
+          isEditing ? (
+            <EditModal
+              show={isEditing}
+              onHide={this.hideEditModal}
+              columns={columns}
+              data={dataSource[currentIndex]}
+              onSubmit={this.commitChange}
+              currentIndex={currentIndex}
+            />
+          ) : null
+        }
+      </div>
+    );
+  }
+}
+
+export default Demo0503;

demo/demolist/Demo0503.scss

@@ -0,0 +1,54 @@
+.demo0503-m-b {
+  .u-form-group {
+    overflow: hidden;
+  }
+  .u-form-control {
+    font-size: 12px;
+  }
+
+  .u-modal-title {
+    text-align: center;
+  }
+
+  .editable-cell {
+    display: block;
+    float: left;
+    width: 220px;
+    padding-right: 25px;
+  }
+
+  .u-label {
+    display: block;
+    float: left;
+    text-align: right;
+    width: 110px;
+    box-sizing: border-box;
+    padding-right: 10px;
+    font-size: 12px;
+    height: 32px;
+    line-height: 32px;
+  }
+  .required {
+    &::before {
+      content: "*";
+      position: absolute;
+      top: 9px;
+      left: -9px;
+      color: red;
+      font-size: 18px;
+    }
+  }
+  .required-icon {
+    position: absolute;
+    top: 2px;
+    color: #F44336;
+    font-size: 20px;
+  }
+}
+
+.u-editable-table-tp {
+  z-index: 9999 !important;
+  .tp-content {
+    color: #F44336;
+  }
+}

dist/demo.css

@@ -688,8 +688,7 @@
 .demo0501 .u-table .editable-cell-text-wrapper {
   box-sizing: border-box;
   line-height: 20px;
-  border-radius: 3px;
+  border-radius: 3px; }
-  padding-left: 0; }
 
 .demo0501 .u-table .required {
   margin-left: 10px;
@@ -755,6 +754,51 @@
 .u-editable-table-tp .tp-content {
   color: #F44336; }
 
+.demo0503-m-b .u-form-group {
+  overflow: hidden; }
+
+.demo0503-m-b .u-form-control {
+  font-size: 12px; }
+
+.demo0503-m-b .u-modal-title {
+  text-align: center; }
+
+.demo0503-m-b .editable-cell {
+  display: block;
+  float: left;
+  width: 220px;
+  padding-right: 25px; }
+
+.demo0503-m-b .u-label {
+  display: block;
+  float: left;
+  text-align: right;
+  width: 110px;
+  box-sizing: border-box;
+  padding-right: 10px;
+  font-size: 12px;
+  height: 32px;
+  line-height: 32px; }
+
+.demo0503-m-b .required::before {
+  content: "*";
+  position: absolute;
+  top: 9px;
+  left: -9px;
+  color: red;
+  font-size: 18px; }
+
+.demo0503-m-b .required-icon {
+  position: absolute;
+  top: 2px;
+  color: #F44336;
+  font-size: 20px; }
+
+.u-editable-table-tp {
+  z-index: 9999 !important; }
+  .u-editable-table-tp .tp-content {
+    color: #F44336; }
+
 th .drop-menu .uf {
   font-size: 12px;
   visibility: hidden;