Merge branch 'develop'

king

2023-11-05 ab949bb71eadda3ec1736ccdcfaa1b12b04cce6a

 src/views/menudesign/menuform/index.jsx

@@ -4,9 +4,13 @@
import { QuestionCircleOutlined } from '@ant-design/icons'

import Api from '@/api'
import asyncComponent from '@/utils/asyncComponent'
import './index.scss'

const { TextArea } = Input

const ColorSketch = asyncComponent(() => import('@/mob/colorsketch'))
const SysColorSketch = asyncComponent(() => import('@/menu/stylecontroller/syscolorsketch'))

class CustomMenuForm extends Component {
  static propTpyes = {
@@ -475,6 +479,16 @@
              })(<TextArea rows={2} placeholder={''} onChange={(e) => {this.selectChange('Remark', e.target.value)}}/>)}
            </Form.Item>
          </Col>
          <Col span={24}>
            <Form.Item style={{marginBottom: '0px'}} label="菜单颜色">
              <ColorSketch allowClear={true} value={config.menuColor || ''} onChange={(val) => {this.selectChange('menuColor', val)}} />
            </Form.Item>
          </Col>
          <Col span={24}>
            <Form.Item style={{marginBottom: '0px'}} label="系统色">
              <SysColorSketch onChange={(val) => {this.selectChange('menuColor', val)}} />
            </Form.Item>
          </Col>
        </Row>
      </Form>
    )