From a02fc6a77fa1b35c6516b2d37108d80e260c6c85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 07 十一月 2024 22:05:08 +0800
Subject: [PATCH] 2024-11-07
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 7d7dcb9..dcf94bf 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -233,7 +233,7 @@
if (this.record.openmenu && this.record.openmenu !== 'goback') {
shows.push('open')
}
- if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ if (['grid'].includes(this.record.execSuccess) || ['grid'].includes(this.record.execError)) {
shows.push('resetPageIndex')
}
@@ -305,7 +305,7 @@
if (this.record.execSuccess === 'goback') {
shows.push('reload')
}
- if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ if (['grid'].includes(this.record.execSuccess) || ['grid'].includes(this.record.execError)) {
shows.push('resetPageIndex')
}
@@ -352,7 +352,7 @@
} else {
shows.push('database')
}
- if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ if (['grid'].includes(this.record.execSuccess) || ['grid'].includes(this.record.execError)) {
shows.push('resetPageIndex')
}
} else if (openType === 'excelOut') {
@@ -389,7 +389,7 @@
} else {
shows.push('database')
}
- if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ if (['grid'].includes(this.record.execSuccess) || ['grid'].includes(this.record.execError)) {
shows.push('resetPageIndex')
}
if (this.record.Ot !== 'notRequired' && appType === 'mob') {
@@ -444,7 +444,7 @@
} else if (this.record.pageTemplate === 'pay') {
reOptions.Ot = requireOptions.filter(op => op.value === 'requiredSgl')
- shows.push('payMode', 'wxApp')
+ shows.push('payMode', 'wxApp', 'wxMerch')
if (this.record.payMode === 'inner') {
reRequired.innerFunc = true
shows.push('innerFunc')
@@ -485,14 +485,16 @@
shows.push('innerFunc', 'extraParam')
reRequired.innerFunc = true
}
- if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ if (['grid'].includes(this.record.execSuccess) || ['grid'].includes(this.record.execError)) {
shows.push('resetPageIndex')
}
if (this.record.execMode === 'pop' || this.record.execMode === 'prompt') {
shows.push('position')
}
} else if (_funcType === 'mkBinding' || _funcType === 'mkUnBinding') {
- shows.push('execSuccess', 'execError')
+ shows.push('execSuccess', 'execError', 'tipTitle')
+ } else if (_funcType === 'mkUnsubscribe' || _funcType === 'reAuth') {
+ shows.push('tipTitle')
} else if (_funcType === 'closetab') {
shows.push('refreshTab')
} else if (_funcType === 'scan') {
@@ -520,7 +522,7 @@
shows.push('innerFunc', 'Ot', 'execSuccess', 'execError', 'urlkey')
} else if (_funcType === 'pay') {
- shows.push('payType', 'wxApp', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu')
+ shows.push('payType', 'wxApp', 'wxMerch', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu')
if (this.record.openmenu && this.record.openmenu !== 'goback') {
shows.push('open')
}
@@ -547,6 +549,11 @@
}
} else if (_funcType === 'shareLink') {
shows.push('shortUrl', 'shareUrl', 'shareProUrl', 'shareTip')
+ } else if (_funcType === 'openLocation') {
+ shows.push('Ot')
+ if (Ot === 'requiredSgl') {
+ shows.push('nameField', 'addressField')
+ }
// } else if (_funcType === 'expPdf') {
// shows.push('exportType')
}
--
Gitblit v1.8.0