formList组件修改

one_stop_public/libs/formList/index.js

@@ -71,8 +71,7 @@ const CreateForm = Form.create()((props) => {
 							//处理日期何时入库问题
 							try {
 								fieldsValue[d] = fieldsValue[d].format('YYYY-MM-DD HH:mm:ss');
-              } catch (e) {
-              }
+							} catch (e) {}
 							break;
 						}
 					}
@@ -119,12 +118,7 @@ const CreateForm = Form.create()((props) => {
 	);
 });
 
-@connect(({
-            formList,
-            DataColumn,
-            DataObj,
-            loading,
-          }) => ({
+@connect(({ formList, DataColumn, DataObj, loading }) => ({
 	formList,
 	DataColumn,
 	DataObj,
@@ -289,19 +283,12 @@ class FormList extends React.Component {
 
 	//渲染值
 	componentDidMount() {
-    const {
-      dispatch,
-    } = this.props;
+		const { dispatch } = this.props;
 		window.addEventListener('resize', this.resize);
 
-
 		// console.log('componentDidMount');
 		if (this.props.objCode) {
-      const {
-        dispatch,
-        objCode,
-        sql
-      } = this.props;
+			const { dispatch, objCode, sql } = this.props;
 
 			if (Number(objCode) === 1) {
 				this.initColumn();
@@ -413,15 +400,8 @@ class FormList extends React.Component {
 	}
 
 	initColumn = () => {
-    const {
-      dispatch,
-      value,
-      objCode
-    } = this.props;
-    const {
-      rights,
-      columnRights
-    } = this.state;
+		const { dispatch, value, objCode } = this.props;
+		const { rights, columnRights } = this.state;
 		if (value && value.columns) {
 			this.columns = value.columns;
 			let cacheList = [];
@@ -540,11 +520,9 @@ class FormList extends React.Component {
 										return val;
 									}
 									if (datas[t].dataFormatStrWeb != null) {
-                    return moment(val)
-                      .format(datas[t].dataFormatStrWeb);
+										return moment(val).format(datas[t].dataFormatStrWeb);
 									} 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) {
@@ -560,7 +538,7 @@ class FormList extends React.Component {
 												{files.map((f, index2) => {
 													return (
 														<li key={index2}>
-                              <FilePreview path={queryApiActionPath() + f.path} pathName={f.name}/>
+															<FilePreview path={queryApiActionPath() + f.path} pathName={f.name} />
 														</li>
 													);
 												})}
@@ -693,9 +671,13 @@ class FormList extends React.Component {
 						this.setState({
 							data,
 							isReady: true,
+              selectedRows: [], // 姚鑫国说的 调了分页接口以后需要 把这个选择的行数据 清空
 						});
 					} else {
-            this.setState({ data });
+						this.setState({
+              data,
+              selectedRows: [], // 姚鑫国说的 调了分页接口以后需要 把这个选择的行数据 清空
+            });
 					}
 				},
 			});
@@ -703,8 +685,7 @@ class FormList extends React.Component {
 	};
 
 	handleStandardTableChange = (pagination, filtersArg, sorter) => {
-    const filters = Object.keys(filtersArg)
-      .reduce((obj, key) => {
+		const filters = Object.keys(filtersArg).reduce((obj, key) => {
 			const newObj = { ...obj };
 			newObj[key] = getValue(filtersArg[key]);
 			return newObj;
@@ -791,8 +772,7 @@ class FormList extends React.Component {
 		for (let i in columns) {
 			if (columns[i].isPrimaryKey) {
 				//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({
@@ -817,10 +797,7 @@ class FormList extends React.Component {
 	handleSearch = (e) => {
 		e.preventDefault();
 
-    const {
-      dispatch,
-      form
-    } = this.props;
+		const { dispatch, form } = this.props;
 
 		const { formValues } = this.state;
 
@@ -871,10 +848,7 @@ class FormList extends React.Component {
 		this.getPage(params);
 	};
 	handleFormReset = () => {
-    const {
-      form,
-      dispatch
-    } = this.props;
+		const { form, dispatch } = this.props;
 		form.resetFields();
 		this.setState(
 			{
@@ -886,17 +860,14 @@ class FormList extends React.Component {
 		);
 	};
 	getItem = (isQuery, form, item, isAdd, formData, labelCol, wrapperCol) => {
-    const {
-      groups,
-      isView
-    } = this.state;
+		const { groups, isView } = this.state;
 		//如果隐藏的话 就用隐藏域放置
 		if (item.isHidden) {
 			return (
 				<FormItem className={styles.hidden} key={item.id}>
 					{form.getFieldDecorator(item.name, {
 						initialValue: formData == null ? '' : formData[item.name],
-          })(<Input type="hidden" placeholder="请输入"/>)}
+					})(<Input type="hidden" placeholder="请输入" />)}
 				</FormItem>
 			);
 		}
@@ -910,7 +881,7 @@ class FormList extends React.Component {
 						{form.getFieldDecorator(item.name, {
 							initialValue: formData == null ? '' : formData[item.name],
 							rules: [{ required: !item.isNull }],
-            })(<Input style={{ width: '70%' }} readOnly={!isAdd} placeholder="请输入"/>)}
+						})(<Input style={{ width: '70%' }} readOnly={!isAdd} placeholder="请输入" />)}
 					</FormItem>
 				);
 			}
@@ -930,8 +901,7 @@ class FormList extends React.Component {
 							showSearch
 							filterOption={(input, option) =>
 								option
-                  ? option.props.children.toLowerCase()
-                  .indexOf(input.toLowerCase()) >= 0
+									? option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
 									: false
 							}
 							placeholder="请选择"
@@ -976,7 +946,7 @@ class FormList extends React.Component {
 									? JSON.parse(formData[item.name])
 									: null,
 						rules: [{ required: !item.isNull }],
-          })(<UploadCom disabled={isView}/>)}
+					})(<UploadCom disabled={isView} />)}
 				</FormItem>
 			);
 		} else if (isQuery && item.isGroupQuery != null && item.isGroupQuery) {
@@ -997,8 +967,7 @@ class FormList extends React.Component {
 							showSearch
 							filterOption={(input, option) =>
 								option
-                  ? option.props.children.toLowerCase()
-                  .indexOf(input.toLowerCase()) >= 0
+									? option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
 									: false
 							}
 							allowClear>
@@ -1017,7 +986,7 @@ class FormList extends React.Component {
 					{form.getFieldDecorator(item.name, {
 						initialValue: formData == null ? '' : formData[item.name],
 						rules: [{ required: !item.isNull }],
-          })(<Input disabled={isView} style={{ width: '70%' }} placeholder="请输入"/>)}
+					})(<Input disabled={isView} style={{ width: '70%' }} placeholder="请输入" />)}
 				</FormItem>
 			);
 		} else if (number.indexOf(item.type) > -1) {
@@ -1036,7 +1005,7 @@ class FormList extends React.Component {
 								callback(errors);
 							},
 						],
-          })(<Input disabled={isView} placeholder="请输入"/>)}
+					})(<Input disabled={isView} placeholder="请输入" />)}
 				</FormItem>
 			);
 		} else if (isQuery && date.indexOf(item.type) > -1) {
@@ -1081,17 +1050,14 @@ class FormList extends React.Component {
 					{form.getFieldDecorator(item.name, {
 						initialValue: formData == null ? '' : formData[item.name],
 						rules: [{ required: !item.isNull }],
-          })(<Input disabled={isView} style={{ width: '70%' }} placeholder="请输入"/>)}
+					})(<Input disabled={isView} style={{ width: '70%' }} placeholder="请输入" />)}
 				</FormItem>
 			);
 		}
 	};
 
 	renderForm() {
-    const {
-      form,
-      get
-    } = this.props;
+		const { form, get } = this.props;
 
 		const { querys } = this.state;
 		if (querys.length == 0) {
@@ -1164,13 +1130,7 @@ class FormList extends React.Component {
 	};
 
 	render() {
-    const {
-      modalVisible,
-      selectedRows,
-      rights,
-      data,
-      isReady,
-    } = this.state;
+		const { modalVisible, selectedRows, rights, data, isReady } = this.state;
 
 		if (!isReady) {
 			return (
@@ -1179,7 +1139,7 @@ class FormList extends React.Component {
 						width: 20,
 						margin: 'auto',
 					}}>
-          <Spin/>
+					<Spin />
 				</div>
 			);
 		}
@@ -1196,10 +1156,7 @@ class FormList extends React.Component {
 			loading,
 			uuid,
 		} = this.props;
-    const {
-      showMobileDiv,
-      isView
-    } = this.state;
+		const { showMobileDiv, isView } = this.state;
 
 		let scrollWidth = document.documentElement.clientWidth || document.body.clientWidth; //可使宽度
 		let isMobile = scrollWidth < 1000;
@@ -1207,7 +1164,10 @@ class FormList extends React.Component {
 			isMobile = true;
 		}
 
-    const showDiv = countWidth({json, uuid});
+		const showDiv = countWidth({
+			json,
+			uuid,
+		});
 		const parentMethods = {
 			handleAdd: this.handleAdd,
 			handleModalVisible: this.handleModalVisible,
@@ -1287,7 +1247,7 @@ class FormList extends React.Component {
 									Dom.map((x, index) => (
 										<Fragment key={Math.random()}>
 											{x}
-                    {index > 0 && index !== Dom.length - 1 && <Divider type="vertical"/>}
+											{index > 0 && index !== Dom.length - 1 && <Divider type="vertical" />}
 										</Fragment>
 									))}
 							</div>
@@ -1408,13 +1368,13 @@ class FormList extends React.Component {
 							{rights && !rights.includes('searchData') ? (
 								''
 							) : (
-                <SearchInfo hanldeHighSearch={this.hanldeHighSearch} objId={this.state.objId}/>
+								<SearchInfo hanldeHighSearch={this.hanldeHighSearch} objId={this.state.objId} />
 							)}
 
 							{rights && !rights.includes('importData') ? (
 								''
 							) : (
-                <ImportUtil objId={this.state.objId} callback={() => this.getPage()}/>
+								<ImportUtil objId={this.state.objId} callback={() => this.getPage()} />
 							)}
 
 							{rights && !rights.includes('exportCurrent') ? (
@@ -1431,12 +1391,12 @@ class FormList extends React.Component {
 							{rights && !rights.includes('exportData') ? (
 								''
 							) : (
-                <ExportInfo objId={this.state.objId}/>
+								<ExportInfo objId={this.state.objId} />
 							)}
 							{rights && !rights.includes('statistics') ? (
 								''
 							) : (
-                <StatisticsInfo objId={this.state.objId}/>
+								<StatisticsInfo objId={this.state.objId} />
 							)}
 							{rights && !rights.includes('delete')
 								? ''
@@ -1478,7 +1438,7 @@ class FormList extends React.Component {
 								</Popover>
 							)}
 							{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 &&
@@ -1548,7 +1508,7 @@ class FormList extends React.Component {
 						)}
 					</div>
 				</Card>
-        <CreateForm {...parentMethods} modalVisible={modalVisible}/>
+				<CreateForm {...parentMethods} modalVisible={modalVisible} />
 			</>
 		);
 		if (isFormCom) {