king
2023-06-14 08cce3334a2dc81d690b518136b0aaea64e48b0b
src/tabviews/zshare/settingcomponent/index.jsx
@@ -14,7 +14,6 @@
class CustomSetting extends Component {
  static propTpyes = {
    dict: PropTypes.object,           // 字典表
    config: PropTypes.object,         // 页面配置信息
    shortcuts: PropTypes.any,         // 自定义设置
  }
@@ -144,29 +143,36 @@
            })
          })
        } else if (item.type === 'table') {
          item.cols && item.cols.forEach(col => {
            if (col.type !== 'action') return
            col.elements && col.elements.forEach(cell => {
              cell.$expanded = false
              if (cell.OpenType === 'funcbutton' && cell.funcType === 'print') {
          let loopCol = (cols) => {
            cols.forEach(col => {
              if (col.type === 'colspan') {
                loopCol(col.subcols)
              } else if (col.type === 'custom') {
                col.elements.forEach(cell => {
                  if (cell.eleType !== 'button') return
                  cell.$expanded = false
                  if (cell.OpenType === 'funcbutton' && cell.funcType === 'print') {
                cell.$port = cell.verify ? cell.verify.linkUrl : ''
                if (cell.verify && cell.verify.printerTypeList && cell.verify.printerTypeList.length > 0) {
                  cell.verify.printerTypeList = cell.verify.printerTypeList.map(_cell => {
                    _cell.uuid = _cell.uuid || _cell.key
                    _cell.parentId = cell.uuid
                    _cell.$port = cell.$port
                    cell.$port = cell.verify ? cell.verify.linkUrl : ''
                    if (cell.verify && cell.verify.printerTypeList && cell.verify.printerTypeList.length > 0) {
                      cell.verify.printerTypeList = cell.verify.printerTypeList.map(_cell => {
                        _cell.uuid = _cell.uuid || _cell.key
                        _cell.parentId = cell.uuid
                        _cell.$port = cell.$port
                    return _cell
                  })
                  cell.$expanded = true
                }
                printbtns.push(cell)
                        return _cell
                      })
                      cell.$expanded = true
                    }
                    printbtns.push(cell)
                  }
                  _comp.action.push({...cell, $line: true, ...(userConfig[cell.uuid] || {})})
                })
              }
              _comp.action.push({...cell, $line: true, ...(userConfig[cell.uuid] || {})})
            })
          })
          }
          loopCol(item.cols)
        } 
        
        if (_comp.action.length > 0) {
@@ -525,9 +531,9 @@
          visible={visible}
          onCancel={() => { this.setState({ visible: false }) }}
          footer={[
            <Button key="revert" type="danger" loading={this.state.revertLoading} onClick={this.settingRevert}>{this.props.dict['main.revert.default']}</Button>,
            <Button key="cancel" onClick={() => { this.setState({ visible: false }) }}>{this.props.dict['main.cancel']}</Button>,
            <Button key="confirm" type="primary" loading={this.state.confirmLoading} onClick={this.settingSubmit}>{this.props.dict['main.submit']}</Button>
            <Button key="revert" type="danger" loading={this.state.revertLoading} onClick={this.settingRevert}>恢复默认设置</Button>,
            <Button key="cancel" onClick={() => { this.setState({ visible: false }) }}>取消</Button>,
            <Button key="confirm" type="primary" loading={this.state.confirmLoading} onClick={this.settingSubmit}>提交</Button>
          ]}
          destroyOnClose
        >