1010

src/components/AutoTable/index.jsx

@@ -67,7 +67,7 @@ export default (props) => {
         };
       });
     }
-  }, [props.tabList]);
+  }, [props.tabList, props.extraparams]);
   return (
     <div className="diycard">
       {props.withCard === false ? (

src/components/TagView/index.jsx

@@ -162,10 +162,28 @@ const TagView = ({ children, home }) => {
           />
         </div>
       </div>
-      <div className={styles.child}>
+      {/* <div className={styles.child}>
         <div className={styles.contianbox}>
           <div style={{ width: '100%', height: '100%' }}> {refresh && children}</div>
         </div>
+      </div> */}
+      <div className={styles.child}>
+        <div className={`${styles.contianbox} boxcontianbox`}>
+          {tagList.map((item) => {
+            return (
+              <div
+                key={item.path}
+                style={{
+                  display: item.active ? 'block' : 'none',
+                  width: '100%',
+                  height: '100%',
+                }}
+              >
+                {item.children}
+              </div>
+            );
+          })}
+        </div>
       </div>
     </>
   );

src/global.less

@@ -424,7 +424,8 @@ ol {
 
 .runtime-keep-alive-layout,
 .ant-table-content,
-.ant-drawer-body {
+.ant-drawer-body,
+.boxcontianbox {
   &::-webkit-scrollbar {
     /*滚动条整体样式*/
 
@@ -585,7 +586,7 @@ ol {
   }
 }
 
-.contianbox___W4bW5 {
+.boxcontianbox {
   .ant-descriptions {
     margin-bottom: 24px;
   }

src/pages/lease/contract/index.jsx

@@ -506,6 +506,10 @@ function Contract(props) {
   }
   useEffect(() => {
     if (state) {
+      setdrawer((s) => ({
+        ...s,
+        open: false,
+      }));
       if (state.isFinish == 1) {
         setactiveTabKey('1')
       } else {
@@ -532,7 +536,7 @@ function Contract(props) {
 
   const tabList = useMemo(() => {
     return getcolumns();
-  }, [activeTabKey, extraparams]);
+  }, [activeTabKey]);
   const pathconfig = useMemo(() => {
     let defpath = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
     return defpath;

src/pages/lease/costanalysis/index.jsx

@@ -208,17 +208,16 @@ const Costanalysis = () => {
   };
   useEffect(() => {
     if (state) {
+      setdrawer((s) => ({
+        ...s,
+        open: false,
+      }));
       catk(state.pageStatus == 1 ? 'item-1' : 'item-2');
       setextraparams(state.extraparams);
     } else {
       catk('item-1');
     }
   }, [state]);
-
-  console.log('====================================');
-  console.log(extraparams);
-  console.log('====================================');
-
   return (
     <div ref={boxRef}>
       <AutoTable
@@ -260,6 +259,11 @@ const Costanalysis = () => {
             },
           },
         }}
+        options={{
+          reload: () => {
+            setextraparams({});
+          }
+        }}
       />
 
       <DrawerPro
@@ -274,7 +278,7 @@ const Costanalysis = () => {
             open: false,
           }));
         }}
-        onValuesChange={(changedValues, allValues) => {}}
+        onValuesChange={(changedValues, allValues) => { }}
         onFinish={async (vals) => {
           let newVals = JSON.parse(JSON.stringify(vals));
           if (drawer?.val == 'confirm') {