Skip to content

W
WebPublic
提交 4a523b07 authored 作者: 钟是志's avatar 钟是志
浏览文件
操作

修复控制台warnning

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