From 35f51aad9824b55bbe67c0fb21bd3d3d24381c2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 16 七月 2023 21:42:33 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/menu/components/share/actioncomponent/formconfig.jsx |   63 +++++++++++++++++++++++++++++++
 1 files changed, 63 insertions(+), 0 deletions(-)

diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 30d6719..dff3ec2 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -577,6 +577,22 @@
       }]
     },
     {
+      type: 'text',
+      key: 'ContentType',
+      label: 'Content-Type',
+      initVal: card.ContentType || '',
+      tooltip: '榛樿鍊硷細application/x-www-form-urlencoded;charset=UTF-8',
+      required: false
+    },
+    {
+      type: 'text',
+      key: 'outerBlacklist',
+      label: '瀛楁榛戝悕鍗�',
+      initVal: card.outerBlacklist || '',
+      tooltip: '涓嶉渶瑕佸洖浼犵殑瀛楁鍙缃瓧娈甸粦鍚嶅崟锛屽涓�艰鐢ㄩ�楀彿鍒嗛殧銆�',
+      required: false
+    },
+    {
       type: 'select',
       key: 'Ot',
       label: '琛岃缃�',
@@ -958,6 +974,22 @@
         value: 'close',
         text: '鍏抽棴'
       }]
+    },
+    {
+      type: 'radio',
+      key: 'popshow',
+      label: '寮圭獥灞曠ず',
+      initVal: card.popshow || 'default',
+      tooltip: '灏忕獥鍙e睍绀哄皢闅愯棌鏍囬鍙婂簳閮ㄦ寜閽��',
+      required: false,
+      options: [{
+        value: 'default',
+        text: '榛樿'
+      }, {
+        value: 'miniview',
+        text: '灏忕獥鍙�'
+      }],
+      forbid: appType === 'mob'
     },
     {
       type: 'radio',
@@ -1642,6 +1674,22 @@
       }]
     },
     {
+      type: 'text',
+      key: 'ContentType',
+      label: 'Content-Type',
+      initVal: card.ContentType || '',
+      tooltip: '榛樿鍊硷細application/x-www-form-urlencoded;charset=UTF-8',
+      required: false
+    },
+    {
+      type: 'text',
+      key: 'outerBlacklist',
+      label: '瀛楁榛戝悕鍗�',
+      initVal: card.outerBlacklist || '',
+      tooltip: '涓嶉渶瑕佸洖浼犵殑瀛楁鍙缃瓧娈甸粦鍚嶅崟锛屽涓�艰鐢ㄩ�楀彿鍒嗛殧銆�',
+      required: false
+    },
+    {
       type: 'select',
       key: 'Ot',
       label: '琛岃缃�',
@@ -1939,6 +1987,21 @@
       }]
     },
     {
+      type: 'radio',
+      key: 'popshow',
+      label: '寮圭獥灞曠ず',
+      initVal: card.popshow || 'default',
+      tooltip: '灏忕獥鍙e睍绀哄皢闅愯棌鏍囬鍙婂簳閮ㄦ寜閽��',
+      required: false,
+      options: [{
+        value: 'default',
+        text: '榛樿'
+      }, {
+        value: 'miniview',
+        text: '灏忕獥鍙�'
+      }]
+    },
+    {
       type: 'text',
       key: 'preFunc',
       label: '鍓嶇疆鍑芥暟',

--
Gitblit v1.8.0