31266 发费数据上报--数据比对页面跳转有误

one_stop_public/libs/TableList.js

@@ -9,20 +9,21 @@
 import React from 'react';
 import FormList from './formList';
 import TreeList from './formList/TreeList';
+import { Spin } from 'antd';
 
 export default class TableList extends React.Component {
 	constructor(props) {
 		super(props);
 		const value = props.value || {};
-    this.otherProps = {};
-    if (props.json.otherProps && props.json.otherProps.length) {
-      try {
-        this.otherProps = new Function(props.json.otherProps)();
-      } catch (e) {
-        console.log('Table 列表组件 otherProps 获取失败');
-      }
-    }
-    // console.log(this.otherProps);
+		this.otherProps = {};
+		if (props.json.otherProps && props.json.otherProps.length) {
+			try {
+				this.otherProps = new Function(props.json.otherProps)();
+			} catch (e) {
+				console.log('Table 列表组件 otherProps 获取失败');
+			}
+		}
+		// console.log(this.otherProps);
 		this.state = {
 			isAll: value.isAll,
 			querys: value.querys,
@@ -40,38 +41,43 @@ export default class TableList extends React.Component {
 		}
 	};
 
-  static getDerivedStateFromProps(nextProps, prevState) {
-    // ...
-    if('value' in nextProps){
-      return {...nextProps.value}; // 更新state
-    }
-    return null; //不需要更新任何state
-  }
+	static getDerivedStateFromProps(nextProps, prevState) {
+		// ...
+		if ('value' in nextProps) {
+			return { ...nextProps.value }; // 更新state
+		}
+		return null; //不需要更新任何state
+	}
 
-  componentDidUpdate(prevProps, prevState) {
-    if(prevState?.columns !== this.state.columns){
-      this.setState({
-        showNo: true,
-      }, () => {
-        setTimeout(()=>{
-          this.setState({
-            showNo: false,
-          });
-        }, 1000);
-      });
-    }
-  }
+	componentDidUpdate(prevProps, prevState) {
+		if (prevState?.columns !== this.state.columns) {
+		  console.log(prevState.columns, this.state.columns);
+			this.setState(
+				{
+					showNo: true,
+				},
+				() => {
+					setTimeout(() => { // 如果两次的表头不同 重新渲染组件
+						this.setState({
+							showNo: false,
+						});
+					}, 10);
+				},
+			);
+		}
+	}
 
-  render() {
+	render() {
 		const { isTree, json, uuid } = this.props;
 		const { showNo } = this.state;
-    if(showNo){
-		  return null;
-    }
+		// console.log(showNo);
+		if (showNo) {
+			return null;
+		}
 		return isTree ? (
 			<TreeList
-        otherProps={this.otherProps}
-        json={json}
+				otherProps={this.otherProps}
+				json={json}
 				onSelectRow={this.props.value.onSelectRow}
 				istableCom={true}
 				showHeader={this.props.showHeader}
@@ -84,26 +90,26 @@ export default class TableList extends React.Component {
 				rights={this.props.rights || []}
 				objCode={this.props.objCode}
 				isFormCom={true}
-        uuid={uuid}
+				uuid={uuid}
 				sql={this.props.sql}
 			/>
 		) : (
 			<FormList
-        otherProps={this.otherProps}
+				otherProps={this.otherProps}
 				json={json}
 				onSelectRow={this.props.value.onSelectRow}
-        getCheckboxProps={this.props.value.getCheckboxProps}
+				getCheckboxProps={this.props.value.getCheckboxProps}
 				istableCom={true}
 				showHeader={this.props.showHeader}
 				get={this.props.get}
 				isHiddenPage={this.props.isHiddenPage != null ? this.props.isHiddenPage : false}
 				pageSize={this.props.pageSize || 10}
-				value={{...this.state}}
+				value={{ ...this.state }}
 				notShowBack={true}
 				rights={this.props.rights || []}
 				objCode={this.props.objCode}
 				isFormCom={true}
-        uuid={uuid}
+				uuid={uuid}
 				sql={this.props.sql}
 			/>
 		);

one_stop_public/libs/formList/index.js

@@ -293,6 +293,7 @@ class FormList extends React.Component {
 			if (Number(objCode) === 1) {
 				this.initColumn();
 			} else {
+			  console.log('componentDidMount-296');
 				dispatch({
 					type: 'DataObj/findByCode',
 					payload: { objCode: this.props.objCode },
@@ -442,7 +443,6 @@ class FormList extends React.Component {
 			  if(this.props.json?.isDiy){ // 2022年11月8日 姚鑫国说的 开起了这个 自定义模式 就不调接口查表头了. 也不调接口查枚举项那些
           this.getPage();
 			    return undefined;
-
         }
 				dispatch({
 					type: 'formList/getHead',
@@ -638,7 +638,7 @@ class FormList extends React.Component {
 
 	getPage = (params, values, callPage, pageNo) => {
 		const { objCode } = this.props;
-		if (this.columns == null || this.columns.length === 0) {
+		if (!this.columns || !Array.isArray(this.columns) || this.columns.length === 0) {
 			return;
 		}
 		const { dispatch } = this.props;
@@ -1159,7 +1159,6 @@ class FormList extends React.Component {
 
 	render() {
 		const { modalVisible, selectedRows, rights, data, isReady } = this.state;
-
 		if (!isReady) {
 			return (
 				<div