trithuc-mvc-react 2.6.3 → 2.6.5

package/api/index.js

@@ -3,7 +3,7 @@ import axios from "axios";
 let baseUrl = "";
 let apiUrl = "";
 
-export function configure({ customBaseUrl,customApiUrl }) {
+export function configure({ customBaseUrl, customApiUrl }) {
   if (customBaseUrl) {
     baseUrl = customBaseUrl;
     apiUrl = customApiUrl;
@@ -66,7 +66,7 @@ export const getDatasFromTable = async ({ tableName, page, pageSize, data }) =>
 };
 
 export const getDataFromTable = async ({ tableName, id }) => {
-  try {    
+  try {
     if (!apiUrl) {
       const url = `${getBaseUrl()}/Admin/${tableName}/GetDetail`;
       const res = await api.get(url, {
@@ -75,7 +75,7 @@ export const getDataFromTable = async ({ tableName, id }) => {
         }
       });
       return res.data;
-    }else{
+    } else {
       const url = `${getBaseUrl()}/${apiUrl}/${tableName}/${id}`;
       const res = await api.get(url, {
         params: {
@@ -103,7 +103,7 @@ export const deleteDataFromTable = async ({ tableName, id }) => {
     const res = await api.delete(`${getBaseUrl()}/${apiUrl}/${tableName}`, {
       data: ids, // Truyền ids như là dữ liệu của body
       headers: {
-        'Content-Type': 'application/json-patch+json' // Đảm bảo Content-Type là đúng
+        "Content-Type": "application/json-patch+json" // Đảm bảo Content-Type là đúng
       }
     });
     return res.data;
@@ -119,7 +119,7 @@ export const deleteMultipleDataFromTable = async ({ tableName, ids }) => {
     const res = await api.delete(`${getBaseUrl()}/${apiUrl}/${tableName}`, {
       data: ids, // Truyền ids như là dữ liệu của body
       headers: {
-        'Content-Type': 'application/json' // Đảm bảo Content-Type là đúng
+        "Content-Type": "application/json-patch+json" // Đảm bảo Content-Type là đúng
       }
     });
     return res.data;
@@ -144,26 +144,61 @@ export const saveDataToTable = async ({ tableName, data }) => {
   }
 };
 export const changeStatusDataToTable = async ({ tableName, id }) => {
-  const res = await api.post(`${getBaseUrl()}/Admin/${tableName}/ChangeStatus`, {
-    id
-  });
-  return res.data;
+  if (!apiUrl) {
+    const res = await api.post(`${getBaseUrl()}/Admin/${tableName}/ChangeStatus`, {
+      id
+    });
+    return res.data;
+  } else {
+    const res = await api.post(`${getBaseUrl()}/${apiUrl}/${tableName}/ChangeStatus`, id, {
+      headers: {
+        "Content-Type": "application/json-patch+json" // Đảm bảo Content-Type là đúng
+      }
+    });
+    return res.data;
+  }
 };
 
 export const exportExcel = async ({ tableName, data }) => {
-  const res = await api.get(`${getBaseUrl()}/Admin/${tableName}/ExportData`, {
-    params: {
-      json: JSON.stringify(data)
-    }
-  });
-  return res.data;
+  if (!apiUrl) {
+    const res = await api.get(`${getBaseUrl()}/Admin/${tableName}/ExportData`, {
+      params: {
+        json: JSON.stringify(data)
+      }
+    });
+    return res.data;
+  } else {
+    const res = await api.get(
+      `${getBaseUrl()}/${apiUrl}/${tableName}/ExportData`,
+      {
+        params: {
+          ...data
+        }
+      },
+      {
+        headers: {
+          "Content-Type": "application/json-patch+json" // Đảm bảo Content-Type là đúng
+        }
+      }
+    );
+    return res.data;
+  }
 };
 
 export const uploadFile = async (formData) => {
-  const res = await api.post(`${getBaseUrl()}/Handler/fileUploader.ashx`, formData, {
-    headers: {
-      "Content-Type": "multipart/form-data"
-    }
-  });
-  return res.data;
+  if (!apiUrl) {
+    const res = await api.post(`${getBaseUrl()}/Handler/fileUploader.ashx`, formData, {
+      headers: {
+        "Content-Type": "multipart/form-data"
+      }
+    });
+    return res.data;
+  } else {
+    const res = await api.post(`${getBaseUrl()}/${apiUrl}/FileUploader`, formData, {
+      headers: {
+        "Content-Type": "multipart/form-data"
+      }
+    });
+    return res.data;
+  }
 };

package/components/DataManagement/index.jsx

@@ -37,6 +37,7 @@ DataManagement.propTypes = {
   disableStatus: PropTypes.bool,
   disableAdd: PropTypes.bool,
   disableCellThaoTac: PropTypes.bool,
+  reserPage: PropTypes.string,
   statusKey: PropTypes.string,
   tableActions: PropTypes.array,
   disableEditor: PropTypes.bool,
@@ -52,6 +53,7 @@ const getDefaultValues = (filters = []) => {
   return defaultValues;
 };
 function DataManagement({
+  reserPage = false,
   sttLuyKe = false,
   columns = [],
   title,
@@ -87,7 +89,7 @@ function DataManagement({
   const [selectedEditItem, setSelectedEditItem] = useState(null);
   const [openViewDialog, setOpenViewDialog] = useState(false);
 
-  const { canCreate } = usePermission(apiUrl?apiUrl:tableName);
+  const { canCreate } = usePermission(apiUrl ? apiUrl : tableName);
   const { defaults, filters } = useMemo(() => {
     const filters = tableFilters.filter(({ type }) => type !== "default");
     const defaultFilters = tableFilters.filter(({ type }) => type === "default");
@@ -113,9 +115,16 @@ function DataManagement({
   const [dataSearch, setDataSearch] = useState({ ...defaults, ...getDefaultValues(filters) });
   const [page, setPage] = useState(0);
 
+  useEffect(() => {
+    if (reserPage) {
+      setPage(0);
+    }
+  }, [reserPage]);
+
   const values = useMemo(() => {
     const hasTabpanel = !!tabPanel;
     return {
+      reserPage,
       sttLuyKe,
       apiUrl,
       tableName,
@@ -140,6 +149,7 @@ function DataManagement({
       defaultRowsPerPage
     };
   }, [
+    reserPage,
     sttLuyKe,
     apiUrl,
     tableName,
@@ -215,7 +225,13 @@ function DataManagement({
             {tabPanel}
             <FilterGod filters={filters} elementSize={elementSize} setPage={setPage} />
             {backParentNavigator}
-            <DataTable multipleActions={multipleActions} page={page} setPage={setPage} disableEdit={disableEdit} disableDelete = {disableDelete}/>
+            <DataTable
+              multipleActions={multipleActions}
+              page={page}
+              setPage={setPage}
+              disableEdit={disableEdit}
+              disableDelete={disableDelete}
+            />
           </Card>
         </FormProvider>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trithuc-mvc-react",
-  "version": "2.6.3",
+  "version": "2.6.5",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"