From bd9dfa6b6ff25dbab21ba9a249fc9d9f4d03dce2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 二月 2024 14:08:39 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/share/markcomponent/index.jsx | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/share/markcomponent/index.jsx b/src/menu/components/share/markcomponent/index.jsx
index 246f2ea..7185bea 100644
--- a/src/menu/components/share/markcomponent/index.jsx
+++ b/src/menu/components/share/markcomponent/index.jsx
@@ -118,7 +118,21 @@
'line-through': '涓垝绾�',
'icon': '鍥炬爣',
'iconfront': '鍥炬爣',
- 'iconback': '鍥炬爣',
+ 'iconback': '鍥炬爣'
+ }
+
+ if (text[0] === 'indent') {
+ return (
+ <div>缂╄繘/{text[1]}涓瓧绗�</div>
+ )
+ } else if (text[0] === 'pointfront') {
+ return (
+ <div><span style={{display: 'inline-block', width: '8px', height: '8px', borderRadius: '14px', background: 'black', verticalAlign: 'middle'}}></span> 鐐癸紙鍓嶏級</div>
+ )
+ } else if (text[0] === 'pointback') {
+ return (
+ <div>鐐癸紙鍚庯級 <span style={{display: 'inline-block', width: '8px', height: '8px', borderRadius: '14px', background: 'black', verticalAlign: 'middle'}}></span></div>
+ )
}
return (
@@ -249,6 +263,7 @@
})
}
]
+
let signs = [
{
value: 'font',
@@ -267,6 +282,14 @@
label: '涓垝绾�'
},
{
+ value: 'pointfront',
+ label: '鐐癸紙鍓嶏級'
+ },
+ {
+ value: 'pointback',
+ label: '鐐癸紙鍚庯級'
+ },
+ {
value: 'iconfront',
label: '鍥炬爣锛堝墠锛�',
children: icons
@@ -275,10 +298,30 @@
value: 'iconback',
label: '鍥炬爣锛堝悗锛�',
children: icons
+ },
+ {
+ value: 'indent',
+ label: '缂╄繘',
+ children: [{
+ value: 2,
+ label: '2涓瓧绗�'
+ }, {
+ value: 4,
+ label: '4涓瓧绗�'
+ }, {
+ value: 6,
+ label: '6涓瓧绗�'
+ }, {
+ value: 8,
+ label: '8涓瓧绗�'
+ }]
}
]
if (type === 'line' || type === 'sequence') {
+ signs.pop()
+ signs.pop()
+ signs.pop()
signs.pop()
signs.pop()
} else if (type === 'slider') {
@@ -371,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'}
@@ -387,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