Skip to content

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

18983 职业技能竞赛选择指导老师，第一次输入工号和姓名，可以搜索到。再次搜索其它老师工号，姓名、还有根据学院搜索，有时候根本搜索不到。属于大bug，要解决。用户体验很差。

上级 c4b6843d
隐藏空白字符变更
内嵌 并排
正在显示 包含 205 行增加 和 156 行删除
one_stop_public/libs/TableSelect.js
浏览文件 @ bf922ed1
import React from 'react'
import { Tree, Upload, Icon, Button, message, Span, Modal, Tag, Table } from 'antd';
import React from 'react';
import { Button, message, Modal, Tag, Table } from 'antd';
import FormList from './formList/index';
const TreeNode = Tree.TreeNode;
import { connect } from 'dva';
@connect(({ DataColumn, SqlManageEntity, loading }) => ({
DataColumn, SqlManageEntity,
loading: loading.models.DataColumn || loading.models.SqlManageEntity
DataColumn,
SqlManageEntity,
loading: loading.models.DataColumn || loading.models.SqlManageEntity,
}))
export default class TableSelect extends React.Component {
constructor(props) {
super(props)
super(props);
const value = props.value || {};
this.state = {
......@@ -21,17 +19,18 @@ export default class TableSelect extends React.Component {
isAll: value.isAll != null ? value.isAll : false,
querys: value.querys || [],
sql: value.sql,
}
};
}
triggerChange = (changedValue) => {
triggerChange = changedValue => {
// Should provide an event to pass value to Form.
const onChange = this.props.onChange;
if (onChange) {
console.log("changedValue", changedValue)
console.log('changedValue', changedValue);
onChange(Object.assign({}, this.state, changedValue));
}
}
};
componentWillReceiveProps(nextProps) {
// Should be a controlled component.
if ('value' in nextProps) {
......@@ -43,167 +42,215 @@ export default class TableSelect extends React.Component {
//
}
}
remove = (rowKey) => {
console.log(rowKey)
const { selects } = this.state
delete selects[rowKey]
console.log(selects)
remove = rowKey => {
const { selects } = this.state;
delete selects[rowKey];
if (!('value' in this.props)) {
this.setState({ selects });
}
this.triggerChange({ selects });
}
};
select = (obj) => {
var { selects } = this.state
const { json: { isMultiple, optionType } } = this.props
let valueName = this.props.json.valueName
if (optionType == "reference" && this.props.dataColumn.referenceObjId) {
valueName = this.props.dataColumn.referenceCodeName
select = obj => {
var { selects } = this.state;
const {
json: { isMultiple, optionType },
} = this.props;
let valueName = this.props.json.valueName;
if (optionType == 'reference' && this.props.dataColumn.referenceObjId) {
valueName = this.props.dataColumn.referenceCodeName;
}
const kk = obj[valueName]
const kk = obj[valueName];
if (kk == null) {
message.error("指定的取值字段不存在或者值为空")
return
message.error('指定的取值字段不存在或者值为空');
return;
}
if (!isMultiple) {
selects = { [kk]: { ...obj, selectKey: kk } }
selects = { [kk]: { ...obj, selectKey: kk } };
} else {
selects[kk] = obj;
selects[kk].selectKey = kk
selects[kk].selectKey = kk;
}
if (!('value' in this.props)) {
this.setState({ selects });
}
this.triggerChange({ selects });
};
}
close = (i) => {
var { values, labels } = this.state
values.splice(i, 1)
labels.splice(i, 1)
close = i => {
var { values, labels } = this.state;
values.splice(i, 1);
labels.splice(i, 1);
if (!('value' in this.props)) {
this.setState({ values, labels });
}
this.triggerChange({ values, labels });
};
}
open = () => {
if (!('value' in this.props)) {
this.setState({ visiable: true });
}
this.triggerChange({ visiable: true });
};
}
closeModal = () => {
if (!('value' in this.props)) {
this.setState({ visiable: false });
}
const { resetSearchText } = this.props;
resetSearchText && resetSearchText();
this.triggerChange({ visiable: false });
}
};
render() {
const { json: { isMultiple, sql, optionType, showTable }, dataColumn: { referenceObjId }, sqlModel, columns, dataSource } = this.props
let { valueName, labelName } = this.props.json
if (optionType == "reference" && referenceObjId) {
valueName = this.props.dataColumn.referenceCodeName
labelName = this.props.dataColumn.referenceNameName
const {
json: { isMultiple, sql, optionType, showTable },
dataColumn: { referenceObjId },
sqlModel,
columns,
dataSource,
} = this.props;
let { valueName, labelName } = this.props.json;
if (optionType == 'reference' && referenceObjId) {
valueName = this.props.dataColumn.referenceCodeName;
labelName = this.props.dataColumn.referenceNameName;
}
if (valueName == null || valueName == "") {
return <>请指定取值的列名</>
if (valueName == null || valueName == '') {
return <>请指定取值的列名</>;
}
const { selects, visiable, labels } = this.state
const keys = []
const { selects, visiable, labels } = this.state;
const keys = [];
for (let i in selects) {
keys.push(selects[i][valueName])
keys.push(selects[i][valueName]);
}
const columns2 = [...columns, {
title: "操作",
render: (val, record) => <a onClick={this.remove.bind(this, record.selectKey)}>移除</a>
}]
const columns3 = [...columns, {
title: "操作",
render: (val, record) =>
keys.includes(record[valueName]) ? <span>已选择</span> : <a onClick={this.select.bind(this, record)}>选择</a>
}]
const columns2 = [
...columns,
{
title: '操作',
render: (val, record) => <a onClick={this.remove.bind(this, record.selectKey)}>移除</a>,
},
];
const columns3 = [
...columns,
{
title: '操作',
render: (val, record) =>
keys.includes(record[valueName]) ? (
<span>已选择</span>
) : (
<a onClick={this.select.bind(this, record)}>选择</a>
),
},
];
const custom = {
isAll: this.state.isAll,
querys: this.state.querys,
sql: this.state.sql,
}
// console.log(columns3)
let allWidth = 0
};
let allWidth = 0;
if (columns3) {
columns3.map((item, index) => {
if (index === columns3.length - 1) {
item.fixed = 'right'
item.width = 50
allWidth += 50
return item
item.fixed = 'right';
item.width = 50;
allWidth += 50;
return item;
}
if (index === columns3.length - 2) {
allWidth += 150
allWidth += 150;
} else {
if (item.width) {
allWidth += item.width
allWidth += item.width;
} else {
item.width = 180
allWidth += 180
item.width = 180;
allWidth += 180;
}
}
return item
})
return item;
});
}
return (
<div>
{Object.keys(selects).length > 0 ?
showTable ? <Table rowKey={valueName} size="small" dataSource={Object.values(selects)} columns={columns2} pagination={false} /> :
Object.keys(selects).map((k) => <Tag key={k} closable onClose={this.remove.bind(this, k)}>{selects[k][labelName]}</Tag>)
: ""
{Object.keys(selects).length > 0 ? (
showTable ? (
<Table
rowKey={valueName}
size="small"
dataSource={Object.values(selects)}
columns={columns2}
pagination={false}
/>
) : (
Object.keys(selects).map(k => (
<Tag key={k} closable onClose={this.remove.bind(this, k)}>
{selects[k][labelName]}
</Tag>
))
)
) : (
''
)}
<Button type="primary" onClick={this.open}>
选择
</Button>
{
visiable && <Modal
width={this.props.get === 'mobile' ? '100%' : '60%'}
maskClosable={false}
title={`请选择`}
visible={visiable}
onOk={this.closeModal}
onCancel={this.closeModal}
>
{optionType == 'reference' ? (
referenceObjId ? (
<FormList
rights={this.props.rights || []}
notShowBack={true}
value={custom}
objId={referenceObjId}
isFormCom={true}
isSelect={true}
selects={keys}
valueName={valueName}
callback={this.select}
sql={sql}
/>
) : (
'未关联数据对象'
)
) : sqlModel.dataObjId ? (
<FormList
rights={this.props.rights || []}
notShowBack={true}
value={custom}
objId={sqlModel.dataObjId}
isFormCom={true}
isSelect={true}
selects={keys}
valueName={valueName}
callback={this.select}
sql={sql}
/>
) : (
<Table
rowKey={valueName}
size="small"
dataSource={dataSource.list}
columns={columns3}
scroll={{ x: allWidth }}
/>
)}
</Modal>
}
<Button type="primary" onClick={this.open}>选择</Button>
<Modal
width={this.props.get==='mobile'?"100%":"60%"}
maskClosable={false}
title={`请选择`}
visible={visiable}
onOk={this.closeModal}
onCancel={this.closeModal}
>
{optionType == "reference" ? referenceObjId ?
<FormList rights={this.props.rights || []} notShowBack={true} value={custom} objId={referenceObjId} isFormCom={true} isSelect={true} selects={keys} valueName={valueName} callback={this.select} sql={sql} />
: "未关联数据对象"
: sqlModel.dataObjId ?
<FormList rights={this.props.rights || []} notShowBack={true} value={custom} objId={sqlModel.dataObjId} isFormCom={true} isSelect={true} selects={keys} valueName={valueName} callback={this.select} sql={sql} />
: <Table rowKey={valueName} size="small" dataSource={dataSource.list} columns={columns3} scroll={{ x: allWidth }} />}
</Modal>
</div>
);
}
}
\ No newline at end of file
}
one_stop_public/tableCompon/index.jsx
浏览文件 @ bf922ed1
......@@ -375,13 +375,18 @@ export default class tableCom extends Component {
count = [];
handleSearch = (selectedKeys, confirm) => {
confirm();
this.setState({searchText: selectedKeys[0]});
};
handleReset = clearFilters => {
clearFilters();
this.setState({searchText: ''});
this.resetSearchText();
};
resetSearchText = () => {
this.setState({
searchText: '',
});
};
getColumnSearchProps = (dataIndex, title) => ({
......@@ -445,20 +450,20 @@ export default class tableCom extends Component {
}
},
});
searchJson=(value,json,level,labs)=>{
for(var i=0;i<json.length;i++){
if(json[i].value==value[level]){
labs.push(json[i].label)
if(json[i].children){
this.searchJson(value,json[i].children,level+1,labs);
}
break;
}
}
searchJson = (value, json, level, labs) => {
for (var i = 0; i < json.length; i++) {
if (json[i].value == value[level]) {
labs.push(json[i].label)
if (json[i].children) {
this.searchJson(value, json[i].children, level + 1, labs);
}
break;
}
}
}
componentWillReceiveProps(props) {
const {json, mapData, obj} = props;
if (json == null || this.props.safe) {
......@@ -560,10 +565,10 @@ export default class tableCom extends Component {
}
}
dataFilter = ['Select', 'Radio', 'Checkbox','Cascader'];
dataFilter = ['Select', 'Radio', 'Checkbox', 'Cascader'];
getData = (json, dataColumn, obj, init) => {
const allValues = JSON.stringify(obj);
if (json.comName == 'TableSelect') {
const {dispatch} = this.props;
......@@ -677,9 +682,9 @@ export default class tableCom extends Component {
});
}
}
if (json.optionType != null && this.dataFilter.includes(json.comName)) {
switch (json.optionType) {
case 'reference':
if (dataColumn.referenceObjId != null) {
......@@ -714,30 +719,30 @@ export default class tableCom extends Component {
break;
case 'func':
if (json.funcs != null && json.funcs != '') {
if(json.comName=="Cascader"){
if (json.comName == "Cascader") {
try {
this.getFunctionValue(json.funcs, {base52: this.props.uuid}, json, () => {
if (init != null && Object.keys(init).length > 0) {
let base52 = dataColumn.base52;
let vlu = this.props.form.getFieldValue(base52);
const labs = [];
this.searchJson(vlu,this.state.options,0,labs)
this.searchJson(vlu, this.state.options, 0, labs)
this.setState({labels: labs});
} else if (!this.props.isEdit && Object.keys(obj).length > 0) {
let base52 = dataColumn.base52;
const vlu = obj[base52];
const labs = [];
this.searchJson(vlu,this.state.options,0,labs)
this.searchJson(vlu, this.state.options, 0, labs)
this.setState({labels: labs});
}
});
} catch (e) {
message.error('公式选项配置存在问题');
}
}else{
} else {
try {
this.getFunctionValue(json.funcs, {base52: this.props.uuid}, json, () => {
if (init != null && Object.keys(init).length > 0) {
......@@ -758,13 +763,13 @@ export default class tableCom extends Component {
}
}
}
this.setState({labels: labs});
} else if (!this.props.isEdit && Object.keys(obj).length > 0) {
let base52 = dataColumn.base52;
const vlu = obj[base52];
const labs = [];
if (vlu instanceof Array) {
for (var i = 0; i < this.state.options.length; i++) {
......@@ -780,18 +785,15 @@ export default class tableCom extends Component {
}
}
}
this.setState({labels: labs});
}
});
} catch (e) {
message.error('公式选项配置存在问题');
}
}
}
}
......@@ -2087,12 +2089,12 @@ export default class tableCom extends Component {
break;
case 'Cascader':
cm= <span>
cm = <span>
{labels != null
? labels.join(json.spliter?json.spliter:"")
? labels.join(json.spliter ? json.spliter : "")
: ''}
</span>
break;
break;
case 'TableSelect':
const ds =
obj[dataColumn.base52] && obj[dataColumn.base52].selects
......@@ -2815,11 +2817,11 @@ export default class tableCom extends Component {
? json.vlds
: [{required: required, message: '请选择' + dataColumn.title}],
})(<Cascader options={options}
allowClear
showSearch
disabled={disabled}
placeholder={json.placeholder}
style={{width: json.width}} />);
allowClear
showSearch
disabled={disabled}
placeholder={json.placeholder}
style={{width: json.width}}/>);
if (
get === 'mobile' &&
((json.isMobileLabel != null && json.isMobileLabel) ||
......@@ -2873,6 +2875,7 @@ export default class tableCom extends Component {
columns={this.state.columns}
dataSource={this.state.dataSource}
sqlModel={this.state.sqlModel}
resetSearchText={this.resetSearchText}
/>,
);
if (
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论