@fctc/widget-logic 6.0.10 → 6.1.1
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.
- package/dist/hooks.d.mts +12 -0
- package/dist/hooks.d.ts +12 -0
- package/dist/hooks.js +10 -3
- package/dist/hooks.mjs +10 -3
- package/dist/index.js +21 -9
- package/dist/index.mjs +21 -9
- package/dist/widget.d.mts +2 -0
- package/dist/widget.d.ts +2 -0
- package/dist/widget.js +21 -9
- package/dist/widget.mjs +21 -9
- 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
|
@@ -902,6 +902,7 @@ var useListData = ({
|
|
|
902
902
|
const [groupByList, setGroupByList] = (0, import_react14.useState)(null);
|
|
903
903
|
const [domain, setDomain] = (0, import_react14.useState)(null);
|
|
904
904
|
const [order, setOrder] = (0, import_react14.useState)("");
|
|
905
|
+
const [orderGroupBy, setOrderGroupBy] = (0, import_react14.useState)("");
|
|
905
906
|
const [selectedRowKeys, setSelectedRowKeys] = (0, import_react14.useState)([]);
|
|
906
907
|
const [debouncedPage] = useDebounce(page, 500);
|
|
907
908
|
const [debouncedDomain] = useDebounce(domain, 500);
|
|
@@ -922,6 +923,7 @@ var useListData = ({
|
|
|
922
923
|
const sort = order ?? (0, import_utils5.formatSortingString)(
|
|
923
924
|
(mode === "kanban" ? viewData?.views?.kanban : viewData?.views?.list)?.default_order
|
|
924
925
|
) ?? "";
|
|
926
|
+
const orderGroupBy2 = groupByList && typeof groupByList === "object" ? (0, import_utils5.formatSortingString)(groupByList?.contexts?.[0]?.order_by) : null;
|
|
925
927
|
return {
|
|
926
928
|
model: action?.res_model,
|
|
927
929
|
specification,
|
|
@@ -932,7 +934,8 @@ var useListData = ({
|
|
|
932
934
|
groupby,
|
|
933
935
|
context,
|
|
934
936
|
sort,
|
|
935
|
-
mode
|
|
937
|
+
mode,
|
|
938
|
+
orderGroupBy: orderGroupBy2
|
|
936
939
|
};
|
|
937
940
|
}, [
|
|
938
941
|
action,
|
|
@@ -942,7 +945,8 @@ var useListData = ({
|
|
|
942
945
|
pageLimit,
|
|
943
946
|
debouncedDomain,
|
|
944
947
|
context,
|
|
945
|
-
model
|
|
948
|
+
model,
|
|
949
|
+
orderGroupBy
|
|
946
950
|
]);
|
|
947
951
|
const list = useGetListData2(
|
|
948
952
|
{ ...listDataProps },
|
|
@@ -954,7 +958,8 @@ var useListData = ({
|
|
|
954
958
|
listDataProps?.sort,
|
|
955
959
|
listDataProps?.context,
|
|
956
960
|
listDataProps?.specification,
|
|
957
|
-
listDataProps?.mode
|
|
961
|
+
listDataProps?.mode,
|
|
962
|
+
listDataProps?.orderGroupBy
|
|
958
963
|
],
|
|
959
964
|
!!listDataProps && !!specification && !(0, import_utils5.isObjectEmpty)(specification) && !!domain,
|
|
960
965
|
service,
|
|
@@ -966,12 +971,14 @@ var useListData = ({
|
|
|
966
971
|
specification,
|
|
967
972
|
page,
|
|
968
973
|
order,
|
|
974
|
+
orderGroupBy,
|
|
969
975
|
domain: listDataProps?.domain,
|
|
970
976
|
pageLimit,
|
|
971
977
|
groupByList,
|
|
972
978
|
selectedRowKeys,
|
|
973
979
|
setPage,
|
|
974
980
|
setOrder,
|
|
981
|
+
setOrderGroupBy,
|
|
975
982
|
setDomain,
|
|
976
983
|
setPageLimit,
|
|
977
984
|
setGroupByList,
|
package/dist/hooks.mjs
CHANGED
|
@@ -887,6 +887,7 @@ var useListData = ({
|
|
|
887
887
|
const [groupByList, setGroupByList] = useState5(null);
|
|
888
888
|
const [domain, setDomain] = useState5(null);
|
|
889
889
|
const [order, setOrder] = useState5("");
|
|
890
|
+
const [orderGroupBy, setOrderGroupBy] = useState5("");
|
|
890
891
|
const [selectedRowKeys, setSelectedRowKeys] = useState5([]);
|
|
891
892
|
const [debouncedPage] = useDebounce(page, 500);
|
|
892
893
|
const [debouncedDomain] = useDebounce(domain, 500);
|
|
@@ -907,6 +908,7 @@ var useListData = ({
|
|
|
907
908
|
const sort = order ?? formatSortingString(
|
|
908
909
|
(mode === "kanban" ? viewData?.views?.kanban : viewData?.views?.list)?.default_order
|
|
909
910
|
) ?? "";
|
|
911
|
+
const orderGroupBy2 = groupByList && typeof groupByList === "object" ? formatSortingString(groupByList?.contexts?.[0]?.order_by) : null;
|
|
910
912
|
return {
|
|
911
913
|
model: action?.res_model,
|
|
912
914
|
specification,
|
|
@@ -917,7 +919,8 @@ var useListData = ({
|
|
|
917
919
|
groupby,
|
|
918
920
|
context,
|
|
919
921
|
sort,
|
|
920
|
-
mode
|
|
922
|
+
mode,
|
|
923
|
+
orderGroupBy: orderGroupBy2
|
|
921
924
|
};
|
|
922
925
|
}, [
|
|
923
926
|
action,
|
|
@@ -927,7 +930,8 @@ var useListData = ({
|
|
|
927
930
|
pageLimit,
|
|
928
931
|
debouncedDomain,
|
|
929
932
|
context,
|
|
930
|
-
model
|
|
933
|
+
model,
|
|
934
|
+
orderGroupBy
|
|
931
935
|
]);
|
|
932
936
|
const list = useGetListData2(
|
|
933
937
|
{ ...listDataProps },
|
|
@@ -939,7 +943,8 @@ var useListData = ({
|
|
|
939
943
|
listDataProps?.sort,
|
|
940
944
|
listDataProps?.context,
|
|
941
945
|
listDataProps?.specification,
|
|
942
|
-
listDataProps?.mode
|
|
946
|
+
listDataProps?.mode,
|
|
947
|
+
listDataProps?.orderGroupBy
|
|
943
948
|
],
|
|
944
949
|
!!listDataProps && !!specification && !isObjectEmpty4(specification) && !!domain,
|
|
945
950
|
service,
|
|
@@ -951,12 +956,14 @@ var useListData = ({
|
|
|
951
956
|
specification,
|
|
952
957
|
page,
|
|
953
958
|
order,
|
|
959
|
+
orderGroupBy,
|
|
954
960
|
domain: listDataProps?.domain,
|
|
955
961
|
pageLimit,
|
|
956
962
|
groupByList,
|
|
957
963
|
selectedRowKeys,
|
|
958
964
|
setPage,
|
|
959
965
|
setOrder,
|
|
966
|
+
setOrderGroupBy,
|
|
960
967
|
setDomain,
|
|
961
968
|
setPageLimit,
|
|
962
969
|
setGroupByList,
|
package/dist/index.js
CHANGED
|
@@ -4976,6 +4976,7 @@ var useListData = ({
|
|
|
4976
4976
|
const [groupByList, setGroupByList] = (0, import_react14.useState)(null);
|
|
4977
4977
|
const [domain, setDomain] = (0, import_react14.useState)(null);
|
|
4978
4978
|
const [order, setOrder] = (0, import_react14.useState)("");
|
|
4979
|
+
const [orderGroupBy, setOrderGroupBy] = (0, import_react14.useState)("");
|
|
4979
4980
|
const [selectedRowKeys, setSelectedRowKeys] = (0, import_react14.useState)([]);
|
|
4980
4981
|
const [debouncedPage] = useDebounce(page, 500);
|
|
4981
4982
|
const [debouncedDomain] = useDebounce(domain, 500);
|
|
@@ -4996,6 +4997,7 @@ var useListData = ({
|
|
|
4996
4997
|
const sort = order ?? (0, import_utils5.formatSortingString)(
|
|
4997
4998
|
(mode === "kanban" ? viewData?.views?.kanban : viewData?.views?.list)?.default_order
|
|
4998
4999
|
) ?? "";
|
|
5000
|
+
const orderGroupBy2 = groupByList && typeof groupByList === "object" ? (0, import_utils5.formatSortingString)(groupByList?.contexts?.[0]?.order_by) : null;
|
|
4999
5001
|
return {
|
|
5000
5002
|
model: action?.res_model,
|
|
5001
5003
|
specification,
|
|
@@ -5006,7 +5008,8 @@ var useListData = ({
|
|
|
5006
5008
|
groupby,
|
|
5007
5009
|
context,
|
|
5008
5010
|
sort,
|
|
5009
|
-
mode
|
|
5011
|
+
mode,
|
|
5012
|
+
orderGroupBy: orderGroupBy2
|
|
5010
5013
|
};
|
|
5011
5014
|
}, [
|
|
5012
5015
|
action,
|
|
@@ -5016,7 +5019,8 @@ var useListData = ({
|
|
|
5016
5019
|
pageLimit,
|
|
5017
5020
|
debouncedDomain,
|
|
5018
5021
|
context,
|
|
5019
|
-
model
|
|
5022
|
+
model,
|
|
5023
|
+
orderGroupBy
|
|
5020
5024
|
]);
|
|
5021
5025
|
const list = useGetListData2(
|
|
5022
5026
|
{ ...listDataProps },
|
|
@@ -5028,7 +5032,8 @@ var useListData = ({
|
|
|
5028
5032
|
listDataProps?.sort,
|
|
5029
5033
|
listDataProps?.context,
|
|
5030
5034
|
listDataProps?.specification,
|
|
5031
|
-
listDataProps?.mode
|
|
5035
|
+
listDataProps?.mode,
|
|
5036
|
+
listDataProps?.orderGroupBy
|
|
5032
5037
|
],
|
|
5033
5038
|
!!listDataProps && !!specification && !(0, import_utils5.isObjectEmpty)(specification) && !!domain,
|
|
5034
5039
|
service,
|
|
@@ -5040,12 +5045,14 @@ var useListData = ({
|
|
|
5040
5045
|
specification,
|
|
5041
5046
|
page,
|
|
5042
5047
|
order,
|
|
5048
|
+
orderGroupBy,
|
|
5043
5049
|
domain: listDataProps?.domain,
|
|
5044
5050
|
pageLimit,
|
|
5045
5051
|
groupByList,
|
|
5046
5052
|
selectedRowKeys,
|
|
5047
5053
|
setPage,
|
|
5048
5054
|
setOrder,
|
|
5055
|
+
setOrderGroupBy,
|
|
5049
5056
|
setDomain,
|
|
5050
5057
|
setPageLimit,
|
|
5051
5058
|
setGroupByList,
|
|
@@ -6588,9 +6595,11 @@ var tableGroupController = (props) => {
|
|
|
6588
6595
|
context,
|
|
6589
6596
|
checkedAll,
|
|
6590
6597
|
groupByList,
|
|
6591
|
-
setSelectedRowKeys
|
|
6598
|
+
setSelectedRowKeys,
|
|
6599
|
+
limit = 10
|
|
6592
6600
|
} = props;
|
|
6593
6601
|
const [pageGroup, setPageGroup] = (0, import_react26.useState)(0);
|
|
6602
|
+
const [pageLimitGroup, setPageLimitGroup] = (0, import_react26.useState)(limit);
|
|
6594
6603
|
const { selectedRowKeys } = (0, import_store.useAppSelector)(import_store.selectList);
|
|
6595
6604
|
const [isShowGroup, setIsShowGroup] = (0, import_react26.useState)(false);
|
|
6596
6605
|
const [colEmptyGroup, setColEmptyGroup] = (0, import_react26.useState)({
|
|
@@ -6608,8 +6617,8 @@ var tableGroupController = (props) => {
|
|
|
6608
6617
|
);
|
|
6609
6618
|
const fromStart = startIndex === -1 ? columns.length : startIndex;
|
|
6610
6619
|
const fromEnd = endIndex === -1 ? columns.length : columns.length - 1 - endIndex;
|
|
6611
|
-
setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd +
|
|
6612
|
-
return { fromStart: fromStart + 1, fromEnd: fromEnd +
|
|
6620
|
+
setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 10 });
|
|
6621
|
+
return { fromStart: fromStart + 1, fromEnd: fromEnd + 10 };
|
|
6613
6622
|
};
|
|
6614
6623
|
return calculateColSpanEmpty();
|
|
6615
6624
|
}, [columns, row]);
|
|
@@ -6625,13 +6634,14 @@ var tableGroupController = (props) => {
|
|
|
6625
6634
|
offset: pageGroup * 10,
|
|
6626
6635
|
fields: groupByList?.fields,
|
|
6627
6636
|
groupby: [groupByList?.contexts[level]?.group_by],
|
|
6628
|
-
limit:
|
|
6637
|
+
limit: pageLimitGroup
|
|
6629
6638
|
};
|
|
6630
6639
|
const queryKey = [
|
|
6631
6640
|
`data-${model}-level_${level}-row-${row?.id}`,
|
|
6632
6641
|
specification,
|
|
6633
6642
|
domain,
|
|
6634
|
-
pageGroup
|
|
6643
|
+
pageGroup,
|
|
6644
|
+
pageLimitGroup
|
|
6635
6645
|
];
|
|
6636
6646
|
const {
|
|
6637
6647
|
data: dataGroup,
|
|
@@ -6705,7 +6715,9 @@ var tableGroupController = (props) => {
|
|
|
6705
6715
|
dataGroup,
|
|
6706
6716
|
pageGroup,
|
|
6707
6717
|
setPageGroup,
|
|
6708
|
-
typeTableGroup
|
|
6718
|
+
typeTableGroup,
|
|
6719
|
+
pageLimitGroup,
|
|
6720
|
+
setPageLimitGroup
|
|
6709
6721
|
};
|
|
6710
6722
|
};
|
|
6711
6723
|
|
package/dist/index.mjs
CHANGED
|
@@ -5070,6 +5070,7 @@ var useListData = ({
|
|
|
5070
5070
|
const [groupByList, setGroupByList] = useState5(null);
|
|
5071
5071
|
const [domain, setDomain] = useState5(null);
|
|
5072
5072
|
const [order, setOrder] = useState5("");
|
|
5073
|
+
const [orderGroupBy, setOrderGroupBy] = useState5("");
|
|
5073
5074
|
const [selectedRowKeys, setSelectedRowKeys] = useState5([]);
|
|
5074
5075
|
const [debouncedPage] = useDebounce(page, 500);
|
|
5075
5076
|
const [debouncedDomain] = useDebounce(domain, 500);
|
|
@@ -5090,6 +5091,7 @@ var useListData = ({
|
|
|
5090
5091
|
const sort = order ?? formatSortingString(
|
|
5091
5092
|
(mode === "kanban" ? viewData?.views?.kanban : viewData?.views?.list)?.default_order
|
|
5092
5093
|
) ?? "";
|
|
5094
|
+
const orderGroupBy2 = groupByList && typeof groupByList === "object" ? formatSortingString(groupByList?.contexts?.[0]?.order_by) : null;
|
|
5093
5095
|
return {
|
|
5094
5096
|
model: action?.res_model,
|
|
5095
5097
|
specification,
|
|
@@ -5100,7 +5102,8 @@ var useListData = ({
|
|
|
5100
5102
|
groupby,
|
|
5101
5103
|
context,
|
|
5102
5104
|
sort,
|
|
5103
|
-
mode
|
|
5105
|
+
mode,
|
|
5106
|
+
orderGroupBy: orderGroupBy2
|
|
5104
5107
|
};
|
|
5105
5108
|
}, [
|
|
5106
5109
|
action,
|
|
@@ -5110,7 +5113,8 @@ var useListData = ({
|
|
|
5110
5113
|
pageLimit,
|
|
5111
5114
|
debouncedDomain,
|
|
5112
5115
|
context,
|
|
5113
|
-
model
|
|
5116
|
+
model,
|
|
5117
|
+
orderGroupBy
|
|
5114
5118
|
]);
|
|
5115
5119
|
const list = useGetListData2(
|
|
5116
5120
|
{ ...listDataProps },
|
|
@@ -5122,7 +5126,8 @@ var useListData = ({
|
|
|
5122
5126
|
listDataProps?.sort,
|
|
5123
5127
|
listDataProps?.context,
|
|
5124
5128
|
listDataProps?.specification,
|
|
5125
|
-
listDataProps?.mode
|
|
5129
|
+
listDataProps?.mode,
|
|
5130
|
+
listDataProps?.orderGroupBy
|
|
5126
5131
|
],
|
|
5127
5132
|
!!listDataProps && !!specification && !isObjectEmpty4(specification) && !!domain,
|
|
5128
5133
|
service,
|
|
@@ -5134,12 +5139,14 @@ var useListData = ({
|
|
|
5134
5139
|
specification,
|
|
5135
5140
|
page,
|
|
5136
5141
|
order,
|
|
5142
|
+
orderGroupBy,
|
|
5137
5143
|
domain: listDataProps?.domain,
|
|
5138
5144
|
pageLimit,
|
|
5139
5145
|
groupByList,
|
|
5140
5146
|
selectedRowKeys,
|
|
5141
5147
|
setPage,
|
|
5142
5148
|
setOrder,
|
|
5149
|
+
setOrderGroupBy,
|
|
5143
5150
|
setDomain,
|
|
5144
5151
|
setPageLimit,
|
|
5145
5152
|
setGroupByList,
|
|
@@ -6683,9 +6690,11 @@ var tableGroupController = (props) => {
|
|
|
6683
6690
|
context,
|
|
6684
6691
|
checkedAll,
|
|
6685
6692
|
groupByList,
|
|
6686
|
-
setSelectedRowKeys
|
|
6693
|
+
setSelectedRowKeys,
|
|
6694
|
+
limit = 10
|
|
6687
6695
|
} = props;
|
|
6688
6696
|
const [pageGroup, setPageGroup] = useState15(0);
|
|
6697
|
+
const [pageLimitGroup, setPageLimitGroup] = useState15(limit);
|
|
6689
6698
|
const { selectedRowKeys } = useAppSelector(selectList);
|
|
6690
6699
|
const [isShowGroup, setIsShowGroup] = useState15(false);
|
|
6691
6700
|
const [colEmptyGroup, setColEmptyGroup] = useState15({
|
|
@@ -6703,8 +6712,8 @@ var tableGroupController = (props) => {
|
|
|
6703
6712
|
);
|
|
6704
6713
|
const fromStart = startIndex === -1 ? columns.length : startIndex;
|
|
6705
6714
|
const fromEnd = endIndex === -1 ? columns.length : columns.length - 1 - endIndex;
|
|
6706
|
-
setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd +
|
|
6707
|
-
return { fromStart: fromStart + 1, fromEnd: fromEnd +
|
|
6715
|
+
setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 10 });
|
|
6716
|
+
return { fromStart: fromStart + 1, fromEnd: fromEnd + 10 };
|
|
6708
6717
|
};
|
|
6709
6718
|
return calculateColSpanEmpty();
|
|
6710
6719
|
}, [columns, row]);
|
|
@@ -6720,13 +6729,14 @@ var tableGroupController = (props) => {
|
|
|
6720
6729
|
offset: pageGroup * 10,
|
|
6721
6730
|
fields: groupByList?.fields,
|
|
6722
6731
|
groupby: [groupByList?.contexts[level]?.group_by],
|
|
6723
|
-
limit:
|
|
6732
|
+
limit: pageLimitGroup
|
|
6724
6733
|
};
|
|
6725
6734
|
const queryKey = [
|
|
6726
6735
|
`data-${model}-level_${level}-row-${row?.id}`,
|
|
6727
6736
|
specification,
|
|
6728
6737
|
domain,
|
|
6729
|
-
pageGroup
|
|
6738
|
+
pageGroup,
|
|
6739
|
+
pageLimitGroup
|
|
6730
6740
|
];
|
|
6731
6741
|
const {
|
|
6732
6742
|
data: dataGroup,
|
|
@@ -6800,7 +6810,9 @@ var tableGroupController = (props) => {
|
|
|
6800
6810
|
dataGroup,
|
|
6801
6811
|
pageGroup,
|
|
6802
6812
|
setPageGroup,
|
|
6803
|
-
typeTableGroup
|
|
6813
|
+
typeTableGroup,
|
|
6814
|
+
pageLimitGroup,
|
|
6815
|
+
setPageLimitGroup
|
|
6804
6816
|
};
|
|
6805
6817
|
};
|
|
6806
6818
|
|
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)({
|
|
@@ -5846,8 +5855,8 @@ var tableGroupController = (props) => {
|
|
|
5846
5855
|
);
|
|
5847
5856
|
const fromStart = startIndex === -1 ? columns.length : startIndex;
|
|
5848
5857
|
const fromEnd = endIndex === -1 ? columns.length : columns.length - 1 - endIndex;
|
|
5849
|
-
setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd +
|
|
5850
|
-
return { fromStart: fromStart + 1, fromEnd: fromEnd +
|
|
5858
|
+
setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 10 });
|
|
5859
|
+
return { fromStart: fromStart + 1, fromEnd: fromEnd + 10 };
|
|
5851
5860
|
};
|
|
5852
5861
|
return calculateColSpanEmpty();
|
|
5853
5862
|
}, [columns, row]);
|
|
@@ -5863,13 +5872,14 @@ var tableGroupController = (props) => {
|
|
|
5863
5872
|
offset: pageGroup * 10,
|
|
5864
5873
|
fields: groupByList?.fields,
|
|
5865
5874
|
groupby: [groupByList?.contexts[level]?.group_by],
|
|
5866
|
-
limit:
|
|
5875
|
+
limit: pageLimitGroup
|
|
5867
5876
|
};
|
|
5868
5877
|
const queryKey = [
|
|
5869
5878
|
`data-${model}-level_${level}-row-${row?.id}`,
|
|
5870
5879
|
specification,
|
|
5871
5880
|
domain,
|
|
5872
|
-
pageGroup
|
|
5881
|
+
pageGroup,
|
|
5882
|
+
pageLimitGroup
|
|
5873
5883
|
];
|
|
5874
5884
|
const {
|
|
5875
5885
|
data: dataGroup,
|
|
@@ -5943,7 +5953,9 @@ var tableGroupController = (props) => {
|
|
|
5943
5953
|
dataGroup,
|
|
5944
5954
|
pageGroup,
|
|
5945
5955
|
setPageGroup,
|
|
5946
|
-
typeTableGroup
|
|
5956
|
+
typeTableGroup,
|
|
5957
|
+
pageLimitGroup,
|
|
5958
|
+
setPageLimitGroup
|
|
5947
5959
|
};
|
|
5948
5960
|
};
|
|
5949
5961
|
|
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({
|
|
@@ -5917,8 +5926,8 @@ var tableGroupController = (props) => {
|
|
|
5917
5926
|
);
|
|
5918
5927
|
const fromStart = startIndex === -1 ? columns.length : startIndex;
|
|
5919
5928
|
const fromEnd = endIndex === -1 ? columns.length : columns.length - 1 - endIndex;
|
|
5920
|
-
setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd +
|
|
5921
|
-
return { fromStart: fromStart + 1, fromEnd: fromEnd +
|
|
5929
|
+
setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 10 });
|
|
5930
|
+
return { fromStart: fromStart + 1, fromEnd: fromEnd + 10 };
|
|
5922
5931
|
};
|
|
5923
5932
|
return calculateColSpanEmpty();
|
|
5924
5933
|
}, [columns, row]);
|
|
@@ -5934,13 +5943,14 @@ var tableGroupController = (props) => {
|
|
|
5934
5943
|
offset: pageGroup * 10,
|
|
5935
5944
|
fields: groupByList?.fields,
|
|
5936
5945
|
groupby: [groupByList?.contexts[level]?.group_by],
|
|
5937
|
-
limit:
|
|
5946
|
+
limit: pageLimitGroup
|
|
5938
5947
|
};
|
|
5939
5948
|
const queryKey = [
|
|
5940
5949
|
`data-${model}-level_${level}-row-${row?.id}`,
|
|
5941
5950
|
specification,
|
|
5942
5951
|
domain,
|
|
5943
|
-
pageGroup
|
|
5952
|
+
pageGroup,
|
|
5953
|
+
pageLimitGroup
|
|
5944
5954
|
];
|
|
5945
5955
|
const {
|
|
5946
5956
|
data: dataGroup,
|
|
@@ -6014,7 +6024,9 @@ var tableGroupController = (props) => {
|
|
|
6014
6024
|
dataGroup,
|
|
6015
6025
|
pageGroup,
|
|
6016
6026
|
setPageGroup,
|
|
6017
|
-
typeTableGroup
|
|
6027
|
+
typeTableGroup,
|
|
6028
|
+
pageLimitGroup,
|
|
6029
|
+
setPageLimitGroup
|
|
6018
6030
|
};
|
|
6019
6031
|
};
|
|
6020
6032
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fctc/widget-logic",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.1.1",
|
|
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.5.
|
|
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",
|