From 2a347c8d91d6962f4302f0553c55a3b9f743baa5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 09 九月 2020 21:15:58 +0800
Subject: [PATCH] 2020-09-09

---
 src/templates/sharecomponent/settingcomponent/index.jsx |   27 +++------------------------
 1 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/src/templates/sharecomponent/settingcomponent/index.jsx b/src/templates/sharecomponent/settingcomponent/index.jsx
index 2550016..ff5fe44 100644
--- a/src/templates/sharecomponent/settingcomponent/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/index.jsx
@@ -1,7 +1,7 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
 import { is, fromJS } from 'immutable'
-import { Icon, Modal, Button, notification } from 'antd'
+import { Icon, Modal, Button } from 'antd'
 
 import Utils from '@/utils/utils.js'
 import DevUtils from '@/utils/devutils.js'
@@ -84,18 +84,8 @@
     const { config } = this.props
     const { menu } = this.state
 
-    this.settingRef.handleConfirm(true).then(setting => {
-      if (setting.interType !== 'inner' || !setting.innerFunc) {
-        notification.warning({
-          top: 92,
-          message: '浣跨敤鍐呴儴鎺ュ彛锛屼笖瀛樺湪鍐呴儴鍑芥暟鏃讹紝鎵嶅彲浠ュ垱寤哄瓨鍌ㄨ繃绋嬶紒',
-          duration: 5
-        })
-        return
-      }
-
+    this.settingRef.handleConfirm('func').then(setting => {
       let _config = {...config, setting: setting}
-
       let newLText = Utils.formatOptions(DevUtils.getTableFunc(setting, menu, _config)) // 鍒涘缓瀛樺偍杩囩▼sql
       let DelText = Utils.formatOptions(DevUtils.dropfunc(setting.innerFunc))          // 鍒犻櫎瀛樺偍杩囩▼sql
 
@@ -114,16 +104,7 @@
     const { config } = this.props
     const { menu } = this.state
 
-    this.settingRef.handleConfirm(true).then(setting => {
-      if (setting.interType !== 'system') {
-        notification.warning({
-          top: 92,
-          message: '浣跨敤绯荤粺鎺ュ彛鏃讹紝鎵嶅彲浠ュ垱寤烘帴鍙o紒',
-          duration: 5
-        })
-        return
-      }
-
+    this.settingRef.handleConfirm('interface').then(setting => {
       let _config = {...config, setting: setting}
       let _menu = {
         type: config.Template === 'CommonTable' ? 'main' : 'subtable',
@@ -173,13 +154,11 @@
           destroyOnClose
         >
           <SettingForm
-            type={config.Template === 'CommonTable' ? 'main' : 'subtable'}
             dict={dict}
             menu={menu}
             config={config}
             search={search}
             permFuncField={permFuncField}
-            inputSubmit={this.settingSave}
             wrappedComponentRef={(inst) => this.settingRef = inst}
           />
         </Modal>

--
Gitblit v1.8.0