@indigina/ui-kit 1.1.361 → 1.1.363
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.
|
@@ -7269,7 +7269,7 @@ const kitFetchGridData = ({ store, destroyRef, isLoading, fetchAction, fetchFrom
|
|
|
7269
7269
|
const action = isSearchMode && fetchFromIndexAction({ ...gridState, searchTerm }) || fetchAction(gridState);
|
|
7270
7270
|
store.dispatch(action).pipe(takeUntilDestroyed(destroyRef)).subscribe(() => isLoading.set(false));
|
|
7271
7271
|
};
|
|
7272
|
-
const kitFetchExportGridData = ({ fetchAction, fetchIndexAction,
|
|
7272
|
+
const kitFetchExportGridData = ({ fetchAction, fetchIndexAction, sort, filter, search, columns, total = 500, }) => {
|
|
7273
7273
|
if (search) {
|
|
7274
7274
|
const searchTerm = kitFormatStringForSearch(search);
|
|
7275
7275
|
return fetchIndexAction(0, total, kitBuildSortString(sort, columns), kitBuildOdataFilter(kitBuildFilters(filter)), searchTerm);
|
|
@@ -10047,6 +10047,9 @@ class KitTranslateLoader {
|
|
|
10047
10047
|
this.http = http;
|
|
10048
10048
|
this.defaultPathPerfix = defaultPathPerfix;
|
|
10049
10049
|
this.overridePathPrefix = overridePathPrefix;
|
|
10050
|
+
this.isTranslationObject = (value) => {
|
|
10051
|
+
return Boolean(value && typeof value === 'object' && !Array.isArray(value));
|
|
10052
|
+
};
|
|
10050
10053
|
}
|
|
10051
10054
|
getTranslation(lang) {
|
|
10052
10055
|
const timestamp = new Date().getTime();
|
|
@@ -10063,9 +10066,7 @@ class KitTranslateLoader {
|
|
|
10063
10066
|
}
|
|
10064
10067
|
const result = { ...target };
|
|
10065
10068
|
for (const key of Object.keys(source)) {
|
|
10066
|
-
if (source[key] &&
|
|
10067
|
-
typeof source[key] === 'object' &&
|
|
10068
|
-
!Array.isArray(source[key])) {
|
|
10069
|
+
if (this.isTranslationObject(source[key]) && this.isTranslationObject(result[key])) {
|
|
10069
10070
|
result[key] = this.deepMerge(result[key] ?? {}, source[key]);
|
|
10070
10071
|
}
|
|
10071
10072
|
else {
|