From ab949bb71eadda3ec1736ccdcfaa1b12b04cce6a Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期日, 05 十一月 2023 10:35:56 +0800 Subject: [PATCH] Merge branch 'develop' --- src/views/tabledesign/menuform/index.jsx | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/views/tabledesign/menuform/index.jsx b/src/views/tabledesign/menuform/index.jsx index 84553b2..e1a70b1 100644 --- a/src/views/tabledesign/menuform/index.jsx +++ b/src/views/tabledesign/menuform/index.jsx @@ -3,9 +3,13 @@ import { Form, Row, Col, Input, Select, notification, Switch, Radio } from 'antd' 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 = { @@ -374,6 +378,16 @@ })(<TextArea rows={2} placeholder={''} onChange={this.changeRemark} />)} </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> ) -- Gitblit v1.8.0