Browse Source

add gld user combo and fix user grid reload bug

master
Alex Cheung 1 year ago
parent
commit
a24dd37d8c
6 changed files with 11 additions and 8 deletions
  1. +2
    -2
      src/pages/pnspsUserDetailPage/UserAuthTable.js
  2. +2
    -1
      src/pages/pnspsUserDetailPage/UserAuthorityCard.js
  3. +2
    -1
      src/pages/pnspsUserGroupDetailPage/GroupAuthCard.js
  4. +2
    -2
      src/pages/pnspsUserGroupDetailPage/GroupAuthTable.js
  5. +2
    -2
      src/pages/pnspsUserGroupDetailPage/UserAddCard.js
  6. +1
    -0
      src/utils/ApiPathConst.js

+ 2
- 2
src/pages/pnspsUserDetailPage/UserAuthTable.js View File

@@ -15,7 +15,7 @@ const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingCompo


// ==============================|| EVENT TABLE ||============================== // // ==============================|| EVENT TABLE ||============================== //


export default function UserAuthTable({setSelectedRow, userAuth}) {
export default function UserAuthTable({setSelectedRow, userAuth,isNewRecord}) {
const [authData, setAuthData] = useState([]); const [authData, setAuthData] = useState([]);
const [onReady, setOnReady] = useState(false); const [onReady, setOnReady] = useState(false);
const [currentSelectedRow, setCurrentSelectedRow] = useState(userAuth); const [currentSelectedRow, setCurrentSelectedRow] = useState(userAuth);
@@ -35,7 +35,7 @@ export default function UserAuthTable({setSelectedRow, userAuth}) {


useEffect(() => { useEffect(() => {
//if state data are ready and assign to different field //if state data are ready and assign to different field
if (authData.length > 0) {
if (authData.length > 0||isNewRecord) {
setOnReady(true); setOnReady(true);
} }
}, [authData]); }, [authData]);


+ 2
- 1
src/pages/pnspsUserDetailPage/UserAuthorityCard.js View File

@@ -16,7 +16,7 @@ const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingCompo
// ==============================|| DASHBOARD - DEFAULT ||============================== // // ==============================|| DASHBOARD - DEFAULT ||============================== //




const UserAuthorityCard = ({isCollectData, updateUserAuthList,userData}) => {
const UserAuthorityCard = ({isCollectData, updateUserAuthList,userData,isNewRecord}) => {
const [currentAuthData, setCurrentAuthData] = React.useState({}); const [currentAuthData, setCurrentAuthData] = React.useState({});
const [onReady, setOnReady] = useState(false); const [onReady, setOnReady] = useState(false);
const [selectedRow, setSelectedRow] = useState([]); const [selectedRow, setSelectedRow] = useState([]);
@@ -57,6 +57,7 @@ const UserAuthorityCard = ({isCollectData, updateUserAuthList,userData}) => {
<UserAuthTable <UserAuthTable
userAuth={userData.authIds} userAuth={userData.authIds}
setSelectedRow={setSelectedRow} setSelectedRow={setSelectedRow}
isNewRecord={isNewRecord}
/> />
</MainCard> </MainCard>
); );


+ 2
- 1
src/pages/pnspsUserGroupDetailPage/GroupAuthCard.js View File

@@ -15,7 +15,7 @@ const GroupAuthTable = Loadable(lazy(() => import('./GroupAuthTable')));
// ==============================|| DASHBOARD - DEFAULT ||============================== // // ==============================|| DASHBOARD - DEFAULT ||============================== //




const GroupAuthCard = ({isCollectData, updateUserAuthList,userGroupData}) => {
const GroupAuthCard = ({isCollectData, updateUserAuthList,userGroupData,isNewRecord}) => {
const [currentAuthData, setCurrentAuthData] = React.useState({}); const [currentAuthData, setCurrentAuthData] = React.useState({});
const [onReady, setOnReady] = useState(false); const [onReady, setOnReady] = useState(false);
const [selectedRow, setSelectedRow] = useState([]); const [selectedRow, setSelectedRow] = useState([]);
@@ -62,6 +62,7 @@ const GroupAuthCard = ({isCollectData, updateUserAuthList,userGroupData}) => {
<GroupAuthTable <GroupAuthTable
userAuth={userGroupData.authIds} userAuth={userGroupData.authIds}
setSelectedRow={setSelectedRow} setSelectedRow={setSelectedRow}
isNewRecord={isNewRecord}
/> />
</MainCard> </MainCard>
); );


+ 2
- 2
src/pages/pnspsUserGroupDetailPage/GroupAuthTable.js View File

@@ -15,7 +15,7 @@ const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingCompo


// ==============================|| EVENT TABLE ||============================== // // ==============================|| EVENT TABLE ||============================== //


export default function GroupAuthTable({setSelectedRow, userAuth}) {
export default function GroupAuthTable({setSelectedRow, userAuth,isNewRecord}) {
const [authData, setAuthData] = useState([]); const [authData, setAuthData] = useState([]);
const [onReady, setOnReady] = useState(false); const [onReady, setOnReady] = useState(false);
const [currentSelectedRow, setCurrentSelectedRow] = useState(userAuth); const [currentSelectedRow, setCurrentSelectedRow] = useState(userAuth);
@@ -35,7 +35,7 @@ export default function GroupAuthTable({setSelectedRow, userAuth}) {


useEffect(() => { useEffect(() => {
//if state data are ready and assign to different field //if state data are ready and assign to different field
if (authData.length > 0) {
if (authData.length > 0||isNewRecord) {
setOnReady(true); setOnReady(true);
} }
}, [authData]); }, [authData]);


+ 2
- 2
src/pages/pnspsUserGroupDetailPage/UserAddCard.js View File

@@ -7,7 +7,7 @@ import {
import MainCard from "../../components/MainCard"; import MainCard from "../../components/MainCard";
import * as React from "react"; import * as React from "react";
import {useEffect, useState} from "react"; import {useEffect, useState} from "react";
import {GET_GROUP_MEMBER_LIST_PATH, GET_USER_COMBO_LIST} from "../../utils/ApiPathConst";
import {GET_GROUP_MEMBER_LIST_PATH, GET_USER_GLD_COMBO_LIST} from "../../utils/ApiPathConst";
import axios from "axios"; import axios from "axios";
import {apiPath} from "../../auth/utils"; import {apiPath} from "../../auth/utils";
import Autocomplete from "@mui/material/Autocomplete"; import Autocomplete from "@mui/material/Autocomplete";
@@ -43,7 +43,7 @@ const UserAddCard = ({isCollectData, updateGroupMember,userGroupData,isNewRecord
} }


useEffect(() => { useEffect(() => {
axios.get(`${apiPath}${GET_USER_COMBO_LIST}`)
axios.get(`${apiPath}${GET_USER_GLD_COMBO_LIST}`)
.then((response) => { .then((response) => {
if (response.status === 200) { if (response.status === 200) {
setUserComboList(response.data.records); setUserComboList(response.data.records);


+ 1
- 0
src/utils/ApiPathConst.js View File

@@ -11,6 +11,7 @@ export const GET_GROUP_AUTH_LIST = '/group/auth/combo';
export const GLD_USER_PATH = apiPath+'/user/gld'; export const GLD_USER_PATH = apiPath+'/user/gld';
export const GET_AUTH_LIST = '/user/auth/combo'; export const GET_AUTH_LIST = '/user/auth/combo';
export const GET_USER_COMBO_LIST = '/user/combo'; export const GET_USER_COMBO_LIST = '/user/combo';
export const GET_USER_GLD_COMBO_LIST = '/user/combo/gld';
export const GET_USER_LOCK = apiPath+'/user/lock'; export const GET_USER_LOCK = apiPath+'/user/lock';
export const GET_USER_UNLOCK = apiPath+'/user/unlock'; export const GET_USER_UNLOCK = apiPath+'/user/unlock';




Loading…
Cancel
Save