@fctc/widget-logic 6.1.6 → 6.1.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/dist/hooks.d.mts +12 -0
  2. package/dist/hooks.d.ts +12 -0
  3. package/dist/hooks.js +10 -6
  4. package/dist/hooks.mjs +10 -6
  5. package/dist/index.js +27 -14
  6. package/dist/index.mjs +27 -14
  7. package/dist/widget.d.mts +2 -0
  8. package/dist/widget.d.ts +2 -0
  9. package/dist/widget.js +27 -11
  10. package/dist/widget.mjs +27 -11
  11. package/package.json +2 -2
package/dist/hooks.d.mts CHANGED
@@ -796,12 +796,14 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
796
796
  specification: Record<string, any> | null;
797
797
  page: number;
798
798
  order: any;
799
+ orderGroupBy: any;
799
800
  domain: any;
800
801
  pageLimit: number;
801
802
  groupByList: any;
802
803
  selectedRowKeys: number[];
803
804
  setPage: react.Dispatch<react.SetStateAction<number>>;
804
805
  setOrder: react.Dispatch<any>;
806
+ setOrderGroupBy: react.Dispatch<any>;
805
807
  setDomain: react.Dispatch<any>;
806
808
  setPageLimit: react.Dispatch<react.SetStateAction<number>>;
807
809
  setGroupByList: react.Dispatch<any>;
@@ -838,12 +840,14 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
838
840
  specification: Record<string, any> | null;
839
841
  page: number;
840
842
  order: any;
843
+ orderGroupBy: any;
841
844
  domain: any;
842
845
  pageLimit: number;
843
846
  groupByList: any;
844
847
  selectedRowKeys: number[];
845
848
  setPage: react.Dispatch<react.SetStateAction<number>>;
846
849
  setOrder: react.Dispatch<any>;
850
+ setOrderGroupBy: react.Dispatch<any>;
847
851
  setDomain: react.Dispatch<any>;
848
852
  setPageLimit: react.Dispatch<react.SetStateAction<number>>;
849
853
  setGroupByList: react.Dispatch<any>;
@@ -880,12 +884,14 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
880
884
  specification: Record<string, any> | null;
881
885
  page: number;
882
886
  order: any;
887
+ orderGroupBy: any;
883
888
  domain: any;
884
889
  pageLimit: number;
885
890
  groupByList: any;
886
891
  selectedRowKeys: number[];
887
892
  setPage: react.Dispatch<react.SetStateAction<number>>;
888
893
  setOrder: react.Dispatch<any>;
894
+ setOrderGroupBy: react.Dispatch<any>;
889
895
  setDomain: react.Dispatch<any>;
890
896
  setPageLimit: react.Dispatch<react.SetStateAction<number>>;
891
897
  setGroupByList: react.Dispatch<any>;
@@ -922,12 +928,14 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
922
928
  specification: Record<string, any> | null;
923
929
  page: number;
924
930
  order: any;
931
+ orderGroupBy: any;
925
932
  domain: any;
926
933
  pageLimit: number;
927
934
  groupByList: any;
928
935
  selectedRowKeys: number[];
929
936
  setPage: react.Dispatch<react.SetStateAction<number>>;
930
937
  setOrder: react.Dispatch<any>;
938
+ setOrderGroupBy: react.Dispatch<any>;
931
939
  setDomain: react.Dispatch<any>;
932
940
  setPageLimit: react.Dispatch<react.SetStateAction<number>>;
933
941
  setGroupByList: react.Dispatch<any>;
@@ -964,12 +972,14 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
964
972
  specification: Record<string, any> | null;
965
973
  page: number;
966
974
  order: any;
975
+ orderGroupBy: any;
967
976
  domain: any;
968
977
  pageLimit: number;
969
978
  groupByList: any;
970
979
  selectedRowKeys: number[];
971
980
  setPage: react.Dispatch<react.SetStateAction<number>>;
972
981
  setOrder: react.Dispatch<any>;
982
+ setOrderGroupBy: react.Dispatch<any>;
973
983
  setDomain: react.Dispatch<any>;
974
984
  setPageLimit: react.Dispatch<react.SetStateAction<number>>;
975
985
  setGroupByList: react.Dispatch<any>;
@@ -1006,12 +1016,14 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
1006
1016
  specification: Record<string, any> | null;
1007
1017
  page: number;
1008
1018
  order: any;
1019
+ orderGroupBy: any;
1009
1020
  domain: any;
1010
1021
  pageLimit: number;
1011
1022
  groupByList: any;
1012
1023
  selectedRowKeys: number[];
1013
1024
  setPage: react.Dispatch<react.SetStateAction<number>>;
1014
1025
  setOrder: react.Dispatch<any>;
1026
+ setOrderGroupBy: react.Dispatch<any>;
1015
1027
  setDomain: react.Dispatch<any>;
1016
1028
  setPageLimit: react.Dispatch<react.SetStateAction<number>>;
1017
1029
  setGroupByList: react.Dispatch<any>;
package/dist/hooks.d.ts CHANGED
@@ -796,12 +796,14 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
796
796
  specification: Record<string, any> | null;
797
797
  page: number;
798
798
  order: any;
799
+ orderGroupBy: any;
799
800
  domain: any;
800
801
  pageLimit: number;
801
802
  groupByList: any;
802
803
  selectedRowKeys: number[];
803
804
  setPage: react.Dispatch<react.SetStateAction<number>>;
804
805
  setOrder: react.Dispatch<any>;
806
+ setOrderGroupBy: react.Dispatch<any>;
805
807
  setDomain: react.Dispatch<any>;
806
808
  setPageLimit: react.Dispatch<react.SetStateAction<number>>;
807
809
  setGroupByList: react.Dispatch<any>;
@@ -838,12 +840,14 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
838
840
  specification: Record<string, any> | null;
839
841
  page: number;
840
842
  order: any;
843
+ orderGroupBy: any;
841
844
  domain: any;
842
845
  pageLimit: number;
843
846
  groupByList: any;
844
847
  selectedRowKeys: number[];
845
848
  setPage: react.Dispatch<react.SetStateAction<number>>;
846
849
  setOrder: react.Dispatch<any>;
850
+ setOrderGroupBy: react.Dispatch<any>;
847
851
  setDomain: react.Dispatch<any>;
848
852
  setPageLimit: react.Dispatch<react.SetStateAction<number>>;
849
853
  setGroupByList: react.Dispatch<any>;
@@ -880,12 +884,14 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
880
884
  specification: Record<string, any> | null;
881
885
  page: number;
882
886
  order: any;
887
+ orderGroupBy: any;
883
888
  domain: any;
884
889
  pageLimit: number;
885
890
  groupByList: any;
886
891
  selectedRowKeys: number[];
887
892
  setPage: react.Dispatch<react.SetStateAction<number>>;
888
893
  setOrder: react.Dispatch<any>;
894
+ setOrderGroupBy: react.Dispatch<any>;
889
895
  setDomain: react.Dispatch<any>;
890
896
  setPageLimit: react.Dispatch<react.SetStateAction<number>>;
891
897
  setGroupByList: react.Dispatch<any>;
@@ -922,12 +928,14 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
922
928
  specification: Record<string, any> | null;
923
929
  page: number;
924
930
  order: any;
931
+ orderGroupBy: any;
925
932
  domain: any;
926
933
  pageLimit: number;
927
934
  groupByList: any;
928
935
  selectedRowKeys: number[];
929
936
  setPage: react.Dispatch<react.SetStateAction<number>>;
930
937
  setOrder: react.Dispatch<any>;
938
+ setOrderGroupBy: react.Dispatch<any>;
931
939
  setDomain: react.Dispatch<any>;
932
940
  setPageLimit: react.Dispatch<react.SetStateAction<number>>;
933
941
  setGroupByList: react.Dispatch<any>;
@@ -964,12 +972,14 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
964
972
  specification: Record<string, any> | null;
965
973
  page: number;
966
974
  order: any;
975
+ orderGroupBy: any;
967
976
  domain: any;
968
977
  pageLimit: number;
969
978
  groupByList: any;
970
979
  selectedRowKeys: number[];
971
980
  setPage: react.Dispatch<react.SetStateAction<number>>;
972
981
  setOrder: react.Dispatch<any>;
982
+ setOrderGroupBy: react.Dispatch<any>;
973
983
  setDomain: react.Dispatch<any>;
974
984
  setPageLimit: react.Dispatch<react.SetStateAction<number>>;
975
985
  setGroupByList: react.Dispatch<any>;
@@ -1006,12 +1016,14 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
1006
1016
  specification: Record<string, any> | null;
1007
1017
  page: number;
1008
1018
  order: any;
1019
+ orderGroupBy: any;
1009
1020
  domain: any;
1010
1021
  pageLimit: number;
1011
1022
  groupByList: any;
1012
1023
  selectedRowKeys: number[];
1013
1024
  setPage: react.Dispatch<react.SetStateAction<number>>;
1014
1025
  setOrder: react.Dispatch<any>;
1026
+ setOrderGroupBy: react.Dispatch<any>;
1015
1027
  setDomain: react.Dispatch<any>;
1016
1028
  setPageLimit: react.Dispatch<react.SetStateAction<number>>;
1017
1029
  setGroupByList: react.Dispatch<any>;
package/dist/hooks.js CHANGED
@@ -147,7 +147,6 @@ var useCallAction = () => {
147
147
  const [actionData, setActionData] = (0, import_react.useState)(
148
148
  void 0
149
149
  );
150
- console.log("env?.context", env?.context);
151
150
  const callAction = (0, import_react.useCallback)(
152
151
  async ({
153
152
  aid,
@@ -584,10 +583,8 @@ var useCompany = ({ service }) => {
584
583
  }
585
584
  }, [current_company_id]);
586
585
  (0, import_react7.useEffect)(() => {
587
- console.log("wesapCompany.data", wesapCompany.data);
588
586
  if (wesapCompany.data) {
589
587
  const allowedCompanies = wesapCompany.data?.allowed_companies?.map((c) => c[0]) ?? [];
590
- console.log("allowedCompanies", allowedCompanies);
591
588
  if (allowedCompanies.length) {
592
589
  setAllowCompanies(allowedCompanies);
593
590
  }
@@ -922,6 +919,7 @@ var useListData = ({
922
919
  const [groupByList, setGroupByList] = (0, import_react14.useState)(null);
923
920
  const [domain, setDomain] = (0, import_react14.useState)(null);
924
921
  const [order, setOrder] = (0, import_react14.useState)("");
922
+ const [orderGroupBy, setOrderGroupBy] = (0, import_react14.useState)("");
925
923
  const [selectedRowKeys, setSelectedRowKeys] = (0, import_react14.useState)([]);
926
924
  const [debouncedPage] = useDebounce(page, 500);
927
925
  const [debouncedDomain] = useDebounce(domain, 500);
@@ -942,6 +940,7 @@ var useListData = ({
942
940
  const sort = order ?? (0, import_utils5.formatSortingString)(
943
941
  (mode === "kanban" ? viewData?.views?.kanban : viewData?.views?.list)?.default_order
944
942
  ) ?? "";
943
+ const orderGroupBy2 = groupByList && typeof groupByList === "object" ? (0, import_utils5.formatSortingString)(groupByList?.contexts?.[0]?.order_by) : null;
945
944
  return {
946
945
  model: action?.res_model,
947
946
  specification,
@@ -952,7 +951,8 @@ var useListData = ({
952
951
  groupby,
953
952
  context,
954
953
  sort,
955
- mode
954
+ mode,
955
+ orderGroupBy: orderGroupBy2
956
956
  };
957
957
  }, [
958
958
  action,
@@ -962,7 +962,8 @@ var useListData = ({
962
962
  pageLimit,
963
963
  debouncedDomain,
964
964
  context,
965
- model
965
+ model,
966
+ orderGroupBy
966
967
  ]);
967
968
  const list = useGetListData2(
968
969
  { ...listDataProps },
@@ -974,7 +975,8 @@ var useListData = ({
974
975
  listDataProps?.sort,
975
976
  listDataProps?.context,
976
977
  listDataProps?.specification,
977
- listDataProps?.mode
978
+ listDataProps?.mode,
979
+ listDataProps?.orderGroupBy
978
980
  ],
979
981
  !!listDataProps && !!specification && !(0, import_utils5.isObjectEmpty)(specification) && !!domain,
980
982
  service,
@@ -986,12 +988,14 @@ var useListData = ({
986
988
  specification,
987
989
  page,
988
990
  order,
991
+ orderGroupBy,
989
992
  domain: listDataProps?.domain,
990
993
  pageLimit,
991
994
  groupByList,
992
995
  selectedRowKeys,
993
996
  setPage,
994
997
  setOrder,
998
+ setOrderGroupBy,
995
999
  setDomain,
996
1000
  setPageLimit,
997
1001
  setGroupByList,
package/dist/hooks.mjs CHANGED
@@ -127,7 +127,6 @@ var useCallAction = () => {
127
127
  const [actionData, setActionData] = useState(
128
128
  void 0
129
129
  );
130
- console.log("env?.context", env?.context);
131
130
  const callAction = useCallback(
132
131
  async ({
133
132
  aid,
@@ -565,10 +564,8 @@ var useCompany = ({ service }) => {
565
564
  }
566
565
  }, [current_company_id]);
567
566
  useEffect4(() => {
568
- console.log("wesapCompany.data", wesapCompany.data);
569
567
  if (wesapCompany.data) {
570
568
  const allowedCompanies = wesapCompany.data?.allowed_companies?.map((c) => c[0]) ?? [];
571
- console.log("allowedCompanies", allowedCompanies);
572
569
  if (allowedCompanies.length) {
573
570
  setAllowCompanies(allowedCompanies);
574
571
  }
@@ -907,6 +904,7 @@ var useListData = ({
907
904
  const [groupByList, setGroupByList] = useState5(null);
908
905
  const [domain, setDomain] = useState5(null);
909
906
  const [order, setOrder] = useState5("");
907
+ const [orderGroupBy, setOrderGroupBy] = useState5("");
910
908
  const [selectedRowKeys, setSelectedRowKeys] = useState5([]);
911
909
  const [debouncedPage] = useDebounce(page, 500);
912
910
  const [debouncedDomain] = useDebounce(domain, 500);
@@ -927,6 +925,7 @@ var useListData = ({
927
925
  const sort = order ?? formatSortingString(
928
926
  (mode === "kanban" ? viewData?.views?.kanban : viewData?.views?.list)?.default_order
929
927
  ) ?? "";
928
+ const orderGroupBy2 = groupByList && typeof groupByList === "object" ? formatSortingString(groupByList?.contexts?.[0]?.order_by) : null;
930
929
  return {
931
930
  model: action?.res_model,
932
931
  specification,
@@ -937,7 +936,8 @@ var useListData = ({
937
936
  groupby,
938
937
  context,
939
938
  sort,
940
- mode
939
+ mode,
940
+ orderGroupBy: orderGroupBy2
941
941
  };
942
942
  }, [
943
943
  action,
@@ -947,7 +947,8 @@ var useListData = ({
947
947
  pageLimit,
948
948
  debouncedDomain,
949
949
  context,
950
- model
950
+ model,
951
+ orderGroupBy
951
952
  ]);
952
953
  const list = useGetListData2(
953
954
  { ...listDataProps },
@@ -959,7 +960,8 @@ var useListData = ({
959
960
  listDataProps?.sort,
960
961
  listDataProps?.context,
961
962
  listDataProps?.specification,
962
- listDataProps?.mode
963
+ listDataProps?.mode,
964
+ listDataProps?.orderGroupBy
963
965
  ],
964
966
  !!listDataProps && !!specification && !isObjectEmpty4(specification) && !!domain,
965
967
  service,
@@ -971,12 +973,14 @@ var useListData = ({
971
973
  specification,
972
974
  page,
973
975
  order,
976
+ orderGroupBy,
974
977
  domain: listDataProps?.domain,
975
978
  pageLimit,
976
979
  groupByList,
977
980
  selectedRowKeys,
978
981
  setPage,
979
982
  setOrder,
983
+ setOrderGroupBy,
980
984
  setDomain,
981
985
  setPageLimit,
982
986
  setGroupByList,
package/dist/index.js CHANGED
@@ -4198,7 +4198,6 @@ var useCallAction = () => {
4198
4198
  const [actionData, setActionData] = (0, import_react.useState)(
4199
4199
  void 0
4200
4200
  );
4201
- console.log("env?.context", env?.context);
4202
4201
  const callAction = (0, import_react.useCallback)(
4203
4202
  async ({
4204
4203
  aid,
@@ -4658,10 +4657,8 @@ var useCompany = ({ service }) => {
4658
4657
  }
4659
4658
  }, [current_company_id]);
4660
4659
  (0, import_react7.useEffect)(() => {
4661
- console.log("wesapCompany.data", wesapCompany.data);
4662
4660
  if (wesapCompany.data) {
4663
4661
  const allowedCompanies = wesapCompany.data?.allowed_companies?.map((c) => c[0]) ?? [];
4664
- console.log("allowedCompanies", allowedCompanies);
4665
4662
  if (allowedCompanies.length) {
4666
4663
  setAllowCompanies(allowedCompanies);
4667
4664
  }
@@ -4996,6 +4993,7 @@ var useListData = ({
4996
4993
  const [groupByList, setGroupByList] = (0, import_react14.useState)(null);
4997
4994
  const [domain, setDomain] = (0, import_react14.useState)(null);
4998
4995
  const [order, setOrder] = (0, import_react14.useState)("");
4996
+ const [orderGroupBy, setOrderGroupBy] = (0, import_react14.useState)("");
4999
4997
  const [selectedRowKeys, setSelectedRowKeys] = (0, import_react14.useState)([]);
5000
4998
  const [debouncedPage] = useDebounce(page, 500);
5001
4999
  const [debouncedDomain] = useDebounce(domain, 500);
@@ -5016,6 +5014,7 @@ var useListData = ({
5016
5014
  const sort = order ?? (0, import_utils5.formatSortingString)(
5017
5015
  (mode === "kanban" ? viewData?.views?.kanban : viewData?.views?.list)?.default_order
5018
5016
  ) ?? "";
5017
+ const orderGroupBy2 = groupByList && typeof groupByList === "object" ? (0, import_utils5.formatSortingString)(groupByList?.contexts?.[0]?.order_by) : null;
5019
5018
  return {
5020
5019
  model: action?.res_model,
5021
5020
  specification,
@@ -5026,7 +5025,8 @@ var useListData = ({
5026
5025
  groupby,
5027
5026
  context,
5028
5027
  sort,
5029
- mode
5028
+ mode,
5029
+ orderGroupBy: orderGroupBy2
5030
5030
  };
5031
5031
  }, [
5032
5032
  action,
@@ -5036,7 +5036,8 @@ var useListData = ({
5036
5036
  pageLimit,
5037
5037
  debouncedDomain,
5038
5038
  context,
5039
- model
5039
+ model,
5040
+ orderGroupBy
5040
5041
  ]);
5041
5042
  const list = useGetListData2(
5042
5043
  { ...listDataProps },
@@ -5048,7 +5049,8 @@ var useListData = ({
5048
5049
  listDataProps?.sort,
5049
5050
  listDataProps?.context,
5050
5051
  listDataProps?.specification,
5051
- listDataProps?.mode
5052
+ listDataProps?.mode,
5053
+ listDataProps?.orderGroupBy
5052
5054
  ],
5053
5055
  !!listDataProps && !!specification && !(0, import_utils5.isObjectEmpty)(specification) && !!domain,
5054
5056
  service,
@@ -5060,12 +5062,14 @@ var useListData = ({
5060
5062
  specification,
5061
5063
  page,
5062
5064
  order,
5065
+ orderGroupBy,
5063
5066
  domain: listDataProps?.domain,
5064
5067
  pageLimit,
5065
5068
  groupByList,
5066
5069
  selectedRowKeys,
5067
5070
  setPage,
5068
5071
  setOrder,
5072
+ setOrderGroupBy,
5069
5073
  setDomain,
5070
5074
  setPageLimit,
5071
5075
  setGroupByList,
@@ -6608,9 +6612,11 @@ var tableGroupController = (props) => {
6608
6612
  context,
6609
6613
  checkedAll,
6610
6614
  groupByList,
6611
- setSelectedRowKeys
6615
+ setSelectedRowKeys,
6616
+ limit = 10
6612
6617
  } = props;
6613
6618
  const [pageGroup, setPageGroup] = (0, import_react26.useState)(0);
6619
+ const [pageLimitGroup, setPageLimitGroup] = (0, import_react26.useState)(limit);
6614
6620
  const { selectedRowKeys } = (0, import_store.useAppSelector)(import_store.selectList);
6615
6621
  const [isShowGroup, setIsShowGroup] = (0, import_react26.useState)(false);
6616
6622
  const [colEmptyGroup, setColEmptyGroup] = (0, import_react26.useState)({
@@ -6620,16 +6626,20 @@ var tableGroupController = (props) => {
6620
6626
  const domain = row?.__domain;
6621
6627
  const processedData = (0, import_react26.useMemo)(() => {
6622
6628
  const calculateColSpanEmpty = () => {
6623
- const startIndex = columns.findIndex(
6629
+ const startIndex = columns?.filter(
6630
+ (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
6631
+ ).findIndex(
6624
6632
  (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator === "sum"
6625
6633
  );
6626
- const endIndex = columns.findLastIndex(
6634
+ const endIndex = columns?.filter(
6635
+ (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
6636
+ ).findLastIndex(
6627
6637
  (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator !== "sum"
6628
6638
  );
6629
6639
  const fromStart = startIndex === -1 ? columns.length : startIndex;
6630
6640
  const fromEnd = endIndex === -1 ? columns.length : columns.length - 1 - endIndex;
6631
- setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 1 });
6632
- return { fromStart: fromStart + 1, fromEnd: fromEnd + 1 };
6641
+ setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 10 });
6642
+ return { fromStart: fromStart + 1, fromEnd: fromEnd + 10 };
6633
6643
  };
6634
6644
  return calculateColSpanEmpty();
6635
6645
  }, [columns, row]);
@@ -6645,13 +6655,14 @@ var tableGroupController = (props) => {
6645
6655
  offset: pageGroup * 10,
6646
6656
  fields: groupByList?.fields,
6647
6657
  groupby: [groupByList?.contexts[level]?.group_by],
6648
- limit: 10
6658
+ limit: pageLimitGroup
6649
6659
  };
6650
6660
  const queryKey = [
6651
6661
  `data-${model}-level_${level}-row-${row?.id}`,
6652
6662
  specification,
6653
6663
  domain,
6654
- pageGroup
6664
+ pageGroup,
6665
+ pageLimitGroup
6655
6666
  ];
6656
6667
  const {
6657
6668
  data: dataGroup,
@@ -6725,7 +6736,9 @@ var tableGroupController = (props) => {
6725
6736
  dataGroup,
6726
6737
  pageGroup,
6727
6738
  setPageGroup,
6728
- typeTableGroup
6739
+ typeTableGroup,
6740
+ pageLimitGroup,
6741
+ setPageLimitGroup
6729
6742
  };
6730
6743
  };
6731
6744
 
package/dist/index.mjs CHANGED
@@ -4287,7 +4287,6 @@ var useCallAction = () => {
4287
4287
  const [actionData, setActionData] = useState(
4288
4288
  void 0
4289
4289
  );
4290
- console.log("env?.context", env?.context);
4291
4290
  const callAction = useCallback(
4292
4291
  async ({
4293
4292
  aid,
@@ -4748,10 +4747,8 @@ var useCompany = ({ service }) => {
4748
4747
  }
4749
4748
  }, [current_company_id]);
4750
4749
  useEffect4(() => {
4751
- console.log("wesapCompany.data", wesapCompany.data);
4752
4750
  if (wesapCompany.data) {
4753
4751
  const allowedCompanies = wesapCompany.data?.allowed_companies?.map((c) => c[0]) ?? [];
4754
- console.log("allowedCompanies", allowedCompanies);
4755
4752
  if (allowedCompanies.length) {
4756
4753
  setAllowCompanies(allowedCompanies);
4757
4754
  }
@@ -5090,6 +5087,7 @@ var useListData = ({
5090
5087
  const [groupByList, setGroupByList] = useState5(null);
5091
5088
  const [domain, setDomain] = useState5(null);
5092
5089
  const [order, setOrder] = useState5("");
5090
+ const [orderGroupBy, setOrderGroupBy] = useState5("");
5093
5091
  const [selectedRowKeys, setSelectedRowKeys] = useState5([]);
5094
5092
  const [debouncedPage] = useDebounce(page, 500);
5095
5093
  const [debouncedDomain] = useDebounce(domain, 500);
@@ -5110,6 +5108,7 @@ var useListData = ({
5110
5108
  const sort = order ?? formatSortingString(
5111
5109
  (mode === "kanban" ? viewData?.views?.kanban : viewData?.views?.list)?.default_order
5112
5110
  ) ?? "";
5111
+ const orderGroupBy2 = groupByList && typeof groupByList === "object" ? formatSortingString(groupByList?.contexts?.[0]?.order_by) : null;
5113
5112
  return {
5114
5113
  model: action?.res_model,
5115
5114
  specification,
@@ -5120,7 +5119,8 @@ var useListData = ({
5120
5119
  groupby,
5121
5120
  context,
5122
5121
  sort,
5123
- mode
5122
+ mode,
5123
+ orderGroupBy: orderGroupBy2
5124
5124
  };
5125
5125
  }, [
5126
5126
  action,
@@ -5130,7 +5130,8 @@ var useListData = ({
5130
5130
  pageLimit,
5131
5131
  debouncedDomain,
5132
5132
  context,
5133
- model
5133
+ model,
5134
+ orderGroupBy
5134
5135
  ]);
5135
5136
  const list = useGetListData2(
5136
5137
  { ...listDataProps },
@@ -5142,7 +5143,8 @@ var useListData = ({
5142
5143
  listDataProps?.sort,
5143
5144
  listDataProps?.context,
5144
5145
  listDataProps?.specification,
5145
- listDataProps?.mode
5146
+ listDataProps?.mode,
5147
+ listDataProps?.orderGroupBy
5146
5148
  ],
5147
5149
  !!listDataProps && !!specification && !isObjectEmpty4(specification) && !!domain,
5148
5150
  service,
@@ -5154,12 +5156,14 @@ var useListData = ({
5154
5156
  specification,
5155
5157
  page,
5156
5158
  order,
5159
+ orderGroupBy,
5157
5160
  domain: listDataProps?.domain,
5158
5161
  pageLimit,
5159
5162
  groupByList,
5160
5163
  selectedRowKeys,
5161
5164
  setPage,
5162
5165
  setOrder,
5166
+ setOrderGroupBy,
5163
5167
  setDomain,
5164
5168
  setPageLimit,
5165
5169
  setGroupByList,
@@ -6703,9 +6707,11 @@ var tableGroupController = (props) => {
6703
6707
  context,
6704
6708
  checkedAll,
6705
6709
  groupByList,
6706
- setSelectedRowKeys
6710
+ setSelectedRowKeys,
6711
+ limit = 10
6707
6712
  } = props;
6708
6713
  const [pageGroup, setPageGroup] = useState15(0);
6714
+ const [pageLimitGroup, setPageLimitGroup] = useState15(limit);
6709
6715
  const { selectedRowKeys } = useAppSelector(selectList);
6710
6716
  const [isShowGroup, setIsShowGroup] = useState15(false);
6711
6717
  const [colEmptyGroup, setColEmptyGroup] = useState15({
@@ -6715,16 +6721,20 @@ var tableGroupController = (props) => {
6715
6721
  const domain = row?.__domain;
6716
6722
  const processedData = useMemo12(() => {
6717
6723
  const calculateColSpanEmpty = () => {
6718
- const startIndex = columns.findIndex(
6724
+ const startIndex = columns?.filter(
6725
+ (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
6726
+ ).findIndex(
6719
6727
  (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator === "sum"
6720
6728
  );
6721
- const endIndex = columns.findLastIndex(
6729
+ const endIndex = columns?.filter(
6730
+ (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
6731
+ ).findLastIndex(
6722
6732
  (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator !== "sum"
6723
6733
  );
6724
6734
  const fromStart = startIndex === -1 ? columns.length : startIndex;
6725
6735
  const fromEnd = endIndex === -1 ? columns.length : columns.length - 1 - endIndex;
6726
- setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 1 });
6727
- return { fromStart: fromStart + 1, fromEnd: fromEnd + 1 };
6736
+ setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 10 });
6737
+ return { fromStart: fromStart + 1, fromEnd: fromEnd + 10 };
6728
6738
  };
6729
6739
  return calculateColSpanEmpty();
6730
6740
  }, [columns, row]);
@@ -6740,13 +6750,14 @@ var tableGroupController = (props) => {
6740
6750
  offset: pageGroup * 10,
6741
6751
  fields: groupByList?.fields,
6742
6752
  groupby: [groupByList?.contexts[level]?.group_by],
6743
- limit: 10
6753
+ limit: pageLimitGroup
6744
6754
  };
6745
6755
  const queryKey = [
6746
6756
  `data-${model}-level_${level}-row-${row?.id}`,
6747
6757
  specification,
6748
6758
  domain,
6749
- pageGroup
6759
+ pageGroup,
6760
+ pageLimitGroup
6750
6761
  ];
6751
6762
  const {
6752
6763
  data: dataGroup,
@@ -6820,7 +6831,9 @@ var tableGroupController = (props) => {
6820
6831
  dataGroup,
6821
6832
  pageGroup,
6822
6833
  setPageGroup,
6823
- typeTableGroup
6834
+ typeTableGroup,
6835
+ pageLimitGroup,
6836
+ setPageLimitGroup
6824
6837
  };
6825
6838
  };
6826
6839
 
package/dist/widget.d.mts CHANGED
@@ -315,6 +315,8 @@ declare const tableGroupController: (props: any) => {
315
315
  pageGroup: any;
316
316
  setPageGroup: react.Dispatch<any>;
317
317
  typeTableGroup: "list" | "group" | "calendar" | undefined;
318
+ pageLimitGroup: number;
319
+ setPageLimitGroup: react.Dispatch<react.SetStateAction<number>>;
318
320
  };
319
321
 
320
322
  declare const searchController: ({ viewData, model, domain, context, fieldsList, }: {
package/dist/widget.d.ts CHANGED
@@ -315,6 +315,8 @@ declare const tableGroupController: (props: any) => {
315
315
  pageGroup: any;
316
316
  setPageGroup: react.Dispatch<any>;
317
317
  typeTableGroup: "list" | "group" | "calendar" | undefined;
318
+ pageLimitGroup: number;
319
+ setPageLimitGroup: react.Dispatch<react.SetStateAction<number>>;
318
320
  };
319
321
 
320
322
  declare const searchController: ({ viewData, model, domain, context, fieldsList, }: {
package/dist/widget.js CHANGED
@@ -4506,6 +4506,7 @@ var useListData = ({
4506
4506
  const [groupByList, setGroupByList] = (0, import_react15.useState)(null);
4507
4507
  const [domain, setDomain] = (0, import_react15.useState)(null);
4508
4508
  const [order, setOrder] = (0, import_react15.useState)("");
4509
+ const [orderGroupBy, setOrderGroupBy] = (0, import_react15.useState)("");
4509
4510
  const [selectedRowKeys, setSelectedRowKeys] = (0, import_react15.useState)([]);
4510
4511
  const [debouncedPage] = useDebounce(page, 500);
4511
4512
  const [debouncedDomain] = useDebounce(domain, 500);
@@ -4526,6 +4527,7 @@ var useListData = ({
4526
4527
  const sort = order ?? (0, import_utils5.formatSortingString)(
4527
4528
  (mode === "kanban" ? viewData?.views?.kanban : viewData?.views?.list)?.default_order
4528
4529
  ) ?? "";
4530
+ const orderGroupBy2 = groupByList && typeof groupByList === "object" ? (0, import_utils5.formatSortingString)(groupByList?.contexts?.[0]?.order_by) : null;
4529
4531
  return {
4530
4532
  model: action?.res_model,
4531
4533
  specification,
@@ -4536,7 +4538,8 @@ var useListData = ({
4536
4538
  groupby,
4537
4539
  context,
4538
4540
  sort,
4539
- mode
4541
+ mode,
4542
+ orderGroupBy: orderGroupBy2
4540
4543
  };
4541
4544
  }, [
4542
4545
  action,
@@ -4546,7 +4549,8 @@ var useListData = ({
4546
4549
  pageLimit,
4547
4550
  debouncedDomain,
4548
4551
  context,
4549
- model
4552
+ model,
4553
+ orderGroupBy
4550
4554
  ]);
4551
4555
  const list = useGetListData2(
4552
4556
  { ...listDataProps },
@@ -4558,7 +4562,8 @@ var useListData = ({
4558
4562
  listDataProps?.sort,
4559
4563
  listDataProps?.context,
4560
4564
  listDataProps?.specification,
4561
- listDataProps?.mode
4565
+ listDataProps?.mode,
4566
+ listDataProps?.orderGroupBy
4562
4567
  ],
4563
4568
  !!listDataProps && !!specification && !(0, import_utils5.isObjectEmpty)(specification) && !!domain,
4564
4569
  service,
@@ -4570,12 +4575,14 @@ var useListData = ({
4570
4575
  specification,
4571
4576
  page,
4572
4577
  order,
4578
+ orderGroupBy,
4573
4579
  domain: listDataProps?.domain,
4574
4580
  pageLimit,
4575
4581
  groupByList,
4576
4582
  selectedRowKeys,
4577
4583
  setPage,
4578
4584
  setOrder,
4585
+ setOrderGroupBy,
4579
4586
  setDomain,
4580
4587
  setPageLimit,
4581
4588
  setGroupByList,
@@ -5826,9 +5833,11 @@ var tableGroupController = (props) => {
5826
5833
  context,
5827
5834
  checkedAll,
5828
5835
  groupByList,
5829
- setSelectedRowKeys
5836
+ setSelectedRowKeys,
5837
+ limit = 10
5830
5838
  } = props;
5831
5839
  const [pageGroup, setPageGroup] = (0, import_react26.useState)(0);
5840
+ const [pageLimitGroup, setPageLimitGroup] = (0, import_react26.useState)(limit);
5832
5841
  const { selectedRowKeys } = (0, import_store.useAppSelector)(import_store.selectList);
5833
5842
  const [isShowGroup, setIsShowGroup] = (0, import_react26.useState)(false);
5834
5843
  const [colEmptyGroup, setColEmptyGroup] = (0, import_react26.useState)({
@@ -5838,16 +5847,20 @@ var tableGroupController = (props) => {
5838
5847
  const domain = row?.__domain;
5839
5848
  const processedData = (0, import_react26.useMemo)(() => {
5840
5849
  const calculateColSpanEmpty = () => {
5841
- const startIndex = columns.findIndex(
5850
+ const startIndex = columns?.filter(
5851
+ (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
5852
+ ).findIndex(
5842
5853
  (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator === "sum"
5843
5854
  );
5844
- const endIndex = columns.findLastIndex(
5855
+ const endIndex = columns?.filter(
5856
+ (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
5857
+ ).findLastIndex(
5845
5858
  (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator !== "sum"
5846
5859
  );
5847
5860
  const fromStart = startIndex === -1 ? columns.length : startIndex;
5848
5861
  const fromEnd = endIndex === -1 ? columns.length : columns.length - 1 - endIndex;
5849
- setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 1 });
5850
- return { fromStart: fromStart + 1, fromEnd: fromEnd + 1 };
5862
+ setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 10 });
5863
+ return { fromStart: fromStart + 1, fromEnd: fromEnd + 10 };
5851
5864
  };
5852
5865
  return calculateColSpanEmpty();
5853
5866
  }, [columns, row]);
@@ -5863,13 +5876,14 @@ var tableGroupController = (props) => {
5863
5876
  offset: pageGroup * 10,
5864
5877
  fields: groupByList?.fields,
5865
5878
  groupby: [groupByList?.contexts[level]?.group_by],
5866
- limit: 10
5879
+ limit: pageLimitGroup
5867
5880
  };
5868
5881
  const queryKey = [
5869
5882
  `data-${model}-level_${level}-row-${row?.id}`,
5870
5883
  specification,
5871
5884
  domain,
5872
- pageGroup
5885
+ pageGroup,
5886
+ pageLimitGroup
5873
5887
  ];
5874
5888
  const {
5875
5889
  data: dataGroup,
@@ -5943,7 +5957,9 @@ var tableGroupController = (props) => {
5943
5957
  dataGroup,
5944
5958
  pageGroup,
5945
5959
  setPageGroup,
5946
- typeTableGroup
5960
+ typeTableGroup,
5961
+ pageLimitGroup,
5962
+ setPageLimitGroup
5947
5963
  };
5948
5964
  };
5949
5965
 
package/dist/widget.mjs CHANGED
@@ -4577,6 +4577,7 @@ var useListData = ({
4577
4577
  const [groupByList, setGroupByList] = useState6(null);
4578
4578
  const [domain, setDomain] = useState6(null);
4579
4579
  const [order, setOrder] = useState6("");
4580
+ const [orderGroupBy, setOrderGroupBy] = useState6("");
4580
4581
  const [selectedRowKeys, setSelectedRowKeys] = useState6([]);
4581
4582
  const [debouncedPage] = useDebounce(page, 500);
4582
4583
  const [debouncedDomain] = useDebounce(domain, 500);
@@ -4597,6 +4598,7 @@ var useListData = ({
4597
4598
  const sort = order ?? formatSortingString(
4598
4599
  (mode === "kanban" ? viewData?.views?.kanban : viewData?.views?.list)?.default_order
4599
4600
  ) ?? "";
4601
+ const orderGroupBy2 = groupByList && typeof groupByList === "object" ? formatSortingString(groupByList?.contexts?.[0]?.order_by) : null;
4600
4602
  return {
4601
4603
  model: action?.res_model,
4602
4604
  specification,
@@ -4607,7 +4609,8 @@ var useListData = ({
4607
4609
  groupby,
4608
4610
  context,
4609
4611
  sort,
4610
- mode
4612
+ mode,
4613
+ orderGroupBy: orderGroupBy2
4611
4614
  };
4612
4615
  }, [
4613
4616
  action,
@@ -4617,7 +4620,8 @@ var useListData = ({
4617
4620
  pageLimit,
4618
4621
  debouncedDomain,
4619
4622
  context,
4620
- model
4623
+ model,
4624
+ orderGroupBy
4621
4625
  ]);
4622
4626
  const list = useGetListData2(
4623
4627
  { ...listDataProps },
@@ -4629,7 +4633,8 @@ var useListData = ({
4629
4633
  listDataProps?.sort,
4630
4634
  listDataProps?.context,
4631
4635
  listDataProps?.specification,
4632
- listDataProps?.mode
4636
+ listDataProps?.mode,
4637
+ listDataProps?.orderGroupBy
4633
4638
  ],
4634
4639
  !!listDataProps && !!specification && !isObjectEmpty4(specification) && !!domain,
4635
4640
  service,
@@ -4641,12 +4646,14 @@ var useListData = ({
4641
4646
  specification,
4642
4647
  page,
4643
4648
  order,
4649
+ orderGroupBy,
4644
4650
  domain: listDataProps?.domain,
4645
4651
  pageLimit,
4646
4652
  groupByList,
4647
4653
  selectedRowKeys,
4648
4654
  setPage,
4649
4655
  setOrder,
4656
+ setOrderGroupBy,
4650
4657
  setDomain,
4651
4658
  setPageLimit,
4652
4659
  setGroupByList,
@@ -5897,9 +5904,11 @@ var tableGroupController = (props) => {
5897
5904
  context,
5898
5905
  checkedAll,
5899
5906
  groupByList,
5900
- setSelectedRowKeys
5907
+ setSelectedRowKeys,
5908
+ limit = 10
5901
5909
  } = props;
5902
5910
  const [pageGroup, setPageGroup] = useState15(0);
5911
+ const [pageLimitGroup, setPageLimitGroup] = useState15(limit);
5903
5912
  const { selectedRowKeys } = useAppSelector(selectList);
5904
5913
  const [isShowGroup, setIsShowGroup] = useState15(false);
5905
5914
  const [colEmptyGroup, setColEmptyGroup] = useState15({
@@ -5909,16 +5918,20 @@ var tableGroupController = (props) => {
5909
5918
  const domain = row?.__domain;
5910
5919
  const processedData = useMemo12(() => {
5911
5920
  const calculateColSpanEmpty = () => {
5912
- const startIndex = columns.findIndex(
5921
+ const startIndex = columns?.filter(
5922
+ (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
5923
+ ).findIndex(
5913
5924
  (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator === "sum"
5914
5925
  );
5915
- const endIndex = columns.findLastIndex(
5926
+ const endIndex = columns?.filter(
5927
+ (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
5928
+ ).findLastIndex(
5916
5929
  (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator !== "sum"
5917
5930
  );
5918
5931
  const fromStart = startIndex === -1 ? columns.length : startIndex;
5919
5932
  const fromEnd = endIndex === -1 ? columns.length : columns.length - 1 - endIndex;
5920
- setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 1 });
5921
- return { fromStart: fromStart + 1, fromEnd: fromEnd + 1 };
5933
+ setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 10 });
5934
+ return { fromStart: fromStart + 1, fromEnd: fromEnd + 10 };
5922
5935
  };
5923
5936
  return calculateColSpanEmpty();
5924
5937
  }, [columns, row]);
@@ -5934,13 +5947,14 @@ var tableGroupController = (props) => {
5934
5947
  offset: pageGroup * 10,
5935
5948
  fields: groupByList?.fields,
5936
5949
  groupby: [groupByList?.contexts[level]?.group_by],
5937
- limit: 10
5950
+ limit: pageLimitGroup
5938
5951
  };
5939
5952
  const queryKey = [
5940
5953
  `data-${model}-level_${level}-row-${row?.id}`,
5941
5954
  specification,
5942
5955
  domain,
5943
- pageGroup
5956
+ pageGroup,
5957
+ pageLimitGroup
5944
5958
  ];
5945
5959
  const {
5946
5960
  data: dataGroup,
@@ -6014,7 +6028,9 @@ var tableGroupController = (props) => {
6014
6028
  dataGroup,
6015
6029
  pageGroup,
6016
6030
  setPageGroup,
6017
- typeTableGroup
6031
+ typeTableGroup,
6032
+ pageLimitGroup,
6033
+ setPageLimitGroup
6018
6034
  };
6019
6035
  };
6020
6036
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fctc/widget-logic",
3
- "version": "6.1.6",
3
+ "version": "6.1.8",
4
4
  "types": "dist/index.d.ts",
5
5
  "main": "dist/index.cjs",
6
6
  "module": "dist/index.mjs",
@@ -74,7 +74,7 @@
74
74
  "test": "jest"
75
75
  },
76
76
  "dependencies": {
77
- "@fctc/interface-logic": "^5.4.9",
77
+ "@fctc/interface-logic": "^5.5.1",
78
78
  "@tanstack/react-query": "^5.84.0",
79
79
  "i18next": "^25.3.2",
80
80
  "i18next-browser-languagedetector": "^8.2.0",