From 75347779d54c3c8a0893166dbb9c03bc06ea1eee Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 21 十二月 2019 16:58:31 +0800
Subject: [PATCH] 2019-12-21

---
 src/templates/comtableconfig/index.jsx |   76 +++++++++++++++++++++++++------------
 1 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index f1a2f66..db0e52a 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -113,7 +113,6 @@
     }
 
     _config.tabs = _config.tabs || []
-    _config.subtabs = _config.subtabs || []
 
     this.setState({
       originActions: _oriActions,
@@ -287,7 +286,7 @@
           this.handleAction(card)
         } else if (type === 'columns') {
           this.handleColumn(card)
-        } else if (type === 'tabs' || type === 'subtabs') {
+        } else if (type === 'tabs') {
           this.handleTab(card)
         }
       })
@@ -913,6 +912,28 @@
   }
 
   handleTab = (card) => {
+    const { config } = this.state
+
+    let menus = []
+
+    config.tabs.forEach(item => {
+      if (item.origin || card.uuid === item.uuid) return
+
+      let menu = {
+        value: item.uuid,
+        text: item.label
+      }
+
+      menus.push(menu)
+    })
+
+    if (card.supMenu && card.supMenu !== 'mainTable') {
+      let _menu = menus.filter(item => item.value === card.supMenu)[0]
+      if (!_menu) {
+        card.supMenu = ''
+      }
+    }
+
     this.setState({
       visible: true,
       formtemp: 'tabs',
@@ -939,22 +960,22 @@
         },
         {
           type: 'select',
-          key: 'linkId',
+          key: 'linkTab',
           label: '鍏宠仈鏍囩',
-          initVal: card.linkId || '',
-          required: true,
+          initVal: card.linkTab || '',
+          required: false,
           options: [{
-            value: 'table',
-            text: 'table'
+            value: '',
+            text: '鏂板缓'
           }, {
-            value: 'bar-chart',
-            text: 'bar-chart'
+            value: 'jadisfjiasodjIjjaidfoasdf',
+            text: '瀛愯〃1'
           }, {
-            value: 'pie-chart',
-            text: 'pie-chart'
+            value: 'dasjfsioafjiaga',
+            text: '瀛愯〃2'
           }, {
-            value: 'line-chart',
-            text: 'line-chart'
+            value: 'jadsifjasgfisag',
+            text: '瀛愯〃3'
           }]
         },
         {
@@ -981,11 +1002,21 @@
           }]
         },
         {
-          type: 'text',
-          key: 'description',
-          label: this.state.dict['header.form.description'],
-          initVal: card.description || '',
-          required: false
+          type: 'select',
+          key: 'supMenu',
+          label: '鍏宠仈鑿滃崟',
+          initVal: card.supMenu || '',
+          required: false,
+          options: [
+            {
+              value: '',
+              text: this.state.dict['header.form.empty']
+            }, {
+              value: 'mainTable',
+              text: '涓昏〃'
+            },
+            ...menus
+          ]
         }
       ]
     })
@@ -1718,9 +1749,6 @@
       if (config.tabs[0] && config.tabs[0].origin) {
         config.tabs = config.tabs.filter(item => !item.origin)
       }
-      if (config.subtabs[0] && config.subtabs[0].origin) {
-        config.subtabs = config.subtabs.filter(item => !item.origin)
-      }
 
       let _LongParam = ''
       let _config = {...config, tables: this.state.selectedTables}
@@ -1977,8 +2005,7 @@
       (config.search[0] && config.search[0].origin) ||
       (config.action[0] && config.action[0].origin) ||
       (config.columns[0] && config.columns[0].origin) ||
-      (config.tabs[0] && config.tabs[0].origin) ||
-      (config.subtabs[0] && config.subtabs[0].origin)
+      (config.tabs[0] && config.tabs[0].origin)
     ) {
       isAdd = true
     }
@@ -2339,8 +2366,7 @@
       (config.search[0] && config.search[0].origin) ||
       (config.action[0] && config.action[0].origin) ||
       (config.columns[0] && config.columns[0].origin) ||
-      (config.tabs[0] && config.tabs[0].origin) ||
-      (config.subtabs[0] && config.subtabs[0].origin)
+      (config.tabs[0] && config.tabs[0].origin)
     ) {
       isAdd = true
     }

--
Gitblit v1.8.0