From f55f4730fd70b20560fab07a1fb31ca35020e2d6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 18 二月 2020 21:44:52 +0800
Subject: [PATCH] 2020-02-18
---
src/templates/tableshare/verifycardexcelin/columnform/index.jsx | 2 +-
src/templates/tableshare/tabform/index.jsx | 10 +++++-----
src/tabviews/subtable/index.jsx | 8 ++++----
src/templates/tableshare/verifycardexcelout/index.jsx | 9 ++++++++-
src/components/sidemenu/index.jsx | 5 ++++-
src/locales/zh-CN/comtable.js | 1 +
src/templates/formtabconfig/index.jsx | 2 +-
src/locales/en-US/comtable.js | 1 +
src/templates/comtableconfig/index.jsx | 2 +-
src/templates/tableshare/verifycardexcelin/index.jsx | 10 +++++++++-
src/templates/subtableconfig/index.jsx | 2 +-
11 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/src/components/sidemenu/index.jsx b/src/components/sidemenu/index.jsx
index cda1c72..804e9bd 100644
--- a/src/components/sidemenu/index.jsx
+++ b/src/components/sidemenu/index.jsx
@@ -89,6 +89,8 @@
}
let parentID = submenuId ? submenuId : result.data[0].ParentID // 灞曞紑浜岀骇鑿滃崟ID
+ let iframes = ['Main/Index', 'bda/rdt', 'Home/rdt']
+
let menulist = result.data.map(item => {
let _smenu = {}
_smenu.id = item.ParentID
@@ -100,6 +102,7 @@
} catch (e) {
_smenu.PageParam = {Icon: 'folder'}
}
+
if (item.FunMenu) {
_smenu.children = item.FunMenu.map(child => {
let _tmenu = {}
@@ -115,7 +118,7 @@
// } else if (child.LinkUrl === 'bda/rdt?pageno=rolemenus&MenuNo=RoleMenuM') {
// _tmenu.type = 'RoleManage'
// _tmenu.forbidden = true
- } else if (child.LinkUrl.split('?')[0] === 'Main/Index' || child.LinkUrl.split('?')[0] === 'bda/rdt') {
+ } else if (iframes.includes(child.LinkUrl.split('?')[0])) {
_tmenu.type = 'iframe'
_tmenu.forbidden = true
}
diff --git a/src/locales/en-US/comtable.js b/src/locales/en-US/comtable.js
index 9fbf495..3ab9167 100644
--- a/src/locales/en-US/comtable.js
+++ b/src/locales/en-US/comtable.js
@@ -35,6 +35,7 @@
'header.menu.page.configurable': 'Configuration Page',
'header.menu.menuID': 'Menu ID',
'header.menu.menuName': 'Menu Name',
+ 'header.menu.viewName': '椤甸潰鍚嶇О',
'header.menu.tabName': '鏍囩鍚嶇О',
'header.menu.Remark': '澶囨敞',
'header.menu.menuNo': 'Menu Parameter',
diff --git a/src/locales/zh-CN/comtable.js b/src/locales/zh-CN/comtable.js
index 75e1c28..3cb01d1 100644
--- a/src/locales/zh-CN/comtable.js
+++ b/src/locales/zh-CN/comtable.js
@@ -35,6 +35,7 @@
'header.menu.page.configurable': '椤甸潰閰嶇疆',
'header.menu.menuID': '鑿滃崟ID',
'header.menu.menuName': '鑿滃崟鍚嶇О',
+ 'header.menu.viewName': '椤甸潰鍚嶇О',
'header.menu.tabName': '鏍囩鍚嶇О',
'header.menu.Remark': '澶囨敞',
'header.menu.menuNo': '鑿滃崟鍙傛暟',
diff --git a/src/tabviews/subtable/index.jsx b/src/tabviews/subtable/index.jsx
index 924ba66..4286b1d 100644
--- a/src/tabviews/subtable/index.jsx
+++ b/src/tabviews/subtable/index.jsx
@@ -35,7 +35,7 @@
loadingview: true, // 椤甸潰鍔犺浇涓�
viewlost: false, // 椤甸潰涓㈠け锛�1銆佹湭鑾峰彇鍒伴厤缃�-椤甸潰涓㈠け锛�2銆侀〉闈㈡湭鍚敤
lostmsg: '', // 椤甸潰涓㈠け鏃剁殑鎻愮ず淇℃伅
- config: {}, // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷寜閽�佹悳绱€�佹樉绀哄垪銆佹爣绛剧瓑
+ config: null, // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷寜閽�佹悳绱€�佹樉绀哄垪銆佹爣绛剧瓑
searchlist: null, // 鎼滅储鏉′欢
actions: null, // 鎸夐挳闆�
columns: null, // 鏄剧ず鍒�
@@ -59,9 +59,9 @@
* @description 涓婄骇鑿滃崟id鍙樺寲鏃讹紝鍒锋柊鏁版嵁
*/
UNSAFE_componentWillReceiveProps(nextProps) {
- if (this.props.Tab.supMenu && !is(fromJS(this.props.BID), fromJS(nextProps.BID))) {
+ if (this.state.config && this.props.Tab.supMenu && !is(fromJS(this.props.BID), fromJS(nextProps.BID))) {
this.loadmaindata(nextProps.BID, 'refresh')
- } else if (nextProps.refreshtabs && nextProps.refreshtabs.includes(this.props.Tab.uuid)) {
+ } else if (this.state.config && nextProps.refreshtabs && nextProps.refreshtabs.includes(this.props.Tab.uuid)) {
this.reloadtable()
}
}
@@ -474,7 +474,7 @@
loadingview: true,
viewlost: false,
lostmsg: '',
- config: {},
+ config: null,
searchlist: null,
actions: null,
columns: null,
diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index b5fbadb..9cfe91e 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -429,7 +429,7 @@
{
type: 'text',
key: 'label',
- label: this.state.dict['header.form.name'],
+ label: this.state.dict['header.menu.tabName'],
initVal: card.label || '',
required: true
},
diff --git a/src/templates/formtabconfig/index.jsx b/src/templates/formtabconfig/index.jsx
index 14f1533..1c350e4 100644
--- a/src/templates/formtabconfig/index.jsx
+++ b/src/templates/formtabconfig/index.jsx
@@ -415,7 +415,7 @@
{
type: 'text',
key: 'label',
- label: this.state.dict['header.form.name'],
+ label: this.state.dict['header.menu.tabName'],
initVal: card.label || '',
required: true
},
diff --git a/src/templates/subtableconfig/index.jsx b/src/templates/subtableconfig/index.jsx
index 8e5ae6a..5256d39 100644
--- a/src/templates/subtableconfig/index.jsx
+++ b/src/templates/subtableconfig/index.jsx
@@ -124,7 +124,7 @@
{
type: 'text',
key: 'tabName',
- label: this.state.dict['header.menu.tabName'],
+ label: this.state.dict['header.menu.viewName'],
initVal: _config.tabName,
required: true,
readonly: false
diff --git a/src/templates/tableshare/tabform/index.jsx b/src/templates/tableshare/tabform/index.jsx
index dd25722..c09e01c 100644
--- a/src/templates/tableshare/tabform/index.jsx
+++ b/src/templates/tableshare/tabform/index.jsx
@@ -26,10 +26,10 @@
const { formlist } = this.props
let type = formlist.filter(cell => cell.key === 'type')[0].initVal
- let _initval = formlist.filter(cell => cell.key === 'linkTab')[0].initVal
+ // let _initval = formlist.filter(cell => cell.key === 'linkTab')[0].initVal
let _tabs = this.props.tabs.filter(tab => tab.type === type)
- let initTab = _tabs.filter(tab => tab.uuid === _initval)[0]
+ // let initTab = _tabs.filter(tab => tab.uuid === _initval)[0]
this.setState({
formlist: formlist.map(item => {
@@ -41,9 +41,9 @@
},
..._tabs
]
- if (!initTab) {
- item.initVal = ''
- }
+ // if (!initTab) {
+ // item.initVal = ''
+ // }
}
return item
diff --git a/src/templates/tableshare/verifycardexcelin/columnform/index.jsx b/src/templates/tableshare/verifycardexcelin/columnform/index.jsx
index 8358cca..3470733 100644
--- a/src/templates/tableshare/verifycardexcelin/columnform/index.jsx
+++ b/src/templates/tableshare/verifycardexcelin/columnform/index.jsx
@@ -101,7 +101,7 @@
initialValue: '',
rules: [
{
- required: this.props.range === 1,
+ required: true,
message: this.props.dict['form.required.input'] + 'Text!'
}
]
diff --git a/src/templates/tableshare/verifycardexcelin/index.jsx b/src/templates/tableshare/verifycardexcelin/index.jsx
index 4308e0a..b68375f 100644
--- a/src/templates/tableshare/verifycardexcelin/index.jsx
+++ b/src/templates/tableshare/verifycardexcelin/index.jsx
@@ -129,12 +129,20 @@
UNSAFE_componentWillMount() {
let _verify = this.props.card.verify || {}
+ let _columns = _verify.columns || []
+ _columns = _columns.map(col => {
+ col.required = col.required || 'true'
+ col.type = col.type || 'Nvarchar(50)'
+
+ return col
+ })
+
this.setState({
verify: {
..._verify,
sheet: _verify.sheet || 'Sheet1',
range: _verify.range || 0,
- columns: _verify.columns || [],
+ columns: _columns,
scripts: _verify.scripts || []
}
})
diff --git a/src/templates/tableshare/verifycardexcelout/index.jsx b/src/templates/tableshare/verifycardexcelout/index.jsx
index 522c8ed..7362874 100644
--- a/src/templates/tableshare/verifycardexcelout/index.jsx
+++ b/src/templates/tableshare/verifycardexcelout/index.jsx
@@ -60,10 +60,17 @@
UNSAFE_componentWillMount() {
let _verify = this.props.card.verify || {}
+ let _columns = _verify.columns || []
+ _columns = _columns.map(col => {
+ col.Width = col.Width || 20
+
+ return col
+ })
+
this.setState({
verify: {
..._verify,
- columns: _verify.columns || [],
+ columns: _columns,
}
})
}
--
Gitblit v1.8.0