From bd1dfc9e6c9b9f8076ca2783ce598e0936b4c664 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 22 十二月 2021 14:36:03 +0800
Subject: [PATCH] 2021-12-22
---
src/tabviews/zshare/mutilform/index.jsx | 81 +++++++++++++++++++++++++++++-----------
1 files changed, 59 insertions(+), 22 deletions(-)
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 184bddf..cafbcdf 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Row, Col, notification, Tooltip, Icon } from 'antd'
+import { Form, Row, Col, notification, Tooltip, Rate } from 'antd'
+import { QuestionCircleOutlined, StarFilled } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -13,6 +14,7 @@
import MKInput from './mkInput'
import MKNumberInput from './mkNumberInput'
import MKSelect from './mkSelect'
+import MkIcon from '@/components/mk-icon'
import './index.scss'
const MKCheckCard = asyncComponent(() => import('./mkCheckCard'))
@@ -29,7 +31,6 @@
static propTpyes = {
menuType: PropTypes.object, // 鑿滃崟绫诲瀷锛屾槸鍚︿负HS
action: PropTypes.object, // 鎸夐挳淇℃伅銆佽〃鍗曞垪琛�
- dict: PropTypes.object, // 瀛楀吀椤�
data: PropTypes.any, // 琛ㄦ牸鏁版嵁
BID: PropTypes.any, // 涓昏〃ID
BData: PropTypes.any, // 涓昏〃鏁版嵁
@@ -73,7 +74,7 @@
if (item.type === 'split' || item.type === 'hint') return true
- if (!item.field || !['text', 'number', 'switch', 'select', 'link', 'linkMain', 'funcvar', 'date', 'datemonth', 'datetime', 'radio', 'checkbox', 'checkcard', 'fileupload', 'textarea', 'multiselect', 'brafteditor', 'color'].includes(item.type)) return false
+ if (!item.field || !['text', 'number', 'switch', 'rate', 'select', 'link', 'linkMain', 'funcvar', 'date', 'datemonth', 'datetime', 'radio', 'checkbox', 'checkcard', 'fileupload', 'textarea', 'multiselect', 'brafteditor', 'color'].includes(item.type)) return false
// 鏁版嵁鑷姩濉厖
let readin = item.readin !== 'false'
@@ -160,6 +161,24 @@
if (['select', 'link', 'radio', 'checkbox', 'checkcard', 'multiselect'].includes(item.type) && item.resourceType === '1') {
deForms.push(item)
+ } else if (item.type === 'rate') {
+ item.rateCount = item.rateCount || 5
+ item.allowHalf = item.allowHalf === 'true'
+
+ if (item.allowHalf) {
+ item.initval = parseFloat(item.initval)
+ if (item.initval % 0.5 !== 0) {
+ item.initval = parseInt(item.initval)
+ }
+ } else {
+ item.initval = parseInt(item.initval)
+ }
+
+ if (isNaN(item.initval) || item.initval < 0) {
+ item.initval = 0
+ } else if (item.initval > item.rateCount) {
+ item.initval = item.rateCount
+ }
}
if (item.type === 'text') {
@@ -341,6 +360,15 @@
if (item.subFields.length === 0) {
item.subFields = null
+ } else if (item.options.length > 0) {
+ item.options = item.options.map(cell => {
+ item.subFields.forEach(m => {
+ cell[m.field] = cell[m.field] === undefined ? '' : cell[m.field]
+ })
+ return cell
+ })
+
+ item.oriOptions = fromJS(item.options).toJS()
}
item.linkSubField = null
}
@@ -348,7 +376,9 @@
if (item.enter === 'tab' || item.enter === 'sub') {
if (fieldMap.has(item.tabField)) {
item.tabUuid = fieldMap.get(item.tabField).uuid
- } else {
+ } else if (item.enter === 'tab') {
+ item.enter = 'false'
+ } else if (item.enter === 'sub') {
item.tabUuid = item.uuid
}
}
@@ -379,11 +409,12 @@
* @description 鑾峰彇涓嬫媺琛ㄥ崟閫夐」淇℃伅
*/
improveActionForm = (deForms) => {
- const { BID, menuType } = this.props
+ const { BID, menuType, action } = this.props
let deffers = []
let mainItems = [] // 浜戠鎴栧崟鐐规暟鎹�
let localItems = [] // 鏈湴鏁版嵁
+ let cache = action.setting.cache !== 'false'
deForms.forEach(item => {
if (item.database === 'sso') {
@@ -419,7 +450,7 @@
deffers.push(
new Promise(resolve => {
- Api.getSystemCacheConfig(param).then(res => {
+ Api.getSystemCacheConfig(param, cache).then(res => {
if (!res.status) {
notification.warning({
top: 92,
@@ -461,7 +492,7 @@
deffers.push(
new Promise(resolve => {
- Api.getSystemCacheConfig(mainparam).then(res => {
+ Api.getSystemCacheConfig(mainparam, cache).then(res => {
if (!res.status) {
notification.warning({
top: 92,
@@ -491,7 +522,9 @@
* @description 娴嬭瘯绯荤粺鑾峰彇涓嬫媺琛ㄥ崟閫夐」淇℃伅
*/
improveSimpleActionForm = (deForms) => {
- let deffers = deForms.map(form => {
+ let cache = this.props.action.setting.cache !== 'false'
+
+ let deffers = deForms.map((form, index) => {
let param = {
func: 'sPC_Get_SelectedList',
LText: form.data_sql,
@@ -505,16 +538,18 @@
return (
new Promise(resolve => {
- Api.getSystemCacheConfig(param).then(res => {
- if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- }
- resolve(res)
- })
+ setTimeout(() => {
+ Api.getSystemCacheConfig(param, cache).then(res => {
+ if (!res.status) {
+ notification.warning({
+ top: 92,
+ message: res.message,
+ duration: 5
+ })
+ }
+ resolve(res)
+ })
+ }, index * 30)
})
)
})
@@ -661,7 +696,7 @@
} else if (item.type === 'hint') {
fields.push(
<Col span={item.span || 24} key={index}>
- <Form.Item className="hint" colon={!!item.label} label={item.label} labelCol={item.labelCol} wrapperCol={item.wrapperCol}>
+ <Form.Item className="hint" colon={!!item.label} label={item.label || ' '} labelCol={item.labelCol} wrapperCol={item.wrapperCol}>
<div className="message">{item.message}</div>
</Form.Item>
</Col>
@@ -669,7 +704,7 @@
} else {
let content = null
let className = ''
- let label = item.tooltip ? <Tooltip placement="topLeft" title={item.tooltip}><Icon type="question-circle" />{item.label}</Tooltip> : item.label
+ let label = item.tooltip ? <Tooltip placement="topLeft" title={item.tooltip}><QuestionCircleOutlined style={{color: '#c49f47', marginRight: '3px'}}/>{item.label}</Tooltip> : item.label
if (item.type === 'text' || item.type === 'linkMain') {
content = (<MKInput config={item} onChange={(val, defer) => !defer && this.recordChange({[item.field]: val})} onSubmit={this.props.inputSubmit} />)
@@ -696,6 +731,8 @@
content = (<MKFileUpload config={item} onChange={(val) => this.recordChange({[item.field]: val})} />)
} else if (item.type === 'textarea') {
content = (<MKTextArea config={item} onChange={(val, defer) => !defer && this.recordChange({[item.field]: val})}/>)
+ } else if (item.type === 'rate') {
+ content = (<Rate count={item.rateCount} disabled={item.readonly} onChange={(val) => this.recordChange({[item.field]: val})} character={item.character ? <MkIcon type={item.character}/> : <StarFilled />} allowHalf={item.allowHalf}/>)
} else if (item.type === 'brafteditor') {
content = (<MKEditor config={item} onChange={(val) => this.recordChange({[item.field]: val})}/>)
label = item.hidelabel !== 'true' ? label : ''
@@ -754,13 +791,13 @@
if (item.type === 'funcvar') {
_item.value = ''
- } else if (_item.value && (item.type === 'text' || item.type === 'textarea' || item.type === 'linkMain')) {
+ } else if (_item.value && (item.type === 'text' || item.type === 'textarea' || item.type === 'linkMain') && typeof(_item.value) === 'string') {
_item.value = _item.value.replace(/\t*|\v*/g, '') // 鍘婚櫎鍒惰〃绗�
if (item.interception === 'true') { // 鍘婚櫎棣栧熬绌烘牸
_item.value = _item.value.replace(/(^\s*|\s*$)/g, '')
}
- if (item.type === 'text' && typeof(_item.value) === 'string') { // 鐗规畩瀛楁鏇挎崲
+ if (item.type === 'text') { // 鐗规畩瀛楁鏇挎崲
_item.value = _item.value.replace(/^(\s*)@appkey@(\s*)$/ig, window.GLOB.appkey)
_item.value = _item.value.replace(/^(\s*)@SessionUid@(\s*)$/ig, (localStorage.getItem('SessionUid') || ''))
_item.value = _item.value.replace(/^(\s*)@bid@(\s*)$/ig, (this.props.BID || ''))
--
Gitblit v1.8.0