@fctc/widget-logic 6.1.0 → 6.1.2

package/dist/index.js

@@ -6595,9 +6595,11 @@ var tableGroupController = (props) => {
     context,
     checkedAll,
     groupByList,
-    setSelectedRowKeys
+    setSelectedRowKeys,
+    limit = 10
   } = props;
   const [pageGroup, setPageGroup] = (0, import_react26.useState)(0);
+  const [pageLimitGroup, setPageLimitGroup] = (0, import_react26.useState)(limit);
   const { selectedRowKeys } = (0, import_store.useAppSelector)(import_store.selectList);
   const [isShowGroup, setIsShowGroup] = (0, import_react26.useState)(false);
   const [colEmptyGroup, setColEmptyGroup] = (0, import_react26.useState)({
@@ -6607,16 +6609,20 @@ var tableGroupController = (props) => {
   const domain = row?.__domain;
   const processedData = (0, import_react26.useMemo)(() => {
     const calculateColSpanEmpty = () => {
-      const startIndex = columns.findIndex(
+      const startIndex = columns?.filter(
+        (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
+      ).findIndex(
         (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator === "sum"
       );
-      const endIndex = columns.findLastIndex(
+      const endIndex = columns?.filter(
+        (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
+      ).findLastIndex(
         (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator !== "sum"
       );
       const fromStart = startIndex === -1 ? columns.length : startIndex;
       const fromEnd = endIndex === -1 ? columns.length : columns.length - 1 - endIndex;
-      setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 1 });
-      return { fromStart: fromStart + 1, fromEnd: fromEnd + 1 };
+      setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 10 });
+      return { fromStart: fromStart + 1, fromEnd: fromEnd + 10 };
     };
     return calculateColSpanEmpty();
   }, [columns, row]);
@@ -6632,13 +6638,14 @@ var tableGroupController = (props) => {
     offset: pageGroup * 10,
     fields: groupByList?.fields,
     groupby: [groupByList?.contexts[level]?.group_by],
-    limit: 10
+    limit: pageLimitGroup
   };
   const queryKey = [
     `data-${model}-level_${level}-row-${row?.id}`,
     specification,
     domain,
-    pageGroup
+    pageGroup,
+    pageLimitGroup
   ];
   const {
     data: dataGroup,
@@ -6712,7 +6719,9 @@ var tableGroupController = (props) => {
     dataGroup,
     pageGroup,
     setPageGroup,
-    typeTableGroup
+    typeTableGroup,
+    pageLimitGroup,
+    setPageLimitGroup
   };
 };
 

package/dist/index.mjs

@@ -6690,9 +6690,11 @@ var tableGroupController = (props) => {
     context,
     checkedAll,
     groupByList,
-    setSelectedRowKeys
+    setSelectedRowKeys,
+    limit = 10
   } = props;
   const [pageGroup, setPageGroup] = useState15(0);
+  const [pageLimitGroup, setPageLimitGroup] = useState15(limit);
   const { selectedRowKeys } = useAppSelector(selectList);
   const [isShowGroup, setIsShowGroup] = useState15(false);
   const [colEmptyGroup, setColEmptyGroup] = useState15({
@@ -6702,16 +6704,20 @@ var tableGroupController = (props) => {
   const domain = row?.__domain;
   const processedData = useMemo12(() => {
     const calculateColSpanEmpty = () => {
-      const startIndex = columns.findIndex(
+      const startIndex = columns?.filter(
+        (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
+      ).findIndex(
         (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator === "sum"
       );
-      const endIndex = columns.findLastIndex(
+      const endIndex = columns?.filter(
+        (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
+      ).findLastIndex(
         (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator !== "sum"
       );
       const fromStart = startIndex === -1 ? columns.length : startIndex;
       const fromEnd = endIndex === -1 ? columns.length : columns.length - 1 - endIndex;
-      setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 1 });
-      return { fromStart: fromStart + 1, fromEnd: fromEnd + 1 };
+      setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 10 });
+      return { fromStart: fromStart + 1, fromEnd: fromEnd + 10 };
     };
     return calculateColSpanEmpty();
   }, [columns, row]);
@@ -6727,13 +6733,14 @@ var tableGroupController = (props) => {
     offset: pageGroup * 10,
     fields: groupByList?.fields,
     groupby: [groupByList?.contexts[level]?.group_by],
-    limit: 10
+    limit: pageLimitGroup
   };
   const queryKey = [
     `data-${model}-level_${level}-row-${row?.id}`,
     specification,
     domain,
-    pageGroup
+    pageGroup,
+    pageLimitGroup
   ];
   const {
     data: dataGroup,
@@ -6807,7 +6814,9 @@ var tableGroupController = (props) => {
     dataGroup,
     pageGroup,
     setPageGroup,
-    typeTableGroup
+    typeTableGroup,
+    pageLimitGroup,
+    setPageLimitGroup
   };
 };
 

package/dist/widget.d.mts

@@ -315,6 +315,8 @@ declare const tableGroupController: (props: any) => {
     pageGroup: any;
     setPageGroup: react.Dispatch<any>;
     typeTableGroup: "list" | "group" | "calendar" | undefined;
+    pageLimitGroup: number;
+    setPageLimitGroup: react.Dispatch<react.SetStateAction<number>>;
 };
 
 declare const searchController: ({ viewData, model, domain, context, fieldsList, }: {

package/dist/widget.d.ts

@@ -315,6 +315,8 @@ declare const tableGroupController: (props: any) => {
     pageGroup: any;
     setPageGroup: react.Dispatch<any>;
     typeTableGroup: "list" | "group" | "calendar" | undefined;
+    pageLimitGroup: number;
+    setPageLimitGroup: react.Dispatch<react.SetStateAction<number>>;
 };
 
 declare const searchController: ({ viewData, model, domain, context, fieldsList, }: {

package/dist/widget.js

@@ -5833,9 +5833,11 @@ var tableGroupController = (props) => {
     context,
     checkedAll,
     groupByList,
-    setSelectedRowKeys
+    setSelectedRowKeys,
+    limit = 10
   } = props;
   const [pageGroup, setPageGroup] = (0, import_react26.useState)(0);
+  const [pageLimitGroup, setPageLimitGroup] = (0, import_react26.useState)(limit);
   const { selectedRowKeys } = (0, import_store.useAppSelector)(import_store.selectList);
   const [isShowGroup, setIsShowGroup] = (0, import_react26.useState)(false);
   const [colEmptyGroup, setColEmptyGroup] = (0, import_react26.useState)({
@@ -5845,16 +5847,20 @@ var tableGroupController = (props) => {
   const domain = row?.__domain;
   const processedData = (0, import_react26.useMemo)(() => {
     const calculateColSpanEmpty = () => {
-      const startIndex = columns.findIndex(
+      const startIndex = columns?.filter(
+        (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
+      ).findIndex(
         (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator === "sum"
       );
-      const endIndex = columns.findLastIndex(
+      const endIndex = columns?.filter(
+        (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
+      ).findLastIndex(
         (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator !== "sum"
       );
       const fromStart = startIndex === -1 ? columns.length : startIndex;
       const fromEnd = endIndex === -1 ? columns.length : columns.length - 1 - endIndex;
-      setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 1 });
-      return { fromStart: fromStart + 1, fromEnd: fromEnd + 1 };
+      setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 10 });
+      return { fromStart: fromStart + 1, fromEnd: fromEnd + 10 };
     };
     return calculateColSpanEmpty();
   }, [columns, row]);
@@ -5870,13 +5876,14 @@ var tableGroupController = (props) => {
     offset: pageGroup * 10,
     fields: groupByList?.fields,
     groupby: [groupByList?.contexts[level]?.group_by],
-    limit: 10
+    limit: pageLimitGroup
   };
   const queryKey = [
     `data-${model}-level_${level}-row-${row?.id}`,
     specification,
     domain,
-    pageGroup
+    pageGroup,
+    pageLimitGroup
   ];
   const {
     data: dataGroup,
@@ -5950,7 +5957,9 @@ var tableGroupController = (props) => {
     dataGroup,
     pageGroup,
     setPageGroup,
-    typeTableGroup
+    typeTableGroup,
+    pageLimitGroup,
+    setPageLimitGroup
   };
 };
 

package/dist/widget.mjs

@@ -5904,9 +5904,11 @@ var tableGroupController = (props) => {
     context,
     checkedAll,
     groupByList,
-    setSelectedRowKeys
+    setSelectedRowKeys,
+    limit = 10
   } = props;
   const [pageGroup, setPageGroup] = useState15(0);
+  const [pageLimitGroup, setPageLimitGroup] = useState15(limit);
   const { selectedRowKeys } = useAppSelector(selectList);
   const [isShowGroup, setIsShowGroup] = useState15(false);
   const [colEmptyGroup, setColEmptyGroup] = useState15({
@@ -5916,16 +5918,20 @@ var tableGroupController = (props) => {
   const domain = row?.__domain;
   const processedData = useMemo12(() => {
     const calculateColSpanEmpty = () => {
-      const startIndex = columns.findIndex(
+      const startIndex = columns?.filter(
+        (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
+      ).findIndex(
         (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator === "sum"
       );
-      const endIndex = columns.findLastIndex(
+      const endIndex = columns?.filter(
+        (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
+      ).findLastIndex(
         (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator !== "sum"
       );
       const fromStart = startIndex === -1 ? columns.length : startIndex;
       const fromEnd = endIndex === -1 ? columns.length : columns.length - 1 - endIndex;
-      setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 1 });
-      return { fromStart: fromStart + 1, fromEnd: fromEnd + 1 };
+      setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 10 });
+      return { fromStart: fromStart + 1, fromEnd: fromEnd + 10 };
     };
     return calculateColSpanEmpty();
   }, [columns, row]);
@@ -5941,13 +5947,14 @@ var tableGroupController = (props) => {
     offset: pageGroup * 10,
     fields: groupByList?.fields,
     groupby: [groupByList?.contexts[level]?.group_by],
-    limit: 10
+    limit: pageLimitGroup
   };
   const queryKey = [
     `data-${model}-level_${level}-row-${row?.id}`,
     specification,
     domain,
-    pageGroup
+    pageGroup,
+    pageLimitGroup
   ];
   const {
     data: dataGroup,
@@ -6021,7 +6028,9 @@ var tableGroupController = (props) => {
     dataGroup,
     pageGroup,
     setPageGroup,
-    typeTableGroup
+    typeTableGroup,
+    pageLimitGroup,
+    setPageLimitGroup
   };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fctc/widget-logic",
-  "version": "6.1.0",
+  "version": "6.1.2",
   "types": "dist/index.d.ts",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -74,7 +74,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@fctc/interface-logic": "^5.5.0",
+    "@fctc/interface-logic": "^5.5.1",
     "@tanstack/react-query": "^5.84.0",
     "i18next": "^25.3.2",
     "i18next-browser-languagedetector": "^8.2.0",