From f9455c981f94d5fd89103b1d332baefd039bebb2 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 25 十月 2024 09:17:14 +0800 Subject: [PATCH] 2024-10-25 --- src/menu/components/share/markcomponent/index.jsx | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/menu/components/share/markcomponent/index.jsx b/src/menu/components/share/markcomponent/index.jsx index f198d58..160c1dd 100644 --- a/src/menu/components/share/markcomponent/index.jsx +++ b/src/menu/components/share/markcomponent/index.jsx @@ -399,12 +399,12 @@ }) this.props.onSubmit(marks) } else { - const _this = this + const that = this confirm({ title: '瀛樺湪鏈繚瀛樻爣璁帮紝纭畾蹇界暐鍚楋紵', onOk() { - _this.setState({ visible: false }) - _this.props.onSubmit(marks) + that.setState({ visible: false }) + that.props.onSubmit(marks) }, onCancel() {} }) @@ -414,11 +414,16 @@ render() { const { marks, markColumns, visible, options, signs } = this.state + let className = '' + if (this.props.type === 'line' && this.props.marks.length) { + className = 'mk-line-marks' + } + return ( - <div style={{display: 'inline-block'}}> + <div style={{display: 'inline-block'}} className={className}> <AntDesignOutlined className="profile" title="鏍囪" onClick={this.resetMark} /> <Modal - wrapClassName="model-table-column-mark-modal" + wrapClassName="mark-modal-wrap" title="鏍囪璁剧疆" visible={visible} width={'75vw'} @@ -430,7 +435,7 @@ > <MarkForm field={this.props.field} signs={signs} columns={options} markChange={this.markChange}/> <Col style={{fontSize: '12px', color: '#757575', paddingLeft: '10px'}} span={24}>娉細浠庝笂鍒颁笅锛屽尮閰嶇涓�涓鍚堟潯浠剁殑鏍囪銆�</Col> - <EditTable actions={['edit', 'move', 'del']} data={marks} columns={markColumns} onChange={(marks) => this.setState({marks})}/> + <EditTable actions={['edit', 'move', 'del', 'copy']} type="marks" data={marks} columns={markColumns} onChange={(marks) => this.setState({marks})}/> </Modal> </div> ) -- Gitblit v1.8.0