Merge branch 'positec' into dms

king

2023-11-05 947d0ed1a628353f42ac4c2aa817a4579cdf126d

 src/menu/components/table/edit-table/columns/index.jsx

@@ -190,8 +190,9 @@

class NormalTableColumns extends Component {
  static propTpyes = {
    config: PropTypes.object,       // 配置信息
    updatecolumn: PropTypes.func    // 数据变化
    config: PropTypes.object,
    updatecolumn: PropTypes.func,
    addColumns: PropTypes.func
  }

  state = {
@@ -406,6 +407,8 @@

  submitCol = (col) => {
    const { card } = this.state
    
    if (!card) return
    
    col.uuid = card.uuid
    col.isSub = card.isSub === true
@@ -689,6 +692,7 @@
          } trigger="hover">
            <Button className="submit-btn" style={config.submit.style} onDoubleClick={() => this.setState({visible: true})} type="primary">提交</Button>
          </Popover>
          <PlusOutlined title="添加列" onClick={this.props.addColumns}/>
          <CopyOutlined title="复制显示列" onClick={this.copycolumn} />
          <MarkColumn columns={fields} type="line" marks={lineMarks} onSubmit={this.updateLineMarks} />
          <ColsControl config={config} onSubmit={this.props.updatecolumn}/>
@@ -714,7 +718,7 @@
            }}
          />
        </DndProvider>
        <EditColumn column={card} columns={this.state.columns} fields={fields} submitCol={this.submitCol} cancelCol={this.cancelCol}/>
        <EditColumn column={card} wrap={config.wrap} columns={this.state.columns} fields={fields} submitCol={this.submitCol} cancelCol={this.cancelCol}/>
        <Modal
          wrapClassName="mk-pop-modal"
          visible={visible}