提交 4a523b07 authored 作者: 钟是志's avatar 钟是志

修复控制台warnning

上级 79b7c604
......@@ -75,16 +75,28 @@ export default class QueryItem extends React.Component {
return(<div> <Select onChange={this.changeStringX}
value={stringX||"="}
style={{width:100}}>
<Option value="=">等于</Option>
<Option value="<>">不等于</Option>
<Option value="IS NOT NULL">不为空</Option>
<Option value="IS NULL">为空</Option>
<Option value="="
key={'='}
>
等于
</Option>
<Option value="<>" key={'<>'}>
不等于
</Option>
<Option value="IS NOT NULL" key={'IS NOT NULL'}>
不为空
</Option>
<Option value="IS NULL" key={'IS NULL'}>
为空
</Option>
</Select>
{disabled?"": <span style={{padding: '0px 10px'}}>
<Select onChange={this.changeNumber}
value={string}
style={{width:200}}>
{obj.options.map((r)=><Option key={r.v} value={r.v}>{r.l}</Option>)}
{obj.options.map((r)=><Option key={r.v} value={r.v}>
{r.l}
</Option>)}
</Select>
</span>}
......@@ -98,11 +110,21 @@ export default class QueryItem extends React.Component {
<Select onChange={this.changeStringX}
value={stringX||"="}
style={{width:100}}>
<Option value="=">等于</Option>
<Option value="!=">不等于</Option>
<Option value="like"></Option>
<Option value="IS NOT NULL">不为空</Option>
<Option value="IS NULL">为空</Option>
<Option value="=" key={'='}>
等于
</Option>
<Option value="!=" key={'!='}>
不等于
</Option>
<Option value="like" key={'like'}>
</Option>
<Option value="IS NOT NULL" key={'IS NOT NULL'}>
不为空
</Option>
<Option value="IS NULL" key={''}>
为空
</Option>
</Select>
{disabled?"": <span style={{padding: '0px 10px'}}>
<Input onChange={this.changeString}
......@@ -119,14 +141,30 @@ export default class QueryItem extends React.Component {
return ( <div> <Select onChange={this.changeStringX}
value={stringX||"="}
style={{width:100}}>
<Option value="=">等于</Option>
<Option value="<>">不等于</Option>
<Option value=">">大于</Option>
<Option value=">=">大于等于</Option>
<Option value="<">小于</Option>
<Option value="<=">小于等于</Option>
<Option value="IS NOT NULL">不为空</Option>
<Option value="IS NULL">为空</Option>
<Option value="=" key={'='}>
等于
</Option>
<Option value="<>" key={'<>'}>
不等于
</Option>
<Option value=">" key={'>'}>
大于
</Option>
<Option value=">=" key={'>='}>
大于等于
</Option>
<Option value="<" key={'<'}>
小于
</Option>
<Option value="<=" key={'<='}>
小于等于
</Option>
<Option value="IS NOT NULL" key={'IS NOT NULL'}>
不为空
</Option>
<Option value="IS NULL" key={'IS NULL'}>
为空
</Option>
</Select>
{disabled?"": <span style={{padding: '0px 10px'}}>
<InputNumber onChange={this.changeNumber}
......@@ -142,7 +180,7 @@ export default class QueryItem extends React.Component {
<Select onChange={this.changeStringX}
value={stringX||"="}
style={{width:100}}>
<Option value="=">
<Option value="=" key={'='}>
等于
</Option>
</Select>
......@@ -151,10 +189,10 @@ export default class QueryItem extends React.Component {
value={string}
style={{width:200}}
>
<Option value={true}>
<Option value={true} key={'true'}>
</Option>
<Option value={false}>
<Option value={false} key={'false'}>
</Option>
</Select>
......@@ -166,14 +204,30 @@ export default class QueryItem extends React.Component {
<Select onChange={this.changeStringX}
value={stringX||"="}
style={{width:100}}>
<Option value="=">等于</Option>
<Option value="<>">不等于</Option>
<Option value=">">大于</Option>
<Option value=">=">大于等于</Option>
<Option value="<">小于</Option>
<Option value="<=">小于等于</Option>
<Option value="IS NOT NULL">不为空</Option>
<Option value="IS NULL">为空</Option>
<Option value="=" key={'='}>
等于
</Option>
<Option value="<>" key={'<>'}>
不等于
</Option>
<Option value=">" key={'>'}>
大于
</Option>
<Option value=">=" key={'>='}>
大于等于
</Option>
<Option value="<" key={'<'}>
小于
</Option>
<Option value="<=" key={'<='}>
小于等于
</Option>
<Option value="IS NOT NULL" key={'IS NOT NULL'}>
不为空
</Option>
<Option value="IS NULL" key={'IS NULL'}>
为空
</Option>
</Select>
{disabled?"": <span style={{padding: '0px 10px'}}>
<DatePicker onChange={this.changeDate}
......
......@@ -7,7 +7,7 @@ import moment from 'moment';
const Option = Select.Option;
const text = [
'BINARY',
'CHAR',
'GEOMETRY',
'GEOMETRYCOLLECTION',
......@@ -46,7 +46,7 @@ export default class QueryItem extends React.Component {
disabled:value.disabled||false
};
}
componentWillReceiveProps(nextProps) {
// Should be a controlled component.
if ('value' in nextProps) {
......@@ -62,9 +62,9 @@ export default class QueryItem extends React.Component {
onChange(Object.assign({}, this.state, changedValue));
}
};
changeNumber=(e)=>{
if (!('value' in this.props)) {
this.setState({ string:e});
}
......@@ -72,26 +72,26 @@ export default class QueryItem extends React.Component {
};
changeStringX=(e)=>{
var disabled = false
if(e=="IS NOT NULL"||e=="IS NULL"){
disabled=true;
}
if (!('value' in this.props)) {
this.setState({ stringX:e ,disabled});
}
this.triggerChange({ stringX:e ,disabled});
};
changeString=(e)=>{
if (!('value' in this.props)) {
this.setState({ string:e.target.value });
}
this.triggerChange({ string:e.target.value });
};
changeDate=(date)=>{
if (!('value' in this.props)) {
this.setState({ string:date.format("YYYY-MM-DD HH:mm:ss")});
}
......@@ -104,17 +104,28 @@ export default class QueryItem extends React.Component {
return(<div> <Select onChange={this.changeStringX}
value={stringX||"="}
style={{width:100}}>
<Option value="=">等于</Option>
<Option value="<>">不等于</Option>
<Option value="IS NOT NULL">不为空</Option>
<Option value="IS NULL">为空</Option>
<Option value="=" key={'='}>
等于
</Option>
<Option value="<>" key={'<>'}>
不等于
</Option>
<Option value="IS NOT NULL" key={'IS NOT NULL'}>
不为空
</Option>
<Option value="IS NULL" key={'IS NULL'}>
为空
</Option>
</Select>
{disabled?"": <span style={{padding: '0px 10px'}}>
<Select onChange={this.changeNumber}
value={string}
style={{width:200}}>
{obj.options.map((r)=><Option key={r.v} value={r.v}>{r.l}</Option>)}
{obj.options.map((r)=><Option key={r.v}
value={r.v}>
{r.l}
</Option>)}
</Select>
</span>}
<Button type="danger" onClick={this.props.deleteQuery}>删除</Button>
......@@ -127,11 +138,25 @@ export default class QueryItem extends React.Component {
<Select onChange={this.changeStringX}
value={stringX||"="}
style={{width:100}}>
<Option value="=">等于</Option>
<Option value="!=">不等于</Option>
<Option value="like"></Option>
<Option value="IS NOT NULL">不为空</Option>
<Option value="IS NULL">为空</Option>
<Option value="=" key={'='}>
等于
</Option>
<Option value="!=" key={'!='}>
不等于
</Option>
<Option value="like" key={'link'}>
</Option>
<Option value="IS NOT NULL"
key={'IS NOT NULL'}
>
不为空
</Option>
<Option value="IS NULL"
key={'IS NULL'}
>
为空
</Option>
</Select>
{disabled?"": <span style={{padding: '0px 10px'}}>
<Input onChange={this.changeString}
......@@ -141,21 +166,37 @@ export default class QueryItem extends React.Component {
/>
</span>}
<Button type="danger" onClick={this.props.deleteQuery}>删除</Button>
</div>)
}else if(number.includes(obj.type)){
return ( <div> <Select onChange={this.changeStringX}
value={stringX||"="}
style={{width:100}}>
<Option value="=">等于</Option>
<Option value="<>">不等于</Option>
<Option value=">">大于</Option>
<Option value=">=">大于等于</Option>
<Option value="<">小于</Option>
<Option value="<=">小于等于</Option>
<Option value="IS NOT NULL">不为空</Option>
<Option value="IS NULL">为空</Option>
<Option value="=" key={'='}>
等于
</Option>
<Option value="<>" key={'<>'}>
不等于
</Option>
<Option value=">" key={'>'}>
大于
</Option>
<Option value=">=" key={'>='}>
大于等于
</Option>
<Option value="<" key={'<'}>
小于
</Option>
<Option value="<=" key={'<='}>
小于等于
</Option>
<Option value="IS NOT NULL" key={'IS NOT NULL'}>
不为空
</Option>
<Option value="IS NULL" key={'IS NULL'}>
为空
</Option>
</Select>
{disabled?"": <span style={{padding: '0px 10px'}}>
<InputNumber onChange={this.changeNumber}
......@@ -171,7 +212,7 @@ export default class QueryItem extends React.Component {
<Select onChange={this.changeStringX}
value={stringX||"="}
style={{width:100}}>
<Option value="=">
<Option value="=" key={'='}>
等于
</Option>
</Select>
......@@ -180,10 +221,14 @@ export default class QueryItem extends React.Component {
value={string}
style={{width:200}}
>
<Option value={true}>
<Option value={true}
key={'true'}
>
</Option>
<Option value={false}>
<Option value={false}
key={'false'}
>
</Option>
</Select>
......@@ -195,14 +240,30 @@ export default class QueryItem extends React.Component {
<Select onChange={this.changeStringX}
value={stringX||"="}
style={{width:100}}>
<Option value="=">等于</Option>
<Option value="<>">不等于</Option>
<Option value=">">大于</Option>
<Option value=">=">大于等于</Option>
<Option value="<">小于</Option>
<Option value="<=">小于等于</Option>
<Option value="IS NOT NULL">不为空</Option>
<Option value="IS NULL">为空</Option>
<Option value="=" key={'='}>
等于
</Option>
<Option value="<>" key={'<>'}>
不等于
</Option>
<Option value=">" key={'>'}>
大于
</Option>
<Option value=">=" key={'>='}>
大于等于
</Option>
<Option value="<" key={'<'}>
小于
</Option>
<Option value="<=" key={'<='}>
小于等于
</Option>
<Option value="IS NOT NULL" key={'IS NOT NULL'}>
不为空
</Option>
<Option value="IS NULL" key={'IS NULL'}>
为空
</Option>
</Select>
{disabled?"": <span style={{padding: '0px 10px'}}>
<DatePicker onChange={this.changeDate}
......@@ -216,10 +277,10 @@ export default class QueryItem extends React.Component {
<Button type="danger" onClick={this.props.deleteQuery}>删除</Button>
</div>)
}else{
}else{
return (<span>暂无法处理</span>)
}
}
}
......@@ -3,14 +3,14 @@
* 2019年12月11日
*/
import React, { Component } from 'react';
import { Button,Modal,Row,Col,Select } from 'antd';
import { Button,Modal,Row,Col,Select } from 'antd';
import funcList from './functionList';
import AceEditor from "react-ace";
import styles from './style.less';
import Throttle from 'lodash-decorators/throttle';
const { Option } = Select;
export default class index extends Component {
state = {
state = {
visible: false, // 模态框状态
selectOne: [], // 系列函数初始数组
selectTwo: [], // 子函数初始数组
......@@ -49,7 +49,7 @@ export default class index extends Component {
};
/**
* 系列函数搜索框change
* @param {*} value
* @param {*} value
*/
selectOneChange = (value) => {
// 筛选出用户选择
......@@ -93,7 +93,7 @@ export default class index extends Component {
}
/**
* 子函数列表搜索框change
* @param {*} value
* @param {*} value
*/
selectTwoChange = (value) => {
const { selectTwo } = this.state
......@@ -106,7 +106,7 @@ export default class index extends Component {
},() => {
this.getListData(this.state.checkedList[0].demo)
})
}
/**
* 数据格式化等操作
......@@ -201,7 +201,12 @@ export default class index extends Component {
>
{
selectOne.map(item =>{
return <Option value={item.key}>{item.value}</Option>
return <Option
value={item.key}
key={item.key}
>
{item.value}
</Option>
})
}
</Select>
......@@ -220,7 +225,9 @@ export default class index extends Component {
>
{
selectTwo.map(item =>{
return <Option value={item.key}>{item.value}</Option>
return <Option value={item.key}
key={item.key}
>{item.value}</Option>
})
}
</Select>
......@@ -288,13 +295,13 @@ export default class index extends Component {
</Col>
</Row>
<Row gutter={16}>
<Col
span={5}
<Col
span={5}
className={styles.left_title}>
计算结果:
</Col>
<Col
span={16}
<Col
span={16}
className={styles.right_content}>
{
resultValue?
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论