Merge branch 'positec' into dms

king

2025-02-06 d1cd5af5adb53e91efdd278328e1b6f8ad834fb5

 src/templates/sharecomponent/columncomponent/dragcolumn/index.jsx

@@ -62,7 +62,7 @@
      newcard.field = ''
      newcard.Hide = 'false'
      newcard.contrastType = 'static'
      newcard.IsSort = 'true'
      newcard.IsSort = 'false'
      newcard.type = item.subType
      newcard.Width = item.subType === 'number' ? 80 : 120
      if (item.subType === 'colspan') {
@@ -131,6 +131,23 @@
          {i === 0 && column.length > 0 && setting.tableType === 'radio' ?
            <div className="page-card" style={{flex: 60}}></div> : null
          }
          {i === 0 && gridBtn && gridBtn.display && gridBtn.position === 'left' ?
            <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
              <div className="mk-popover-control">
                <EditOutlined className="edit" onClick={handleGridBtn}/>
              </div>
            } trigger="hover">
              <div className="page-card" style={{flex: gridBtn.Width}}>
                <div style={{cursor: 'default'}}>
                  <span className="ant-table-header-column">
                    <div className="ant-table-column-sorters" title={gridBtn.label} style={{textAlign: gridBtn.Align}}>
                      <span className="ant-table-column-title">{gridBtn.label}</span>
                    </div>
                  </span>
                </div>
              </div>
            </Popover> : null
          }
          {column.map(card => (
            <Card
              key={card.uuid}
@@ -144,7 +161,7 @@
              findCard={findCard}
            />
          ))}
          {i === (columns.length - 1) && gridBtn && gridBtn.display ?
          {i === (columns.length - 1) && gridBtn && gridBtn.display && gridBtn.position !== 'left' ?
            <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
              <div className="mk-popover-control">
                <EditOutlined className="edit" onClick={handleGridBtn}/>