Merge branch 'develop'

king

2024-05-21 66bdbc1df92e8ec4a5108a4e0323e25a7b9ff8f8

 src/tabviews/zshare/normalTable/index.jsx

@@ -343,6 +343,7 @@
  triggerLink = (e, item, record) => {
    e.stopPropagation()

    if (item.linkThdMenu) {
    let __param = {
      $BID: record.$$uuid
    }
@@ -352,13 +353,11 @@
      __param.$searchval = record[item.field] || ''
    }

    if (item.linkfields && item.linkfields.length > 0) {
      item.linkfields.forEach(field => {
        __param[field] = record[field] || ''
      Object.keys(record).forEach(key => {
        if (/^\$/.test(key)) return
        __param[key] = record[key]
      })
    }

    if (item.linkThdMenu) {
      let tabmenu = item.linkThdMenu
      tabmenu.param = __param

@@ -741,6 +740,7 @@
        </div>
      )
    } else if (item.type === 'action') {
      let lid = (record.$$uuid || '') + (record.$Index || '')
      return (
        <div className="action-col">
          {item.operations.map(btn => {
@@ -750,6 +750,7 @@
                  key={btn.uuid}
                  btn={btn}
                  BID={record.$$BID}
                  LID={lid}
                  disabled={record.$disabled}
                  selectedData={[record]}
                  BData={this.props.BData}
@@ -763,6 +764,7 @@
                  key={btn.uuid}
                  btn={btn}
                  BID={record.$$BID}
                  LID={lid}
                  disabled={record.$disabled}
                  selectedData={[record]}
                  BData={this.props.BData}
@@ -777,6 +779,7 @@
                  disabled={record.$disabled}
                  selectedData={[record]}
                  BID={record.$$BID}
                  LID={lid}
                  BData={this.props.BData}
                  MenuID={this.props.MenuID}
                />
@@ -787,6 +790,7 @@
                  key={btn.uuid}
                  btn={btn}
                  BID={record.$$BID}
                  LID={lid}
                  disabled={record.$disabled}
                  selectedData={[record]}
                  BData={this.props.BData}
@@ -1212,7 +1216,7 @@
    if (!setting.doubleClick) return
    if (record.$disabled) return

    MKEmitter.emit('triggerBtnId', setting.doubleClick, [record], 'linkbtn')
    MKEmitter.emit('triggerBtnId', setting.doubleClick, [record], 'linkbtn', (record.$$uuid || '') + (record.$Index || ''))
  }

  render() {