Merge branch 'develop'

king

2023-07-12 f724c64b419f148985c0bd5a1153e3fc7d84b9e6

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

@@ -93,6 +93,14 @@
        }
      }

      if (item.style.clear === 'left') {
        item.wStyle = {clear: 'left'}
      } else if (item.style.clear === 'right') {
        item.wStyle = {float: 'right'}
      }

      delete item.style.clear

      if (item.$cardType !== 'extendCard') {
        _card = item
      } else if (!_card) {
@@ -320,10 +328,6 @@
      })
    } else {
      this.loadData(id)
    }

    if (position === 'popclose') { // 执行启动弹窗的按钮所选择的刷新项
      btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
    }
  }

@@ -1042,7 +1046,7 @@
          <div className={`data-zoom ${config.wrap.wrapClass}`} style={config.wrap.minWidth ? {minWidth: config.wrap.minWidth} : null}>
            <Row className={'card-row-list '}>
              {precards.map((item, index) => (
                <Col key={'pre' + index} className="extend-card" span={item.setting.width || 6}>
                <Col key={'pre' + index} className="extend-card" style={item.wStyle} span={item.setting.width || 6}>
                  {item.setting.cardRole === 'header' ? <TableHeader card={item} data={extendData} refresh={this.refreshByHeader}>
                    {item.setting.checkAll === 'show' ? <span onClick={this.checkAll} className={'circle-select' + checkAll}></span> : null}
                  </TableHeader> : <CardItem card={item} cards={config} data={extendData}>
@@ -1074,7 +1078,7 @@
                }

                return (
                  <Col key={index} span={card.setting.width}>
                  <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(index, subClass)} onClick={() => {this.changeCard(index, item, subClass)}}>
                        <span className="circle-select"></span>
@@ -1091,7 +1095,7 @@
                )
              })}
              {nextcards.map((item, index) => (
                <Col key={'next' + index} className="extend-card" span={item.setting.width || 6}>
                <Col key={'next' + index} className="extend-card" style={item.wStyle} span={item.setting.width || 6}>
                  {item.setting.cardRole === 'header' ? <TableHeader card={item} data={extendData} refresh={this.refreshByHeader}>
                    {item.setting.checkAll === 'show' ? <span onClick={this.checkAll} className={'circle-select' + checkAll}></span> : null}
                  </TableHeader> : <CardItem card={item} cards={config} data={extendData}>