From 7cdc8fa2ed47233c32ed9e1e969999684a3a5e04 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 30 十二月 2021 15:41:16 +0800
Subject: [PATCH] 2021-12-30
---
src/templates/zshare/modalform/index.jsx | 5 +
src/menu/components/table/edit-table/columns/tableIn/index.jsx | 18 +++---
src/tabviews/zshare/mutilform/mkCheckCard/index.jsx | 57 +++++++++++--------
src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx | 4
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 33 ++++++-----
src/templates/sharecomponent/searchcomponent/searchform/index.jsx | 4 -
6 files changed, 66 insertions(+), 55 deletions(-)
diff --git a/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx b/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx
index d0b5dd8..1c83631 100644
--- a/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx
+++ b/src/menu/components/table/edit-table/columns/tableIn/customscript/index.jsx
@@ -36,7 +36,7 @@
fields.push('jskey')
- let _sql = `Declare @${btn.sheet} table (${usefulfields.map(item => item.field + ' ' + item.type).join(',')},jskey nvarchar(50) )
+ let _sql = `Declare @${btn.sheet} table (${usefulfields.map(item => item.field + ' ' + item.type).join(',')},jskey nvarchar(50),data_type nvarchar(50),BID nvarchar(50))
Declare @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@login_city nvarchar(50),@ErrorCode nvarchar(50), @retmsg nvarchar(4000),@tbid Nvarchar(512)
Select @ErrorCode='', @retmsg=''
`
@@ -274,7 +274,7 @@
</Col>
{usefulfields ? <Col span={24} className="sqlfield">
<Form.Item label={'鍙敤瀛楁'}>
- BID, ID, LoginUID, SessionUid, UserID, Appkey, UserName, FullName, RoleID, mk_departmentcode, mk_organization, login_city, {usefulfields}
+ BID, ID, LoginUID, SessionUid, UserID, Appkey, UserName, FullName, RoleID, mk_departmentcode, mk_organization, login_city, {usefulfields},data_type锛堟敞锛歫skey涓轰富閿�硷紝鏂板鏃跺墠绔敓鎴愶紱data_type涓烘搷浣滅被鍨嬶紝鏂板 - add銆佷慨鏀� - upt銆佸垹闄� - del锛�
</Form.Item>
</Col> : null}
<Col span={8} style={{whiteSpace: 'nowrap'}}>
diff --git a/src/menu/components/table/edit-table/columns/tableIn/index.jsx b/src/menu/components/table/edit-table/columns/tableIn/index.jsx
index b11ab29..633ae38 100644
--- a/src/menu/components/table/edit-table/columns/tableIn/index.jsx
+++ b/src/menu/components/table/edit-table/columns/tableIn/index.jsx
@@ -168,26 +168,26 @@
}
UNSAFE_componentWillMount() {
- const { columns, cols, card, setting } = this.props
+ const { columns, card, setting } = this.props
let _verify = fromJS(card).toJS()
_verify.sheet = _verify.sheet || setting.tableName
let fieldLabel = {}
- let _columns = []
- let _fields = {}
+ // let _columns = []
+ // let _fields = {}
columns.forEach(col => {
fieldLabel[col.field] = col.label
- _fields[col.field] = col
+ // _fields[col.field] = col
})
- cols.forEach(col => {
- if (!col.field || col.type === 'index' || !_fields[col.field]) return
+ // cols.forEach(col => {
+ // if (!col.field || col.type === 'index' || !_fields[col.field]) return
- _columns.push(_fields[col.field])
- })
+ // _columns.push(_fields[col.field])
+ // })
this.setState({
- fields: _columns,
+ fields: fromJS(columns).toJS().filter(item => item.field !== setting.primaryKey),
fieldLabel,
verify: _verify
}, () => {
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index fe08fdc..eda2395 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -526,24 +526,24 @@
}
componentDidMount () {
- const { fields, columns } = this.props
+ const { fields, setting } = this.props
const { data, editable } = this.state
- let _fields = []
+ // let _fields = [] // 瀹氫箟鍏ㄩ儴瀛楁锛屼笉鍦ㄤ粠鍙紪杈戝垪涓�夊彇
- let fieldType = {}
- fields.forEach(item => {
- fieldType[item.field] = item.datatype
- })
+ // let fieldType = {}
+ // fields.forEach(item => {
+ // fieldType[item.field] = item.datatype
+ // })
- columns.forEach(col => {
- if (!col.field || col.type === 'index') return
+ // columns.forEach(col => {
+ // if (!col.field || col.type === 'index') return
- _fields.push({...col, datatype: fieldType[col.field] || 'Nvarchar(50)'})
- })
+ // _fields.push({...col, datatype: fieldType[col.field] || 'Nvarchar(50)'})
+ // })
this.setState({
- fields: _fields,
+ fields: fields.filter(item => item.field !== setting.primaryKey),
})
if (editable === 'true' && data && data.length > 0) {
@@ -613,8 +613,6 @@
item.$Index = item.key + 1 + ''
fields.forEach(col => {
- item[col.field] = item[col.field] !== undefined ? item[col.field] : ''
-
if (col.initval !== '$copy') {
item[col.field] = col.initval
}
@@ -623,6 +621,9 @@
if (isNaN(item[col.field])) {
item[col.field] = 0
}
+ }
+ if (item[col.field] === undefined) {
+ item[col.field] = ''
}
})
@@ -693,8 +694,6 @@
}
fields.forEach(col => {
- item[col.field] = item[col.field] !== undefined ? item[col.field] : ''
-
if (col.initval !== '$copy') {
item[col.field] = col.initval
}
@@ -704,6 +703,10 @@
item[col.field] = 0
}
}
+
+ if (item[col.field] === undefined) {
+ item[col.field] = ''
+ }
})
this.setState({edData: [...edData, item]})
diff --git a/src/tabviews/zshare/mutilform/mkCheckCard/index.jsx b/src/tabviews/zshare/mutilform/mkCheckCard/index.jsx
index 6d15d1d..9014cbb 100644
--- a/src/tabviews/zshare/mutilform/mkCheckCard/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkCheckCard/index.jsx
@@ -36,7 +36,7 @@
componentDidMount () {
const { config } = this.state
- if (config.multiple !== 'true' && config.linkField) {
+ if (config.linkField) {
MKEmitter.addListener('mkFP', this.mkFormHandle)
}
}
@@ -69,33 +69,42 @@
const { config } = this.state
let options = config.oriOptions.filter(option => option.ParentID === parentId)
- let _option = options[0] && !options[0].$disabled ? options[0] : null
- let val = _option ? _option.$value : ''
- this.setState({
- options,
- value: val
- })
-
- let other = {}
-
- if (config.subFields && _option) {
- config.subFields.forEach((n, i) => {
- other[n.field] = _option[n.field]
- setTimeout(() => {
- MKEmitter.emit('mkFC', 'input', n.uuid, _option[n.field])
- }, i * 5)
+ if (config.multiple === 'true') {
+ this.setState({
+ options,
+ selectKeys: []
})
- }
+ this.props.onChange('')
+ } else {
+ let _option = options[0] && !options[0].$disabled ? options[0] : null
+ let val = _option ? _option.$value : ''
- this.props.onChange(val, other)
-
- if (level < 7 && config.linkFields) {
- config.linkFields.forEach((m, i) => {
- setTimeout(() => {
- MKEmitter.emit('mkFP', m.uuid, val, level + 1)
- }, (i + 1) * 70)
+ this.setState({
+ options,
+ selectKeys: val
})
+
+ let other = {}
+
+ if (config.subFields && _option) {
+ config.subFields.forEach((n, i) => {
+ other[n.field] = _option[n.field]
+ setTimeout(() => {
+ MKEmitter.emit('mkFC', 'input', n.uuid, _option[n.field])
+ }, i * 5)
+ })
+ }
+
+ this.props.onChange(val, other)
+
+ if (level < 7 && config.linkFields) {
+ config.linkFields.forEach((m, i) => {
+ setTimeout(() => {
+ MKEmitter.emit('mkFP', m.uuid, val, level + 1)
+ }, (i + 1) * 70)
+ })
+ }
}
}
diff --git a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
index 955dfb7..ced101f 100644
--- a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
@@ -202,9 +202,7 @@
shows.push('dataSource', 'cardValField', 'fields', 'orderBy', 'orderType', 'database', 'backgroundColor')
}
}
- if (this.record.multiple === 'false') {
- shows.push('linkField')
- }
+ shows.push('linkField')
reRequired.linkField = false
}
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index 2e1b2d3..711f3e6 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -172,12 +172,13 @@
if (this.record.multiple === 'false') {
shows.push('linkSubField')
- shows.push('linkField')
- reRequired.linkField = false
} else {
reTooltip.initval = '娣诲姞澶氫釜鍒濆鍊艰浣跨敤閫楀彿鍒嗛殧銆�'
}
+ shows.push('linkField')
+ reRequired.linkField = false
+
if (sessionStorage.getItem('appType') === 'mob') {
shows.push('hidelabel')
}
--
Gitblit v1.8.0