From 84484749fb00946f14002fa0db4d37a99f204c3a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 01 八月 2021 21:43:20 +0800
Subject: [PATCH] 2021-08-01
---
src/mob/components/menubar/normal-menubar/menucomponent/settingform/index.jsx | 18 +++++++++++++++++-
src/mob/components/menubar/normal-menubar/menucomponent/index.jsx | 2 +-
src/mob/components/navbar/normal-navbar/menusetting/menutable/index.jsx | 4 ++--
src/mob/components/navbar/normal-navbar/menusetting/menuform/index.jsx | 18 +++++++++++++++++-
src/mob/components/menubar/normal-menubar/menucomponent/settingform/index.scss | 6 ++++++
src/mob/components/navbar/normal-navbar/menusetting/menuform/index.scss | 7 +++++++
6 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx b/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
index bb3ba06..aae1331 100644
--- a/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
+++ b/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
@@ -192,7 +192,7 @@
wrapClassName="popview-modal"
title={'鑿滃崟璁剧疆'}
visible={visible}
- width={800}
+ width={900}
maskClosable={false}
okText={dict['model.submit']}
onOk={this.settingSubmit}
diff --git a/src/mob/components/menubar/normal-menubar/menucomponent/settingform/index.jsx b/src/mob/components/menubar/normal-menubar/menucomponent/settingform/index.jsx
index b193269..b68ed4e 100644
--- a/src/mob/components/menubar/normal-menubar/menucomponent/settingform/index.jsx
+++ b/src/mob/components/menubar/normal-menubar/menucomponent/settingform/index.jsx
@@ -135,14 +135,30 @@
}
]
})(
- <Radio.Group style={{whiteSpace: 'nowrap'}} onChange={(e) => this.setState({type: e.target.value})}>
+ <Radio.Group className="over" onChange={(e) => this.setState({type: e.target.value})}>
<Radio value="menu">鑿滃崟</Radio>
<Radio value="linkmenu">鍏宠仈鑿滃崟</Radio>
+ <Radio value="sysmenu">绯荤粺椤�</Radio>
<Radio value="link">閾炬帴</Radio>
</Radio.Group>
)}
</Form.Item>
</Col>
+ {type === 'sysmenu' ? <Col span={12}>
+ <Form.Item label="绯荤粺椤甸潰">
+ {getFieldDecorator('sysmenu', {
+ initialValue: setting.sysmenu || '',
+ rules: [{
+ required: true,
+ message: '璇烽�夋嫨绯荤粺椤甸潰!'
+ }]
+ })(
+ <Select>
+ <Select.Option value="AIService">鏅鸿兘瀹㈡湇</Select.Option>
+ </Select>
+ )}
+ </Form.Item>
+ </Col> : null}
{type === 'menu' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="澶嶅埗鑿滃崟浠呭湪褰撳墠鑿滃崟涓嶅瓨鍦ㄦ椂鏈夋晥銆�">
diff --git a/src/mob/components/menubar/normal-menubar/menucomponent/settingform/index.scss b/src/mob/components/menubar/normal-menubar/menucomponent/settingform/index.scss
index 91dfcf6..74dd321 100644
--- a/src/mob/components/menubar/normal-menubar/menucomponent/settingform/index.scss
+++ b/src/mob/components/menubar/normal-menubar/menucomponent/settingform/index.scss
@@ -22,4 +22,10 @@
.color-sketch-block {
margin-top: 7px;
}
+ .ant-radio-group.over {
+ white-space: nowrap;
+ .ant-radio-wrapper {
+ margin-right: 0;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/mob/components/navbar/normal-navbar/menusetting/menuform/index.jsx b/src/mob/components/navbar/normal-navbar/menusetting/menuform/index.jsx
index 2fafa7b..2c1173d 100644
--- a/src/mob/components/navbar/normal-navbar/menusetting/menuform/index.jsx
+++ b/src/mob/components/navbar/normal-navbar/menusetting/menuform/index.jsx
@@ -146,9 +146,10 @@
{getFieldDecorator('property', {
initialValue: menu.property || 'menu'
})(
- <Radio.Group onChange={this.changeProperty} style={{whiteSpace: 'nowrap'}}>
+ <Radio.Group onChange={this.changeProperty} className="over">
<Radio value="menu">鑿滃崟</Radio>
<Radio value="linkmenu">鍏宠仈鑿滃崟</Radio>
+ <Radio value="sysmenu">绯荤粺椤�</Radio>
<Radio value="link">閾炬帴</Radio>
</Radio.Group>
)}
@@ -166,6 +167,21 @@
)}
</Form.Item>
</Col>
+ {property === 'sysmenu' ? <Col span={12}>
+ <Form.Item label="绯荤粺椤甸潰">
+ {getFieldDecorator('sysmenu', {
+ initialValue: menu.sysmenu || '',
+ rules: [{
+ required: true,
+ message: '璇烽�夋嫨绯荤粺椤甸潰!'
+ }]
+ })(
+ <Select>
+ <Select.Option value="AIService">鏅鸿兘瀹㈡湇</Select.Option>
+ </Select>
+ )}
+ </Form.Item>
+ </Col> : null}
{property === 'link' ? <Col span={24}>
<Form.Item label="閾炬帴鍦板潃" className="textarea">
{getFieldDecorator('link', {
diff --git a/src/mob/components/navbar/normal-navbar/menusetting/menuform/index.scss b/src/mob/components/navbar/normal-navbar/menusetting/menuform/index.scss
index b94aad3..c4e38c9 100644
--- a/src/mob/components/navbar/normal-navbar/menusetting/menuform/index.scss
+++ b/src/mob/components/navbar/normal-navbar/menusetting/menuform/index.scss
@@ -7,4 +7,11 @@
width: 84%;
}
}
+
+ .ant-radio-group.over {
+ white-space: nowrap;
+ .ant-radio-wrapper {
+ margin-right: 0;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/mob/components/navbar/normal-navbar/menusetting/menutable/index.jsx b/src/mob/components/navbar/normal-navbar/menusetting/menutable/index.jsx
index 8ffba38..25a5ee3 100644
--- a/src/mob/components/navbar/normal-navbar/menusetting/menutable/index.jsx
+++ b/src/mob/components/navbar/normal-navbar/menusetting/menutable/index.jsx
@@ -23,7 +23,7 @@
{ title: '鑿滃崟鍚嶇О', dataIndex: 'name', key: 'name' },
{ title: '鑿滃崟鍙傛暟', dataIndex: 'MenuNo', key: 'MenuNo' },
{ title: '鑿滃崟灞炴��', dataIndex: 'property', key: 'property', render: text => {
- const trans = {menu: '鑿滃崟', link: '閾炬帴', linkmenu: '鍏宠仈鑿滃崟'}
+ const trans = {menu: '鑿滃崟', link: '閾炬帴', linkmenu: '鍏宠仈鑿滃崟', sysmenu: '绯荤粺椤�'}
return trans[text]
}},
@@ -177,7 +177,7 @@
<Modal
title="缂栬緫"
visible={visible}
- width={750}
+ width={900}
maskClosable={false}
onOk={this.menuSubmit}
onCancel={() => { this.setState({ visible: false }) }}
--
Gitblit v1.8.0