2021-01-18

king

2021-01-18 fe098b477db95ac7053936abc8a823905de7c21d

2021-01-18

 src/tabviews/custom/components/share/normalTable/index.jsx

@@ -248,6 +248,10 @@
        content = md5(content)
      }

      if (col.rowspan === 'true') {
        resProps.rowSpan = record['$$' + col.field]
      }

      if (col.linkThdMenu || col.linkurl) {
        content = (
          <div>

 src/tabviews/zshare/normalTable/index.jsx

@@ -182,7 +182,7 @@
    if (rowspans.length === 0) {
      rowspans = null
    }

    
    this.setState({
      columns: _columns,
      pageSize: pageSize ? pageSize : 10,
@@ -481,6 +481,21 @@
      }

      if (item.linkThdMenu || item.linkurl) {
        if (item.rowspan === 'true') {
          return {
            children: (
              <div className={className}>
                <div className="baseboard link-menu" onDoubleClick={(e) => this.triggerLink(e, item, record)}></div>
                <div className="content link-menu" onDoubleClick={(e) => this.triggerLink(e, item, record)}>
                  {content}
                </div>
              </div>
            ),
            props: {
              rowSpan: record['$$' + item.field],
            }
          }
        }
        return (
          <div className={className}>
            <div className="baseboard link-menu" onDoubleClick={(e) => this.triggerLink(e, item, record)}></div>
@@ -490,6 +505,21 @@
          </div>
        )
      } else {
        if (item.rowspan === 'true') {
          return {
            children: (
              <div className={className}>
                <div className="baseboard"></div>
                <div className="content">
                  {content}
                </div>
              </div>
            ),
            props: {
              rowSpan: record['$$' + item.field],
            }
          }
        }
        return (
          <div className={className}>
            <div className="baseboard"></div>