From 76a4300654a18d228838c3f27455dc8e7a8cd616 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 15 一月 2021 17:04:42 +0800
Subject: [PATCH] Merge branch 'master' into bms

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

diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 9899f8d..0444ac7 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -44,15 +44,16 @@
   ]
 
   if (type === 'chart') {
-    opentypes = [
-      {
-        value: 'excelIn',
-        text: Formdict['model.form.excelIn']
-      }, {
-        value: 'excelOut',
-        text: Formdict['model.form.excelOut']
-      }
-    ]
+    opentypes = opentypes.filter(item => item.value === 'excelIn' || item.value === 'excelOut')
+  }
+
+  let refresh = []
+  if (sessionStorage.getItem('editMenuType') === 'popview') { // 寮圭獥鏍囩
+    opentypes = opentypes.filter(item => item.value !== 'popview' && item.value !== 'funcbutton')
+    refresh.push({
+      value: 'popclose',
+      text: '鏍囩鍒锋柊'
+    })
   }
 
   let forms = [
@@ -226,45 +227,72 @@
       options: menulist
     },
     {
-      type: 'radio',
+      type: 'select',
       key: 'execSuccess',
       label: Formdict['model.form.afterSuccess'],
       initVal: card.execSuccess || 'never',
+      tooltip: refresh.length ? '鎵ц鏍囩鍒锋柊鏃讹紝浼氬悓姝ュ埛鏂板綋鍓嶇粍浠跺拰涓婄骇缁勪欢-琛屻��' : '鍒锋柊涓婄骇缁勪欢-琛屾椂锛屼細鍚屾鍒锋柊褰撳墠缁勪欢锛屾敞锛氫笂绾х粍浠跺湪鏁版嵁婧愪腑娣诲姞銆�',
       required: true,
       options: [{
-        value: 'grid',
-        text: Formdict['header.form.refresh']
-      }, {
         value: 'never',
         text: Formdict['header.form.refresh.never']
-      }]
+      }, {
+        value: 'grid',
+        text: '鍒锋柊褰撳墠缁勪欢'
+      }, {
+        value: 'mainline',
+        text: '鍒锋柊涓婄骇缁勪欢 - 琛�'
+      },
+      ...refresh]
     },
     {
-      type: 'radio',
+      type: 'select',
       key: 'execError',
       label: Formdict['model.form.afterError'],
       initVal: card.execError || 'never',
+      tooltip: refresh.length ? '鎵ц鏍囩鍏抽棴鍒锋柊鏃讹紝浼氬悓姝ュ埛鏂板綋鍓嶇粍浠跺拰涓婄骇缁勪欢-琛屻��' : '鍒锋柊涓婄骇缁勪欢-琛屾椂锛屼細鍚屾鍒锋柊褰撳墠缁勪欢锛屾敞锛氫笂绾х粍浠跺湪鏁版嵁婧愪腑娣诲姞銆�',
       required: true,
       options: [{
-        value: 'grid',
-        text: Formdict['header.form.refresh']
-      }, {
         value: 'never',
         text: Formdict['header.form.refresh.never']
-      }]
+      }, {
+        value: 'grid',
+        text: '鍒锋柊褰撳墠缁勪欢'
+      }, {
+        value: 'mainline',
+        text: '鍒锋柊涓婄骇缁勪欢 - 琛�'
+      },
+      ...refresh]
     },
     {
-      type: 'radio',
+      type: 'select',
       key: 'popClose',
       label: Formdict['header.form.popClose'],
       initVal: card.popClose || 'never',
       required: true,
       options: [{
-        value: 'grid',
-        text: Formdict['header.form.refresh']
-      }, {
         value: 'never',
         text: Formdict['header.form.refresh.never']
+      }, {
+        value: 'grid',
+        text: '鍒锋柊褰撳墠缁勪欢'
+      }, {
+        value: 'mainline',
+        text: '鍒锋柊涓婄骇缁勪欢 - 琛�'
+      }]
+    },
+    {
+      type: 'radio',
+      key: 'resetPageIndex',
+      label: '鍒锋柊鏃�',
+      initVal: card.resetPageIndex || 'true',
+      required: false,
+      options: [{
+        value: 'true',
+        text: '閲嶇疆椤电爜'
+      }, {
+        value: 'false',
+        text: '涓嶉噸缃�'
       }]
     },
     {

--
Gitblit v1.8.0