From 21167ece56edd628e6f6546d1d642947cc3a048f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 12 八月 2024 22:17:33 +0800
Subject: [PATCH] 2024-08-12

---
 src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx |  110 +++++++++++++++++++++++++++---------------------------
 1 files changed, 55 insertions(+), 55 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 b57fb2b..76ad886 100644
--- a/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx
+++ b/src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx
@@ -102,7 +102,7 @@
               })(<Input placeholder={''} autoComplete="off" onPressEnter={this.handleSubmit} />)}
             </Form.Item>
           </Col>
-          <Col span={22}>
+          {/* <Col span={22}>
             <Form.Item label="鑿滃崟鍙傛暟">
               {getFieldDecorator('MenuNo', {
                 initialValue: menu.MenuNo || '',
@@ -114,7 +114,7 @@
                 ]
               })(<Input placeholder={''} autoComplete="off" onPressEnter={this.handleSubmit} />)}
             </Form.Item>
-          </Col>
+          </Col> */}
           <Col span={22}>
             <Form.Item label="鑿滃崟灞炴��">
               {getFieldDecorator('property', {
@@ -129,6 +129,59 @@
               )}
             </Form.Item>
           </Col>
+          {property === 'linkmenu' ? <Col span={22}>
+            <Form.Item label={
+              <Tooltip placement="topLeft" title="鍏宠仈褰撳墠app涓凡鏈夌殑鑿滃崟銆�">
+                <QuestionCircleOutlined className="mk-form-tip" />
+                鍏宠仈鑿滃崟
+              </Tooltip>
+            }>
+              {getFieldDecorator('linkMenuId', {
+                initialValue: menu.linkMenuId || '',
+                rules: [{
+                  required: true,
+                  message: '璇烽�夋嫨鍏宠仈鑿滃崟!'
+                }]
+              })(
+                <Select>
+                  {appMenus.map(item => (<Select.Option key={item.MenuID} value={item.MenuID}>{item.MenuName}</Select.Option>))}
+                </Select>
+              )}
+            </Form.Item>
+          </Col> : null}
+          {property === 'menu' ? <Col span={22}>
+            <Form.Item label={
+              <Tooltip placement="topLeft" title="澶嶅埗鑿滃崟浠呭湪褰撳墠鑿滃崟涓嶅瓨鍦ㄦ椂鏈夋晥銆�">
+                <QuestionCircleOutlined className="mk-form-tip" />
+                澶嶅埗鑿滃崟
+              </Tooltip>
+            }>
+              {getFieldDecorator('copyMenuId', {
+                initialValue: menu.copyMenuId || ''
+              })(
+                <Select allowClear dropdownMatchSelectWidth={false} onChange={(val) => this.setState({copyMenu: val})}>
+                  {appMenus.map(item => (<Select.Option key={item.MenuID} value={item.MenuID}>{item.MenuName}</Select.Option>))}
+                </Select>
+              )}
+            </Form.Item>
+          </Col> : null}
+          {property === 'menu' && copyMenu ? <Col span={22}>
+            <Form.Item label={
+              <Tooltip placement="topLeft" title="澶嶅埗鑿滃崟鏃讹紝鏄惁娓呯┖鍘熼〉闈腑鐨勫叧鑱旇彍鍗曘��">
+                <QuestionCircleOutlined className="mk-form-tip" />
+                娓呯┖鍏宠仈鑿滃崟
+              </Tooltip>
+            }>
+              {getFieldDecorator('clearMenu', {
+                initialValue: menu.clearMenu || 'true'
+              })(
+                <Radio.Group>
+                  <Radio value="true">鏄�</Radio>
+                  <Radio value="false">鍚�</Radio>
+                </Radio.Group>
+              )}
+            </Form.Item>
+          </Col> : null}
           <Col span={22}>
             <Form.Item label="闅愯棌">
               {getFieldDecorator('hidden', {
@@ -162,59 +215,6 @@
                   message: '璇疯緭鍏ラ摼鎺ュ湴鍧�!'
                 }]
               })(<TextArea rows={2} />)}
-            </Form.Item>
-          </Col> : null}
-          {property === 'linkmenu' ? <Col span={22}>
-            <Form.Item label={
-              <Tooltip placement="topLeft" title="鍏宠仈褰撳墠app涓凡鏈夌殑鑿滃崟銆�">
-                <QuestionCircleOutlined className="mk-form-tip" />
-                鍏宠仈鑿滃崟
-              </Tooltip>
-            }>
-              {getFieldDecorator('linkMenuId', {
-                initialValue: menu.linkMenuId || '',
-                rules: [{
-                  required: true,
-                  message: '璇烽�夋嫨鍏宠仈鑿滃崟!'
-                }]
-              })(
-                <Select>
-                  {appMenus.map(item => (<Select.Option key={item.MenuID} value={item.MenuID}>{item.MenuName}</Select.Option>))}
-                </Select>
-              )}
-            </Form.Item>
-          </Col> : null}
-          {property === 'menu' ? <Col span={22}>
-            <Form.Item label={
-              <Tooltip placement="topLeft" title="澶嶅埗鑿滃崟浠呭湪褰撳墠鑿滃崟涓嶅瓨鍦ㄦ椂鏈夋晥銆�">
-                <QuestionCircleOutlined className="mk-form-tip" />
-                澶嶅埗鑿滃崟
-              </Tooltip>
-            }>
-              {getFieldDecorator('copyMenuId', {
-                initialValue: menu.copyMenuId || ''
-              })(
-                <Select allowClear onChange={(val) => this.setState({copyMenu: val})}>
-                  {appMenus.map(item => (<Select.Option key={item.MenuID} value={item.MenuID}>{item.MenuName}</Select.Option>))}
-                </Select>
-              )}
-            </Form.Item>
-          </Col> : null}
-          {property === 'menu' && copyMenu ? <Col span={12}>
-            <Form.Item label={
-              <Tooltip placement="topLeft" title="澶嶅埗鑿滃崟鏃讹紝鏄惁娓呯┖鍘熼〉闈腑鐨勫叧鑱旇彍鍗曘��">
-                <QuestionCircleOutlined className="mk-form-tip" />
-                娓呯┖鍏宠仈鑿滃崟
-              </Tooltip>
-            }>
-              {getFieldDecorator('clearMenu', {
-                initialValue: menu.clearMenu || 'true'
-              })(
-                <Radio.Group>
-                  <Radio value="true">鏄�</Radio>
-                  <Radio value="false">鍚�</Radio>
-                </Radio.Group>
-              )}
             </Form.Item>
           </Col> : null}
         </Row>

--
Gitblit v1.8.0