From e5a92d6bee2b8d47d5c145ed92485fd19b663b0f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 27 十二月 2024 12:26:21 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index a9d4429..6fcaa2f 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -251,7 +251,7 @@
if (openType === 'pop') {
shows.push('extBtn')
if (this.record.extBtn === 'true') {
- shows.push('extLabel', 'extValue')
+ shows.push('extLabel', 'extStyle', 'confLabel', 'confStyle', 'extValue')
}
}
} else if (openType === 'form') {
@@ -741,6 +741,10 @@
_fieldval.color = 'primary'
}
}
+ this.record.resetPageIndex = 'false'
+ if ([this.record.execSuccess, this.record.execError].includes('grid')) {
+ _fieldval.resetPageIndex = 'false'
+ }
} else if (value === 'audit') {
_fieldval.label = '瀹℃牳'
_fieldval.Ot = 'required'
@@ -757,6 +761,10 @@
} else {
_fieldval.color = 'danger'
}
+ this.record.resetPageIndex = 'true'
+ if ([this.record.execSuccess, this.record.execError].includes('grid')) {
+ _fieldval.resetPageIndex = 'true'
+ }
} else if (value === 'custom') {
_fieldval.Ot = 'required'
}
--
Gitblit v1.8.0