From 2031a460f6c0827fe80f8c625dd98333d1631d2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 五月 2020 22:10:48 +0800
Subject: [PATCH] 2020-05-08

---
 src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx |   78 ++++++++++++++++----------------------
 1 files changed, 33 insertions(+), 45 deletions(-)

diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
index cbbd0d8..abf8146 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
@@ -1,6 +1,6 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Button, notification, Modal, Menu, Icon, Tooltip, Radio, Dropdown } from 'antd'
+import { Form, Row, Col, Input, Button, notification, Modal, Icon, Tooltip, Radio, Select } from 'antd'
 import moment from 'moment'
 
 import Utils from '@/utils/utils.js'
@@ -153,23 +153,20 @@
     })
   }
 
-  selectScript = (e) => {
-    const { systemScripts, usefulfields, btn } = this.props
+  selectScript = (value, option) => {
+    const { usefulfields, btn } = this.props
 
-    let option = ''
-    if (e.key === 'default') {
+    let _value = ''
+    if (value === 'default') {
       let fields = usefulfields.map(col => col.Column).join(',')
       
       if (fields) {
         fields = fields + ','
       }
 
-      option = {
-        name: '榛樿sql',
-        value: `Insert into ${btn.sheet} (${fields}createuserid,createuser,createstaff,bid)\nSelect ${fields}@userid,@username,@fullname,@BID From @${btn.sheet}`
-      }
+      _value = `Insert into ${btn.sheet} (${fields}createuserid,createuser,createstaff,bid)\nSelect ${fields}@userid,@username,@fullname,@BID From @${btn.sheet}`
     } else {
-      option = systemScripts[+e.key]
+      _value = value
     }
 
     let _sql = this.props.form.getFieldValue('sql')
@@ -180,10 +177,10 @@
     }
 
     _sql = _sql.replace(/\s{6}$/, '')
-    _sql = _sql + `/*${option.name}*/
+    _sql = _sql + `/*${option.props.children}*/
     `
     _sql = _sql.replace(/\s{4}$/, '')
-    _sql = _sql + option.value
+    _sql = _sql + _value
 
     this.props.form.setFieldsValue({
       sql: _sql
@@ -206,8 +203,18 @@
     }
 
     return (
-      <Form {...formItemLayout} className="verify-form" id="verifycard2">
+      <Form {...formItemLayout} className="verify-form" id="verify-excelin-custom-scripts">
         <Row gutter={24}>
+          {btn.sheet ? <Col span={8}>
+            <Form.Item label={'琛ㄥ悕'} style={{whiteSpace: 'nowrap', margin: 0}}>
+              {btn.sheet}
+            </Form.Item>
+          </Col> : null}
+          <Col span={16}>
+            <Form.Item label={'鎶ラ敊瀛楁'} style={{margin: 0}}>
+              errorCode, errmsg
+            </Form.Item>
+          </Col>
           {usefulfields ? <Col span={24} className="sqlfield">
             <Form.Item label={'鍙敤瀛楁'}>
               {usefulfields}
@@ -231,48 +238,29 @@
               )}
             </Form.Item>
           </Col>
-          <Col span={4} style={{lineHeight: '40px', textAlign: 'center'}}>
-            <Dropdown trigger={['click']} overlayClassName="mk-normal-dropdown" overlay={
-              <Menu onClick={this.selectScript}>
-                <Menu.Item key="default">榛樿sql</Menu.Item>
+          <Col span={10}>
+            <Form.Item style={{marginBottom: 0}} label={'蹇嵎娣诲姞'}>
+              <Select
+                showSearch
+                filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
+                onChange={this.selectScript}
+                getPopupContainer={() => document.getElementById('verify-excelin-custom-scripts')}
+              >
+                <Select.Option key="default" value={'default'}>
+                  榛樿sql
+                </Select.Option>
                 {systemScripts.map((option, i) =>
-                  <Menu.Item key={i} value={option.value}>{option.name}</Menu.Item>
-                )}
-                {systemScripts.map((option, i) =>
-                  <Menu.Item key={i + '1'} value={option.value}>{option.name}</Menu.Item>
-                )}
-              </Menu>
-            }>
-              <span style={{color: '#1890ff', display: 'inline-block', cursor: 'pointer'}}>
-                蹇嵎娣诲姞 <Icon type="down" style={{marginRight: '5px'}} />
-              </span>
-            </Dropdown>
-          </Col>
-          {/* <Col span={8}>
-            <Form.Item style={{marginBottom: 0}} label={
-              <Tooltip placement="bottomLeft" title={'浠庣郴缁熷嚱鏁伴泦涓�夋嫨闇�瑕佺殑鍑芥暟锛屽彲蹇�熸坊鍔犺嚦sql涓��'}>
-                <Icon type="question-circle" style={{color: '#c49f47', marginRight: '5px'}} />
-                蹇嵎娣诲姞
-              </Tooltip>
-            }>
-              <Select value="" onChange={this.selectScript}>
-                {systemScripts.map((option, i) =>
-                  <Select.Option title={option.name} key={i} value={option.value}>
+                  <Select.Option key={i} value={option.value}>
                     {option.name}
                   </Select.Option>
                 )}
               </Select>
             </Form.Item>
-          </Col> */}
+          </Col>
           <Col span={4} className="add">
             <Button onClick={this.handleConfirm} loading={this.state.loading} className="mk-green" style={{marginBottom: 15, marginLeft: 40}}>
               淇濆瓨
             </Button>
-          </Col>
-          <Col span={8} style={{textAlign: 'right'}}>
-            {btn.sheet ? <span style={{maxWidth: '100%', display: 'inline-block', position: 'relative', top: '20px', whiteSpace: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden'}}>
-              琛ㄥ悕:  {btn.sheet}
-            </span> : null}
           </Col>
           <Col span={24} className="sql">
             <Form.Item label={'sql'}>

--
Gitblit v1.8.0