From 6bbf496f57d1a6da1d9d1142a806600504567f35 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 13 九月 2024 23:40:20 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/zshare/mutilform/index.jsx | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 15d2493..bf3c61e 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -4,6 +4,7 @@
import { Form, Row, Col, notification, Tooltip, Rate } from 'antd'
import { QuestionCircleOutlined, StarFilled } from '@ant-design/icons'
import moment from 'moment'
+import md5 from 'md5'
import Api from '@/api'
import Utils from '@/utils/utils.js'
@@ -782,7 +783,7 @@
resetFocus = (id, field) => {
const { action } = this.props
- if (id !== action.uuid) return
+ if (id !== action.uuid.replace(/_pop$/, '')) return
let focusId = ''
@@ -851,7 +852,7 @@
}
getFormData = (deForms) => {
- if (window.backend && window.GLOB.CacheData.has('sql_' + deForms[0].uuid)) {
+ if (window.backend && window.GLOB.CacheData.has('sql_' + md5(this.props.action.uuid.replace(/_pop$/, '') + deForms[0].uuid))) {
this.improveBackActionForm(deForms)
} else if (deForms.length === 1) {
this.improveSimpleActionForm(deForms)
@@ -889,9 +890,16 @@
let skip = false
deForms.forEach(item => {
- let ex = window.GLOB.CacheData.get('sql_' + item.uuid)
+ let ex = window.GLOB.CacheData.get('sql_' + md5(action.uuid.replace(/_pop$/, '') + item.uuid))
- if (!ex) return
+ if (!ex) {
+ notification.warning({
+ top: 92,
+ message: '琛ㄥ崟锛�' + item.label + '锛夋棤鍙墽琛岃剼鏈��',
+ duration: 5
+ })
+ return
+ }
let exps = []
ex.reps.forEach(n => {
--
Gitblit v1.8.0