From 1f5c6ac307a134dfa45b64c5723f2481ead9f213 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 16 七月 2023 16:23:09 +0800
Subject: [PATCH] 2023-07-16
---
src/menu/components/form/formaction/formconfig.jsx | 8 ++++
src/menu/components/form/simple-form/index.jsx | 4 +
src/menu/components/share/actioncomponent/actionform/index.jsx | 2
src/templates/modalconfig/index.jsx | 4 +
src/menu/components/form/step-form/index.jsx | 4 +
src/menu/modalconfig/index.jsx | 4 +
src/mob/modalconfig/index.jsx | 4 +
src/menu/components/form/tab-form/index.jsx | 4 +
src/menu/components/share/actioncomponent/formconfig.jsx | 16 ++++++++
src/menu/components/form/formaction/actionform/index.jsx | 2
src/tabviews/zshare/actionList/normalbutton/index.jsx | 10 +++++
11 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/src/menu/components/form/formaction/actionform/index.jsx b/src/menu/components/form/formaction/actionform/index.jsx
index 0bc7907..b8967c0 100644
--- a/src/menu/components/form/formaction/actionform/index.jsx
+++ b/src/menu/components/form/formaction/actionform/index.jsx
@@ -61,7 +61,7 @@
if (this.record.intertype === 'custom') {
shows.pop()
- shows.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross', 'stringify', 'ContentType')
+ shows.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross', 'stringify', 'ContentType', 'outerBlacklist')
if (this.record.procMode === 'system') {
shows.push('sql', 'sqlType')
} else if (this.record.procMode === 'inner') {
diff --git a/src/menu/components/form/formaction/formconfig.jsx b/src/menu/components/form/formaction/formconfig.jsx
index 0642615..9d78a8e 100644
--- a/src/menu/components/form/formaction/formconfig.jsx
+++ b/src/menu/components/form/formaction/formconfig.jsx
@@ -310,6 +310,14 @@
required: false
},
{
+ type: 'text',
+ key: 'outerBlacklist',
+ label: '瀛楁榛戝悕鍗�',
+ initVal: card.outerBlacklist || '',
+ tooltip: '涓嶉渶瑕佸洖浼犵殑瀛楁鍙缃瓧娈甸粦鍚嶅崟锛屽涓�艰鐢ㄩ�楀彿鍒嗛殧銆�',
+ required: false
+ },
+ {
type: 'radio',
key: 'Ot',
label: '琛岃缃�',
diff --git a/src/menu/components/form/simple-form/index.jsx b/src/menu/components/form/simple-form/index.jsx
index 2255364..f113cc2 100644
--- a/src/menu/components/form/simple-form/index.jsx
+++ b/src/menu/components/form/simple-form/index.jsx
@@ -344,6 +344,8 @@
index = i
}
+ if (!item.field) return
+
if (['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field) {
_inputfields.push({
field: item.field,
@@ -373,7 +375,7 @@
if (item.type === 'multiselect' || (item.type === 'checkcard' && item.multiple === 'true')) return
- if (item.field && !uniq.has(item.field)) {
+ if (!uniq.has(item.field)) {
uniq.set(item.field, true)
_linkableFields.push({
diff --git a/src/menu/components/form/step-form/index.jsx b/src/menu/components/form/step-form/index.jsx
index 61eef30..80ae892 100644
--- a/src/menu/components/form/step-form/index.jsx
+++ b/src/menu/components/form/step-form/index.jsx
@@ -445,6 +445,8 @@
index = i
}
+ if (!item.field) return
+
if (['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field) {
_inputfields.push({
field: item.field,
@@ -475,7 +477,7 @@
if (item.type === 'multiselect' || (item.type === 'checkcard' && item.multiple === 'true')) return
- if (item.field && !uniq.has(item.field)) {
+ if (!uniq.has(item.field)) {
uniq.set(item.field, true)
_linkableFields.push({
diff --git a/src/menu/components/form/tab-form/index.jsx b/src/menu/components/form/tab-form/index.jsx
index b437049..f3dd1bd 100644
--- a/src/menu/components/form/tab-form/index.jsx
+++ b/src/menu/components/form/tab-form/index.jsx
@@ -451,6 +451,8 @@
index = i
}
+ if (!item.field) return
+
if (['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field) {
_inputfields.push({
field: item.field,
@@ -480,7 +482,7 @@
if (item.type === 'multiselect' || (item.type === 'checkcard' && item.multiple === 'true')) return
- if (item.field && !uniq.has(item.field)) {
+ if (!uniq.has(item.field)) {
uniq.set(item.field, true)
_linkableFields.push({
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 9d066d2..45a8b3a 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -166,7 +166,7 @@
reOptions.intertype = this.state.interTypeOptions
if (intertype === 'custom') {
- shows.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross', 'stringify', 'ContentType')
+ shows.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross', 'stringify', 'ContentType', 'outerBlacklist')
if (this.record.procMode === 'system') {
shows.push('sql', 'sqlType')
} else if (this.record.procMode === 'inner') {
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 2c40947..dff3ec2 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -585,6 +585,14 @@
required: false
},
{
+ type: 'text',
+ key: 'outerBlacklist',
+ label: '瀛楁榛戝悕鍗�',
+ initVal: card.outerBlacklist || '',
+ tooltip: '涓嶉渶瑕佸洖浼犵殑瀛楁鍙缃瓧娈甸粦鍚嶅崟锛屽涓�艰鐢ㄩ�楀彿鍒嗛殧銆�',
+ required: false
+ },
+ {
type: 'select',
key: 'Ot',
label: '琛岃缃�',
@@ -1674,6 +1682,14 @@
required: false
},
{
+ type: 'text',
+ key: 'outerBlacklist',
+ label: '瀛楁榛戝悕鍗�',
+ initVal: card.outerBlacklist || '',
+ tooltip: '涓嶉渶瑕佸洖浼犵殑瀛楁鍙缃瓧娈甸粦鍚嶅崟锛屽涓�艰鐢ㄩ�楀彿鍒嗛殧銆�',
+ required: false
+ },
+ {
type: 'select',
key: 'Ot',
label: '琛岃缃�',
diff --git a/src/menu/modalconfig/index.jsx b/src/menu/modalconfig/index.jsx
index cea6fbe..36be738 100644
--- a/src/menu/modalconfig/index.jsx
+++ b/src/menu/modalconfig/index.jsx
@@ -125,6 +125,8 @@
index = i
}
+ if (!item.field) return
+
if (['text', 'number', 'textarea', 'color'].includes(item.type) && card.field !== item.field) {
_inputfields.push({
field: item.field,
@@ -154,7 +156,7 @@
if (item.type === 'multiselect' || (item.type === 'checkcard' && item.multiple === 'true')) return
- if (item.field && !uniq.has(item.field)) {
+ if (!uniq.has(item.field)) {
uniq.set(item.field, true)
_linkableFields.push({
diff --git a/src/mob/modalconfig/index.jsx b/src/mob/modalconfig/index.jsx
index 3ced3e3..9352857 100644
--- a/src/mob/modalconfig/index.jsx
+++ b/src/mob/modalconfig/index.jsx
@@ -147,6 +147,8 @@
index = i
}
+ if (!item.field) return
+
if (['text', 'number', 'textarea', 'color'].includes(item.type) && card.field !== item.field) {
_inputfields.push({
field: item.field,
@@ -176,7 +178,7 @@
if (item.type === 'checkcard' && item.multiple === 'true') return
- if (item.field && !uniq.has(item.field)) {
+ if (!uniq.has(item.field)) {
uniq.set(item.field, true)
_linkableFields.push({
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index cef2d8d..48ae9df 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1341,6 +1341,16 @@
if (Array.isArray(res)) {
res = { data: res }
}
+
+ if (btn.outerBlacklist) {
+ let list = btn.outerBlacklist.split(',').map(m => m.toLowerCase())
+ Object.keys(res).forEach(key => {
+ if (list.includes(key.toLowerCase())) {
+ delete res[key]
+ }
+ })
+ }
+
res.mk_api_key = mkey
this.customCallbackRequest(params, res, record, _resolve)
}
diff --git a/src/templates/modalconfig/index.jsx b/src/templates/modalconfig/index.jsx
index fde73c3..5e51140 100644
--- a/src/templates/modalconfig/index.jsx
+++ b/src/templates/modalconfig/index.jsx
@@ -255,6 +255,8 @@
index = i
}
+ if (!item.field) return
+
if (['text', 'number', 'textarea', 'color'].includes(item.type) && card.field !== item.field) {
_inputfields.push({
field: item.field,
@@ -284,7 +286,7 @@
if (item.type === 'multiselect' || (item.type === 'checkcard' && item.multiple === 'true')) return
- if (item.field && !uniq.has(item.field)) {
+ if (!uniq.has(item.field)) {
uniq.set(item.field, true)
_linkableFields.push({
--
Gitblit v1.8.0