Commit 74a3e8cd2e6a88ada60742aa14177c1b676b47f5

Authored by Min
1 parent 837238b1

1.表格支持虚拟滚动

src/components/Common/CommonTable/index.js
@@ -3374,7 +3374,7 @@ class CommonTableRc extends React.Component { @@ -3374,7 +3374,7 @@ class CommonTableRc extends React.Component {
3374 // } 3374 // }
3375 // } 3375 // }
3376 3376
3377 - // if (!this.props.noVlist && !noVlistController) { 3377 + if (!this.props.noVlist && !noVlistController) {
3378 if (this.props.slaveInfo || this.useVListNew) { 3378 if (this.props.slaveInfo || this.useVListNew) {
3379 if (!this.uniqueId) { 3379 if (!this.uniqueId) {
3380 this.uniqueId = this.props.formId 3380 this.uniqueId = this.props.formId
@@ -3443,7 +3443,7 @@ class CommonTableRc extends React.Component { @@ -3443,7 +3443,7 @@ class CommonTableRc extends React.Component {
3443 } 3443 }
3444 components = { ...this.Vcomponents1, ...components }; 3444 components = { ...this.Vcomponents1, ...components };
3445 } 3445 }
3446 - // } 3446 + }
3447 if (this.props.config && this.props.config.iFreezeColumn) { 3447 if (this.props.config && this.props.config.iFreezeColumn) {
3448 tableColumn.forEach((val, index) => { 3448 tableColumn.forEach((val, index) => {
3449 if (tableColumn[index].fixedHelp) { 3449 if (tableColumn[index].fixedHelp) {
@@ -7722,6 +7722,7 @@ class CommonTableRc extends React.Component { @@ -7722,6 +7722,7 @@ class CommonTableRc extends React.Component {
7722 genFooter = () => { 7722 genFooter = () => {
7723 const { tableColumn, totalData, totalData1 } = this.state; 7723 const { tableColumn, totalData, totalData1 } = this.state;
7724 const { dNetMoney, dNetPrice } = this.props.app.decimals; 7724 const { dNetMoney, dNetPrice } = this.props.app.decimals;
  7725 + console.log('totalData', totalData);
7725 const sModelsType = 7726 const sModelsType =
7726 commonUtils.isNotEmptyObject(this.props) && 7727 commonUtils.isNotEmptyObject(this.props) &&
7727 commonUtils.isNotEmptyObject(this.props.app) 7728 commonUtils.isNotEmptyObject(this.props.app)
@@ -7748,6 +7749,7 @@ class CommonTableRc extends React.Component { @@ -7748,6 +7749,7 @@ class CommonTableRc extends React.Component {
7748 } 7749 }
7749 const cells = []; 7750 const cells = [];
7750 const cells1 = []; 7751 const cells1 = [];
  7752 +
7751 if (totalData.length) { 7753 if (totalData.length) {
7752 let summaryCellTotal = ""; 7754 let summaryCellTotal = "";
7753 summaryCellTotal = ( 7755 summaryCellTotal = (
@@ -8160,7 +8162,6 @@ class CommonTableRc extends React.Component { @@ -8160,7 +8162,6 @@ class CommonTableRc extends React.Component {
8160 commonUtils.isNotEmptyObject(this.props.tableProps.chooseProcessConfigRow) 8162 commonUtils.isNotEmptyObject(this.props.tableProps.chooseProcessConfigRow)
8161 ) { 8163 ) {
8162 const iIndex = this.props.tableProps.chooseProcessConfigRow; 8164 const iIndex = this.props.tableProps.chooseProcessConfigRow;
8163 - console.log("🚀 ~ CommonTableRc ~ this.props.tableProps:", this.props)  
8164 this.props.onBtnChoose("process", "BtnChooseProcess", iIndex); 8165 this.props.onBtnChoose("process", "BtnChooseProcess", iIndex);
8165 } 8166 }
8166 }; 8167 };
@@ -11158,7 +11159,6 @@ class CommonTableRc extends React.Component { @@ -11158,7 +11159,6 @@ class CommonTableRc extends React.Component {
11158 mesPageChange: true 11159 mesPageChange: true
11159 }); 11160 });
11160 } 11161 }
11161 - console.log(tableProps, 'tablePropstableProps');  
11162 11162
11163 return ( 11163 return (
11164 <FormItem 11164 <FormItem
src/mes/productionExec/productionExecMain/index.js
@@ -1102,7 +1102,7 @@ const ProductionExecContent0 = props =&gt; { @@ -1102,7 +1102,7 @@ const ProductionExecContent0 = props =&gt; {
1102 <div className="topPart"> 1102 <div className="topPart">
1103 <div className="type1Content"> 1103 <div className="type1Content">
1104 <div className="leftTable"> 1104 <div className="leftTable">
1105 - <StaticEditTable {...tableProps} /> 1105 + <StaticEditTable {...tableProps} noVlist />
1106 </div> 1106 </div>
1107 <div className="rightForm"> 1107 <div className="rightForm">
1108 <CommonViewTable className="rightFormBox" {...viewProps} /> 1108 <CommonViewTable className="rightFormBox" {...viewProps} />