From 515f0149680345557c373b385e165756107d44fa Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 19 九月 2021 22:04:24 +0800
Subject: [PATCH] 2021-09-19

---
 src/templates/sharecomponent/actioncomponent/actionform/index.jsx |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
index ea12b80..b544ead 100644
--- a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
@@ -9,9 +9,9 @@
 
 const { TextArea } = Input
 const actionTypeOptions = {
-  pop: ['label', 'position', 'OpenType', 'intertype', 'Ot', 'icon', 'class', 'execSuccess', 'execError'],
-  prompt: ['label', 'position', 'OpenType', 'intertype', 'Ot', 'icon', 'class', 'execSuccess', 'execError'],
-  exec: ['label', 'position', 'OpenType', 'intertype', 'Ot', 'icon', 'class', 'execSuccess', 'execError'],
+  pop: ['label', 'position', 'OpenType', 'intertype', 'Ot', 'icon', 'class', 'execSuccess', 'execError', 'openmenu', 'output'],
+  prompt: ['label', 'position', 'OpenType', 'intertype', 'Ot', 'icon', 'class', 'execSuccess', 'execError', 'openmenu', 'output'],
+  exec: ['label', 'position', 'OpenType', 'intertype', 'Ot', 'icon', 'class', 'execSuccess', 'execError', 'openmenu', 'output'],
   excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'icon', 'class', 'sheet', 'execSuccess', 'execError'],
   excelOut: ['label', 'OpenType', 'intertype', 'icon', 'class', 'execSuccess', 'execError', 'pagination', 'search'],
   popview: ['label', 'Ot', 'OpenType', 'icon', 'class', 'position', 'tabType', 'linkTab', 'popClose', 'display', 'ratio', 'placement'],
@@ -678,7 +678,12 @@
       } else if (item.type === 'cascader') { // 澶氶��
         fields.push(
           <Col span={12} key={index}>
-            <Form.Item label={item.label}>
+            <Form.Item label={item.tooltip ?
+              <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
+                <Icon type="question-circle" />
+                {item.label}
+              </Tooltip> : item.label
+            }>
               {getFieldDecorator(item.key, {
                 initialValue: item.initVal || [],
                 rules: [
@@ -757,6 +762,25 @@
               })
             }
           }
+          if (values.openmenu && Array.isArray(values.openmenu) && values.openmenu.length > 0) {
+            let list = null
+            try {
+              list = JSON.parse(sessionStorage.getItem('thdMenuList')) || []
+            } catch (e) {
+              list = []
+            }
+
+            let id = values.openmenu[values.openmenu.length - 1]
+
+            list.forEach(item => {
+              if (item.MenuID === id) {
+                values.MenuID = id
+                values.MenuName = item.MenuName
+                values.MenuNo = item.MenuNo
+                values.tabType = item.type
+              }
+            })
+          }
 
           resolve(values)
         } else {

--
Gitblit v1.8.0