Merge branch 'master' into positec

king

2023-12-24 3e13e3e61854671fce6aac45679e1b7252126105

 src/tabviews/custom/components/card/double-data-card/index.jsx

@@ -229,6 +229,8 @@
    if (config.setting.onload === 'true') {
      this.initExec()
    }

    this.autoExec()
  }

  shouldComponentUpdate (nextProps, nextState) {
@@ -319,6 +321,25 @@
      setTimeout(() => {
        this.loadData()
      }, config.setting.delay || 0)
    }
  }

  autoExec = (times) => {
    const { config } = this.state

    if (!config.wrap.autoExec) return

    let btn = document.getElementById('button' + config.wrap.autoExec)

    this.autoTimer && clearTimeout(this.autoTimer)

    if (btn) {
      MKEmitter.emit('triggerBtnId', config.wrap.autoExec, [])
    } else if (!times || times < 20) {
      times = times ? times + 1 : 1
      this.autoTimer = setTimeout(() => {
        this.autoExec(times)
      }, 1000)
    }
  }

@@ -1193,6 +1214,20 @@
                    subClass = opens.indexOf(item.key) > -1 ? 'mk-unfold' : 'mk-collapse'
                    unfold = opens.indexOf(item.key) > -1
                  }

                  if (!unfold && item.children.length > 5) {
                    return (
                      <Col key={index} span={card.setting.width} style={card.wStyle}>
                        <div className={className} style={wrapStyle}>
                          <CardItem card={card} cards={config} data={item} onDoubleClick={() => this.onDoubleClick(item.key, subClass)} onClick={() => {this.changeCard(item.key, item, subClass)}}>
                            <span className="circle-select"></span>
                            {card.setting.controlIcon === 'left' ? <PlusSquareOutlined className={subClass} onClick={(e) => this.changeUnfold(e, item.key, subClass)}/> : null}
                            {card.setting.controlIcon === 'right' ? <UpOutlined className={subClass} onClick={(e) => this.changeUnfold(e, item.key, subClass)}/> : null}
                          </CardItem>
                        </div>
                      </Col>
                    )
                  }
                }

                return (