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

2022年12月12日 姚新国说的 没配这个东西都搞成 true qq 聊天记录

上级 0b44f6e5
...@@ -71,7 +71,8 @@ const CreateForm = Form.create()((props) => { ...@@ -71,7 +71,8 @@ const CreateForm = Form.create()((props) => {
//处理日期何时入库问题 //处理日期何时入库问题
try { try {
fieldsValue[d] = fieldsValue[d].format('YYYY-MM-DD HH:mm:ss'); fieldsValue[d] = fieldsValue[d].format('YYYY-MM-DD HH:mm:ss');
} catch (e) {} } catch (e) {
}
break; break;
} }
} }
...@@ -118,7 +119,11 @@ const CreateForm = Form.create()((props) => { ...@@ -118,7 +119,11 @@ const CreateForm = Form.create()((props) => {
); );
}); });
@connect(({ formList, DataColumn, DataObj }) => ({ @connect(({
formList,
DataColumn,
DataObj
}) => ({
formList, formList,
DataColumn, DataColumn,
DataObj, DataObj,
...@@ -288,7 +293,11 @@ class FormList extends React.Component { ...@@ -288,7 +293,11 @@ class FormList extends React.Component {
window.addEventListener('resize', this.resize); window.addEventListener('resize', this.resize);
if (this.props.objCode) { if (this.props.objCode) {
const { dispatch, objCode, sql } = this.props; const {
dispatch,
objCode,
sql
} = this.props;
if (Number(objCode) === 1) { if (Number(objCode) === 1) {
this.initColumn(); this.initColumn();
...@@ -414,8 +423,15 @@ class FormList extends React.Component { ...@@ -414,8 +423,15 @@ class FormList extends React.Component {
} }
initColumn = () => { initColumn = () => {
const { dispatch, value, objCode } = this.props; const {
const { rights, columnRights } = this.state; dispatch,
value,
objCode
} = this.props;
const {
rights,
columnRights
} = this.state;
if (value && value.columns) { if (value && value.columns) {
this.columns = value.columns; this.columns = value.columns;
let cacheList = []; let cacheList = [];
...@@ -440,7 +456,9 @@ class FormList extends React.Component { ...@@ -440,7 +456,9 @@ class FormList extends React.Component {
if (Number(objCode) === 1) { if (Number(objCode) === 1) {
this.getPage(); this.getPage();
} else { } else {
if(this.props.json?.isDiy){ // 2022年11月8日 姚鑫国说的 开起了这个 自定义模式 就不调接口查表头了. 也不调接口查枚举项那些 if (this.props.json?.isDiy !== 'false' && this.props.json?.isDiy !== false) {
// 2022年11月8日 姚鑫国说的 开起了这个 自定义模式 就不调接口查表头了. 也不调接口查枚举项那些
// 2022年12月12日 姚新国说的 没配这个东西都搞成 true qq 聊天记录
this.getPage(); this.getPage();
return undefined; return undefined;
} }
...@@ -492,7 +510,9 @@ class FormList extends React.Component { ...@@ -492,7 +510,9 @@ class FormList extends React.Component {
if (Number(objCode) === 1) { if (Number(objCode) === 1) {
} else { } else {
if(this.props.json?.isDiy){ // 2022年11月8日 姚鑫国说的 开起了这个 自定义模式 就不调接口查表头了. if (this.props.json?.isDiy !== 'false' && this.props.json?.isDiy !== false) {
// 2022年11月8日 姚鑫国说的 开起了这个 自定义模式 就不调接口查表头了.
// 2022年12月12日 姚新国说的 没配这个东西都搞成 true qq 聊天记录
this.getPage(); this.getPage();
return undefined; return undefined;
} }
...@@ -542,9 +562,11 @@ class FormList extends React.Component { ...@@ -542,9 +562,11 @@ class FormList extends React.Component {
return val; return val;
} }
if (datas[t].dataFormatStrWeb != null) { if (datas[t].dataFormatStrWeb != null) {
return moment(val).format(datas[t].dataFormatStrWeb); return moment(val)
.format(datas[t].dataFormatStrWeb);
} else { } else {
return moment(val).format('YYYY-MM-DD HH:mm:ss'); return moment(val)
.format('YYYY-MM-DD HH:mm:ss');
} }
}; };
} else if (datas[t].name.indexOf('process_status') > -1) { } else if (datas[t].name.indexOf('process_status') > -1) {
...@@ -560,7 +582,7 @@ class FormList extends React.Component { ...@@ -560,7 +582,7 @@ class FormList extends React.Component {
{files.map((f, index2) => { {files.map((f, index2) => {
return ( return (
<li key={index2}> <li key={index2}>
<FilePreview path={queryFileUrl(f.path)} pathName={f.name} /> <FilePreview path={queryFileUrl(f.path)} pathName={f.name}/>
</li> </li>
); );
})} })}
...@@ -713,7 +735,8 @@ class FormList extends React.Component { ...@@ -713,7 +735,8 @@ class FormList extends React.Component {
}; };
handleStandardTableChange = (pagination, filtersArg, sorter) => { handleStandardTableChange = (pagination, filtersArg, sorter) => {
const filters = Object.keys(filtersArg).reduce((obj, key) => { const filters = Object.keys(filtersArg)
.reduce((obj, key) => {
const newObj = { ...obj }; const newObj = { ...obj };
newObj[key] = getValue(filtersArg[key]); newObj[key] = getValue(filtersArg[key]);
return newObj; return newObj;
...@@ -800,7 +823,8 @@ class FormList extends React.Component { ...@@ -800,7 +823,8 @@ class FormList extends React.Component {
for (let i in columns) { for (let i in columns) {
if (columns[i].isPrimaryKey) { if (columns[i].isPrimaryKey) {
//key //key
Keys[columns[i].name] = selectedRows.map((row) => row[columns[i].name]).join(','); Keys[columns[i].name] = selectedRows.map((row) => row[columns[i].name])
.join(',');
} }
} }
this.props.dispatch({ this.props.dispatch({
...@@ -825,7 +849,10 @@ class FormList extends React.Component { ...@@ -825,7 +849,10 @@ class FormList extends React.Component {
handleSearch = (e) => { handleSearch = (e) => {
e.preventDefault(); e.preventDefault();
const { dispatch, form } = this.props; const {
dispatch,
form
} = this.props;
const { formValues } = this.state; const { formValues } = this.state;
...@@ -876,7 +903,10 @@ class FormList extends React.Component { ...@@ -876,7 +903,10 @@ class FormList extends React.Component {
this.getPage(params); this.getPage(params);
}; };
handleFormReset = () => { handleFormReset = () => {
const { form, dispatch } = this.props; const {
form,
dispatch
} = this.props;
form.resetFields(); form.resetFields();
this.setState( this.setState(
{ {
...@@ -888,14 +918,17 @@ class FormList extends React.Component { ...@@ -888,14 +918,17 @@ class FormList extends React.Component {
); );
}; };
getItem = (isQuery, form, item, isAdd, formData, labelCol, wrapperCol) => { getItem = (isQuery, form, item, isAdd, formData, labelCol, wrapperCol) => {
const { groups, isView } = this.state; const {
groups,
isView
} = this.state;
//如果隐藏的话 就用隐藏域放置 //如果隐藏的话 就用隐藏域放置
if (item.isHidden) { if (item.isHidden) {
return ( return (
<FormItem className={styles.hidden} key={item.id}> <FormItem className={styles.hidden} key={item.id}>
{form.getFieldDecorator(item.name, { {form.getFieldDecorator(item.name, {
initialValue: formData == null ? '' : formData[item.name], initialValue: formData == null ? '' : formData[item.name],
})(<Input type="hidden" placeholder="请输入" />)} })(<Input type="hidden" placeholder="请输入"/>)}
</FormItem> </FormItem>
); );
} }
...@@ -909,7 +942,7 @@ class FormList extends React.Component { ...@@ -909,7 +942,7 @@ class FormList extends React.Component {
{form.getFieldDecorator(item.name, { {form.getFieldDecorator(item.name, {
initialValue: formData == null ? '' : formData[item.name], initialValue: formData == null ? '' : formData[item.name],
rules: [{ required: !item.isNull }], rules: [{ required: !item.isNull }],
})(<Input style={{ width: '70%' }} readOnly={!isAdd} placeholder="请输入" />)} })(<Input style={{ width: '70%' }} readOnly={!isAdd} placeholder="请输入"/>)}
</FormItem> </FormItem>
); );
} }
...@@ -929,7 +962,8 @@ class FormList extends React.Component { ...@@ -929,7 +962,8 @@ class FormList extends React.Component {
showSearch showSearch
filterOption={(input, option) => filterOption={(input, option) =>
option option
? option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 ? option.props.children.toLowerCase()
.indexOf(input.toLowerCase()) >= 0
: false : false
} }
placeholder="请选择" placeholder="请选择"
...@@ -974,7 +1008,7 @@ class FormList extends React.Component { ...@@ -974,7 +1008,7 @@ class FormList extends React.Component {
? JSON.parse(formData[item.name]) ? JSON.parse(formData[item.name])
: null, : null,
rules: [{ required: !item.isNull }], rules: [{ required: !item.isNull }],
})(<UploadCom disabled={isView} />)} })(<UploadCom disabled={isView}/>)}
</FormItem> </FormItem>
); );
} else if (isQuery && item.isGroupQuery != null && item.isGroupQuery) { } else if (isQuery && item.isGroupQuery != null && item.isGroupQuery) {
...@@ -995,7 +1029,8 @@ class FormList extends React.Component { ...@@ -995,7 +1029,8 @@ class FormList extends React.Component {
showSearch showSearch
filterOption={(input, option) => filterOption={(input, option) =>
option option
? option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 ? option.props.children.toLowerCase()
.indexOf(input.toLowerCase()) >= 0
: false : false
} }
allowClear> allowClear>
...@@ -1014,7 +1049,7 @@ class FormList extends React.Component { ...@@ -1014,7 +1049,7 @@ class FormList extends React.Component {
{form.getFieldDecorator(item.name, { {form.getFieldDecorator(item.name, {
initialValue: formData == null ? '' : formData[item.name], initialValue: formData == null ? '' : formData[item.name],
rules: [{ required: !item.isNull }], rules: [{ required: !item.isNull }],
})(<Input disabled={isView} style={{ width: '70%' }} placeholder="请输入" />)} })(<Input disabled={isView} style={{ width: '70%' }} placeholder="请输入"/>)}
</FormItem> </FormItem>
); );
} else if (number.indexOf(item.type) > -1) { } else if (number.indexOf(item.type) > -1) {
...@@ -1033,7 +1068,7 @@ class FormList extends React.Component { ...@@ -1033,7 +1068,7 @@ class FormList extends React.Component {
callback(errors); callback(errors);
}, },
], ],
})(<Input disabled={isView} placeholder="请输入" />)} })(<Input disabled={isView} placeholder="请输入"/>)}
</FormItem> </FormItem>
); );
} else if (isQuery && date.indexOf(item.type) > -1) { } else if (isQuery && date.indexOf(item.type) > -1) {
...@@ -1078,14 +1113,18 @@ class FormList extends React.Component { ...@@ -1078,14 +1113,18 @@ class FormList extends React.Component {
{form.getFieldDecorator(item.name, { {form.getFieldDecorator(item.name, {
initialValue: formData == null ? '' : formData[item.name], initialValue: formData == null ? '' : formData[item.name],
rules: [{ required: !item.isNull }], rules: [{ required: !item.isNull }],
})(<Input disabled={isView} style={{ width: '70%' }} placeholder="请输入" />)} })(<Input disabled={isView} style={{ width: '70%' }} placeholder="请输入"/>)}
</FormItem> </FormItem>
); );
} }
}; };
renderForm() { renderForm() {
const { form, get, json } = this.props; const {
form,
get,
json
} = this.props;
const { querys } = this.state; const { querys } = this.state;
if (querys.length === 0 || json?.isHiddenSearch === true) { if (querys.length === 0 || json?.isHiddenSearch === true) {
...@@ -1158,7 +1197,13 @@ class FormList extends React.Component { ...@@ -1158,7 +1197,13 @@ class FormList extends React.Component {
}; };
render() { render() {
const { modalVisible, selectedRows, rights, data, isReady } = this.state; const {
modalVisible,
selectedRows,
rights,
data,
isReady
} = this.state;
if (!isReady) { if (!isReady) {
return ( return (
<div <div
...@@ -1166,7 +1211,7 @@ class FormList extends React.Component { ...@@ -1166,7 +1211,7 @@ class FormList extends React.Component {
width: 20, width: 20,
margin: 'auto', margin: 'auto',
}}> }}>
<Spin /> <Spin/>
</div> </div>
); );
} }
...@@ -1183,7 +1228,11 @@ class FormList extends React.Component { ...@@ -1183,7 +1228,11 @@ class FormList extends React.Component {
uuid, uuid,
obj, obj,
} = this.props; } = this.props;
const { showMobileDiv, isView, loading } = this.state; const {
showMobileDiv,
isView,
loading
} = this.state;
let scrollWidth = document.documentElement.clientWidth || document.body.clientWidth; //可使宽度 let scrollWidth = document.documentElement.clientWidth || document.body.clientWidth; //可使宽度
let isMobile = scrollWidth < 1000; let isMobile = scrollWidth < 1000;
...@@ -1274,7 +1323,7 @@ class FormList extends React.Component { ...@@ -1274,7 +1323,7 @@ class FormList extends React.Component {
Dom.map((x, index) => ( Dom.map((x, index) => (
<Fragment key={Math.random()}> <Fragment key={Math.random()}>
{x} {x}
{index > 0 && index !== Dom.length - 1 && <Divider type="vertical" />} {index > 0 && index !== Dom.length - 1 && <Divider type="vertical"/>}
</Fragment> </Fragment>
))} ))}
</div> </div>
...@@ -1365,13 +1414,13 @@ class FormList extends React.Component { ...@@ -1365,13 +1414,13 @@ class FormList extends React.Component {
{rights && !rights.includes('searchData') ? ( {rights && !rights.includes('searchData') ? (
'' ''
) : ( ) : (
<SearchInfo hanldeHighSearch={this.hanldeHighSearch} objId={this.state.objId} /> <SearchInfo hanldeHighSearch={this.hanldeHighSearch} objId={this.state.objId}/>
)} )}
{rights && !rights.includes('importData') ? ( {rights && !rights.includes('importData') ? (
'' ''
) : ( ) : (
<ImportUtil objId={this.state.objId} callback={() => this.getPage()} /> <ImportUtil objId={this.state.objId} callback={() => this.getPage()}/>
)} )}
{rights && !rights.includes('exportCurrent') ? ( {rights && !rights.includes('exportCurrent') ? (
...@@ -1388,12 +1437,12 @@ class FormList extends React.Component { ...@@ -1388,12 +1437,12 @@ class FormList extends React.Component {
{rights && !rights.includes('exportData') ? ( {rights && !rights.includes('exportData') ? (
'' ''
) : ( ) : (
<ExportInfo objId={this.state.objId} /> <ExportInfo objId={this.state.objId}/>
)} )}
{rights && !rights.includes('statistics') ? ( {rights && !rights.includes('statistics') ? (
'' ''
) : ( ) : (
<StatisticsInfo objId={this.state.objId} /> <StatisticsInfo objId={this.state.objId}/>
)} )}
{rights && !rights.includes('delete') {rights && !rights.includes('delete')
? '' ? ''
...@@ -1435,7 +1484,7 @@ class FormList extends React.Component { ...@@ -1435,7 +1484,7 @@ class FormList extends React.Component {
</Popover> </Popover>
)} )}
{btns && btns.after && btns.after.length > 0 {btns && btns.after && btns.after.length > 0
? btns.after.map((r) => <Button {...r} loading={loading} />) ? btns.after.map((r) => <Button {...r} loading={loading}/>)
: ''} : ''}
{!!this.props.otherProps && {!!this.props.otherProps &&
...@@ -1507,7 +1556,7 @@ class FormList extends React.Component { ...@@ -1507,7 +1556,7 @@ class FormList extends React.Component {
)} )}
</div> </div>
</Card> </Card>
<CreateForm {...parentMethods} modalVisible={modalVisible} /> <CreateForm {...parentMethods} modalVisible={modalVisible}/>
</> </>
); );
if (isFormCom) { if (isFormCom) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论