From 81d171b4738c72991a6169a9d08e9775d1897f9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 17 十月 2024 11:17:42 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/components/header/index.scss | 7 +++++--
src/menu/components/tree/antd-tree/index.scss | 6 +-----
src/menu/stylecontroller/index.jsx | 15 +++++++++------
src/menu/components/share/actioncomponent/index.jsx | 2 +-
4 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/components/header/index.scss b/src/components/header/index.scss
index 751fa9a..7ba7cf0 100644
--- a/src/components/header/index.scss
+++ b/src/components/header/index.scss
@@ -287,9 +287,9 @@
}
.wx-sms-wrap {
text-align: center;
-
+
.tip {
- margin: 15px;
+ margin: 215px 15px 15px;
img {
width: 24px;
margin-right: 10px;
@@ -305,5 +305,8 @@
font-weight: bold;
}
}
+ .qrcode-box + .tip {
+ margin-top: 15px;
+ }
}
}
\ No newline at end of file
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index c30f245..e565fa3 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -157,7 +157,7 @@
card: element
})
- MKEmitter.emit('changeStyle', options, _style, this.getStyle)
+ MKEmitter.emit('changeStyle', options, _style, this.getStyle, 'toolBtn')
}
addButton = (cardId, element) => {
diff --git a/src/menu/components/tree/antd-tree/index.scss b/src/menu/components/tree/antd-tree/index.scss
index 37f6cfb..a0eeef9 100644
--- a/src/menu/components/tree/antd-tree/index.scss
+++ b/src/menu/components/tree/antd-tree/index.scss
@@ -29,11 +29,7 @@
.model-menu-action-list:not(.length0) {
margin: 10px 0px;
}
- .model-menu-action-list {
- .ant-btn {
- border-width: 0px;
- }
- }
+
.ant-tree li .ant-tree-node-content-wrapper, .ant-tree li span.ant-tree-switcher, .ant-tree li span.ant-tree-iconEle {
height: var(--mk-tree-line-height);
line-height: var(--mk-tree-line-height);
diff --git a/src/menu/stylecontroller/index.jsx b/src/menu/stylecontroller/index.jsx
index 850eafb..59dabec 100644
--- a/src/menu/stylecontroller/index.jsx
+++ b/src/menu/stylecontroller/index.jsx
@@ -130,9 +130,12 @@
}
onCloseDrawer = () => {
+ const { type } = this.state
let card = fromJS(this.state.card).toJS()
- if (card.borderWidth === '0px' || !card.borderWidth) {
+ if (type === 'toolBtn' && card.borderWidth === '0px') {
+ delete card.borderColor
+ } else if (card.borderWidth === '0px' || !card.borderWidth) {
delete card.borderWidth
delete card.borderColor
}
@@ -893,11 +896,11 @@
label={<ColumnWidthOutlined title="杈规瀹藉害"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- {borposition === 'outer' ? <StyleInput defaultValue={card.borderWidth || ''} options={['px']} onChange={this.changeBorderWidth}/> : null}
- {borposition === 'left' ? <StyleInput defaultValue={card.borderLeftWidth || ''} options={['px']} onChange={this.changeBorderWidth}/> : null}
- {borposition === 'right' ? <StyleInput defaultValue={card.borderRightWidth || ''} options={['px']} onChange={this.changeBorderWidth}/> : null}
- {borposition === 'top' ? <StyleInput defaultValue={card.borderTopWidth || ''} options={['px']} onChange={this.changeBorderWidth}/> : null}
- {borposition === 'bottom' ? <StyleInput defaultValue={card.borderBottomWidth || ''} options={['px']} onChange={this.changeBorderWidth}/> : null}
+ {borposition === 'outer' ? <StyleInput clear={true} defaultValue={card.borderWidth || ''} options={['px']} onChange={this.changeBorderWidth}/> : null}
+ {borposition === 'left' ? <StyleInput clear={true} defaultValue={card.borderLeftWidth || ''} options={['px']} onChange={this.changeBorderWidth}/> : null}
+ {borposition === 'right' ? <StyleInput clear={true} defaultValue={card.borderRightWidth || ''} options={['px']} onChange={this.changeBorderWidth}/> : null}
+ {borposition === 'top' ? <StyleInput clear={true} defaultValue={card.borderTopWidth || ''} options={['px']} onChange={this.changeBorderWidth}/> : null}
+ {borposition === 'bottom' ? <StyleInput clear={true} defaultValue={card.borderBottomWidth || ''} options={['px']} onChange={this.changeBorderWidth}/> : null}
</Form.Item>
</Col>
<Col span={24}>
--
Gitblit v1.8.0