From c814723d4f7de7a4d84e9f7e95c58ec700c64c9a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 09 八月 2022 10:32:22 +0800
Subject: [PATCH] 2022-08-09
---
src/mob/components/navbar/normal-navbar/menus/menuform/index.jsx | 134 +++++++++++++-------------
src/pc/components/navbar/normal-navbar/index.jsx | 4
src/mob/components/menubar/normal-menubar/menucomponent/index.jsx | 2
src/views/pcdesign/index.jsx | 6
src/views/mobdesign/index.jsx | 9 +
src/mob/components/menubar/normal-menubar/menucomponent/options.jsx | 45 +++++---
src/pc/components/navbar/normal-navbar/menusetting/menuform/index.jsx | 74 +++++++-------
src/pc/components/navbar/normal-navbar/menusetting/menutable/index.jsx | 6
8 files changed, 146 insertions(+), 134 deletions(-)
diff --git a/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx b/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
index 863c894..3c28d9f 100644
--- a/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
+++ b/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
@@ -110,7 +110,7 @@
MenuID: card.setting.type === 'linkmenu' ? card.setting.linkMenuId : card.uuid,
copyMenuId: card.setting.type === 'menu' ? card.setting.copyMenuId : '',
clearMenu: card.setting.clearMenu || 'true',
- MenuNo: card.setting.MenuNo || '',
+ // MenuNo: card.setting.MenuNo || '',
MenuName: card.setting.name,
})
}
diff --git a/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx b/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx
index 3e8bc87..8e189c7 100644
--- a/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx
+++ b/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx
@@ -22,24 +22,13 @@
initval: setting.name || '',
required: true
},
- {
- type: 'text',
- field: 'MenuNo',
- label: '鑿滃崟鍙傛暟',
- initval: setting.MenuNo || '',
- required: true
- },
- {
- type: 'number',
- field: 'width',
- label: '瀹藉害',
- initval: setting.width || 24,
- tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
- min: 1,
- max: 24,
- precision: 0,
- required: true
- },
+ // {
+ // type: 'text',
+ // field: 'MenuNo',
+ // label: '鑿滃崟鍙傛暟',
+ // initval: setting.MenuNo || '',
+ // required: true
+ // },
{
type: 'radio',
field: 'type',
@@ -55,6 +44,7 @@
{field: 'copyMenuId', values: ['menu']},
{field: 'linkMenuId', values: ['linkmenu']},
{field: 'linkurl', values: ['link']},
+ {field: 'primaryId', values: ['menu', 'linkmenu']},
]
},
{
@@ -132,6 +122,17 @@
},
{
type: 'number',
+ field: 'width',
+ label: '瀹藉害',
+ initval: setting.width || 24,
+ tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
+ min: 1,
+ max: 24,
+ precision: 0,
+ required: true
+ },
+ {
+ type: 'number',
field: 'iconFont',
label: '瀛椾綋澶у皬',
initval: setting.iconFont || 20,
@@ -198,6 +199,14 @@
required: false,
options: columns
},
+ {
+ type: 'text',
+ field: 'primaryId',
+ label: '闈欐�佷富閿��',
+ initval: setting.primaryId || '',
+ tooltip: '鍙綔涓築ID浼犲埌涓嬩竴椤甸潰銆�',
+ required: false
+ }
]
return menuWrapForm
diff --git a/src/mob/components/navbar/normal-navbar/menus/menuform/index.jsx b/src/mob/components/navbar/normal-navbar/menus/menuform/index.jsx
index 2ffce2b..cacce83 100644
--- a/src/mob/components/navbar/normal-navbar/menus/menuform/index.jsx
+++ b/src/mob/components/navbar/normal-navbar/menus/menuform/index.jsx
@@ -106,44 +106,6 @@
</Form.Item>
</Col>
<Col span={12}>
- <Form.Item label="鑿滃崟鍙傛暟">
- {getFieldDecorator('MenuNo', {
- initialValue: menu.MenuNo || '',
- rules: [
- {
- required: true,
- message: '璇疯緭鍏ヨ彍鍗曞弬鏁�!'
- }
- ]
- })(<Input placeholder={''} autoComplete="off" onPressEnter={this.handleSubmit} />)}
- </Form.Item>
- </Col>
- <Col span={12}>
- <Form.Item label="鍥炬爣">
- {getFieldDecorator('icon', {
- initialValue: menu.icon || ''
- })(
- <MkEditIcon options={['normal', 'data', 'direction', 'edit', 'hint']} allowClear />
- )}
- </Form.Item>
- </Col>
- <Col span={12}>
- <Form.Item label={
- <Tooltip placement="topLeft" title="缁戝畾鎻愮ず瀛楁鍚庯紝浼氬湪鑿滃崟鍙充笂瑙掓樉绀烘彁绀轰俊鎭�傛敞锛氬湪娣诲姞鍥炬爣鏃舵湁鏁堛��">
- <QuestionCircleOutlined className="mk-form-tip" />
- 鎻愮ず
- </Tooltip>
- }>
- {getFieldDecorator('tip', {
- initialValue: menu.tip || ''
- })(
- <Select allowClear>
- {cols.map(item => <Select.Option key={item.uuid} value={item.field}>{item.label}</Select.Option>)}
- </Select>
- )}
- </Form.Item>
- </Col>
- <Col span={12}>
<Form.Item label="鑿滃崟灞炴��">
{getFieldDecorator('property', {
initialValue: menu.property || 'menu'
@@ -156,35 +118,6 @@
)}
</Form.Item>
</Col>
- <Col span={12}>
- <Form.Item label="闅愯棌">
- {getFieldDecorator('hidden', {
- initialValue: menu.hidden || 'false'
- })(
- <Radio.Group>
- <Radio value="false">鍚�</Radio>
- <Radio value="true">鏄�</Radio>
- </Radio.Group>
- )}
- </Form.Item>
- </Col>
- {property === 'menu' || property === 'linkmenu' ? <Col span={12}>
- <Form.Item label={
- <Tooltip placement="topLeft" title="鏇挎崲褰撳墠椤甸潰鎴栨墦寮�鏂伴〉闈紝鍦℉5鎴栧皬绋嬪簭涓湁鏁堛��">
- <QuestionCircleOutlined className="mk-form-tip" />
- 鎵撳紑鏂瑰紡
- </Tooltip>
- }>
- {getFieldDecorator('open', {
- initialValue: menu.open || 'self'
- })(
- <Radio.Group>
- <Radio value="self">鏍囩椤�</Radio>
- <Radio value="blank">鏂伴〉闈�</Radio>
- </Radio.Group>
- )}
- </Form.Item>
- </Col> : null}
{property === 'link' ? <Col span={24}>
<Form.Item label="閾炬帴鍦板潃" className="textarea">
{getFieldDecorator('link', {
@@ -261,6 +194,73 @@
)}
</Form.Item>
</Col> : null}
+ {/* <Col span={12}>
+ <Form.Item label="鑿滃崟鍙傛暟">
+ {getFieldDecorator('MenuNo', {
+ initialValue: menu.MenuNo || '',
+ rules: [
+ {
+ required: true,
+ message: '璇疯緭鍏ヨ彍鍗曞弬鏁�!'
+ }
+ ]
+ })(<Input placeholder={''} autoComplete="off" onPressEnter={this.handleSubmit} />)}
+ </Form.Item>
+ </Col> */}
+ <Col span={12}>
+ <Form.Item label="鍥炬爣">
+ {getFieldDecorator('icon', {
+ initialValue: menu.icon || ''
+ })(
+ <MkEditIcon options={['normal', 'data', 'direction', 'edit', 'hint']} allowClear />
+ )}
+ </Form.Item>
+ </Col>
+ <Col span={12}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="缁戝畾鎻愮ず瀛楁鍚庯紝浼氬湪鑿滃崟鍙充笂瑙掓樉绀烘彁绀轰俊鎭�傛敞锛氬湪娣诲姞鍥炬爣鏃舵湁鏁堛��">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 鎻愮ず
+ </Tooltip>
+ }>
+ {getFieldDecorator('tip', {
+ initialValue: menu.tip || ''
+ })(
+ <Select allowClear>
+ {cols.map(item => <Select.Option key={item.uuid} value={item.field}>{item.label}</Select.Option>)}
+ </Select>
+ )}
+ </Form.Item>
+ </Col>
+ <Col span={12}>
+ <Form.Item label="闅愯棌">
+ {getFieldDecorator('hidden', {
+ initialValue: menu.hidden || 'false'
+ })(
+ <Radio.Group>
+ <Radio value="false">鍚�</Radio>
+ <Radio value="true">鏄�</Radio>
+ </Radio.Group>
+ )}
+ </Form.Item>
+ </Col>
+ {property === 'menu' || property === 'linkmenu' ? <Col span={12}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="鏇挎崲褰撳墠椤甸潰鎴栨墦寮�鏂伴〉闈紝鍦℉5鎴栧皬绋嬪簭涓湁鏁堛��">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 鎵撳紑鏂瑰紡
+ </Tooltip>
+ }>
+ {getFieldDecorator('open', {
+ initialValue: menu.open || 'self'
+ })(
+ <Radio.Group>
+ <Radio value="self">鏍囩椤�</Radio>
+ <Radio value="blank">鏂伴〉闈�</Radio>
+ </Radio.Group>
+ )}
+ </Form.Item>
+ </Col> : null}
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="鍦℉5鎴栧皬绋嬪簭涓湁鏁堛��">
diff --git a/src/pc/components/navbar/normal-navbar/index.jsx b/src/pc/components/navbar/normal-navbar/index.jsx
index 0c8d24e..7a3868e 100644
--- a/src/pc/components/navbar/normal-navbar/index.jsx
+++ b/src/pc/components/navbar/normal-navbar/index.jsx
@@ -141,7 +141,7 @@
MenuID: menu.property === 'linkmenu' ? menu.linkMenuId : menu.MenuID,
copyMenuId: menu.property === 'menu' ? menu.copyMenuId : '',
clearMenu: menu.clearMenu || 'true',
- MenuNo: menu.MenuNo,
+ // MenuNo: menu.MenuNo,
MenuName: menu.name,
})
}
@@ -153,7 +153,7 @@
MKEmitter.emit('changeEditMenu', {
MenuID: card.wrap.linkmenu,
copyMenuId: '',
- MenuNo: '',
+ // MenuNo: '',
MenuName: ''
})
}
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..f8ea138 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,41 +129,6 @@
)}
</Form.Item>
</Col>
- <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>
- {property !== 'classify' ? <Col span={22}>
- <Form.Item label="鎵撳紑鏂瑰紡">
- {getFieldDecorator('open', {
- initialValue: menu.open || 'blank'
- })(
- <Radio.Group>
- <Radio value="blank">鏂扮獥鍙�</Radio>
- <Radio value="self">褰撳墠绐楀彛</Radio>
- </Radio.Group>
- )}
- </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涓凡鏈夌殑鑿滃崟銆�">
@@ -217,6 +182,41 @@
)}
</Form.Item>
</Col> : null}
+ <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>
+ {property !== 'classify' ? <Col span={22}>
+ <Form.Item label="鎵撳紑鏂瑰紡">
+ {getFieldDecorator('open', {
+ initialValue: menu.open || 'blank'
+ })(
+ <Radio.Group>
+ <Radio value="blank">鏂扮獥鍙�</Radio>
+ <Radio value="self">褰撳墠绐楀彛</Radio>
+ </Radio.Group>
+ )}
+ </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}
</Row>
</Form>
)
diff --git a/src/pc/components/navbar/normal-navbar/menusetting/menutable/index.jsx b/src/pc/components/navbar/normal-navbar/menusetting/menutable/index.jsx
index 8891018..3ee2c9c 100644
--- a/src/pc/components/navbar/normal-navbar/menusetting/menutable/index.jsx
+++ b/src/pc/components/navbar/normal-navbar/menusetting/menutable/index.jsx
@@ -21,7 +21,7 @@
editMenu: null,
columns: [
{ title: '鑿滃崟鍚嶇О', dataIndex: 'name', key: 'name' },
- { title: '鑿滃崟鍙傛暟', dataIndex: 'MenuNo', key: 'MenuNo' },
+ // { title: '鑿滃崟鍙傛暟', dataIndex: 'MenuNo', key: 'MenuNo' },
{ title: '鑿滃崟灞炴��', dataIndex: 'property', key: 'property', render: text => {
const trans = {menu: '鑿滃崟', link: '閾炬帴', linkmenu: '鍏宠仈鑿滃崟', classify: '鍒嗙被'}
@@ -203,7 +203,7 @@
editMenu: null,
columns: [
{ title: '鑿滃崟鍚嶇О', dataIndex: 'name', key: 'name' },
- { title: '鑿滃崟鍙傛暟', dataIndex: 'MenuNo', key: 'MenuNo' },
+ // { title: '鑿滃崟鍙傛暟', dataIndex: 'MenuNo', key: 'MenuNo' },
{ title: '鑿滃崟灞炴��', dataIndex: 'property', key: 'property', render: text => {
const trans = {menu: '鑿滃崟', link: '閾炬帴', linkmenu: '鍏宠仈鑿滃崟', classify: '鍒嗙被'}
@@ -402,7 +402,7 @@
editMenu: null,
columns: [
{ title: '鑿滃崟鍚嶇О', dataIndex: 'name', key: 'name' },
- { title: '鑿滃崟鍙傛暟', dataIndex: 'MenuNo', key: 'MenuNo' },
+ // { title: '鑿滃崟鍙傛暟', dataIndex: 'MenuNo', key: 'MenuNo' },
{ title: '鑿滃崟灞炴��', dataIndex: 'property', key: 'property', render: text => {
const trans = {menu: '鑿滃崟', link: '閾炬帴', linkmenu: '鍏宠仈鑿滃崟', classify: '鍒嗙被'}
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index 424b0e0..a519595 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -551,7 +551,8 @@
Template: 'webPage',
enabled: false,
MenuName: urlParam.MenuName || '',
- MenuNo: urlParam.MenuNo || '',
+ // MenuNo: urlParam.MenuNo || '',
+ MenuNo: '',
tables: [],
components: [],
viewType: 'menu',
@@ -801,7 +802,8 @@
config.MenuID = MenuId
config.open_edition = ''
config.MenuName = urlParam.MenuName || ''
- config.MenuNo = urlParam.MenuNo || ''
+ // config.MenuNo = urlParam.MenuNo || ''
+ config.MenuNo = ''
let indeComs = []
config.components.forEach(item => {
@@ -1090,7 +1092,8 @@
menus.push({
MenuID: m.uuid,
MenuName: m.setting.name,
- MenuNo: m.setting.MenuNo
+ // MenuNo: m.setting.MenuNo
+ MenuNo: ''
})
}
} else if (m.setting.type === 'linkmenu' && menuObj[m.setting.linkMenuId]) {
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index b26500d..cc33747 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -238,7 +238,7 @@
type: 'view'
}
- param.MenuNo = menu.MenuNo || ''
+ // param.MenuNo = menu.MenuNo || ''
param.MenuName = menu.MenuName || ''
param = window.btoa(window.encodeURIComponent(JSON.stringify(param)))
@@ -640,7 +640,7 @@
Template: 'webPage',
enabled: false,
MenuName: urlParam.MenuName || '',
- MenuNo: urlParam.MenuNo || '',
+ MenuNo: '',
tables: [],
components: [],
viewType: 'menu',
@@ -777,7 +777,7 @@
config.MenuID = MenuId
config.open_edition = ''
config.MenuName = urlParam.MenuName || ''
- config.MenuNo = urlParam.MenuNo || ''
+ config.MenuNo = ''
let indeComs = []
config.components.forEach(item => {
--
Gitblit v1.8.0