-
+
'auto'}
/>
);
diff --git a/src/pages/PublicNotice/Search_GLD/SearchForm.js b/src/pages/PublicNotice/Search_GLD/SearchForm.js
index 27cc414..2d4292b 100644
--- a/src/pages/PublicNotice/Search_GLD/SearchForm.js
+++ b/src/pages/PublicNotice/Search_GLD/SearchForm.js
@@ -236,7 +236,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
}}
renderInput={(params) => (
}
});
} else {
- setWarningText("Please select Organization before active this account.")
+ setWarningText("Please select Organisation before active this account.")
setIsWarningPopUp(true);
}
@@ -235,7 +235,7 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
{/*end top button*/}
- Organization User Details
+ Organisation User Details
@@ -297,7 +297,7 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
{FieldUtils.getComboField({
- label: "Organization:",
+ label: "Organisation:",
valueName: "orgId",
disabled: (!editMode),
dataList: orgData,
@@ -466,7 +466,7 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
: null
@@ -475,7 +475,7 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
- Organization
+ Organisation
diff --git a/src/pages/User/DetailsPage_Organization/index.js b/src/pages/User/DetailsPage_Organization/index.js
index df96f6a..0b124a8 100644
--- a/src/pages/User/DetailsPage_Organization/index.js
+++ b/src/pages/User/DetailsPage_Organization/index.js
@@ -133,7 +133,7 @@ const UserMaintainPage_Organization = () => {
- Maintain Organization User
+ Maintain Organisation User
diff --git a/src/pages/User/SearchPage_Organization/index.js b/src/pages/User/SearchPage_Organization/index.js
index 7200ad8..98f9553 100644
--- a/src/pages/User/SearchPage_Organization/index.js
+++ b/src/pages/User/SearchPage_Organization/index.js
@@ -72,7 +72,7 @@ const UserSearchPage_Organization = () => {
- View Organization User
+ View Organisation User
diff --git a/src/pages/authentication/auth-forms/CustomFormWizard.js b/src/pages/authentication/auth-forms/CustomFormWizard.js
index 143e700..00b061a 100644
--- a/src/pages/authentication/auth-forms/CustomFormWizard.js
+++ b/src/pages/authentication/auth-forms/CustomFormWizard.js
@@ -1685,7 +1685,7 @@ const CustomFormWizard = (props) => {
帳戶申請已成功提交。
- 驗證電郵將發送到你的電郵地址，請要指示完成驗證及登入系統。
+ 驗證電郵將發送到你的電郵地址，請依指示完成驗證及登入系統。
:
diff --git a/src/pages/authentication/auth-forms/PreviewUploadFileTable.js b/src/pages/authentication/auth-forms/PreviewUploadFileTable.js
index 779a7b6..4a48bb9 100644
--- a/src/pages/authentication/auth-forms/PreviewUploadFileTable.js
+++ b/src/pages/authentication/auth-forms/PreviewUploadFileTable.js
@@ -104,6 +104,7 @@ export default function PreviewUploadFileTable({ recordList, }) {
disableColumnMenu
disableColumnSelector
hideFooter
+ getRowHeight={()=>"auto"}
/>
);
diff --git a/src/pages/authentication/auth-forms/UploadFileTable.js b/src/pages/authentication/auth-forms/UploadFileTable.js
index 2b295e2..cecc645 100644
--- a/src/pages/authentication/auth-forms/UploadFileTable.js
+++ b/src/pages/authentication/auth-forms/UploadFileTable.js
@@ -106,6 +106,7 @@ export default function UploadFileTable({ recordList, setUpdateRows, }) {
disableColumnMenu
disableColumnSelector
hideFooter
+ getRowHeight={()=>"auto"}
/>
);
diff --git a/src/utils/CommonFunction.js b/src/utils/CommonFunction.js
index aef31ea..4ac4443 100644
--- a/src/utils/CommonFunction.js
+++ b/src/utils/CommonFunction.js
@@ -3,27 +3,27 @@ import DialogTitle from "@mui/material/DialogTitle";
import DialogContent from "@mui/material/DialogContent";
import DialogContentText from "@mui/material/DialogContentText";
import DialogActions from "@mui/material/DialogActions";
-import {Button} from "@mui/material";
+import { Button } from "@mui/material";
import Dialog from "@mui/material/Dialog";
import * as React from "react";
import { toast } from "react-toastify";
-export function getDeletedRecordWithRefList(referenceList, updatedList){
- return referenceList.filter(x => !updatedList.includes(x)) ;
+export function getDeletedRecordWithRefList(referenceList, updatedList) {
+ return referenceList.filter(x => !updatedList.includes(x));
}
-export function getIdList(input){
+export function getIdList(input) {
const output = input.map(function (obj) {
return obj.id;
});
return output;
}
-export function getObjectById(list, id){
+export function getObjectById(list, id) {
const obj = list.find((element) => {
return element.id === id;
});
- return obj === undefined || Object.keys(obj).length <= 0? null : obj
+ return obj === undefined || Object.keys(obj).length <= 0 ? null : obj
}
export function removeObjectWithId(arr, id) {
@@ -34,7 +34,7 @@ export function removeObjectWithId(arr, id) {
}
export function getDateString(queryDateArray) {
- return(
+ return (
queryDateArray[0]
+ "-" +
queryDateArray[1]
@@ -60,7 +60,8 @@ export const notifySaveSuccess = () => {
draggable: true,
progress: undefined,
theme: "light",
-})};
+ })
+};
export const notifyCreateSuccess = () => {
const userType = JSON.parse(localStorage.getItem("userData")).type
@@ -73,108 +74,130 @@ export const notifyCreateSuccess = () => {
draggable: true,
progress: undefined,
theme: "light",
-})};
+ })
+};
export const notifyVerifySuccess = () => {
const userType = JSON.parse(localStorage.getItem("userData")).type
toast.success(userType === "GLD" ? 'Verify success!' : "驗證成功!", {
- position: "bottom-right",
- autoClose: 5000,
- hideProgressBar: false,
- closeOnClick: true,
- pauseOnHover: true,
- draggable: true,
- progress: undefined,
- theme: "light",
-})};
+ position: "bottom-right",
+ autoClose: 5000,
+ hideProgressBar: false,
+ closeOnClick: true,
+ pauseOnHover: true,
+ draggable: true,
+ progress: undefined,
+ theme: "light",
+ })
+};
export const notifyDeleteSuccess = () => {
const userType = JSON.parse(localStorage.getItem("userData")).type
toast.success(userType === "GLD" ? 'Delete success!' : "刪除成功!", {
- position: "bottom-right",
- autoClose: 5000,
- hideProgressBar: false,
- closeOnClick: true,
- pauseOnHover: true,
- draggable: true,
- progress: undefined,
- theme: "light",
-})};
+ position: "bottom-right",
+ autoClose: 5000,
+ hideProgressBar: false,
+ closeOnClick: true,
+ pauseOnHover: true,
+ draggable: true,
+ progress: undefined,
+ theme: "light",
+ })
+};
export const notifyLockSuccess = () => {
toast.success('Lock success!', {
- position: "bottom-right",
- autoClose: 5000,
- hideProgressBar: false,
- closeOnClick: true,
- pauseOnHover: true,
- draggable: true,
- progress: undefined,
- theme: "light",
-})};
+ position: "bottom-right",
+ autoClose: 5000,
+ hideProgressBar: false,
+ closeOnClick: true,
+ pauseOnHover: true,
+ draggable: true,
+ progress: undefined,
+ theme: "light",
+ })
+};
export const notifyUnlockSuccess = () => {
toast.success('Unlock success!', {
- position: "bottom-right",
- autoClose: 5000,
- hideProgressBar: false,
- closeOnClick: true,
- pauseOnHover: true,
- draggable: true,
- progress: undefined,
- theme: "light",
-})};
+ position: "bottom-right",
+ autoClose: 5000,
+ hideProgressBar: false,
+ closeOnClick: true,
+ pauseOnHover: true,
+ draggable: true,
+ progress: undefined,
+ theme: "light",
+ })
+};
export const notifyActiveSuccess = () => {
toast.success('Active success!', {
- position: "bottom-right",
- autoClose: 5000,
- hideProgressBar: false,
- closeOnClick: true,
- pauseOnHover: true,
- draggable: true,
- progress: undefined,
- theme: "light",
-})};
+ position: "bottom-right",
+ autoClose: 5000,
+ hideProgressBar: false,
+ closeOnClick: true,
+ pauseOnHover: true,
+ draggable: true,
+ progress: undefined,
+ theme: "light",
+ })
+};
export const notifyDownloadSuccess = () => {
const userType = JSON.parse(localStorage.getItem("userData")).type
toast.success(userType === "GLD" ? 'Download success!' : "下載成功!", {
- position: "bottom-right",
- autoClose: 5000,
- hideProgressBar: false,
- closeOnClick: true,
- pauseOnHover: true,
- draggable: true,
- progress: undefined,
- theme: "light",
-})};
+ position: "bottom-right",
+ autoClose: 5000,
+ hideProgressBar: false,
+ closeOnClick: true,
+ pauseOnHover: true,
+ draggable: true,
+ progress: undefined,
+ theme: "light",
+ })
+};
export const notifyActionSuccess = (actionMsg) => {
toast.success(`${actionMsg}`, {
- position: "bottom-right",
- autoClose: 5000,
- hideProgressBar: false,
- closeOnClick: true,
- pauseOnHover: true,
- draggable: true,
- progress: undefined,
- theme: "light",
-})};
+ position: "bottom-right",
+ autoClose: 5000,
+ hideProgressBar: false,
+ closeOnClick: true,
+ pauseOnHover: true,
+ draggable: true,
+ progress: undefined,
+ theme: "light",
+ })
+};
export const notifyActionError = (actionMsg) => {
toast.error(`${actionMsg}`, {
- position: "bottom-right",
- autoClose: 5000,
- hideProgressBar: false,
- closeOnClick: true,
- pauseOnHover: true,
- draggable: true,
- progress: undefined,
- theme: "light",
-})};
-
-export function prettyJson(json){
+ position: "bottom-right",
+ autoClose: 5000,
+ hideProgressBar: false,
+ closeOnClick: true,
+ pauseOnHover: true,
+ draggable: true,
+ progress: undefined,
+ theme: "light",
+ })
+};
+
+export const notifyActionWarning = (actionMsg) => {
+ toast.warn(`${actionMsg}`, {
+ position: "bottom-right",
+ autoClose: 5000,
+ hideProgressBar: false,
+ closeOnClick: true,
+ pauseOnHover: true,
+ draggable: true,
+ progress: undefined,
+ theme: "light",
+ })
+}
+
+export function prettyJson(json) {
console.log(json);
console.log(JSON.stringify(json, null, 2));
return (
@@ -183,11 +206,11 @@ export function prettyJson(json){
}
export function GeneralConfirmWindow({
- isWindowOpen,
- title,
- content,
- onNormalClose,
- onConfirmClose}){
+ isWindowOpen,
+ title,
+ content,
+ onNormalClose,
+ onConfirmClose }) {
return (