From f128d679cacda2a6b5b730ad0368b5fe73f887f7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 14 二月 2025 15:27:02 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/form/tab-form/index.jsx | 330 +++++++++++++++---------------------------------------
1 files changed, 95 insertions(+), 235 deletions(-)
diff --git a/src/menu/components/form/tab-form/index.jsx b/src/menu/components/form/tab-form/index.jsx
index f3dd1bd..86400d1 100644
--- a/src/menu/components/form/tab-form/index.jsx
+++ b/src/menu/components/form/tab-form/index.jsx
@@ -2,10 +2,8 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Popover, Modal, Button, Switch, notification, message } from 'antd'
-import { PlusOutlined, SettingOutlined, EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
-import moment from 'moment'
+import { PlusOutlined, SettingOutlined, EditOutlined, ToolOutlined, DeleteOutlined, SwapOutlined, FontColorsOutlined } from '@ant-design/icons'
-import Api from '@/api'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
import { getModalForm } from '@/templates/zshare/formconfig'
@@ -22,9 +20,9 @@
const MobCardComponent = asyncComponent(() => import('@/mob/components/formdragelement'))
const FormTitle = asyncComponent(() => import('../dragtitle'))
const FormAction = asyncComponent(() => import('../formaction'))
+const FormFork = asyncComponent(() => import('@/menu/modalconfig/formfork'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const PasteComponent = asyncIconComponent(() => import('@/menu/components/share/pastecomponent'))
-const UserComponent = asyncIconComponent(() => import('@/menu/components/share/usercomponent'))
const FieldsComponent = asyncComponent(() => import('@/templates/sharecomponent/fieldscomponent'))
const { confirm } = Modal
@@ -45,8 +43,7 @@
visible: false,
editform: null,
formlist: null,
- sqlVerifing: false,
- standardform: null
+ sqlVerifing: false
}
UNSAFE_componentWillMount () {
@@ -73,44 +70,24 @@
sort: 1,
style: {},
fields: [],
- subButton: {label: '鎻愪氦', type: 'submit', intertype: 'system', reload: 'false', sqlType: 'update', sql: '', Ot: 'notRequired', execSuccess: 'never', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}},
+ subButton: {label: '鎻愪氦', type: 'submit', intertype: 'system', reload: 'false', sqlType: '', sql: '', Ot: 'notRequired', execSuccess: 'never', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}},
}, {
uuid: Utils.getuuid(),
setting: {title: '鍒嗙粍2', align: 'left_right'},
sort: 1,
style: {},
fields: [],
- subButton: {label: '鎻愪氦', type: 'submit', intertype: 'system', reload: 'false', sqlType: 'update', sql: '', Ot: 'notRequired', execSuccess: 'never', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}},
+ subButton: {label: '鎻愪氦', type: 'submit', intertype: 'system', reload: 'false', sqlType: '', sql: '', Ot: 'notRequired', execSuccess: 'never', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}},
}, {
uuid: Utils.getuuid(),
setting: {title: '鍒嗙粍3', align: 'left_right'},
sort: 1,
style: {},
fields: [],
- subButton: {label: '鎻愪氦', type: 'submit', intertype: 'system', reload: 'false', sqlType: 'update', sql: '', Ot: 'notRequired', execSuccess: 'never', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}},
+ subButton: {label: '鎻愪氦', type: 'submit', intertype: 'system', reload: 'false', sqlType: '', sql: '', Ot: 'notRequired', execSuccess: 'never', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}},
}]
}
- if (card.config) {
- let config = fromJS(card.config).toJS()
-
- _card.wrap = config.wrap
- _card.wrap.name = card.name
- _card.style = config.style
-
- _card.setting = config.setting
- _card.columns = config.columns
- _card.scripts = config.scripts
-
- _card.subcards = config.subcards.map(scard => {
- scard.uuid = Utils.getuuid()
- scard.fields = scard.fields.map(elem => {
- elem.uuid = Utils.getuuid()
- return elem
- })
- return scard
- })
- }
this.setState({
group: _card.subcards[0] || null
})
@@ -124,6 +101,10 @@
}
}
+ componentDidMount () {
+ MKEmitter.addListener('mkUpdateInter', this.mkUpdateInter)
+ }
+
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.state), fromJS(nextState))
}
@@ -135,6 +116,21 @@
this.setState = () => {
return
}
+ MKEmitter.removeListener('mkUpdateInter', this.mkUpdateInter)
+ }
+
+ mkUpdateInter = (inter, split) => {
+ const { card } = this.state
+
+ if (card.wrap.datatype === 'public' && card.wrap.publicId === inter.uuid) {
+ let _card = {...card, columns: fromJS(inter.columns).toJS()}
+
+ split.delay = split.delay + 10
+
+ setTimeout(() => {
+ this.updateComponent(_card)
+ }, split.delay)
+ }
}
/**
@@ -144,49 +140,19 @@
card.width = card.wrap.width
card.name = card.wrap.name
card.errors = []
- let idCtrl = false
-
- if (card.wrap.datatype !== 'static') {
- let supModule = card.setting.supModule ? card.setting.supModule[card.setting.supModule.length - 1] || '' : ''
- if (supModule === 'empty') {
- supModule = ''
- }
-
+
+ card.$c_fc = true
+ if (card.wrap.datatype === 'dynamic') {
card.$c_ds = true
- card.errors = checkComponent(card)
-
- if (card.errors.length === 0) {
- card.$tables = getTables(card)
- }
-
- card.subcards.forEach(item => {
- item.fields.forEach(m => {
- if (m.dataSource && /@ID@/ig.test(m.dataSource)) {
- idCtrl = true
- }
- if (m.type === 'linkMain' && !supModule) {
- card.errors.push({ level: 1, detail: `璇锋鏌ュ垎缁勨��${item.setting.title}鈥濅腑鍏宠仈涓昏〃鈥�${m.label}鈥濇槸鍚︽湁鏁坄})
- }
- })
- })
} else {
- let supModule = card.wrap.supModule ? card.wrap.supModule[card.wrap.supModule.length - 1] : ''
-
- card.$tables = getTables(card)
-
- card.subcards.forEach(item => {
- item.fields.forEach(m => {
- if (m.dataSource && /@ID@/ig.test(m.dataSource)) {
- idCtrl = true
- }
- if (m.type === 'linkMain' && !supModule) {
- card.errors.push({ level: 1, detail: `璇锋鏌ュ垎缁勨��${item.setting.title}鈥濅腑鍏宠仈涓昏〃鈥�${m.label}鈥濇槸鍚︽湁鏁坄})
- }
- })
- })
+ delete card.$c_ds
}
- card.idCtrl = idCtrl
+ card.errors = checkComponent(card)
+ card.$tables = getTables(card)
+
+ delete card.$c_ds
+ delete card.$c_fc
this.setState({
card: card
@@ -230,7 +196,7 @@
sort: card.subcards.length + 1,
style: {},
fields: [],
- subButton: {label: '鎻愪氦', type: 'submit', intertype: 'system', reload: 'false', sqlType: 'update', sql: '', Ot: 'notRequired', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}},
+ subButton: {label: '鎻愪氦', type: 'submit', intertype: 'system', reload: 'false', sqlType: '', sql: '', Ot: 'notRequired', execSuccess: 'never', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}},
}
card.subcards.push(newcard)
@@ -260,7 +226,7 @@
closeGroup = (cell) => {
const { group } = this.state
let card = fromJS(this.state.card).toJS()
- const _this = this
+ const that = this
confirm({
content: '纭畾鍒犻櫎鍒嗙粍鍚楋紵',
@@ -272,8 +238,8 @@
_group = card.subcards[0] || null
}
- _this.setState({group: _group})
- _this.updateComponent(card)
+ that.setState({group: _group})
+ that.updateComponent(card)
},
onCancel() {}
})
@@ -304,7 +270,7 @@
changecols = (type) => {
let card = fromJS(this.state.card).toJS()
let config = fromJS(this.state.group).toJS()
- let _this = this
+ let that = this
config.fields = config.fields.map(item => {
item.labelwidth = 33.3
@@ -336,8 +302,8 @@
}
return item
})
- _this.setState({group: config})
- _this.updateComponent(card)
+ that.setState({group: config})
+ that.updateComponent(card)
},
onCancel() {}
})
@@ -367,7 +333,7 @@
closeForm = (cell) => {
let group = fromJS(this.state.group).toJS()
let card = fromJS(this.state.card).toJS()
- let _this = this
+ let that = this
group.fields = group.fields.filter(item => item.uuid !== cell.uuid)
@@ -381,8 +347,8 @@
confirm({
content: `纭畾鍒犻櫎<<${cell.label}>>鍚楋紵`,
onOk() {
- _this.setState({group})
- _this.updateComponent(card)
+ that.setState({group})
+ that.updateComponent(card)
},
onCancel() {}
})
@@ -412,6 +378,7 @@
orderType: 'asc',
readonly: 'false',
required: 'true',
+ readin: 'top',
focus: true
}
@@ -434,98 +401,14 @@
* @description 琛ㄥ崟缂栬緫
*/
handleForm = (_item) => {
- const { card, group, appType } = this.state
+ const { card, group } = this.state
+
let _form = fromJS(_item).toJS()
- let _inputfields = []
- let _tabfields = []
- let _linkableFields = []
- let _linksupFields = []
- let standardform = null
-
- let uniq = new Map()
- let index = null
- uniq.set(_form.field, true)
-
- group.fields.forEach((item, i) => {
- if (_form.uuid === item.uuid) {
- index = i
- }
-
- if (!item.field) return
-
- if (['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field) {
- _inputfields.push({
- field: item.field,
- label: item.label
- })
- }
- if (_form.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) {
- _tabfields.push({
- field: item.field,
- label: item.label
- })
- }
-
- if (item.type === 'switch' || item.type === 'check') {
- _linksupFields.push({
- field: item.field,
- label: item.label
- })
- }
-
- if (!['select', 'link', 'radio', 'checkcard', 'multiselect'].includes(item.type)) return
-
- _linksupFields.push({
- field: item.field,
- label: item.label
- })
-
- if (item.type === 'multiselect' || (item.type === 'checkcard' && item.multiple === 'true')) return
-
- if (!uniq.has(item.field)) {
- uniq.set(item.field, true)
-
- _linkableFields.push({
- field: item.field,
- label: item.label + '-琛ㄥ崟'
- })
- }
- })
-
- if (index !== null) {
- if (index === 0) {
- standardform = group.fields[index + 1] || null
- } else {
- standardform = group.fields[index - 1] || null
- }
- }
-
- card.columns.forEach(col => {
- if (col.field && !uniq.has(col.field)) {
- uniq.set(col.field, true)
-
- _linkableFields.push({
- field: col.field,
- label: col.label + '-鏄剧ず鍒�'
- })
- }
- })
-
- if (_form.linkSubField && _form.linkSubField.length > 0) {
- let fields = _inputfields.map(item => item.field)
- _form.linkSubField = _form.linkSubField.filter(item => fields.includes(item))
- }
-
- if (appType !== 'mob' && !_form.span && standardform && standardform.span) {
- _form.span = standardform.span
- _form.labelwidth = standardform.labelwidth
- }
this.setState({
- standardform,
visible: true,
editform: _form,
- formlist: getModalForm(_form, _inputfields, _tabfields, _linkableFields, _linksupFields, card.columns)
+ formlist: getModalForm(_form, group.fields, card.columns)
})
}
@@ -536,76 +419,33 @@
* 3銆侀�氳繃loading鍒锋柊
*/
handleSubmit = () => {
+ let _config = fromJS(this.state.group).toJS()
+
this.formRef.handleConfirm().then(res => {
- let _config = fromJS(this.state.group).toJS()
- let fieldrepet = false // 瀛楁閲嶅
-
_config.fields = _config.fields.map(item => {
- if (item.uuid !== res.uuid && res.field && item.field && item.field.toLowerCase() === res.field.toLowerCase()) {
- fieldrepet = true
- }
-
delete item.focus
- if (item.uuid === res.uuid) {
- if (item.style) {
- res.style = item.style
- }
- return res
+ if (item.uuid === res.values.uuid) {
+ return res.values
} else {
return item
}
})
- if (fieldrepet) {
- notification.warning({
- top: 92,
- message: '瀛楁宸插瓨鍦紒',
- duration: 10
- })
- return
- }
-
- window.GLOB.formId = res.uuid
-
- if (['select', 'multiselect', 'link', 'checkbox', 'radio', 'checkcard'].includes(res.type) && res.resourceType === '1' && /\s/.test(res.dataSource)) {
+ if (res.loading) {
this.setState({
sqlVerifing: true
})
- let param = {
- func: 's_debug_sql',
- exec_type: 'y',
- LText: `declare @mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20)
- ${res.dataSource}`
- }
-
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${param.timestamp}'`)
- param.LText = param.LText.replace(/\n/g, ' ')
-
- param.LText = Utils.formatOptions(param.LText)
- param.secretkey = Utils.encrypt('', param.timestamp)
-
- if (window.GLOB.mainSystemApi && res.database === 'sso') {
- param.rduri = window.GLOB.mainSystemApi
- }
-
- Api.genericInterface(param).then(result => {
- if (result.status) {
- this.setState({
- sqlVerifing: false,
- editform: null,
- visible: false
- })
- this.updateGroup(_config)
- } else {
- this.setState({sqlVerifing: false})
-
- Modal.error({
- title: result.message
- })
- }
+ res.promise().then(() => {
+ this.setState({
+ sqlVerifing: false,
+ editform: null,
+ visible: false
+ })
+ this.updateGroup(_config)
+ }, () => {
+ this.setState({sqlVerifing: false})
})
} else {
this.setState({
@@ -629,6 +469,7 @@
res.fields.forEach(item => {
item.uuid = Utils.getuuid()
+ delete item.focus
})
delete res.prevButton
@@ -661,6 +502,17 @@
} else {
_card.setting.supModule = ''
}
+ } else if (res.datatype === 'public') {
+ let interfaces = window.GLOB.customMenu.interfaces || []
+
+ let d = interfaces.filter(m => m.uuid === res.publicId && m.status === 'true')[0]
+
+ if (d) {
+ _card.columns = fromJS(d.columns).toJS()
+
+ _card.setting = { interType: 'system' }
+ _card.scripts = []
+ }
}
this.updateComponent(_card)
@@ -669,7 +521,7 @@
clearGroup = () => {
let group = fromJS(this.state.group).toJS()
let card = fromJS(this.state.card).toJS()
- let _this = this
+ let that = this
group.fields = []
@@ -683,8 +535,8 @@
confirm({
content: `纭畾娓呯┖琛ㄥ崟鍚楋紵`,
onOk() {
- _this.setState({group})
- _this.updateComponent(card)
+ that.setState({group})
+ that.updateComponent(card)
},
onCancel() {}
})
@@ -744,10 +596,8 @@
<CopyComponent type="tabform" card={card}/>
<PasteComponent config={card} options={['formgroup', 'simpleform']} updateConfig={this.pasteForm} />
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
- <UserComponent config={card}/>
<DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} />
- {card.wrap.datatype !== 'static' ? <SettingComponent config={card} updateConfig={this.updateComponent} /> : null}
- {card.wrap.datatype === 'static' ? <SettingOutlined style={{color: '#eeeeee', cursor: 'not-allowed'}}/> : null}
+ {card.wrap.datatype === 'dynamic' ? <SettingComponent config={card} updateConfig={this.updateComponent} /> : <SettingOutlined style={{color: '#eeeeee', cursor: 'not-allowed'}}/>}
</div>
} trigger="hover">
<ToolOutlined />
@@ -766,12 +616,22 @@
{group ? <div className={`form-area mk-${card.wrap.formStyle || ''}`}>
<PlusOutlined className="plus" title="娣诲姞琛ㄥ崟" onClick={this.addForm}/>
<FieldsComponent config={group} type="form" plusFields={this.plusFields} />
- <span style={{color: 'red', marginLeft: '30px', cursor: 'pointer'}} onClick={this.clearGroup}>娓呯┖</span>
- <Switch checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={this.state.showField} onChange={(val) => this.setState({showField: val})} />
- {appType !== 'mob' ? <Button className="mk-cols-change" onClick={() => this.changecols(1)}>1鍒�</Button> : null}
- {appType !== 'mob' ? <Button className="mk-cols-change" onClick={() => this.changecols(2)}>2鍒�</Button> : null}
- {appType !== 'mob' ? <Button className="mk-cols-change" onClick={() => this.changecols(3)}>3鍒�</Button> : null}
- {appType !== 'mob' ? <Button className="mk-cols-change" onClick={() => this.changecols(4)}>4鍒�</Button> : null}
+ <div className="mk-form-tool">
+ <DeleteOutlined title="娓呯┖" onClick={this.clearGroup} />
+ {appType !== 'mob' ? <Popover title="鍒囨崲甯冨眬" overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
+ <>
+ <Button style={{marginRight: '10px'}} onClick={() => this.changecols(1)}>1鍒�</Button>
+ <Button style={{marginRight: '10px'}} onClick={() => this.changecols(2)}>2鍒�</Button>
+ <Button style={{marginRight: '10px'}} onClick={() => this.changecols(3)}>3鍒�</Button>
+ <Button onClick={() => this.changecols(4)}>4鍒�</Button>
+ </>
+ } trigger="hover">
+ <SwapOutlined />
+ </Popover> : null}
+ <FormFork forms={group.fields}/>
+ {/* <CopyOutlined title="澶嶅埗" onClick={this.triggerCopy} /> */}
+ <Switch checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={this.state.showField} onChange={(val) => this.setState({showField: val})} />
+ </div>
<div style={{clear: 'both'}}></div>
{appType !== 'mob' ? <CardComponent
list={group.fields}
@@ -827,7 +687,7 @@
card={this.state.editform}
formlist={this.state.formlist}
inputSubmit={this.handleSubmit}
- standardform={this.state.standardform}
+ fields={group.fields}
wrappedComponentRef={(inst) => this.formRef = inst}
/>
</Modal>
--
Gitblit v1.8.0