From 0c84df247914f893ef5e41d57a422e10a2dc814c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 12 十一月 2021 17:02:06 +0800
Subject: [PATCH] 2021-11-12

---
 src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx |   70 ++++++++++++++++++++++-------------
 1 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx b/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx
index a0411c6..39da53f 100644
--- a/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx
+++ b/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx
@@ -1,6 +1,7 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Radio, Tooltip, Icon, Select } from 'antd'
+import { Form, Row, Col, Input, Radio, Tooltip, Select } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
 
 import './index.scss'
 
@@ -14,7 +15,6 @@
 
   state = {
     property: this.props.menu.property || 'menu',
-    linkIntId: this.props.menu.linkIntId || '',
     appMenus: [],
   }
 
@@ -23,7 +23,7 @@
     if (appMenus) {
       try {
         appMenus = JSON.parse(appMenus)
-      } catch {
+      } catch (e) {
         appMenus = []
       }
     } else {
@@ -47,9 +47,6 @@
     return new Promise((resolve, reject) => {
       this.props.form.validateFieldsAndScroll((err, values) => {
         if (!err) {
-          if (values.linkmenuid) {
-            values.linkIntId = this.state.linkIntId || ''
-          }
           resolve(values)
         } else {
           reject(err)
@@ -70,10 +67,6 @@
     let val = e.target.value
 
     this.setState({property: val})
-  }
-
-  changeLinkMenu = (val, { props }) => {
-    this.setState({linkIntId: props.intid})
   }
 
   render() {
@@ -109,30 +102,44 @@
             </Form.Item>
           </Col>
           <Col span={22}>
+            <Form.Item label="鑿滃崟鍙傛暟">
+              {getFieldDecorator('MenuNo', {
+                initialValue: menu.MenuNo || '',
+                rules: [
+                  {
+                    required: true,
+                    message: '璇疯緭鍏ヨ彍鍗曞弬鏁�!'
+                  }
+                ]
+              })(<Input placeholder={''} autoComplete="off" onPressEnter={this.handleSubmit} />)}
+            </Form.Item>
+          </Col>
+          <Col span={22}>
             <Form.Item label="鑿滃崟灞炴��">
               {getFieldDecorator('property', {
                 initialValue: menu.property || 'menu'
               })(
                 <Radio.Group onChange={this.changeProperty}>
                   <Radio value="menu">鑿滃崟</Radio>
+                  <Radio value="linkmenu">鍏宠仈鑿滃崟</Radio>
                   <Radio value="link">閾炬帴</Radio>
                   {menu.level === 1 || menu.level === 2 ? <Radio value="classify">鍒嗙被</Radio> : null}
-                  <Radio value="linkmenu">鍏宠仈鑿滃崟</Radio>
                 </Radio.Group>
               )}
             </Form.Item>
           </Col>
-          {property === 'link' ? <Col span={22}>
-            <Form.Item label="閾炬帴鍦板潃">
-              {getFieldDecorator('link', {
-                initialValue: menu.link || '',
-                rules: [{
-                  required: true,
-                  message: '璇疯緭鍏ラ摼鎺ュ湴鍧�!'
-                }]
-              })(<TextArea rows={2} />)}
+          <Col span={22}>
+            <Form.Item label="闅愯棌">
+              {getFieldDecorator('hidden', {
+                initialValue: menu.hidden || 'false'
+              })(
+                <Radio.Group>
+                  <Radio value="false">鍚�</Radio>
+                  <Radio value="true">鏄�</Radio>
+                </Radio.Group>
+              )}
             </Form.Item>
-          </Col> : null}
+          </Col>
           {property !== 'classify' ? <Col span={22}>
             <Form.Item label="鎵撳紑鏂瑰紡">
               {getFieldDecorator('open', {
@@ -145,10 +152,21 @@
               )}
             </Form.Item>
           </Col> : null}
+          {property === 'link' ? <Col span={22}>
+            <Form.Item label="閾炬帴鍦板潃">
+              {getFieldDecorator('link', {
+                initialValue: menu.link || '',
+                rules: [{
+                  required: true,
+                  message: '璇疯緭鍏ラ摼鎺ュ湴鍧�!'
+                }]
+              })(<TextArea rows={2} />)}
+            </Form.Item>
+          </Col> : null}
           {property === 'linkmenu' ? <Col span={22}>
             <Form.Item label={
               <Tooltip placement="topLeft" title="鍏宠仈褰撳墠app涓凡鏈夌殑鑿滃崟銆�">
-                <Icon type="question-circle" style={{color: '#c49f47', marginRight: '3px'}}/>
+                <QuestionCircleOutlined className="mk-form-tip" />
                 鍏宠仈鑿滃崟
               </Tooltip>
             }>
@@ -159,8 +177,8 @@
                   message: '璇烽�夋嫨鍏宠仈鑿滃崟!'
                 }]
               })(
-                <Select onChange={this.changeLinkMenu}>
-                  {appMenus.map(item => (<Select.Option key={item.MenuID} intid={item.menuid_int} value={item.MenuID}>{item.MenuName}</Select.Option>))}
+                <Select>
+                  {appMenus.map(item => (<Select.Option key={item.MenuID} value={item.MenuID}>{item.MenuName}</Select.Option>))}
                 </Select>
               )}
             </Form.Item>
@@ -168,14 +186,14 @@
           {property === 'menu' ? <Col span={22}>
             <Form.Item label={
               <Tooltip placement="topLeft" title="澶嶅埗鑿滃崟浠呭湪褰撳墠鑿滃崟涓嶅瓨鍦ㄦ椂鏈夋晥銆�">
-                <Icon type="question-circle" style={{color: '#c49f47', marginRight: '3px'}}/>
+                <QuestionCircleOutlined className="mk-form-tip" />
                 澶嶅埗鑿滃崟
               </Tooltip>
             }>
               {getFieldDecorator('copyMenuId', {
                 initialValue: menu.copyMenuId || ''
               })(
-                <Select>
+                <Select allowClear>
                   {appMenus.map(item => (<Select.Option key={item.MenuID} value={item.MenuID}>{item.MenuName}</Select.Option>))}
                 </Select>
               )}

--
Gitblit v1.8.0