From e1d8b67d9219f1631e855542155d6db21aa31a97 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 10 七月 2024 14:23:38 +0800
Subject: [PATCH] 2024-07-10
---
src/menu/stylecontroller/index.jsx | 659 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 482 insertions(+), 177 deletions(-)
diff --git a/src/menu/stylecontroller/index.jsx b/src/menu/stylecontroller/index.jsx
index a98c24b..850eafb 100644
--- a/src/menu/stylecontroller/index.jsx
+++ b/src/menu/stylecontroller/index.jsx
@@ -1,7 +1,6 @@
import React, {Component} from 'react'
-import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Collapse, Form, Col, InputNumber, Input, Select, Radio, Drawer, Button } from 'antd'
+import { Collapse, Form, Col, InputNumber, Input, Select, Radio, Drawer, Button, message, Checkbox, Tooltip } from 'antd'
import {
ColumnHeightOutlined,
FontSizeOutlined,
@@ -30,32 +29,37 @@
ArrowRightOutlined,
SwapOutlined,
EnterOutlined,
+ DragOutlined,
+ EyeOutlined,
+ QuestionCircleOutlined
} from '@ant-design/icons'
import MKEmitter from '@/utils/events.js'
import asyncComponent from '@/utils/asyncComponent'
import StyleInput from './styleInput'
+import SysColorSketch from './syscolorsketch'
+import MainLogo from '@/assets/img/main-logo.png'
import './index.scss'
const { Panel } = Collapse
const { Option } = Select
const ColorSketch = asyncComponent(() => import('@/mob/colorsketch'))
+const PasteBoard = asyncComponent(() => import('@/components/pasteboard'))
const SourceComponent = asyncComponent(() => import('@/menu/components/share/sourcecomponent'))
class MobController extends Component {
- static propTpyes = {
- editElem: PropTypes.any,
- updateStyle: PropTypes.func,
- }
-
state = {
card: null,
fonts: null,
- comIds: [],
backgroundImage: '',
options: [],
- borposition: 'outer'
+ borposition: 'outer',
+ type: '',
+ logo: sessionStorage.getItem('CloudLogo') || MainLogo
}
+
+ callback = null
+ timer = null
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.state), fromJS(nextState))
@@ -75,7 +79,7 @@
MKEmitter.removeListener('changeStyle', this.initStyle)
}
- initStyle = (comIds, options, style = {}) => {
+ initStyle = (options, style = {}, callback, type) => {
let backgroundImage = ''
if (style.backgroundImage && /^url/ig.test(style.backgroundImage)) {
backgroundImage = style.backgroundImage.replace(/^url\(/ig, '').replace(/\)$/ig, '')
@@ -95,13 +99,31 @@
}
}
+ this.callback = callback
+ this.timer = null
+
+ let card = fromJS(style).toJS()
+ let borposition = 'outer'
+
+ if (!card.borderWidth) {
+ if (card.borderLeftWidth) {
+ borposition = 'left'
+ } else if (card.borderRightWidth) {
+ borposition = 'right'
+ } else if (card.borderTopWidth) {
+ borposition = 'top'
+ } else if (card.borderBottomWidth) {
+ borposition = 'bottom'
+ }
+ }
+
this.setState({
visible: true,
+ type: type || '',
fonts: fonts,
- comIds: comIds,
- card: fromJS(style).toJS(),
+ card: card,
options: options,
- borposition: 'outer',
+ borposition: borposition,
backgroundImage
})
window.GLOB.styling = true
@@ -110,56 +132,87 @@
onCloseDrawer = () => {
let card = fromJS(this.state.card).toJS()
- let check = false
- if (card.borderWidth === '0px') {
+ if (card.borderWidth === '0px' || !card.borderWidth) {
delete card.borderWidth
delete card.borderColor
- check = true
- } else if (card.borderLeftWidth === '0px') {
- delete card.borderLeftWidth
- delete card.borderLeftColor
- check = true
- } else if (card.borderRightWidth === '0px') {
- delete card.borderRightWidth
- delete card.borderRightColor
- check = true
- } else if (card.borderTopWidth === '0px') {
- delete card.borderTopWidth
- delete card.borderTopColor
- check = true
- } else if (card.borderBottomWidth === '0px') {
- delete card.borderBottomWidth
- delete card.borderBottomColor
- check = true
}
- if (check) {
- MKEmitter.emit('submitStyle', this.state.comIds, card)
+ if (card.borderLeftWidth === '0px' || !card.borderLeftWidth) {
+ delete card.borderLeftWidth
+ delete card.borderLeftColor
+ }
+ if (card.borderRightWidth === '0px' || !card.borderRightWidth) {
+ delete card.borderRightWidth
+ delete card.borderRightColor
+ }
+ if (card.borderTopWidth === '0px' || !card.borderTopWidth) {
+ delete card.borderTopWidth
+ delete card.borderTopColor
+ }
+ if (card.borderBottomWidth === '0px' || !card.borderBottomWidth) {
+ delete card.borderBottomWidth
+ delete card.borderBottomColor
+ }
+
+ if (/0px 0px 0px | transparent/.test(card.boxShadow)) {
+ delete card.hShadow
+ delete card.vShadow
+ delete card.shadowBlur
+ delete card.shadowColor
+ delete card.boxShadow
+ }
+
+ if (!is(fromJS(this.state.card), fromJS(card))) {
+ this.callback && this.callback(card)
}
this.setState({
visible: false,
- comIds: [],
card: null,
options: [],
backgroundImage: ''
})
window.GLOB.styling = false
+ this.callback = null
}
- updateStyle = (style) => {
- const { comIds, card } = this.state
+ updateStyle = (style, delay) => {
+ const { card } = this.state
let _style = {
...card,
...style
}
+ Object.keys(style).forEach(key => {
+ if (!_style[key] && _style[key] !== 0) {
+ delete _style[key]
+ }
+ })
+
+ if (_style.position === 'relative') {
+ _style.zIndex = 1
+ } else if (_style.position === 'absolute') {
+ _style.zIndex = 2
+ } else if (_style.position === 'fixed') {
+ _style.zIndex = 3
+ } else {
+ delete _style.zIndex
+ }
+
this.setState({
card: _style,
})
- MKEmitter.emit('submitStyle', comIds, _style)
+ this.timer && clearTimeout(this.timer)
+
+ if (delay) {
+ this.timer = setTimeout(() => {
+ this.callback && this.callback(_style)
+ }, 300)
+ } else {
+ this.callback && this.callback(_style)
+ }
}
/**
@@ -176,7 +229,7 @@
value = 300
}
- this.updateStyle({fontSize: `${value}px`})
+ this.updateStyle({fontSize: `${value}px`}, true)
}
/**
@@ -187,7 +240,7 @@
if (isNaN(value) || value < 1 || value > 10) return
- this.updateStyle({lineHeight: value})
+ this.updateStyle({lineHeight: value}, true)
}
/**
@@ -198,7 +251,7 @@
if (isNaN(value) || value < 0 || value > 100) return
- this.updateStyle({letterSpacing: `${value}px`})
+ this.updateStyle({letterSpacing: `${value}px`}, true)
}
/**
@@ -209,60 +262,11 @@
if (isNaN(value) || value < 0 || value > 100) return
- this.updateStyle({textIndent: `${value}px`})
- }
-
- /**
- * @description 淇敼瀛椾綋绮楃粏
- */
- boldChange = (val) => {
- this.updateStyle({fontWeight: val})
- }
-
- /**
- * @description 鑷姩鎹㈣
- */
- wordBreakChange = (val) => {
- this.updateStyle({wordBreak: val})
- }
-
- /**
- * @description 淇敼瀛椾綋棰滆壊 锛岄鑹叉帶浠�
- */
- changeFontColor = (val) => {
- this.updateStyle({color: val})
- }
-
- /**
- * @description 瀛椾綋瀵归綈
- */
- changeTextAlign = (e) => {
- this.updateStyle({textAlign: e.target.value})
- }
-
- /**
- * @description 瀛椾綋鏍峰紡锛屽�炬枩
- */
- changeFontStyle = (e) => {
- this.updateStyle({fontStyle: e.target.value})
- }
-
- /**
- * @description 瀛椾綋瑁呴グ锛屼笅鍒掔嚎銆佽疮绌跨嚎銆佷笂鍒掔嚎
- */
- changeTextDecoration = (e) => {
- this.updateStyle({textDecoration: e.target.value})
- }
-
- /**
- * @description 淇敼鑳屾櫙棰滆壊 锛岄鑹叉帶浠�
- */
- changeBackgroundColor = (val) => {
- this.updateStyle({backgroundColor: val})
+ this.updateStyle({textIndent: `${value}px`}, true)
}
changeBackground = (val) => {
- const { comIds, card } = this.state
+ const { card } = this.state
let _style = { ...card }
@@ -280,29 +284,8 @@
})
if (!val || /(^linear-gradient|^radial-gradient)\(.*\)$/.test(val)) {
- MKEmitter.emit('submitStyle', comIds, _style)
+ this.callback && this.callback(_style)
}
- }
-
- /**
- * @description 淇敼鑳屾櫙澶у皬
- */
- changeBackgroundSize = (val) => {
- this.updateStyle({backgroundSize: val})
- }
-
- /**
- * @description 淇敼鑳屾櫙浣嶇疆
- */
- changeBackgroundPositon= (val) => {
- this.updateStyle({backgroundPositon: val})
- }
-
- /**
- * @description 淇敼鑳屾櫙閲嶅璁剧疆
- */
- changeBackgroundRepeat = (val) => {
- this.updateStyle({backgroundRepeat: val})
}
/**
@@ -311,7 +294,7 @@
changeShadowColor = (val) => {
const { card } = this.state
- let boxShadow = `${card.hShadow || '0px'} ${card.vShadow || '0px'} ${card.shadowBlur || '0px'} ${val}`
+ let boxShadow = `${card.hShadow || '0px'} ${card.vShadow || '0px'} ${card.shadowBlur || '0px'} ${val || 'transparent'}`
this.updateStyle({shadowColor: val, boxShadow})
}
@@ -417,30 +400,177 @@
this.updateStyle(_style)
}
- changeWidth = (val) => {
- let _val = val
- if (_val === '0px') {
- _val = 'auto'
- }
-
- this.updateStyle({width: _val})
- }
-
- changeHeight = (val) => {
- let _val = val
- if (_val === '0px') {
- _val = 'auto'
- }
-
- this.updateStyle({height: _val})
- }
-
changeNormalStyle = (val, type) => {
this.updateStyle({[type]: val})
}
+ copy = () => {
+ const { card, options } = this.state
+
+ let msg = { copyType: 'style' }
+
+ msg.data = card
+ msg.options = options
+
+ try {
+ msg = window.btoa(window.encodeURIComponent(JSON.stringify(msg)))
+ } catch (e) {
+ console.warn('Stringify Failure')
+ msg = ''
+ }
+
+ if (msg) {
+ let oInput = document.createElement('input')
+ oInput.value = msg
+ document.body.appendChild(oInput)
+ oInput.select()
+ document.execCommand('Copy')
+ document.body.removeChild(oInput)
+ message.success('澶嶅埗鎴愬姛銆�')
+ }
+ }
+
+ paste = (res, callback) => {
+ const { options } = this.state
+
+ if (res.copyType !== 'style') {
+ message.warning('閰嶇疆淇℃伅鏍煎紡閿欒锛�', 5)
+ return
+ }
+
+ let style = res.data || {}
+
+ if (JSON.stringify(res.options) !== JSON.stringify(options)) {
+ res.options.forEach(n => {
+ if (options.includes(n)) return
+
+ if (n === 'width') {
+ delete style.width
+ } else if (n === 'height') {
+ delete style.height
+ } else if (n === 'font') {
+ if (options.includes('font1')) {
+ ['lineHeight', 'letterSpacing', 'fontStyle', 'textAlign', 'textDecoration'].forEach(m => {
+ delete style[m]
+ })
+ } else if (options.includes('font2')) {
+
+ } else {
+ ['fontSize', 'fontWeight', 'lineHeight', 'letterSpacing', 'color', 'fontStyle', 'textAlign', 'textDecoration'].forEach(m => {
+ delete style[m]
+ })
+ }
+ } else if (n === 'font1') {
+ if (options.includes('font') || options.includes('font2')) {
+
+ } else {
+ ['fontSize', 'fontWeight', 'color'].forEach(m => {
+ delete style[m]
+ })
+ }
+ } else if (n === 'font2') {
+ if (options.includes('font')) {
+ ['textIndent', 'wordBreak'].forEach(m => {
+ delete style[m]
+ })
+ } else if (options.includes('font1')) {
+ ['lineHeight', 'letterSpacing', 'fontStyle', 'textAlign', 'textDecoration', 'textIndent', 'wordBreak'].forEach(m => {
+ delete style[m]
+ })
+ } else {
+ ['fontSize', 'fontWeight', 'lineHeight', 'letterSpacing', 'color', 'fontStyle', 'textAlign', 'textDecoration', 'textIndent', 'wordBreak'].forEach(m => {
+ delete style[m]
+ })
+ }
+ } else if (n === 'background') {
+ if (!options.includes('backgroundColor')) {
+ delete style.backgroundColor
+ }
+ delete style.backgroundImage
+ delete style.backgroundSize
+ delete style.backgroundRepeat
+ delete style.backgroundPosition
+ } else if (n === 'backgroundColor') {
+ if (!options.includes('background')) {
+ delete style.backgroundColor
+ }
+ } else if (n === 'border') {
+ Object.keys(style).forEach(key => {
+ if (!/border/.test(key)) return
+ delete style[key]
+ })
+ } else if (n === 'shadow') {
+ delete style.boxShadow
+ delete style.hShadow
+ delete style.vShadow
+ delete style.shadowBlur
+ delete style.shadowColor
+ } else if (n === 'margin') {
+ delete style.marginTop
+ delete style.marginBottom
+ delete style.marginLeft
+ delete style.marginRight
+ } else if (n === 'padding') {
+ delete style.paddingTop
+ delete style.paddingBottom
+ delete style.paddingLeft
+ delete style.paddingRight
+ } else if (n === 'float') {
+ delete style.float
+ } else if (n === 'minHeight') {
+ delete style.minHeight
+ } else if (n === 'clear') {
+ delete style.clear
+ } else if (n === 'display') {
+ delete style.display
+ } else if (n === 'position') {
+ delete style.position
+ delete style.top
+ delete style.bottom
+ delete style.left
+ delete style.right
+ } else if (n === 'transform') {
+ delete style.transform
+ } else if (n === 'overflow') {
+ delete style.overflow
+ }
+ })
+ }
+
+ let backgroundImage = ''
+ if (style.backgroundImage && /^url/ig.test(style.backgroundImage)) {
+ backgroundImage = style.backgroundImage.replace(/^url\(/ig, '').replace(/\)$/ig, '')
+ }
+
+ let borposition = 'outer'
+
+ if (!style.borderWidth) {
+ if (style.borderLeftWidth) {
+ borposition = 'left'
+ } else if (style.borderRightWidth) {
+ borposition = 'right'
+ } else if (style.borderTopWidth) {
+ borposition = 'top'
+ } else if (style.borderBottomWidth) {
+ borposition = 'bottom'
+ }
+ }
+
+ this.setState({
+ card: style,
+ borposition,
+ backgroundImage
+ })
+
+ this.callback && this.callback(style)
+
+ callback()
+
+ message.success('绮樿创鎴愬姛銆�')
+ }
+
render () {
- const { card, options, backgroundImage, borposition, fonts } = this.state
+ const { card, options, backgroundImage, borposition, fonts, type, logo } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -456,7 +586,7 @@
<Drawer
title={
<div className="header-logo">
- <img src={window.GLOB.mainlogo} alt=""/>
+ <img src={logo} alt=""/>
</div>
}
placement="left"
@@ -468,7 +598,7 @@
maskStyle={{opacity: 0.1}}
visible={this.state.visible}
>
- <div className="menu-style-controller">
+ <div className={'menu-style-controller ' + (type || '')}>
<Form {...formItemLayout}>
{card ? <Collapse expandIconPosition="right" destroyInactivePanel={true} defaultActiveKey={options[0]}>
{options.includes('width') ? <Panel header="瀹藉害" key="width">
@@ -478,7 +608,7 @@
label={<ColumnWidthOutlined title="瀹藉害"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <StyleInput defaultValue={card.width || ''} options={['px', 'vh', 'vw', '%']} onChange={this.changeWidth}/>
+ <StyleInput clear={true} defaultValue={card.width || ''} options={['px', 'vh', 'vw', '%', 'auto']} onChange={(val) => this.changeNormalStyle(val, 'width')}/>
</Form.Item>
</Col>
</Panel> : null}
@@ -489,7 +619,7 @@
label={<ColumnHeightOutlined title="楂樺害"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <StyleInput defaultValue={card.height || ''} options={['px', 'vh', 'vw']} onChange={this.changeHeight}/>
+ <StyleInput clear={true} defaultValue={card.height || ''} options={['px', 'vh', 'vw']} onChange={(val) => this.changeNormalStyle(val, 'height')}/>
</Form.Item>
</Col>
</Panel> : null}
@@ -501,7 +631,7 @@
</Col> : null}
{fonts.includes('fontWeight') ? <Col span={12}>
<Form.Item colon={false} label={<BoldOutlined title="瀛椾綋绮楃粏"/>}>
- <Select defaultValue={card.fontWeight || 'normal'} onChange={this.boldChange}>
+ <Select defaultValue={card.fontWeight || 'normal'} onChange={(val) => this.changeNormalStyle(val, 'fontWeight')}>
<Option value="normal">normal</Option>
<Option value="bold">bold</Option>
<Option value="bolder">bolder</Option>
@@ -535,7 +665,7 @@
</Col> : null}
{fonts.includes('wordBreak') ? <Col span={12}>
<Form.Item colon={false} label={<EnterOutlined title="鑷姩鎹㈣"/>}>
- <Select defaultValue={card.wordBreak || 'normal'} onChange={this.wordBreakChange}>
+ <Select defaultValue={card.wordBreak || 'normal'} onChange={(val) => this.changeNormalStyle(val, 'wordBreak')}>
<Option value="normal">normal</Option>
<Option value="break-all">break-all</Option>
</Select>
@@ -547,7 +677,14 @@
label={<FontColorsOutlined title="瀛椾綋棰滆壊"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <ColorSketch value={card.color || 'rgba(0, 0, 0, 0.85)'} onChange={this.changeFontColor} />
+ <ColorSketch value={card.color || ''} onChange={(val) => this.changeNormalStyle(val, 'color')} />
+ </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={(val) => this.changeNormalStyle(val, 'color')} />
</Form.Item>
</Col> : null}
{fonts.includes('fontStyle') ? <Col span={24}>
@@ -556,7 +693,7 @@
label={' '}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <Radio.Group defaultValue={card.fontStyle || 'normal'} onChange={this.changeFontStyle}>
+ <Radio.Group defaultValue={card.fontStyle || 'normal'} onChange={(e) => this.changeNormalStyle(e.target.value, 'fontStyle')}>
<Radio.Button value="normal"><span title="鏍囧噯">N</span></Radio.Button>
<Radio.Button value="italic"><ItalicOutlined title="鏂滀綋"/></Radio.Button>
<Radio.Button value="oblique" style={{fontStyle: 'oblique'}}><span title="鍊炬枩">B</span></Radio.Button>
@@ -569,7 +706,7 @@
label={' '}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <Radio.Group className="text-align" defaultValue={card.textAlign || 'left'} onChange={this.changeTextAlign}>
+ <Radio.Group className="text-align" defaultValue={card.textAlign || 'left'} onChange={(e) => this.changeNormalStyle(e.target.value, 'textAlign')}>
<Radio.Button value="left"><AlignLeftOutlined title="宸﹀榻�"/></Radio.Button>
<Radio.Button value="center"><AlignCenterOutlined title="灞呬腑瀵归綈"/></Radio.Button>
<Radio.Button value="right"><AlignRightOutlined title="鍙冲榻�"/></Radio.Button>
@@ -582,7 +719,7 @@
label={' '}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <Radio.Group className="text-decoration" defaultValue={card.textDecoration || 'none'} onChange={this.changeTextDecoration}>
+ <Radio.Group className="text-decoration" defaultValue={card.textDecoration || 'none'} onChange={(e) => this.changeNormalStyle(e.target.value, 'textDecoration')}>
<Radio.Button value="none"><span title="鏍囧噯">N</span></Radio.Button>
<Radio.Button value="underline"><UnderlineOutlined title="涓嬪垝绾�"/></Radio.Button>
<Radio.Button value="line-through"><StrikethroughOutlined title="涓垝绾�"/></Radio.Button>
@@ -590,15 +727,41 @@
</Radio.Group>
</Form.Item>
</Col> : null}
+ {options.includes('fontFamily') ? <Col span={24}>
+ <Form.Item
+ colon={false}
+ label=" "
+ labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
+ >
+ <Checkbox.Group options={[
+ { label: '寰蒋闆呴粦', value: 'Microsoft YaHei' },
+ { label: '瀹嬩綋', value: 'Simsun' },
+ { label: '榛戜綋', value: 'Simhei' },
+ { label: '浠垮畫', value: 'FangSong' },
+ { label: '妤蜂綋', value: 'KaiTi' },
+ // { label: 'Helvetica', value: 'Helvetica' },
+ // { label: 'Arial', value: 'Arial' },
+ // { label: 'Verdana', value: 'Verdana' },
+ // { label: 'Georgia', value: 'Georgia' },
+ ]} defaultValue={card.fontFamily} onChange={(val) => this.changeNormalStyle(val, 'fontFamily')} />
+ </Form.Item>
+ </Col> : null}
</Panel> : null}
{options.includes('background') || options.includes('backgroundColor') ? <Panel header="鑳屾櫙" key="background">
- <Col span={24}>
+ <Col span={24} className="bg-color-panel">
<Form.Item
colon={false}
label={<BgColorsOutlined title="鑳屾櫙棰滆壊"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <ColorSketch value={card.backgroundColor || '#ffffff'} onChange={this.changeBackgroundColor} />
+ <ColorSketch allowClear={true} value={card.backgroundColor || ''} onChange={(val) => this.changeNormalStyle(val, 'backgroundColor')} />
+ </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={(val) => this.changeNormalStyle(val, 'backgroundColor')} />
</Form.Item>
</Col>
{window.develop === true ? <Col span={24}>
@@ -610,7 +773,7 @@
<Input value={card.background || ''} onChange={(e) => this.changeBackground(e.target.value)} />
</Form.Item>
</Col> : null}
- {!options.includes('backgroundColor') ? <Col span={24}>
+ {!options.includes('backgroundColor') ? <Col span={24} className="bg-image-panel">
<Form.Item
colon={false}
label={<PictureOutlined title="鑳屾櫙鍥剧墖"/>}
@@ -625,7 +788,7 @@
label="姣斾緥"
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <Select defaultValue={card.backgroundSize || 'cover'} onChange={this.changeBackgroundSize}>
+ <Select defaultValue={card.backgroundSize || 'cover'} onChange={(val) => this.changeNormalStyle(val, 'backgroundSize')}>
<Option value="100%">100%</Option>
<Option value="100% 100%">100% 100%</Option>
<Option value="auto 100%">auto 100%</Option>
@@ -642,7 +805,7 @@
label="閲嶅"
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <Select defaultValue={card.backgroundRepeat || 'no-repeat'} onChange={this.changeBackgroundRepeat}>
+ <Select defaultValue={card.backgroundRepeat || 'no-repeat'} onChange={(val) => this.changeNormalStyle(val, 'backgroundRepeat')}>
<Option value="repeat">repeat</Option>
<Option value="no-repeat">no-repeat</Option>
<Option value="repeat-x">repeat-x</Option>
@@ -656,10 +819,16 @@
label="浣嶇疆"
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <Select defaultValue={card.backgroundPositon || 'center'} onChange={this.changeBackgroundPositon}>
+ <Select defaultValue={card.backgroundPosition || 'center'} onChange={(val) => this.changeNormalStyle(val, 'backgroundPosition')}>
<Option value="center">center</Option>
- <Option value="top">top</Option>
- <Option value="bottom">bottom</Option>
+ <Option value="center top">center top</Option>
+ <Option value="center bottom">center bottom</Option>
+ <Option value="left top">left top</Option>
+ <Option value="left center">left center</Option>
+ <Option value="left bottom">left bottom</Option>
+ <Option value="right top">right top</Option>
+ <Option value="right center">right center</Option>
+ <Option value="right bottom">right bottom</Option>
</Select>
</Form.Item>
</Col> : null}
@@ -671,7 +840,7 @@
label={<BorderOutlined title="杈规浣嶇疆"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <Radio.Group className="border-position" defaultValue={'outer'} onChange={(e) => this.setState({borposition: e.target.value})}>
+ <Radio.Group className="border-position" defaultValue={borposition} onChange={(e) => this.setState({borposition: e.target.value})}>
<Radio value="outer"><BorderOuterOutlined title="澶栬竟妗�"/></Radio>
<Radio value="left"><BorderLeftOutlined title="宸﹁竟妗�"/></Radio>
<Radio value="right"><BorderRightOutlined title="鍙宠竟妗�"/></Radio>
@@ -724,11 +893,11 @@
label={<ColumnWidthOutlined title="杈规瀹藉害"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- {borposition === 'outer' ? <StyleInput defaultValue={card.borderWidth || '0px'} options={['px']} onChange={this.changeBorderWidth}/> : null}
- {borposition === 'left' ? <StyleInput defaultValue={card.borderLeftWidth || '0px'} options={['px']} onChange={this.changeBorderWidth}/> : null}
- {borposition === 'right' ? <StyleInput defaultValue={card.borderRightWidth || '0px'} options={['px']} onChange={this.changeBorderWidth}/> : null}
- {borposition === 'top' ? <StyleInput defaultValue={card.borderTopWidth || '0px'} options={['px']} onChange={this.changeBorderWidth}/> : null}
- {borposition === 'bottom' ? <StyleInput defaultValue={card.borderBottomWidth || '0px'} options={['px']} onChange={this.changeBorderWidth}/> : null}
+ {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}
</Form.Item>
</Col>
<Col span={24}>
@@ -737,11 +906,18 @@
label={<BgColorsOutlined title="杈规棰滆壊"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- {borposition === 'outer' ? <ColorSketch defaultValue={card.borderColor || 'transparent'} onChange={this.changeBorderColor} /> : null}
- {borposition === 'left' ? <ColorSketch defaultValue={card.borderLeftColor || 'transparent'} onChange={this.changeBorderColor} /> : null}
- {borposition === 'right' ? <ColorSketch defaultValue={card.borderRightColor || 'transparent'} onChange={this.changeBorderColor} /> : null}
- {borposition === 'top' ? <ColorSketch defaultValue={card.borderTopColor || 'transparent'} onChange={this.changeBorderColor} /> : null}
- {borposition === 'bottom' ? <ColorSketch defaultValue={card.borderBottomColor || 'transparent'} onChange={this.changeBorderColor} /> : null}
+ {borposition === 'outer' ? <ColorSketch allowClear={true} value={card.borderColor || ''} onChange={this.changeBorderColor} /> : null}
+ {borposition === 'left' ? <ColorSketch allowClear={true} value={card.borderLeftColor || ''} onChange={this.changeBorderColor} /> : null}
+ {borposition === 'right' ? <ColorSketch allowClear={true} value={card.borderRightColor || ''} onChange={this.changeBorderColor} /> : null}
+ {borposition === 'top' ? <ColorSketch allowClear={true} value={card.borderTopColor || ''} onChange={this.changeBorderColor} /> : null}
+ {borposition === 'bottom' ? <ColorSketch allowClear={true} value={card.borderBottomColor || ''} onChange={this.changeBorderColor} /> : null}
+ </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}>
@@ -750,7 +926,7 @@
label={<RadiusSettingOutlined title="鍦嗚"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <StyleInput defaultValue={card.borderRadius || '0px'} options={['px', '%']} onChange={(val) => this.changeNormalStyle(val, 'borderRadius')}/>
+ <StyleInput clear={true} defaultValue={card.borderRadius || ''} options={['px', '%']} onChange={(val) => this.changeNormalStyle(val, 'borderRadius')}/>
</Form.Item>
</Col>
</Panel> : null}
@@ -761,7 +937,14 @@
label={<BgColorsOutlined title="闃村奖棰滆壊"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <ColorSketch value={card.shadowColor || 'transparent'} onChange={this.changeShadowColor} />
+ <ColorSketch allowClear={true} value={card.shadowColor || ''} 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>
<Col span={24}>
@@ -799,7 +982,7 @@
label={<ArrowUpOutlined title="涓婅竟璺�"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <StyleInput defaultValue={card.marginTop || '0px'} options={['px', 'vh', 'vw', '%']} onChange={(val) => this.changeNormalStyle(val, 'marginTop')}/>
+ <StyleInput clear={true} defaultValue={card.marginTop || ''} options={['px', 'vh', 'vw', '%']} onChange={(val) => this.changeNormalStyle(val, 'marginTop')}/>
</Form.Item>
</Col>
<Col span={24}>
@@ -808,7 +991,7 @@
label={<ArrowDownOutlined title="涓嬭竟璺�"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <StyleInput defaultValue={card.marginBottom || '0px'} options={['px', 'vh', 'vw', '%']} onChange={(val) => this.changeNormalStyle(val, 'marginBottom')}/>
+ <StyleInput clear={true} defaultValue={card.marginBottom || ''} options={['px', 'vh', 'vw', '%']} onChange={(val) => this.changeNormalStyle(val, 'marginBottom')}/>
</Form.Item>
</Col>
<Col span={24}>
@@ -817,7 +1000,7 @@
label={<ArrowLeftOutlined title="宸﹁竟璺�"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <StyleInput defaultValue={card.marginLeft || '0px'} options={['px', 'vh', 'vw', '%']} onChange={(val) => this.changeNormalStyle(val, 'marginLeft')}/>
+ <StyleInput clear={true} defaultValue={card.marginLeft || ''} options={['px', 'vh', 'vw', '%']} onChange={(val) => this.changeNormalStyle(val, 'marginLeft')}/>
</Form.Item>
</Col>
<Col span={24}>
@@ -826,7 +1009,7 @@
label={<ArrowRightOutlined title="鍙宠竟璺�"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <StyleInput defaultValue={card.marginRight || '0px'} options={['px', 'vh', 'vw', '%']} onChange={(val) => this.changeNormalStyle(val, 'marginRight')}/>
+ <StyleInput clear={true} defaultValue={card.marginRight || ''} options={['px', 'vh', 'vw', '%']} onChange={(val) => this.changeNormalStyle(val, 'marginRight')}/>
</Form.Item>
</Col>
</Panel> : null}
@@ -837,7 +1020,7 @@
label={<ArrowUpOutlined title="涓婅竟璺�"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <StyleInput defaultValue={card.paddingTop || '0px'} options={['px', 'vh', 'vw', '%']} onChange={(val) => this.changeNormalStyle(val, 'paddingTop')}/>
+ <StyleInput clear={true} defaultValue={card.paddingTop || ''} options={['px', 'vh', 'vw', '%']} onChange={(val) => this.changeNormalStyle(val, 'paddingTop')}/>
</Form.Item>
</Col>
<Col span={24}>
@@ -846,7 +1029,7 @@
label={<ArrowDownOutlined title="涓嬭竟璺�"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <StyleInput defaultValue={card.paddingBottom || '0px'} options={['px', 'vh', 'vw', '%']} onChange={(val) => this.changeNormalStyle(val, 'paddingBottom')}/>
+ <StyleInput clear={true} defaultValue={card.paddingBottom || ''} options={['px', 'vh', 'vw', '%']} onChange={(val) => this.changeNormalStyle(val, 'paddingBottom')}/>
</Form.Item>
</Col>
<Col span={24}>
@@ -855,7 +1038,7 @@
label={<ArrowLeftOutlined title="宸﹁竟璺�"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <StyleInput defaultValue={card.paddingLeft || '0px'} options={['px', 'vh', 'vw', '%']} onChange={(val) => this.changeNormalStyle(val, 'paddingLeft')}/>
+ <StyleInput clear={true} defaultValue={card.paddingLeft || ''} options={['px', 'vh', 'vw', '%']} onChange={(val) => this.changeNormalStyle(val, 'paddingLeft')}/>
</Form.Item>
</Col>
<Col span={24}>
@@ -864,11 +1047,11 @@
label={<ArrowRightOutlined title="鍙宠竟璺�"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <StyleInput defaultValue={card.paddingRight || '0px'} options={['px', 'vh', 'vw', '%']} onChange={(val) => this.changeNormalStyle(val, 'paddingRight')}/>
+ <StyleInput clear={true} defaultValue={card.paddingRight || ''} options={['px', 'vh', 'vw', '%']} onChange={(val) => this.changeNormalStyle(val, 'paddingRight')}/>
</Form.Item>
</Col>
</Panel> : null}
- {options.includes('float') ? <Panel header="瀵归綈鏂瑰紡" key="float">
+ {options.includes('float') ? <Panel header={<Tooltip placement="topLeft" title="鎸夐挳鐩稿浜庢爡鏍肩殑浣嶇疆锛屾敞锛氳缃搴︽椂鏈夋晥銆�">瀵归綈鏂瑰紡<QuestionCircleOutlined style={{marginLeft: '3px'}} /></Tooltip>} key="float">
<Col span={24}>
<Form.Item
colon={false}
@@ -890,14 +1073,136 @@
label={<ColumnHeightOutlined title="鏈�灏忛珮搴�"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <StyleInput defaultValue={card.minHeight || '28px'} options={['px']} onChange={(val) => this.changeNormalStyle(val, 'minHeight')}/>
+ <StyleInput clear={true} defaultValue={card.minHeight || ''} options={['px', 'vh', 'vw']} onChange={(val) => this.changeNormalStyle(val, 'minHeight')}/>
+ </Form.Item>
+ </Col>
+ </Panel> : null}
+ {options.includes('clear') ? <Panel header="娴姩" key="clear">
+ <Col span={24}>
+ <Form.Item
+ colon={false}
+ label={<SwapOutlined title="娴姩"/>}
+ labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
+ >
+ <Radio.Group style={{whiteSpace: 'nowrap'}} defaultValue={card.clear || 'none'} onChange={(e) => this.changeNormalStyle(e.target.value, 'clear')}>
+ <Radio value="none">宸︽诞鍔�</Radio>
+ <Radio value="left">涓嶆诞鍔�</Radio>
+ <Radio value="right">鍙虫诞鍔�</Radio>
+ </Radio.Group>
+ </Form.Item>
+ </Col>
+ </Panel> : null}
+ {options.includes('display') ? <Panel header="鏄剧ず" key="display">
+ <Col span={24}>
+ <Form.Item
+ colon={false}
+ label={<SwapOutlined title="鏄剧ず"/>}
+ labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
+ >
+ <Radio.Group style={{whiteSpace: 'nowrap'}} defaultValue={card.display || 'block'} onChange={(e) => this.changeNormalStyle(e.target.value, 'display')}>
+ <Radio value="block">鍧楃骇鍏冪礌</Radio>
+ <Radio value="inline-block">琛屽唴鍧楀厓绱�</Radio>
+ </Radio.Group>
+ </Form.Item>
+ </Col>
+ </Panel> : null}
+ {options.includes('overflow') ? <Panel header="婧㈠嚭" key="overflow">
+ <Col span={24}>
+ <Form.Item
+ colon={false}
+ label={<EyeOutlined title="婧㈠嚭"/>}
+ labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
+ >
+ <Radio.Group style={{whiteSpace: 'nowrap'}} defaultValue={card.overflow || 'hidden'} onChange={(e) => this.changeNormalStyle(e.target.value, 'overflow')}>
+ <Radio value="hidden">闅愯棌</Radio>
+ <Radio value="visible">鏄剧ず</Radio>
+ </Radio.Group>
+ </Form.Item>
+ </Col>
+ </Panel> : null}
+ {options.includes('position') ? <Panel header="瀹氫綅" key="position">
+ <div style={{paddingLeft: '35px', fontSize: '12px'}}>娉細瀹氫綅鏁堟灉璇峰湪杩愯鐜涓煡鐪嬨��</div>
+ <Col span={24}>
+ <Form.Item
+ colon={false}
+ label={<SwapOutlined title="瀹氫綅"/>}
+ labelCol={{xs: { span: 24 }, sm: { span: 3 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 21 }} }
+ >
+ <Radio.Group style={{whiteSpace: 'nowrap'}} defaultValue={card.position || 'unset'} onChange={(e) => this.changeNormalStyle(e.target.value, 'position')}>
+ <Radio value="unset">鏃�</Radio>
+ <Radio value="relative">鐩稿</Radio>
+ <Radio value="absolute">缁濆</Radio>
+ <Radio value="fixed">鍥哄畾</Radio>
+ </Radio.Group>
+ </Form.Item>
+ </Col>
+ <Col span={24}>
+ <Form.Item
+ colon={false}
+ label={<ArrowUpOutlined title="涓�"/>}
+ labelCol={{xs: { span: 24 }, sm: { span: 3 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 21 }} }
+ >
+ <StyleInput clear={true} defaultValue={card.top || ''} options={['px', 'vh', 'vw', '%']} onChange={(val) => this.changeNormalStyle(val, 'top')}/>
+ </Form.Item>
+ </Col>
+ <Col span={24}>
+ <Form.Item
+ colon={false}
+ label={<ArrowDownOutlined title="涓�"/>}
+ labelCol={{xs: { span: 24 }, sm: { span: 3 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 21 }} }
+ >
+ <StyleInput clear={true} defaultValue={card.bottom || ''} options={['px', 'vh', 'vw', '%']} onChange={(val) => this.changeNormalStyle(val, 'bottom')}/>
+ </Form.Item>
+ </Col>
+ <Col span={24}>
+ <Form.Item
+ colon={false}
+ label={<ArrowLeftOutlined title="宸�"/>}
+ labelCol={{xs: { span: 24 }, sm: { span: 3 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 21 }} }
+ >
+ <StyleInput clear={true} defaultValue={card.left || ''} options={['px', 'vh', 'vw', '%']} onChange={(val) => this.changeNormalStyle(val, 'left')}/>
+ </Form.Item>
+ </Col>
+ <Col span={24}>
+ <Form.Item
+ colon={false}
+ label={<ArrowRightOutlined title="鍙�"/>}
+ labelCol={{xs: { span: 24 }, sm: { span: 3 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 21 }} }
+ >
+ <StyleInput clear={true} defaultValue={card.right || ''} options={['px', 'vh', 'vw', '%']} onChange={(val) => this.changeNormalStyle(val, 'right')}/>
+ </Form.Item>
+ </Col>
+ </Panel> : null}
+ {options.includes('transform') ? <Panel header="浣嶇疆鍙樻崲" key="transform">
+ <div style={{paddingLeft: '50px', fontSize: '12px'}}>娉細鍙樻崲鏁堟灉璇峰湪杩愯鐜涓煡鐪嬨��</div>
+ <Col span={24}>
+ <Form.Item
+ colon={false}
+ label={<DragOutlined title="鍙樻崲"/>}
+ labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
+ >
+ <Select defaultValue={card.transform || ''} onChange={(val) => this.changeNormalStyle(val, 'transform')}>
+ <Option value="">鏃�</Option>
+ <Option value="translateY(-50%)">涓婄Щ50%</Option>
+ <Option value="translateY(50%)">涓嬬Щ50%</Option>
+ <Option value="translateX(-50%)">宸︾Щ50%</Option>
+ <Option value="translateX(50%)">鍙崇Щ50%</Option>
+ <Option value="translate(-50%, -50%)">宸︿笂绉�50%</Option>
+ <Option value="translate(-50%, 50%)">宸︿笅绉�50%</Option>
+ <Option value="translate(50%, -50%)">鍙充笂绉�50%</Option>
+ <Option value="translate(50%, 50%)">鍙充笅绉�50%</Option>
+ </Select>
</Form.Item>
</Col>
</Panel> : null}
</Collapse> : null}
</Form>
- <div style={{textAlign: 'right'}}>
- <Button style={{margin: '30px 10px 30px 0px'}} onClick={this.onCloseDrawer}>鍏抽棴</Button>
+ <div style={{textAlign: 'right', lineHeight: '60px', marginBottom: '30px'}}>
+ <div style={{float: 'left'}}>
+ <Button onClick={() => this.copy()} className="mk-border-green" style={{marginRight: '10px'}}>澶嶅埗</Button>
+ <PasteBoard getPasteValue={this.paste}><Button style={{borderColor: 'rgb(64, 169, 255)', color: 'rgb(64, 169, 255)'}}>绮樿创</Button></PasteBoard>
+ </div>
+ <Button style={{marginRight: '10px'}} onClick={this.onCloseDrawer}>鍏抽棴</Button>
</div>
</div>
</Drawer>
--
Gitblit v1.8.0