Merge branch 'Paging' into Paging_Enhancement

src/pages/Setting/SystemSetting/index.js

@@ -34,6 +34,7 @@ const BackgroundHead = {
 const SystemSetting = () => {
     const [searchCriteria, setSearchCriteria] = React.useState({});
     const [selectedItem, setSelectedItem] = React.useState({});
+    const [reloadTime, setReloadTime] = React.useState(new Date())
 
     React.useEffect(()=>{
         setSearchCriteria({})
@@ -43,6 +44,11 @@ const SystemSetting = () => {
         setSelectedItem(param.row);
     }
 
+    React.useEffect(() => {
+        searchCriteria.reloadTime = reloadTime;
+        setSearchCriteria(searchCriteria);
+    }, [reloadTime]);
+
     const onSave = (param) => {
         HttpUtils.post({
             url: GET_SYS_PARAMS + "/update",
@@ -52,7 +58,7 @@ const SystemSetting = () => {
             },
             onSuccess: () => {
                 notifyActionSuccess();
-                loadList();
+                setReloadTime(new Date());
             }
         });
     }

src/pages/User/ManagePage_OrgPublic/index.js

@@ -69,7 +69,7 @@ const ManageOrgUserPage = () => {
         HttpUtils.get({
             url: GET_USER_UNLOCK + "/" + params.row.id,
             onSuccess: () => {
-                setReloadTime(new Date);
+                setReloadTime(new Date());
             }
         });
     }
@@ -109,7 +109,7 @@ const ManageOrgUserPage = () => {
             {
                 url: (!selectUser.row.primaryUser ? GET_SET_PRIMARY_USER : GET_SET_UN_PRIMARY_USER) + "/" + selectUser.row.id,
                 onSuccess: function () {
-                    setReloadTime(new Date);
+                    setReloadTime(new Date());
                 }
             }
         );