From c76e56d9cc6f8f5e93aaf355b269ec8cac8c6b95 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 15 二月 2020 02:18:10 +0800
Subject: [PATCH] 2020-02-15
---
src/templates/tableshare/verifycardexcelin/columnform/index.jsx | 4
src/tabviews/formtab/index.jsx | 23 --
src/templates/formtabconfig/settingform/index.jsx | 127 ++++++++++-----
src/templates/formtabconfig/index.jsx | 42 ++++-
node_modules.rar | 0
src/templates/comtableconfig/index.jsx | 4
src/templates/formtabconfig/actionform/index.jsx | 124 ++++++++++++++-
src/templates/subtableconfig/index.jsx | 4
src/templates/comtableconfig/settingform/index.jsx | 43 ++--
src/templates/modalconfig/index.jsx | 4
src/templates/formtabconfig/source.jsx | 6
src/templates/formtabconfig/dragelement/card.jsx | 2
src/locales/zh-CN/comtable.js | 4
src/tabviews/commontable/index.jsx | 10 +
src/templates/subtableconfig/settingform/index.jsx | 46 +++--
src/locales/en-US/comtable.js | 4
src/templates/formtabconfig/index.scss | 11
src/utils/option.js | 10 +
18 files changed, 330 insertions(+), 138 deletions(-)
diff --git a/node_modules.rar b/node_modules.rar
new file mode 100644
index 0000000..1fe7810
--- /dev/null
+++ b/node_modules.rar
Binary files differ
diff --git a/src/locales/en-US/comtable.js b/src/locales/en-US/comtable.js
index 3d3c64f..0460f6d 100644
--- a/src/locales/en-US/comtable.js
+++ b/src/locales/en-US/comtable.js
@@ -47,6 +47,9 @@
'header.menu.func.create': '鍒涘缓瀛樺偍杩囩▼',
'header.menu.tab': '鏍囩椤�',
'header.menu.tab.subtable': '瀛愯〃',
+ 'header.menu.datasource': '鏁版嵁鏉ユ簮',
+ 'header.menu.maintable': '涓昏〃',
+ 'header.menu.query': '鏌ヨ',
'header.form.tabType': '鏍囩绫诲瀷',
'header.form.search.placeholder': 'Please add search criteria',
'header.form.modal.placeholder': 'Please add the form',
@@ -69,6 +72,7 @@
'header.form.execError': 'Failure',
'header.form.messageTip': '淇℃伅鎻愮ず',
'header.form.errorTime': '鍋滅暀鏃堕棿',
+ 'header.form.refresh': '鍒锋柊',
'header.form.refresh.never': 'Don\'t refresh',
'header.form.refresh.view': 'Refresh the page',
'header.form.refresh.grid': 'Refresh the table',
diff --git a/src/locales/zh-CN/comtable.js b/src/locales/zh-CN/comtable.js
index 4dcf6c7..51f1649 100644
--- a/src/locales/zh-CN/comtable.js
+++ b/src/locales/zh-CN/comtable.js
@@ -47,6 +47,9 @@
'header.menu.func.create': '鍒涘缓瀛樺偍杩囩▼',
'header.menu.tab': '鏍囩椤�',
'header.menu.tab.subtable': '瀛愯〃',
+ 'header.menu.datasource': '鏁版嵁鏉ユ簮',
+ 'header.menu.maintable': '涓昏〃',
+ 'header.menu.query': '鏌ヨ',
'header.form.tabType': '鏍囩绫诲瀷',
'header.form.search.placeholder': '璇锋坊鍔犳悳绱㈡潯浠�',
'header.form.modal.placeholder': '璇锋坊鍔犺〃鍗�',
@@ -69,6 +72,7 @@
'header.form.execError': '鎵ц澶辫触',
'header.form.messageTip': '淇℃伅鎻愮ず',
'header.form.errorTime': '鍋滅暀鏃堕棿',
+ 'header.form.refresh': '鍒锋柊',
'header.form.refresh.never': '涓嶅埛鏂�',
'header.form.refresh.view': '鍒锋柊椤甸潰',
'header.form.refresh.grid': '鍒锋柊琛ㄦ牸',
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 067bbe5..ffc11cf 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -701,6 +701,14 @@
* @description 瑙﹀彂鎸夐挳寮圭獥锛堟爣绛鹃〉锛�
*/
triggerPopview = (btn, data) => {
+ const { setting } = this.state
+
+ let _primaryId = ''
+
+ if (data && data[0] && setting.primaryKey) {
+ _primaryId = data[0][setting.primaryKey] || ''
+ }
+
if (btn.OpenType === 'popview') {
this.setState({
popAction: btn,
@@ -718,6 +726,7 @@
param: {
btn: btn,
data: data,
+ primaryId: _primaryId,
arr_field: this.state.arr_field
}
}
@@ -742,6 +751,7 @@
tabParam: {
btn: btn,
data: data,
+ primaryId: _primaryId,
arr_field: this.state.arr_field
}
})
diff --git a/src/tabviews/formtab/index.jsx b/src/tabviews/formtab/index.jsx
index 77d9dab..79c1cea 100644
--- a/src/tabviews/formtab/index.jsx
+++ b/src/tabviews/formtab/index.jsx
@@ -89,7 +89,7 @@
}
let _arrField = [] // 瀛楁闆�
- console.log(this.props.param)
+
if (this.props.param && this.props.param.arr_field) {
_arrField = this.props.param.arr_field
} else {
@@ -132,34 +132,21 @@
}
})
- let _data = null
- let _isCustomData = false
-
- if (this.props.param && this.props.param.data) {
- _data = this.props.param.data[0] || null
- }
-
- if ((config.setting.interType === 'inner' && config.setting.innerFunc) || (config.setting.interType === 'outer' && config.setting.interface)) {
- _isCustomData = true
- _data = null
- }
-
-
this.setState({
config: config,
setting: config.setting,
actions: config.action,
isLinkMain: _isLinkMain,
arr_field: _arrField,
- data: _data,
+ data: config.setting.datatype === 'query' ? null : (this.props.param.data[0] || null),
BIDs: {
- mainTable: (!_isCustomData && _data && _data[0] && _data[0][config.setting.primaryKey]) || '',
- mainTabledata: (!_isCustomData && _data && _data[0]) || ''
+ mainTable: this.props.param.primaryId || '',
+ mainTabledata: config.setting.datatype === 'query' ? '' : (this.props.param.data[0] || '')
}
}, () => {
this.improveSelectOption(config.groups)
- if (_isCustomData) {
+ if (config.setting.datatype === 'query') {
this.loadmaindata()
}
})
diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index d50cd94..fedf01d 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -12,6 +12,7 @@
import zhCN from '@/locales/zh-CN/comtable.js'
import enUS from '@/locales/en-US/comtable.js'
import { getSearchForm, getActionForm, getColumnForm } from '@/templates/tableshare/formconfig'
+import { queryTableSql } from '@/utils/option.js'
import ActionForm from './actionform'
import SettingForm from './settingform'
@@ -186,8 +187,7 @@
componentDidMount () {
let param = {
func: 'sPC_Get_SelectedList',
- // LText: 'select TbName ,Remark from sDataDictionary where IsKey!=\'\' and Deleted =0',
- LText: 'select TbName,Remark from (select TbName,Remark from sDataDictb where appkey= @appkey@ and Deleted=0 union select a.TbName,Remark from (select TbName,Remark from sDataDictb where appkey= \'\' and Deleted=0 ) a left join (select TbName from sDataDictb where appkey= @appkey@ and Deleted=0 ) b on a.TbName=b.TbName where b.TbName is null ) t',
+ LText: queryTableSql,
obj_name: 'data',
arr_field: 'TbName,Remark'
}
diff --git a/src/templates/comtableconfig/settingform/index.jsx b/src/templates/comtableconfig/settingform/index.jsx
index 4d3b356..b55e8b4 100644
--- a/src/templates/comtableconfig/settingform/index.jsx
+++ b/src/templates/comtableconfig/settingform/index.jsx
@@ -21,11 +21,12 @@
columns: this.props.columns.filter(item => item.field && item.type !== 'colspan'),
currentTabs: null,
selectTabs: [],
- interReadonly: false
+ interReadonly: false,
+ primaryKey: ''
}
UNSAFE_componentWillMount() {
- const { config, data } = this.props
+ const { config, data, columns } = this.props
let _tabs = []
let _select = []
let _tabMap = new Map()
@@ -45,10 +46,26 @@
}
})
+ let primaryKey = data.primaryKey
+ if (primaryKey) {
+ let field = columns.filter(column => column.field === primaryKey)
+ if (field.length !== 1) {
+ primaryKey = ''
+ }
+ }
+ if (!primaryKey) {
+ columns.forEach(col => {
+ if (col.field.toLowerCase() === 'id') {
+ primaryKey = col.field
+ }
+ })
+ }
+
this.setState({
currentTabs: _tabs,
selectTabs: _select,
- interReadonly: data.sysInterface === 'true'
+ interReadonly: data.sysInterface === 'true',
+ primaryKey: primaryKey
})
}
@@ -122,7 +139,7 @@
render() {
const { data, dict, menu, usefulFields } = this.props
const { getFieldDecorator } = this.props.form
- const { interType, columns, selectTabs } = this.state
+ const { interType, columns, selectTabs, primaryKey } = this.state
const formItemLayout = {
labelCol: {
@@ -133,17 +150,6 @@
xs: { span: 24 },
sm: { span: 16 }
}
- }
-
- let primaryKey = data.primaryKey
- if (primaryKey) {
- let field = columns.filter(column => column.field === primaryKey)
- if (field.length !== 1) {
- primaryKey = ''
- }
- }
- if (!primaryKey && columns.length === 0) {
- primaryKey = 'ID'
}
let str = '^(' + usefulFields.join('|') + ')'
@@ -319,16 +325,13 @@
<Col span={12}>
<Form.Item label="涓婚敭">
{getFieldDecorator('primaryKey', {
- initialValue: primaryKey
+ initialValue: primaryKey || ''
})(
<Select
getPopupContainer={() => document.getElementById('commontable-setting-form')}
onChange={this.selectChange}
>
- <Select.Option key='unset' value="">涓嶈缃�</Select.Option>
- {columns.length === 0 ?
- <Select.Option key='id' value="ID">ID</Select.Option> : null
- }
+ <Select.Option key='unset' value="">鏈缃�</Select.Option>
{columns.map((option, index) =>
<Select.Option id={option.uuid} title={option.label} key={index} value={option.field}>{option.label}</Select.Option>
)}
diff --git a/src/templates/formtabconfig/actionform/index.jsx b/src/templates/formtabconfig/actionform/index.jsx
index 95bdf11..a87c475 100644
--- a/src/templates/formtabconfig/actionform/index.jsx
+++ b/src/templates/formtabconfig/actionform/index.jsx
@@ -28,6 +28,23 @@
}, {
value: 'update',
text: this.props.dict['header.form.action.update']
+ }],
+ returnoptions: [{ // 杩斿洖鍚�-涓嶅埛鏂般�佸埛鏂伴〉闈€�佸埛鏂拌〃鏍�
+ value: 'never',
+ text: this.props.dict['header.form.refresh.never']
+ }, {
+ value: 'grid',
+ text: this.props.dict['header.form.refresh.grid']
+ }, {
+ value: 'view',
+ text: this.props.dict['header.form.refresh.view']
+ }],
+ currentoptions: [{ // 涓嶈繑鍥炴椂-涓嶅埛鏂般�佸埛鏂�
+ value: 'never',
+ text: this.props.dict['header.form.refresh.never']
+ }, {
+ value: 'refresh',
+ text: this.props.dict['header.form.refresh']
}]
}
@@ -36,20 +53,32 @@
const { card } = this.props
let _intertype = ''
let _options = null
- console.log(this.props.card.btnType)
+ let _success = 'close'
+ let _error = 'notclose'
+
+ this.props.formlist.forEach(form => {
+ if (form.key === 'intertype') {
+ _intertype = form.initVal
+ } else if (form.key === 'afterExecSuccess') {
+ _success = form.initVal
+ } else if (form.key === 'afterExecError') {
+ _error = form.initVal
+ }
+ })
+
if (card.btnType === 'cancel') {
_options = ['label', 'OpenType', 'icon', 'class', 'execSuccess']
- } else {
- this.props.formlist.forEach(form => {
- if (form.key === 'intertype') {
- _intertype = form.initVal
- }
- })
-
+ } else if (card.btnType === 'confirm') {
if (_intertype === 'outer') {
_options = ['label', 'OpenType', 'intertype', 'innerFunc', 'interface', 'outerFunc', 'callbackFunc', 'sysInterface', 'icon', 'class', 'execSuccess', 'execError', 'afterExecSuccess', 'afterExecError']
} else {
_options = ['label', 'OpenType', 'intertype', 'innerFunc', 'icon', 'class', 'execSuccess', 'execError', 'sql', 'sqlType', 'afterExecSuccess', 'afterExecError']
+ }
+ } else {
+ if (_intertype === 'outer') {
+ _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'interface', 'outerFunc', 'callbackFunc', 'sysInterface', 'icon', 'class', 'execSuccess', 'execError', 'afterExecSuccess', 'afterExecError']
+ } else {
+ _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'icon', 'class', 'execSuccess', 'execError', 'afterExecSuccess', 'afterExecError']
}
}
@@ -76,7 +105,22 @@
}
} else if (item.key === 'execSuccess' && card.btnType === 'cancel') {
item.label = '鍏抽棴鍚�'
+ } else if (item.key === 'execSuccess' && card.btnType !== 'cancel') {
+ if (_success === 'close') {
+ item.options = this.state.returnoptions
+ } else {
+ item.options = this.state.currentoptions
+ }
+ } else if (item.key === 'execError') {
+ if (_error === 'close') {
+ item.options = this.state.returnoptions
+ } else {
+ item.options = this.state.currentoptions
+ }
+ } else if (item.key === 'innerFunc' && card.btnType !== 'confirm' && _intertype === 'inner') {
+ item.required = true
}
+
item.hidden = !_options.includes(item.key)
return item
})
@@ -96,15 +140,66 @@
}
}
+ selectChange = (key, value) => {
+ if (key === 'afterExecSuccess') {
+ this.setState({
+ formlist: this.state.formlist.map(item => {
+ if (item.key === 'execSuccess') {
+ if (value === 'close') {
+ item.options = this.state.returnoptions
+ } else {
+ item.options = this.state.currentoptions
+ }
+ }
+
+ return item
+ })
+ })
+ this.props.form.setFieldsValue({
+ execSuccess: 'never'
+ })
+ } else if (key === 'afterExecError') {
+ this.setState({
+ formlist: this.state.formlist.map(item => {
+ if (item.key === 'execError') {
+ if (value === 'close') {
+ item.options = this.state.returnoptions
+ } else {
+ item.options = this.state.currentoptions
+ }
+ }
+
+ return item
+ })
+ })
+ this.props.form.setFieldsValue({
+ execError: 'never'
+ })
+ }
+ }
+
onChange = (e, key) => {
+ const { card } = this.props
+
let value = e.target.value
+
if (key === 'intertype') {
let _options = null
- if (value === 'inner') {
- _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'icon', 'class', 'execSuccess', 'execError', 'sql', 'sqlType', 'afterExecSuccess', 'afterExecError']
+
+ if (card.btnType === 'confirm') {
+ if (value === 'outer') {
+ _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'interface', 'outerFunc', 'callbackFunc', 'sysInterface', 'icon', 'class', 'execSuccess', 'execError', 'afterExecSuccess', 'afterExecError']
+ } else {
+ _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'icon', 'class', 'execSuccess', 'execError', 'sql', 'sqlType', 'afterExecSuccess', 'afterExecError']
+ }
} else {
- _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'icon', 'class', 'execSuccess', 'execError', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc', 'afterExecSuccess', 'afterExecError']
+ if (value === 'outer') {
+ _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'interface', 'outerFunc', 'callbackFunc', 'sysInterface', 'icon', 'class', 'execSuccess', 'execError', 'afterExecSuccess', 'afterExecError']
+ } else {
+ _options = ['label', 'OpenType', 'intertype', 'innerFunc', 'icon', 'class', 'execSuccess', 'execError', 'afterExecSuccess', 'afterExecError']
+ }
}
+
this.setState({
interType: value,
formlist: this.state.formlist.map(item => {
@@ -114,7 +209,12 @@
item.readonly = false
} else if (item.key === 'sysInterface') {
item.initVal = 'false'
+ } else if (item.key === 'innerFunc' && card.btnType !== 'confirm' && value === 'inner') {
+ item.required = true
+ } else if (item.key === 'innerFunc' && card.btnType !== 'confirm' && value === 'outer') {
+ item.required = false
}
+
return item
})
})
@@ -125,7 +225,6 @@
})
}
this.setState({
- // interType: value,
formlist: this.state.formlist.map(item => {
if (item.key === 'interface' && value === 'true') {
item.readonly = true
@@ -230,6 +329,7 @@
showSearch
filterOption={(input, option) => option.props.children[2].toLowerCase().indexOf(input.toLowerCase()) >= 0}
getPopupContainer={() => document.getElementById('winter')}
+ onChange={(val) => this.selectChange(item.key, val)}
disabled={!!item.readonly}
>
{item.options.map((option, index) =>
diff --git a/src/templates/formtabconfig/dragelement/card.jsx b/src/templates/formtabconfig/dragelement/card.jsx
index 169d396..0b907c4 100644
--- a/src/templates/formtabconfig/dragelement/card.jsx
+++ b/src/templates/formtabconfig/dragelement/card.jsx
@@ -133,7 +133,7 @@
}
</div>
<Icon className="edit" title="缂栬緫" type="edit" onClick={edit} />
- {type === 'action' && ['prompt', 'exec'].includes(card.OpenType) && card.intertype === 'inner' && !card.innerFunc ?
+ {type === 'action' && card.btnType === 'confirm' && card.intertype === 'inner' && !card.innerFunc ?
<Icon className="edit profile" title="鏍￠獙瑙勫垯" type="profile" onClick={profile} /> : null
}
{card.btnType !== 'confirm' && card.btnType !== 'cancel' && <Icon className="edit close" title="鍒犻櫎" type="close" onClick={del} />}
diff --git a/src/templates/formtabconfig/index.jsx b/src/templates/formtabconfig/index.jsx
index 830ea64..e2b0def 100644
--- a/src/templates/formtabconfig/index.jsx
+++ b/src/templates/formtabconfig/index.jsx
@@ -12,11 +12,11 @@
import enUS from '@/locales/en-US/comtable.js'
import Utils from '@/utils/utils.js'
import { getModalForm, getActionForm } from '@/templates/tableshare/formconfig'
+import { queryTableSql } from '@/utils/option.js'
import ModalForm from '@/templates/ushare/modalform'
import ActionForm from './actionform'
import SettingForm from './settingform'
-// import ModalForm from './modalform'
import DragElement from './dragelement'
import GroupForm from './groupform'
import TabForm from '@/templates/tableshare/tabform'
@@ -63,8 +63,8 @@
funcLoading: false, // 瀛樺偍杩囩▼鍒涘缓涓�
tabviews: [], // 鎵�鏈夋爣绛鹃〉
profileVisible: false, // 楠岃瘉淇℃伅妯℃�佹
- editgroup: null,
- groupVisible: null
+ editgroup: null, // 褰撳墠缂栬緫缁�
+ groupVisible: false // 缂栬緫缁勬ā鎬佹
}
/**
@@ -123,8 +123,7 @@
componentDidMount () {
let param = {
func: 'sPC_Get_SelectedList',
- // LText: 'select TbName ,Remark from sDataDictionary where IsKey!=\'\' and Deleted =0',
- LText: 'select TbName,Remark from (select TbName,Remark from sDataDictb where appkey= @appkey@ and Deleted=0 union select a.TbName,Remark from (select TbName,Remark from sDataDictb where appkey= \'\' and Deleted=0 ) a left join (select TbName from sDataDictb where appkey= @appkey@ and Deleted=0 ) b on a.TbName=b.TbName where b.TbName is null ) t',
+ LText: queryTableSql,
obj_name: 'data',
arr_field: 'TbName,Remark'
}
@@ -1177,6 +1176,13 @@
let _LongParam = ''
let _config = {...config, tables: this.state.selectedTables}
+ // 鏁版嵁鏉ユ簮涓烘煡璇笖鏈缃富閿椂锛屽惎鐢ㄤ负false
+ if (_config.setting.datatype === 'query' && !_config.setting.primaryKey) {
+ _config.enabled = false
+ } else if (_config.setting.datatype === 'query' && _config.setting.interType === 'inner' && !_config.setting.innerFunc && !_config.setting.dataresource) {
+ _config.enabled = false
+ }
+
// 鏍囩涓嶅悎娉曟椂锛屽惎鐢ㄧ姸鎬佷负false
if (_config.tabgroups.length > 1) {
_config.tabgroups.forEach(group => {
@@ -1739,17 +1745,37 @@
}
})
}
+ let forminvalid = true
+ if (config.groups.length > 1) {
+ config.groups.forEach(group => {
+ if (group.sublist.length === 0) {
+ forminvalid = false
+ }
+ })
+ }
- if (config.setting.interType === 'inner' && !config.setting.innerFunc && !config.setting.dataresource) {
+ if (config.setting.datatype === 'query' && config.setting.interType === 'inner' && !config.setting.innerFunc && !config.setting.dataresource) {
notification.warning({
top: 92,
- message: '鑿滃崟灏氭湭璁剧疆鏁版嵁婧愶紝涓嶅彲鍚敤锛�',
+ message: '灏氭湭璁剧疆鏁版嵁婧愶紝涓嶅彲鍚敤锛�',
+ duration: 10
+ })
+ } else if (config.setting.datatype === 'query' && config.setting.primaryKey) {
+ notification.warning({
+ top: 92,
+ message: '灏氭湭璁剧疆涓婚敭锛屼笉鍙惎鐢紒',
duration: 10
})
} else if (!tabinvalid) {
notification.warning({
top: 92,
- message: '鑿滃崟鏍囩椤佃缃敊璇紙澶氳鏍囩鍐咃紝琛屾爣绛句笉鍙负绌猴級锛屼笉鍙惎鐢紒',
+ message: '瀛樺湪澶氫綑鏍囩缁勶紝涓嶅彲鍚敤锛�',
+ duration: 10
+ })
+ } else if (!forminvalid) {
+ notification.warning({
+ top: 92,
+ message: '瀛樺湪澶氫綑绌鸿〃鍗曠粍锛屼笉鍙惎鐢紒',
duration: 10
})
} else {
diff --git a/src/templates/formtabconfig/index.scss b/src/templates/formtabconfig/index.scss
index 31bafb6..32dd704 100644
--- a/src/templates/formtabconfig/index.scss
+++ b/src/templates/formtabconfig/index.scss
@@ -300,14 +300,17 @@
cursor: pointer;
display: none;
}
- .edit.close {
- left: 40px;
- color: #ff4d4f;
- }
.edit.profile {
left: 20px;
color: purple;
}
+ .edit.close {
+ left: 20px;
+ color: #ff4d4f;
+ }
+ .edit.profile + .edit.close {
+ left: 40px;
+ }
button {
cursor: move;
min-width: 65px;
diff --git a/src/templates/formtabconfig/settingform/index.jsx b/src/templates/formtabconfig/settingform/index.jsx
index c724b8b..15b044f 100644
--- a/src/templates/formtabconfig/settingform/index.jsx
+++ b/src/templates/formtabconfig/settingform/index.jsx
@@ -19,11 +19,12 @@
columns: null,
currentTabs: null,
selectTabs: [],
- interReadonly: false
+ interReadonly: false,
+ primaryKey: ''
}
UNSAFE_componentWillMount() {
- const { config, menu } = this.props
+ const { config } = this.props
let _tabs = []
let _select = []
@@ -32,9 +33,6 @@
let _setting = config.setting
try {
- if (menu && menu.LongParam) {
- _columns = menu.LongParam.columns.filter(item => item.field && item.type !== 'colspan')
- }
config.groups.forEach(group => {
let list = group.sublist.filter(item => item.field)
_columns = [..._columns, ...list]
@@ -72,12 +70,30 @@
}
})
+ let primaryKey = _setting.primaryKey
+ if (primaryKey) {
+ let field = _columns.filter(column => column.field === primaryKey)
+ if (field.length !== 1) {
+ primaryKey = ''
+ }
+ }
+ if (!primaryKey) {
+ _columns.forEach(col => {
+ if (col.field.toLowerCase() === 'id') {
+ primaryKey = col.field
+ }
+ })
+ }
+
this.setState({
currentTabs: _tabs,
selectTabs: _select,
columns: _columns,
setting: _setting,
- interReadonly: _setting.sysInterface === 'true'
+ interType: _setting.interType || 'inner',
+ interReadonly: _setting.sysInterface === 'true',
+ datatype: _setting.datatype || 'maintable',
+ primaryKey: primaryKey
})
}
@@ -131,10 +147,34 @@
})
}
+ sourceChange = (e) => {
+ const { interType } = this.state
+
+ this.setState({
+ datatype: e.target.value
+ }, () => {
+ if (interType === 'inner') return
+
+ let _type = this.props.form.getFieldValue('sysInterface')
+ if (_type === 'true') {
+ this.props.form.setFieldsValue({
+ interface: window.GLOB.mainSystemApi || window.GLOB.subSystemApi
+ })
+ this.setState({
+ interReadonly: true
+ })
+ } else {
+ this.setState({
+ interReadonly: false
+ })
+ }
+ })
+ }
+
render() {
const { dict, usefulFields, menu } = this.props
const { getFieldDecorator } = this.props.form
- const { interType, columns, selectTabs, setting } = this.state
+ const { interType, columns, selectTabs, setting, datatype, primaryKey } = this.state
const formItemLayout = {
labelCol: {
@@ -145,17 +185,6 @@
xs: { span: 24 },
sm: { span: 16 }
}
- }
-
- let primaryKey = setting.primaryKey
- if (primaryKey) {
- let field = columns.filter(column => column.field === primaryKey)
- if (field.length !== 1) {
- primaryKey = ''
- }
- }
- if (!primaryKey && columns.length === 0) {
- primaryKey = 'ID'
}
let str = '^(' + usefulFields.join('|') + ')'
@@ -195,9 +224,37 @@
</Form.Item>
</Col>
<Col span={12}>
+ <Form.Item label={dict['header.menu.datasource']}>
+ {getFieldDecorator('datatype', {
+ initialValue: setting.datatype || 'maintable'
+ })(
+ <Radio.Group onChange={this.sourceChange}>
+ <Radio value="maintable">{dict['header.menu.maintable']}</Radio>
+ <Radio value="query">{dict['header.menu.query']}</Radio>
+ </Radio.Group>
+ )}
+ </Form.Item>
+ </Col>
+ {datatype === 'query' ? <Col span={12}>
+ <Form.Item label="涓婚敭">
+ {getFieldDecorator('primaryKey', {
+ initialValue: primaryKey || ''
+ })(
+ <Select
+ getPopupContainer={() => document.getElementById('commontable-setting-form')}
+ >
+ <Select.Option key='unset' value="">鏈缃�</Select.Option>
+ {columns.map((option, index) =>
+ <Select.Option id={option.uuid} title={option.label} key={index} value={option.field}>{option.label}</Select.Option>
+ )}
+ </Select>
+ )}
+ </Form.Item>
+ </Col> : null}
+ {datatype === 'query' ? <Col span={12}>
<Form.Item label={dict['header.form.intertype']}>
{getFieldDecorator('interType', {
- initialValue: setting.interType || 'inner'
+ initialValue: interType
})(
<Radio.Group onChange={this.onChange}>
<Radio value="inner">{dict['header.form.interface.inner']}</Radio>
@@ -205,8 +262,8 @@
</Radio.Group>
)}
</Form.Item>
- </Col>
- {interType === 'outer' ? <Col span={12}>
+ </Col> : null}
+ {datatype === 'query' && interType === 'outer' ? <Col span={12}>
<Form.Item label={dict['header.form.sysInterface']}>
{getFieldDecorator('sysInterface', {
initialValue: setting.sysInterface || 'false'
@@ -218,7 +275,7 @@
)}
</Form.Item>
</Col> : null}
- {interType === 'outer' ? <Col span={12}>
+ {datatype === 'query' && interType === 'outer' ? <Col span={12}>
<Form.Item label={dict['header.form.interface']}>
{getFieldDecorator('interface', {
initialValue: setting.sysInterface === 'true' ? (window.GLOB.mainSystemApi || window.GLOB.subSystemApi) : (setting.interface || ''),
@@ -235,7 +292,7 @@
})(<Input placeholder="" autoComplete="off" disabled={this.state.interReadonly} />)}
</Form.Item>
</Col> : null}
- {interType !== 'outer' ? <Col span={12}>
+ {datatype === 'query' && interType !== 'outer' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" overlayClassName="middle" title={`鍙嚜瀹氫箟鏁版嵁澶勭悊鍑芥暟锛屽嚱鏁板悕绉伴渶浠�${usefulFields.join(', ')}绛夊瓧绗﹀紑濮嬶紱鏈缃椂浼氳皟鐢ㄧ郴缁熷嚱鏁帮紝浣跨敤绯荤粺鍑芥暟闇�瀹屽杽鏁版嵁婧愩�俙}>
<Icon type="question-circle" />
@@ -256,7 +313,7 @@
})(<Input placeholder="" autoComplete="off" />)}
</Form.Item>
</Col> : null}
- {interType !== 'outer' ? <Col span={24}>
+ {datatype === 'query' && interType !== 'outer' ? <Col span={24}>
<Form.Item help={'鏁版嵁ID锛�' + menu.MenuID} label={
<Tooltip placement="topLeft" title="浣跨敤绯荤粺鍑芥暟鏃讹紝闇�濉啓鏁版嵁婧愶紝鑷畾涔夊嚱鏁版椂锛屽彲蹇界暐銆�">
<Icon type="question-circle" />
@@ -268,7 +325,7 @@
})(<TextArea rows={4} />)}
</Form.Item>
</Col> : null}
- {interType === 'outer' ? <Col span={12}>
+ {datatype === 'query' && interType === 'outer' ? <Col span={12}>
<Form.Item label={dict['header.form.outerFunc']}>
{getFieldDecorator('outerFunc', {
initialValue: setting.outerFunc || '',
@@ -284,26 +341,6 @@
})(<Input placeholder="" autoComplete="off" />)}
</Form.Item>
</Col> : null}
-
- <Col span={12}>
- <Form.Item label="涓婚敭">
- {getFieldDecorator('primaryKey', {
- initialValue: primaryKey
- })(
- <Select
- getPopupContainer={() => document.getElementById('commontable-setting-form')}
- >
- <Select.Option key='unset' value="">涓嶈缃�</Select.Option>
- {columns.length === 0 ?
- <Select.Option key='id' value="ID">ID</Select.Option> : null
- }
- {columns.map((option, index) =>
- <Select.Option id={option.uuid} title={option.label} key={index} value={option.field}>{option.label}</Select.Option>
- )}
- </Select>
- )}
- </Form.Item>
- </Col>
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="涓昏〃鍙�夊彇鍏宠仈鏍囩锛屾爣绛惧叧鑱斿悗锛屼富琛ㄦ暟鎹垏鎹㈡椂锛屼笅绾ф爣绛句細璺熼殢涓昏〃涓婚敭鍊煎彉鍖栥��">
diff --git a/src/templates/formtabconfig/source.jsx b/src/templates/formtabconfig/source.jsx
index bb6e0f9..b66366c 100644
--- a/src/templates/formtabconfig/source.jsx
+++ b/src/templates/formtabconfig/source.jsx
@@ -82,7 +82,7 @@
execError: 'never',
errorTime: 15,
OpenType: 'exec',
- icon: 'plus',
+ icon: '',
class: 'green',
verify: null
}, {
@@ -95,8 +95,8 @@
OpenType: 'exec',
pageTemplate: '',
url: '',
- icon: 'rollback',
- class: 'purple'
+ icon: '',
+ class: 'danger'
}
],
tabs: [
diff --git a/src/templates/modalconfig/index.jsx b/src/templates/modalconfig/index.jsx
index 4b7b064..e299d77 100644
--- a/src/templates/modalconfig/index.jsx
+++ b/src/templates/modalconfig/index.jsx
@@ -11,6 +11,7 @@
import enUS from '@/locales/en-US/comtable.js'
import Utils from '@/utils/utils.js'
import { getModalForm } from '@/templates/tableshare/formconfig'
+import { queryTableSql } from '@/utils/option.js'
import ModalForm from '@/templates/ushare/modalform'
import DragElement from './dragelement'
@@ -131,8 +132,7 @@
componentDidMount () {
let param = {
func: 'sPC_Get_SelectedList',
- // LText: 'select TbName ,Remark from sDataDictionary where IsKey!=\'\' and Deleted =0',
- LText: 'select TbName,Remark from (select TbName,Remark from sDataDictb where appkey= @appkey@ and Deleted=0 union select a.TbName,Remark from (select TbName,Remark from sDataDictb where appkey= \'\' and Deleted=0 ) a left join (select TbName from sDataDictb where appkey= @appkey@ and Deleted=0 ) b on a.TbName=b.TbName where b.TbName is null ) t',
+ LText: queryTableSql,
obj_name: 'data',
arr_field: 'TbName,Remark'
}
diff --git a/src/templates/subtableconfig/index.jsx b/src/templates/subtableconfig/index.jsx
index 38d0960..be73f88 100644
--- a/src/templates/subtableconfig/index.jsx
+++ b/src/templates/subtableconfig/index.jsx
@@ -12,6 +12,7 @@
import enUS from '@/locales/en-US/comtable.js'
import Utils from '@/utils/utils.js'
import { getSearchForm, getActionForm, getColumnForm } from '@/templates/tableshare/formconfig'
+import { queryTableSql } from '@/utils/option.js'
import ActionForm from './actionform'
import SettingForm from './settingform'
@@ -155,8 +156,7 @@
componentDidMount () {
let param = {
func: 'sPC_Get_SelectedList',
- // LText: 'select TbName ,Remark from sDataDictionary where IsKey!=\'\' and Deleted =0',
- LText: 'select TbName,Remark from (select TbName,Remark from sDataDictb where appkey= @appkey@ and Deleted=0 union select a.TbName,Remark from (select TbName,Remark from sDataDictb where appkey= \'\' and Deleted=0 ) a left join (select TbName from sDataDictb where appkey= @appkey@ and Deleted=0 ) b on a.TbName=b.TbName where b.TbName is null ) t',
+ LText: queryTableSql,
obj_name: 'data',
arr_field: 'TbName,Remark'
}
diff --git a/src/templates/subtableconfig/settingform/index.jsx b/src/templates/subtableconfig/settingform/index.jsx
index a67d205..41a9c8a 100644
--- a/src/templates/subtableconfig/settingform/index.jsx
+++ b/src/templates/subtableconfig/settingform/index.jsx
@@ -18,7 +18,31 @@
state = {
interType: this.props.data.interType || 'inner',
columns: this.props.columns.filter(item => item.field && item.type !== 'colspan'),
- interReadonly: this.props.data.sysInterface === 'true'
+ interReadonly: this.props.data.sysInterface === 'true',
+ primaryKey: ''
+ }
+
+ UNSAFE_componentWillMount() {
+ const { data, columns } = this.props
+
+ let primaryKey = data.primaryKey
+ if (primaryKey) {
+ let field = columns.filter(column => column.field === primaryKey)
+ if (field.length !== 1) {
+ primaryKey = ''
+ }
+ }
+ if (!primaryKey) {
+ columns.forEach(col => {
+ if (col.field.toLowerCase() === 'id') {
+ primaryKey = col.field
+ }
+ })
+ }
+
+ this.setState({
+ primaryKey: primaryKey
+ })
}
handleConfirm = () => {
@@ -94,7 +118,7 @@
render() {
const { data, dict, tabId, usefulFields } = this.props
const { getFieldDecorator } = this.props.form
- const { interType, columns } = this.state
+ const { interType, columns, primaryKey } = this.state
const formItemLayout = {
labelCol: {
@@ -105,17 +129,6 @@
xs: { span: 24 },
sm: { span: 16 }
}
- }
-
- let primaryKey = data.primaryKey
- if (primaryKey) {
- let field = columns.filter(column => column.field === primaryKey)
- if (field.length !== 1) {
- primaryKey = ''
- }
- }
- if (!primaryKey && columns.length === 0) {
- primaryKey = 'ID'
}
let str = '^(' + usefulFields.join('|') + ')'
@@ -266,16 +279,13 @@
<Col span={12}>
<Form.Item label="涓婚敭">
{getFieldDecorator('primaryKey', {
- initialValue: primaryKey
+ initialValue: primaryKey || ''
})(
<Select
getPopupContainer={() => document.getElementById('subtable-setting-form')}
onChange={this.selectChange}
>
- <Select.Option key='unset' value="">涓嶈缃�</Select.Option>
- {columns.length === 0 ?
- <Select.Option key='id' value="ID">ID</Select.Option> : null
- }
+ <Select.Option key='unset' value="">鏈缃�</Select.Option>
{columns.map((option, index) =>
<Select.Option id={option.uuid} title={option.label} key={index} value={option.field}>{option.label}</Select.Option>
)}
diff --git a/src/templates/tableshare/verifycardexcelin/columnform/index.jsx b/src/templates/tableshare/verifycardexcelin/columnform/index.jsx
index 2b420a7..8358cca 100644
--- a/src/templates/tableshare/verifycardexcelin/columnform/index.jsx
+++ b/src/templates/tableshare/verifycardexcelin/columnform/index.jsx
@@ -57,7 +57,7 @@
this.props.form.setFieldsValue({
Column: '',
Text: '',
- required: 'false',
+ required: 'true',
type: 'Nvarchar(50)'
})
}
@@ -111,7 +111,7 @@
<Col span={7}>
<Form.Item label={'鏄惁蹇呭～'}>
{getFieldDecorator('required', {
- initialValue: 'false'
+ initialValue: 'true'
})(
<Select>
<Select.Option value="false"> 鍚� </Select.Option>
diff --git a/src/utils/option.js b/src/utils/option.js
index 747831e..b606bae 100644
--- a/src/utils/option.js
+++ b/src/utils/option.js
@@ -5,6 +5,7 @@
const _dict = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
+// 琛ㄥ崟鏍￠獙瑙勫垯
export const formRule = {
input: {
max: 100,
@@ -36,6 +37,7 @@
}
}
+// 绯荤粺妯℃澘
export const sysTemps = [
{
title: '鍩虹琛ㄦ牸',
@@ -61,6 +63,7 @@
}
]
+// 鏃ユ湡榛樿鍊奸�夋嫨鑼冨洿
export const dateOptions = {
date: [
{value: '', text: _dict['date.empty']},
@@ -105,7 +108,8 @@
]
}
-export const matchReg = { // 鍖归厤瑙勫垯
+// 鍖归厤瑙勫垯
+export const matchReg = {
text: [{
value: 'like',
text: 'like'
@@ -146,6 +150,7 @@
}]
}
+// 鎸夐挳鍥炬爣闆�
export const btnIcons = [{
value: '',
text: 'unset'
@@ -187,6 +192,7 @@
text: 'step-forward'
}]
+// 鎸夐挳棰滆壊闆�
export const btnClasses = [{
value: 'default',
text: '榛樿锛堥粦杈圭櫧搴曪級'
@@ -239,3 +245,5 @@
value: 'border-purple',
text: '鐧藉簳绱'
}]
+
+export const queryTableSql = 'select TbName,Remark from (select TbName,Remark from sDataDictb where appkey= @appkey@ and Deleted=0 union select a.TbName,Remark from (select TbName,Remark from sDataDictb where appkey= \'\' and Deleted=0 ) a left join (select TbName from sDataDictb where appkey= @appkey@ and Deleted=0 ) b on a.TbName=b.TbName where b.TbName is null ) t'
--
Gitblit v1.8.0