2023-02-05

king

2023-02-05 eabede786184b634bb7fc0344262ae040732e03b

2023-02-05

 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>

 src/menu/stylecombcontroller/styleInput/index.jsx

@@ -140,7 +140,7 @@
      <div className="style-input-box">
        <Input value={value} addonAfter={
          options.length > 1 ?
          <Select value={<span>{unit}</span>} onChange={this.changeUnit}>
          <Select value={unit} onChange={this.changeUnit}>
            {options.map(item => <Option key={item} value={item}>{item}</Option>)}
          </Select> :
          <div className="single-unit">{unit}</div>

 src/menu/stylecontroller/syscolorsketch/index.jsx

@@ -35,7 +35,7 @@

    return (
      <div className="sys-color-sketch-block">
        {colors.map(color => <span onClick={() => this.handleChange(color)} style={ {background: color} }></span>)}
        {colors.map(color => <span key={color} onClick={() => this.handleChange(color)} style={ {background: color} }></span>)}
      </div>
    )
  }