From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/mutilform/index.jsx | 110 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 83 insertions(+), 27 deletions(-)
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 1db51b6..1496a1f 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -25,11 +25,12 @@
const MKTextArea = asyncComponent(() => import('./mkTextArea'))
const MKFileUpload = asyncComponent(() => import('../fileupload'))
const MKColor = asyncComponent(() => import('./mkColor'))
+const MkFormula = asyncComponent(() => import('./mkFormula'))
+const MkCascader = asyncComponent(() => import('./mkCascader'))
const MKEditor = asyncComponent(() => import('@/components/editor'))
class MainSearch extends Component {
static propTpyes = {
- menuType: PropTypes.object, // 鑿滃崟绫诲瀷锛屾槸鍚︿负HS
action: PropTypes.object, // 鎸夐挳淇℃伅銆佽〃鍗曞垪琛�
data: PropTypes.any, // 琛ㄦ牸鏁版嵁
BID: PropTypes.any, // 涓昏〃ID
@@ -77,7 +78,14 @@
linkFields[item.linkField].push({field: item.field, uuid: item.uuid})
}
- if (item.type === 'split') return true
+ if (item.style) {
+ delete item.style.marginTop
+ delete item.style.marginBottom
+ delete item.style.marginLeft
+ delete item.style.marginRight
+ }
+
+ if (item.type === 'split' || item.type === 'formula') return true
if (item.type === 'hint') {
if (item.field && data && data[item.field]) {
item.message = data[item.field]
@@ -91,7 +99,12 @@
item.precision = 'second'
}
- if (!item.field || !['text', 'number', 'switch', 'rate', 'select', 'link', 'linkMain', 'funcvar', 'date', 'datemonth', 'radio', 'checkbox', 'checkcard', 'fileupload', 'textarea', 'multiselect', 'brafteditor', 'color'].includes(item.type)) return false
+ if (!item.field || !['text', 'number', 'switch', 'rate', 'select', 'link', 'cascader', 'linkMain', 'funcvar', 'date', 'datemonth', 'radio', 'checkbox', 'checkcard', 'fileupload', 'textarea', 'multiselect', 'brafteditor', 'color'].includes(item.type)) return false
+
+ if (/^\s+$/.test(item.label)) {
+ item.style = item.style || {}
+ item.style.color = 'transparent'
+ }
// 鏁版嵁鑷姩濉厖
let readin = item.readin !== 'false'
@@ -111,14 +124,8 @@
item.initval = item.initval || 0
}
- if (['select', 'link', 'radio', 'checkbox', 'checkcard', 'multiselect'].includes(item.type)) {
+ if (['select', 'link', 'radio', 'checkbox', 'checkcard', 'multiselect', 'cascader'].includes(item.type)) {
item.options = item.options || []
- // item.options = item.options.map(cell => {
- // cell.value = cell.Value
- // cell.label = cell.Text
-
- // return cell
- // })
item.options = item.options.filter(cell => {
cell.value = cell.Value
cell.label = cell.Text
@@ -199,7 +206,7 @@
item.initval = ''
}
- if (['select', 'link', 'radio', 'checkbox', 'checkcard', 'multiselect'].includes(item.type) && item.resourceType === '1') {
+ if (['select', 'link', 'radio', 'checkbox', 'checkcard', 'multiselect', 'cascader'].includes(item.type) && item.resourceType === '1') {
deForms.push(item)
} else if (item.type === 'rate') {
item.rateCount = item.rateCount || 5
@@ -227,7 +234,15 @@
}
let _rules = [{
pattern: /^[^']*$/ig,
- message: formRule.input.quotemsg
+ message: '涓嶅彲浣跨敤鑻辨枃鐘舵�佺殑鍗曞紩鍙凤紒'
+ }, {
+ validator: (rule, value, callback) => {
+ if (/--/ig.test(value)) {
+ callback('涓嶅彲浣跨敤 -- 锛�')
+ } else {
+ callback()
+ }
+ }
}, {
required: item.required === 'true',
message: item.label + '涓嶅彲涓虹┖!'
@@ -253,13 +268,18 @@
})
} else if (item.regular === 'letter&number') {
_rules.push({
- pattern: /^[a-zA-Z0-9]*$/ig,
- message: formRule.input.letternummsg
+ pattern: /^[a-zA-Z0-9@_.]*$/ig,
+ message: '璇疯緭鍏ユ暟瀛椼�佸瓧姣嶄互鍙夽_.'
})
} else if (item.regular === 'phone') {
_rules.push({
pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/ig,
message: '璇锋纭緭鍏ユ墜鏈哄彿'
+ })
+ } else if (item.regular === 'email') {
+ _rules.push({
+ pattern: /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/,
+ message: '璇锋纭緭鍏ラ偖绠卞湴鍧�'
})
} else if (item.regular === 'funcname') {
_rules.push({
@@ -291,7 +311,15 @@
if (item.encryption !== 'true') {
_rules.push({
pattern: /^[^']*$/ig,
- message: formRule.input.quotemsg
+ message: '涓嶅彲浣跨敤鑻辨枃鐘舵�佺殑鍗曞紩鍙凤紒'
+ }, {
+ validator: (rule, value, callback) => {
+ if (/--/ig.test(value)) {
+ callback('涓嶅彲浣跨敤 -- 锛�')
+ } else {
+ callback()
+ }
+ }
})
}
item.rules = _rules
@@ -364,7 +392,7 @@
let item = fieldMap.get(cell.field)
// 涓嬬骇琛ㄥ崟鎺у埗-瀛楁鍐欏叆
- if ((['select', 'radio', 'link'].includes(item.type) || (item.type === 'checkcard' && item.multiple !== 'true')) && item.linkSubField) {
+ if ((['select', 'radio', 'link'].includes(item.type) || (item.type === 'checkcard' && item.multiple !== 'true') || (item.type === 'cascader' && item.resourceType !== '2')) && item.linkSubField) {
item.subFields = []
item.linkSubField.forEach(m => {
let n = fieldMap.get(m)
@@ -404,7 +432,7 @@
item.options = item.oriOptions.filter(option => option.ParentID === item.supInitVal || option.value === '')
}
- if (['select', 'link', 'radio'].includes(item.type) && item.resourceType !== '1') { // 閫変腑绗竴椤�
+ if (['select', 'link', 'radio'].includes(item.type) && item.resourceType === '0') { // 閫変腑绗竴椤�
if (typeof(item.initval) === 'string' && item.initval.indexOf('$first') > -1) {
item.initval = item.options[0] ? item.options[0].value : ''
}
@@ -431,8 +459,12 @@
}
if (item.subFields && item.options.length > 0) {
+ let initval = item.initval
+ if (item.type === 'cascader' && item.separator) {
+ initval = initval.split(item.separator).pop()
+ }
// eslint-disable-next-line
- let option = item.options.filter(cell => item.initval == cell.value)[0]
+ let option = item.options.filter(cell => initval == cell.value)[0]
if (option) {
reFieldsVal = reFieldsVal || {}
@@ -466,7 +498,7 @@
}
if (deForms.length > 0) {
- if (this.props.menuType !== 'HS' && options.sysType === 'local' && window.GLOB.systemType !== 'production') {
+ if (!window.GLOB.mkHS && options.sysType === 'local' && window.GLOB.systemType !== 'production') {
this.improveSimpleActionForm(deForms)
} else {
this.improveActionForm(deForms)
@@ -479,7 +511,7 @@
* @description 鑾峰彇涓嬫媺琛ㄥ崟閫夐」淇℃伅
*/
improveActionForm = (deForms) => {
- const { BID, menuType, action } = this.props
+ const { BID, action } = this.props
let deffers = []
let mainItems = [] // 浜戠鎴栧崟鐐规暟鎹�
@@ -494,7 +526,7 @@
}
})
- if (menuType !== 'HS' && options.sysType !== 'local') {
+ if (!window.GLOB.mkHS && options.sysType !== 'local') {
localItems = [...localItems, ...mainItems]
mainItems = []
}
@@ -514,7 +546,7 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
- if (menuType === 'HS') { // 浜戠鏁版嵁楠岃瘉
+ if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
@@ -549,7 +581,7 @@
mainparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
mainparam.secretkey = Utils.encrypt(mainparam.LText, mainparam.timestamp)
- if (menuType === 'HS') { // 浜戠鏁版嵁楠岃瘉
+ if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
mainparam.open_key = Utils.encryptOpenKey(mainparam.secretkey, mainparam.timestamp)
if (options.cloudServiceApi) {
mainparam.rduri = options.cloudServiceApi
@@ -642,7 +674,7 @@
resetFormList = (result) => {
let reFieldsVal = null
let _formlist = fromJS(this.state.formlist).toJS().map(item => {
- if (['select', 'link', 'radio', 'checkbox', 'checkcard', 'multiselect'].includes(item.type) && result[item.field] && result[item.field].length > 0) {
+ if (['select', 'link', 'radio', 'checkbox', 'checkcard', 'multiselect', 'cascader'].includes(item.type) && result[item.field] && result[item.field].length > 0) {
let options = []
result[item.field].forEach(cell => {
let _cell = { key: Utils.getuuid() }
@@ -688,8 +720,12 @@
}
if (item.subFields && item.options.length > 0) {
+ let initval = item.initval
+ if (item.type === 'cascader' && item.separator) {
+ initval = initval.split(item.separator).pop()
+ }
// eslint-disable-next-line
- let option = item.options.filter(cell => item.initval == cell.value)[0]
+ let option = item.options.filter(cell => initval == cell.value)[0]
if (option) {
reFieldsVal = reFieldsVal || {}
@@ -731,9 +767,12 @@
callback(item.label + '鏈�灏忓�间负 ' + item.min)
} else if (typeof(item.max) === 'number' && val > item.max) {
callback(item.label + '鏈�澶у�间负 ' + item.max)
+ } else {
+ callback()
}
+ } else {
+ callback()
}
- callback()
}
recordChange = (values, item) => {
@@ -801,6 +840,14 @@
</Form.Item>
</Col>
)
+ } else if (item.type === 'formula') {
+ fields.push(
+ <Col span={item.span || 24} key={index}>
+ <Form.Item className="hint" colon={false} label={<span className="mk-form-label" style={item.style}>{item.label}</span>} labelCol={item.labelCol} wrapperCol={item.wrapperCol}>
+ <MkFormula config={item} data={this.record}></MkFormula>
+ </Form.Item>
+ </Col>
+ )
} else {
let content = null
let className = ''
@@ -814,6 +861,8 @@
content = (<MKNumberInput config={item} onChange={(val, defer) => !defer && this.recordChange({[item.field]: val})} onSubmit={this.props.inputSubmit} />)
} else if (item.type === 'select' || item.type === 'link' || item.type === 'multiselect') {
content = (<MKSelect config={item} onChange={(val, other) => this.recordChange({[item.field]: val, ...other}, item)} onSubmit={this.props.inputSubmit} />)
+ } else if (item.type === 'cascader') {
+ content = (<MkCascader config={item} onChange={(val, other) => this.recordChange({[item.field]: val, ...other}, item)}/>)
} else if (item.type === 'color') {
content = (<MKColor config={item} onChange={(val) => this.recordChange({[item.field]: val})}/>)
} else if (item.type === 'checkcard') {
@@ -909,6 +958,9 @@
if (item.declareType === 'nvarchar(50)') {
_item.type = 'text'
}
+ } else if (item.declare === 'decimal' && ['select', 'link', 'radio', 'checkcard'].includes(item.type)) {
+ _item.type = 'number'
+ _item.fieldlen = item.decimal || 0
}
if (item.type === 'text' && item.lenControl && item.lenControl !== 'limit') {
@@ -934,9 +986,13 @@
if (action.setting && action.setting.align) {
_align = action.setting.align
}
+ let space = ' space-normal'
+ if (action.setting && action.setting.verticalSpace) {
+ space = ' space-' + action.setting.verticalSpace
+ }
return (
- <Form className={'main-form-field ' + _align}>
+ <Form className={'main-form-field ' + _align + space}>
<Row gutter={24}>{this.getFields()}</Row>
</Form>
)
--
Gitblit v1.8.0