From a8e94242166881639cecf3809e45ca527233ebd7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 23 三月 2021 16:42:20 +0800
Subject: [PATCH] 2021-03-23
---
src/tabviews/verupmanage/actionList/index.jsx | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/tabviews/verupmanage/actionList/index.jsx b/src/tabviews/verupmanage/actionList/index.jsx
index 5671678..6947633 100644
--- a/src/tabviews/verupmanage/actionList/index.jsx
+++ b/src/tabviews/verupmanage/actionList/index.jsx
@@ -2,13 +2,16 @@
import PropTypes from 'prop-types'
import moment from 'moment'
import { Button, Modal, notification, message } from 'antd'
-import MutilForm from '@/tabviews/zshare/mutilform'
+
+import asyncSpinComponent from '@/utils/asyncSpinComponent'
import Utils, { getSysDefaultSql } from '@/utils/utils.js'
import options from '@/store/options.js'
+import { updateForm } from '@/utils/utils-update.js'
import Api from '@/api'
import './index.scss'
const { confirm } = Modal
+const MutilForm = asyncSpinComponent(() => import('@/tabviews/zshare/mutilform'))
class MainAction extends Component {
static propTpyes = {
@@ -109,6 +112,7 @@
this.setState({loadingUuid: ''})
})
} else if (item.OpenType === 'pop') {
+ item = updateForm(item)
if (item.setting.display === 'prompt') { // 濡傛灉琛ㄥ崟浠ユ槸鍚︽灞曠ず锛屼笉璇锋眰涓嬫媺鑿滃崟淇℃伅
this.setState({
execAction: item,
@@ -648,17 +652,10 @@
const { BData } = this.props
const { execAction, tabledata } = this.state
let _this = this
- let _fields = []
-
- if (execAction.groups.length > 0) {
- execAction.groups.forEach(group => {
- _fields = [..._fields, ...group.sublist]
- })
- } else {
- _fields = execAction.fields
- }
- let result = _fields.map(item => {
+ let result = []
+ execAction.fields.forEach(item => {
+ if (!item.field) return
let _readin = item.readin !== 'false'
let _initval = item.initval
@@ -679,14 +676,14 @@
_fieldlen = item.decimal ? item.decimal : 0
}
- return {
+ result.push({
key: item.field,
readonly: item.readonly === 'true',
readin: _readin,
fieldlen: _fieldlen,
type: item.type,
value: _initval
- }
+ })
})
confirm({
--
Gitblit v1.8.0