From 862b6cf69dc925a6138a7ebf79b782a5d7791202 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 03 一月 2020 12:13:52 +0800
Subject: [PATCH] 2020-01-03

---
 src/templates/comtableconfig/index.jsx |   61 ++----------------------------
 1 files changed, 4 insertions(+), 57 deletions(-)

diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index 2d71a5c..187031b 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -85,6 +85,9 @@
 
     if (!_LongParam) {
       _config = JSON.parse(JSON.stringify(Source.baseConfig))
+      if (!menu.isSubtable) { // 涓嶆槸閫夋嫨涓诲瓙琛ㄦ椂锛岄殣钘忔爣绛鹃〉
+        _config.tabs = []
+      }
     } else {
       _config = _LongParam
     }
@@ -629,7 +632,7 @@
           type: 'radio',
           key: 'intertype',
           label: this.state.dict['header.form.intertype'],
-          initVal: card.intertype,
+          initVal: card.intertype || 'inner',
           required: true,
           options: [{
             value: 'inner',
@@ -749,42 +752,6 @@
             value: 'view',
             text: this.state.dict['header.form.refresh.view']
           }]
-        },
-        {
-          type: 'select',
-          key: 'errorTip',
-          label: this.state.dict['header.form.messageTip'],
-          initVal: card.errorTip || 'E',
-          tooltip: '璇ラ�夐」涓烘彁绀烘晥鏋滃睍绀猴紝閫夋嫨鎻愮ず绫诲瀷鍚庯紝鍙偣鍑绘寜閽煡鐪嬶紝鑷畾涔夊嚱鏁颁腑璁剧疆 ErrCode 涓猴紙S銆�-1銆丒銆丯銆丗銆丯M锛夋椂锛屼細浠ュ搴旀柟寮忓睍绀烘彁绀轰俊鎭��',
-          tooltipClass: 'middle',
-          required: false,
-          options: [{
-            value: 'S',
-            text: 'S(鎻愰啋妗�-0)'
-          }, {
-            value: '-1',
-            text: '-1(涓嶆彁绀�)'
-          }, {
-            value: 'N',
-            text: 'N(鎻愰啋妗�-1)'
-          }, {
-            value: 'F',
-            text: 'F(鎻愰啋妗�-2)'
-          }, {
-            value: 'E',
-            text: 'E(纭妗�)'
-          }, {
-            value: 'NM',
-            text: 'NM(椤堕儴鎻愮ず)'
-          }]
-        },
-        {
-          type: 'number',
-          key: 'errorTime',
-          label: this.state.dict['header.form.errorTime'],
-          initVal: card.errorTime || 15,
-          tooltip: '鎵ц缁撴灉涓缃� ErrCode 涓� N 鎴� F 鏃舵湁鏁�',
-          required: false
         },
         {
           type: 'select',
@@ -1175,26 +1142,6 @@
     if (this.state.formtemp !== 'gridbtn') {
       this.formRef.handleConfirm().then(res => {
         let isupdate = false
-
-        if (res.type === 'search') {
-          if ((res.values.type === 'multiselect' || res.values.type === 'select' || res.values.type === 'link') && res.values.resourceType === '1') {
-            let _datasource = res.values.dataSource
-
-            if (/\s/.test(_datasource)) {
-              _datasource = '(' + _datasource + ') tb'
-            }
-
-            let sql = 'select ' + res.values.valueField + ',' + res.values.valueText + ' from ' + _datasource
-            if (res.values.type === 'link') {
-              sql = 'select ' + res.values.valueField + ',' + res.values.valueText + ',' + res.values.linkField + ' from ' + _datasource
-            }
-            if (res.values.orderBy) {
-              sql = sql + ' order by ' + res.values.orderBy + ' ' + res.values.orderType
-            }
-
-            res.values.dataSourceSql = Utils.formatOptions(sql)
-          }
-        }
 
         if (res.type === 'action' && card.originCard && res.values.OpenType === 'pop') {
           Api.getSystemConfig({

--
Gitblit v1.8.0