diff --git a/src/components/Common/CommonListSelect/index.js b/src/components/Common/CommonListSelect/index.js index c52e706..cf65e08 100644 --- a/src/components/Common/CommonListSelect/index.js +++ b/src/components/Common/CommonListSelect/index.js @@ -213,7 +213,7 @@ const CommonListComponent = Form.create({ ...commonBusiness.getTableTypes('slave', props), enabled: false, tableProps: { - rowKey: 'sSlaveId', pagination, onChange: props.onTitleChange, AutoTableHeight: 350, + rowKey: 'sSlaveId', pagination, onChange: props.onTitleChange, AutoTableHeight: 550, }, }; const name = 'filterTree'; @@ -276,7 +276,7 @@ const CommonListComponent = Form.create({ const bPadPop = props.sModelsId === "12710101117211852461310" || props.sModelsId === "12710101117218031681520"; - + if (bPadPop) { tableProps.fixedHeight = "325px"; } diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js index 9b80a00..86fce11 100644 --- a/src/components/Common/CommonTable/index.js +++ b/src/components/Common/CommonTable/index.js @@ -11239,7 +11239,7 @@ class CommonTableRc extends React.Component { )} {commonPopupVisible ? ( { const asyncFunc = async () => { for (let i = 0; i < afterInterfaceArr.length; i++) { if (bProgressBar) { - xlyProcessPercent = 0; + let xlyProcessPercent = 0; clearInterval(xlyProcessTimer); message.loading({ content: , @@ -1088,4 +1088,4 @@ const handleScanFace = (props) => { } -export default ToolbarFun; \ No newline at end of file +export default ToolbarFun;