Merge branch 'master' of g.civnet.cn:test/maintenance

src/components/Upload/index.tsx

@@ -48,6 +48,7 @@ class PicturesWall extends React.Component<PicturesWallType> {
     previewTitle: '',
     imgBed: [],
     curSelectedImg: '',
+    prevProps:{},
     fileList: this.props.value ? Array.isArray(this.props.value) ? this.props.value.map((v) => ({
       url: v,
       uid: uuid(8, 16),
@@ -64,8 +65,9 @@ class PicturesWall extends React.Component<PicturesWallType> {
   static getDerivedStateFromProps = (props, state) => {
     const fileList = state.fileList;
     const shouldUpdate = props.value && fileList.every(f => Array.isArray(props.value) ? !props.value.some(v => f.url === v) : f.url !== props.value)
-    if(fileList.length === 0 && props.value && shouldUpdate){
+    if(props.value !== state.prevProps.value && shouldUpdate){
       return {
+        provProps: props,
         fileList:  Array.isArray(props.value) ? props.value.map((v) => ({
           url: v,
           uid: uuid(8, 16),
@@ -79,7 +81,9 @@ class PicturesWall extends React.Component<PicturesWallType> {
         }] as UploadFile<any>[]
       }
     }
-    return null;
+    return {
+      prevProps: props
+    };
   }
 
   update = () =>{

src/pages/webConfig/index.js

@@ -39,12 +39,15 @@ const WebConfigPage = props => {
   }, []);
 
   useEffect(() => {
+    if (!curWeb) return;
+    const title = curWeb.text;
     // eslint-disable-next-line no-unused-expressions
-    curWeb &&
-      getWebconfig(curWeb.text).then(res => {
-        setConfigObj(res);
+    getWebconfig(curWeb.text).then(res => {
+      setConfigObj(res);
+      if (title === curWeb.text) {
         setToEdit(res);
-      });
+      }
+    });
   }, [curWeb]);
 
   const renderTabPane = tabPaneItem => (

src/pages/webConfig/index.less

 .webConfigContainer{
-
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  .ant-tabs-content-holder>.ant-tabs-content.ant-tabs-content-top{
+    position: absolute;
+    width: 100%;
+    height: calc(100% - 40px);
+  }
 }
 
 .webConfigContainer > .ant-tabs-card .ant-tabs-content {