From d662ba9cab4b39371b0ae2c78fcfbaf76a4fe18a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 06 二月 2023 15:40:20 +0800
Subject: [PATCH] 2023-02-06
---
src/menu/stylecombcontroller/index.jsx | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/src/menu/stylecombcontroller/index.jsx b/src/menu/stylecombcontroller/index.jsx
index e47bdd3..5d83165 100644
--- a/src/menu/stylecombcontroller/index.jsx
+++ b/src/menu/stylecombcontroller/index.jsx
@@ -30,6 +30,7 @@
import MKEmitter from '@/utils/events.js'
import ColorSketch from '@/mob/colorsketch'
+import SysColorSketch from '@/menu/stylecontroller/syscolorsketch'
import StyleInput from './styleInput'
import './index.scss'
@@ -242,6 +243,7 @@
}
render () {
+ const { style, borposition } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -251,6 +253,20 @@
xs: { span: 24 },
sm: { span: 16 }
}
+ }
+
+ let borderColor = ''
+
+ if (borposition === 'outer') {
+ borderColor = style.borderColor || ''
+ } else if (borposition === 'left') {
+ borderColor = style.borderLeftColor || ''
+ } else if (borposition === 'right') {
+ borderColor = style.borderRightColor || ''
+ } else if (borposition === 'top') {
+ borderColor = style.borderTopColor || ''
+ } else if (borposition === 'bottom') {
+ borderColor = style.borderBottomColor || ''
}
return (
@@ -312,7 +328,14 @@
label={<FontColorsOutlined title="瀛椾綋棰滆壊"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <ColorSketch onChange={this.changeFontColor} />
+ <ColorSketch value={style.color || ''} onChange={this.changeFontColor} />
+ </Form.Item>
+ <Form.Item
+ colon={false}
+ label={<BgColorsOutlined title="绯荤粺鑹�"/>}
+ labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
+ >
+ <SysColorSketch onChange={this.changeFontColor} />
</Form.Item>
</Col>
<Col span={24}>
@@ -363,7 +386,14 @@
label={<BgColorsOutlined title="鑳屾櫙棰滆壊"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <ColorSketch onChange={this.changeBackgroundColor} />
+ <ColorSketch value={style.backgroundColor || ''} onChange={this.changeBackgroundColor} />
+ </Form.Item>
+ <Form.Item
+ colon={false}
+ label={<BgColorsOutlined title="绯荤粺鑹�"/>}
+ labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
+ >
+ <SysColorSketch onChange={this.changeBackgroundColor} />
</Form.Item>
</Col>
</Panel>
@@ -412,7 +442,14 @@
label={<BgColorsOutlined title="杈规棰滆壊"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <ColorSketch onChange={this.changeBorderColor} />
+ <ColorSketch value={borderColor} onChange={this.changeBorderColor} />
+ </Form.Item>
+ <Form.Item
+ colon={false}
+ label={<BgColorsOutlined title="绯荤粺鑹�"/>}
+ labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
+ >
+ <SysColorSketch onChange={this.changeBorderColor} />
</Form.Item>
</Col>
<Col span={24}>
@@ -432,7 +469,14 @@
label={<BgColorsOutlined title="闃村奖棰滆壊"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <ColorSketch onChange={this.changeShadowColor} />
+ <ColorSketch value={style.shadow || ''} onChange={this.changeShadowColor} />
+ </Form.Item>
+ <Form.Item
+ colon={false}
+ label={<BgColorsOutlined title="绯荤粺鑹�"/>}
+ labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
+ >
+ <SysColorSketch onChange={this.changeShadowColor} />
</Form.Item>
</Col>
</Panel>
--
Gitblit v1.8.0