Merge branch 'develop'

king

2023-12-24 43008f1240d6568a3364721bb01fc7e31b33d147

 src/tabviews/custom/components/card/cardcellList/index.jsx

@@ -1012,10 +1012,10 @@
          _style_ = {..._style_, ...card.wrapStyle}
        }
  
        let MkButton = null
  
        if (['exec', 'prompt', 'pop', 'form'].includes(card.OpenType)) {
          contents.push(
            <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
              <NormalButton
          MkButton = <NormalButton
                btn={card}
                BID={data.$$BID}
                BData={data.$$BData || ''}
@@ -1024,12 +1024,8 @@
                columns={cards.columns}
                selectedData={_data}
              />
            </div>
          )
        } else if (card.OpenType === 'excelIn') {
          contents.push(
            <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
              <ExcelInButton
          MkButton = <ExcelInButton
                btn={card}
                BID={data.$$BID}
                BData={data.$$BData || ''}
@@ -1037,12 +1033,8 @@
                setting={cards.setting}
                selectedData={_data}
              />
            </div>
          )
        } else if (card.OpenType === 'excelOut') {
          contents.push(
            <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
              <ExcelOutButton
          MkButton = <ExcelOutButton
                btn={card}
                BID={data.$$BID}
                BData={data.$$BData || ''}
@@ -1050,12 +1042,8 @@
                setting={cards.setting}
                selectedData={_data}
              />
            </div>
          )
        } else if (card.OpenType === 'popview') {
          contents.push(
            <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
              <PopupButton
          MkButton = <PopupButton
                btn={card}
                BID={data.$$BID}
                BData={data.$$BData || ''}
@@ -1063,37 +1051,25 @@
                setting={cards.setting}
                selectedData={_data}
              />
            </div>
          )
        } else if (card.OpenType === 'tab') {
          contents.push(
            <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
              <TabButton
          MkButton = <TabButton
                btn={card}
                BID={data.$$BID}
                BData={data.$$BData || ''}
                disabled={_disabled}
                selectedData={_data}
              />
            </div>
          )
        } else if (card.OpenType === 'innerpage') {
          contents.push(
            <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
              <NewPageButton
          MkButton = <NewPageButton
                btn={card}
                BID={data.$$BID}
                BData={data.$$BData || ''}
                disabled={_disabled}
                selectedData={_data}
              />
            </div>
          )
        } else if (card.OpenType === 'funcbutton') {
          if (card.funcType === 'changeuser' || card.funcType === 'closetab') {
            contents.push(
              <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
                <ChangeUserButton
            MkButton = <ChangeUserButton
                  btn={card}
                  BID={data.$$BID}
                  BData={data.$$BData || ''}
@@ -1101,12 +1077,8 @@
                  setting={cards.setting}
                  selectedData={_data}
                />
              </div>
            )
          } else if (card.funcType === 'print') {
            contents.push(
              <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
                <PrintButton
            MkButton = <PrintButton
                  btn={card}
                  BID={data.$$BID}
                  BData={data.$$BData || ''}
@@ -1115,43 +1087,37 @@
                  columns={cards.columns}
                  selectedData={_data}
                />
              </div>
            )
          } else if (card.funcType === 'megvii') {
            contents.push(
              <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
                <FuncMegvii
            MkButton = <FuncMegvii
                  btn={card}
                  BID={data.$$BID}
                  disabled={_disabled}
                  setting={cards.setting}
                  selectedData={_data}
                />
              </div>
            )
          } else if (card.funcType === 'filezip') {
            contents.push(
              <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
                <FuncZip
            MkButton = <FuncZip
                  btn={card}
                  BID={data.$$BID}
                  disabled={_disabled}
                  setting={cards.setting}
                  selectedData={_data}
                />
              </div>
            )
          } else if (card.funcType === 'addline' || card.funcType === 'delline') {
            contents.push(
              <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
                <EditLine
            MkButton = <EditLine
                  btn={card}
                  disabled={_disabled}
                  selectedData={_data}
                />
          }
        }

        if (MkButton) {
          contents.push(
            <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
              {MkButton}
              </div>
            )
          }
        }
      }
    })