@sankhyalabs/sankhyablocks 0.0.0-bugfix-dev-KB-131882.1 → 0.0.0-bugfix-dev-KB-131882.2
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/cjs/{SnkMultiSelectionListDataSource-a891430e.js → SnkMultiSelectionListDataSource-f53b60c4.js} +1 -1
- package/dist/cjs/{dataunit-fetcher-4320f7ec.js → dataunit-fetcher-6febd6c4.js} +23 -1
- package/dist/cjs/pesquisa-grid_2.cjs.entry.js +1 -1
- package/dist/cjs/snk-actions-button_8.cjs.entry.js +1 -1
- package/dist/cjs/snk-application.cjs.entry.js +1 -1
- package/dist/cjs/snk-attach.cjs.entry.js +1 -1
- package/dist/cjs/snk-crud.cjs.entry.js +1 -1
- package/dist/cjs/snk-data-exporter.cjs.entry.js +2 -2
- package/dist/cjs/{snk-data-unit-b54fdf9a.js → snk-data-unit-94757628.js} +1 -1
- package/dist/cjs/snk-data-unit.cjs.entry.js +2 -2
- package/dist/cjs/snk-detail-view.cjs.entry.js +2 -2
- package/dist/cjs/snk-grid.cjs.entry.js +2 -2
- package/dist/cjs/{snk-guides-viewer-58185ae3.js → snk-guides-viewer-315f8580.js} +1 -1
- package/dist/cjs/snk-guides-viewer.cjs.entry.js +2 -2
- package/dist/cjs/snk-layout-form-config.cjs.entry.js +1 -1
- package/dist/cjs/snk-pesquisa.cjs.entry.js +1 -1
- package/dist/cjs/snk-simple-crud.cjs.entry.js +2 -2
- package/dist/collection/lib/http/data-fetcher/fetchers/data-unit/dataunit-fetcher.js +24 -2
- package/dist/components/dataunit-fetcher.js +23 -1
- package/dist/esm/{SnkMultiSelectionListDataSource-14633bf6.js → SnkMultiSelectionListDataSource-6e9496f0.js} +1 -1
- package/dist/esm/{dataunit-fetcher-3d5c4ae4.js → dataunit-fetcher-21c43ec7.js} +23 -1
- package/dist/esm/pesquisa-grid_2.entry.js +1 -1
- package/dist/esm/snk-actions-button_8.entry.js +1 -1
- package/dist/esm/snk-application.entry.js +1 -1
- package/dist/esm/snk-attach.entry.js +1 -1
- package/dist/esm/snk-crud.entry.js +1 -1
- package/dist/esm/snk-data-exporter.entry.js +2 -2
- package/dist/esm/{snk-data-unit-363c3551.js → snk-data-unit-3b06a0f3.js} +1 -1
- package/dist/esm/snk-data-unit.entry.js +2 -2
- package/dist/esm/snk-detail-view.entry.js +2 -2
- package/dist/esm/snk-grid.entry.js +2 -2
- package/dist/esm/{snk-guides-viewer-6a72a3f4.js → snk-guides-viewer-a4e31f63.js} +1 -1
- package/dist/esm/snk-guides-viewer.entry.js +2 -2
- package/dist/esm/snk-layout-form-config.entry.js +1 -1
- package/dist/esm/snk-pesquisa.entry.js +1 -1
- package/dist/esm/snk-simple-crud.entry.js +2 -2
- package/dist/sankhyablocks/{p-fc5e95f4.entry.js → p-07619e85.entry.js} +1 -1
- package/dist/sankhyablocks/{p-c6a97fda.entry.js → p-0d15b109.entry.js} +1 -1
- package/dist/sankhyablocks/{p-30641d55.entry.js → p-17653b22.entry.js} +1 -1
- package/dist/sankhyablocks/{p-48762fe9.js → p-25540da8.js} +1 -1
- package/dist/sankhyablocks/{p-7c4f4851.js → p-362e6e8c.js} +1 -1
- package/dist/sankhyablocks/{p-2ccbbeec.js → p-45a830d9.js} +1 -1
- package/dist/sankhyablocks/{p-18cc9111.entry.js → p-4a8d0917.entry.js} +1 -1
- package/dist/sankhyablocks/{p-f7e8b651.entry.js → p-4cdfa0e4.entry.js} +1 -1
- package/dist/sankhyablocks/{p-b8dfe9cf.entry.js → p-4fe8380b.entry.js} +1 -1
- package/dist/sankhyablocks/{p-b6bfabec.entry.js → p-73b455e1.entry.js} +1 -1
- package/dist/sankhyablocks/{p-1df34264.entry.js → p-88b0797e.entry.js} +1 -1
- package/dist/sankhyablocks/{p-fce86770.entry.js → p-8bb4e86b.entry.js} +1 -1
- package/dist/sankhyablocks/{p-685bc841.js → p-b9970342.js} +1 -1
- package/dist/sankhyablocks/{p-d70de708.entry.js → p-f1110b78.entry.js} +1 -1
- package/dist/sankhyablocks/{p-9ce1539b.entry.js → p-f1bf7248.entry.js} +1 -1
- package/dist/sankhyablocks/{p-2ee83af1.entry.js → p-f1d541e9.entry.js} +1 -1
- package/dist/sankhyablocks/{p-a210e55b.entry.js → p-f2472d12.entry.js} +1 -1
- package/dist/sankhyablocks/sankhyablocks.esm.js +1 -1
- package/dist/types/lib/http/data-fetcher/fetchers/data-unit/dataunit-fetcher.d.ts +2 -1
- package/package.json +1 -1
|
@@ -6,7 +6,7 @@ const core = require('@sankhyalabs/core');
|
|
|
6
6
|
const index$1 = require('./index-e3e39724.js');
|
|
7
7
|
require('@sankhyalabs/ezui/dist/collection/utils/constants');
|
|
8
8
|
const UnitMetadata = require('@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata');
|
|
9
|
-
const dataunitFetcher = require('./dataunit-fetcher-
|
|
9
|
+
const dataunitFetcher = require('./dataunit-fetcher-6febd6c4.js');
|
|
10
10
|
require('./filter-item-type.enum-a7ffdaa6.js');
|
|
11
11
|
require('./form-config-fetcher-72cf0e3d.js');
|
|
12
12
|
require('./constants-6d82e405.js');
|
|
@@ -926,7 +926,7 @@ class DataUnitFetcher {
|
|
|
926
926
|
}
|
|
927
927
|
metadata.fields.push(Object.assign(Object.assign({}, source), { properties }));
|
|
928
928
|
});
|
|
929
|
-
metadata.fields.sort((a, b) => a
|
|
929
|
+
metadata.fields.sort((a, b) => this.sortFieldsByGroup(a, b));
|
|
930
930
|
resolve(metadata);
|
|
931
931
|
})
|
|
932
932
|
.catch((error) => {
|
|
@@ -934,6 +934,28 @@ class DataUnitFetcher {
|
|
|
934
934
|
});
|
|
935
935
|
});
|
|
936
936
|
}
|
|
937
|
+
// Os campos devem ser separados em dois grupos: campos da própria entidade e campos que representam ligação com outra entidade.
|
|
938
|
+
// Além do grupo, a ordenação deve respeitar o atributo "order" de cada campo.
|
|
939
|
+
// Para saber se é um campo de relação, verificamos se o nome contém '.' (ex: 'Parceiro.CODPAR').
|
|
940
|
+
sortFieldsByGroup(a, b) {
|
|
941
|
+
const aIsRelation = a.name.includes('.');
|
|
942
|
+
const bIsRelation = b.name.includes('.');
|
|
943
|
+
// Se um é relação e outro não, campos próprios vêm primeiro
|
|
944
|
+
if (aIsRelation !== bIsRelation) {
|
|
945
|
+
return aIsRelation ? 1 : -1;
|
|
946
|
+
}
|
|
947
|
+
// Se ambos são relações, ordena por nome da entidade primeiro
|
|
948
|
+
if (aIsRelation && bIsRelation) {
|
|
949
|
+
const aEntity = a.name.split('.')[0];
|
|
950
|
+
const bEntity = b.name.split('.')[0];
|
|
951
|
+
if (aEntity !== bEntity) {
|
|
952
|
+
return aEntity.localeCompare(bEntity);
|
|
953
|
+
}
|
|
954
|
+
}
|
|
955
|
+
// Dentro do mesmo grupo (próprios ou mesma entidade de relação), ordena por order
|
|
956
|
+
return a.order - b.order;
|
|
957
|
+
}
|
|
958
|
+
;
|
|
937
959
|
loadSelectDistinct(dataUnit, fieldName, argument) {
|
|
938
960
|
const { parentRecordId, filters } = dataUnit.getLastLoadRequest() || {};
|
|
939
961
|
const filteredFilters = filters.filter(f => f.name !== `${constants.DISTINCT_FILTER_NAME_PREFIX}${fieldName}`);
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
5
|
const index = require('./index-1894343a.js');
|
|
6
|
-
const dataunitFetcher = require('./dataunit-fetcher-
|
|
6
|
+
const dataunitFetcher = require('./dataunit-fetcher-6febd6c4.js');
|
|
7
7
|
require('./DataFetcher-3a8ea521.js');
|
|
8
8
|
const ISave = require('./ISave-a66bb65e.js');
|
|
9
9
|
require('@sankhyalabs/core');
|
|
@@ -10,7 +10,7 @@ require('./ISave-a66bb65e.js');
|
|
|
10
10
|
require('./index-e3e39724.js');
|
|
11
11
|
require('@sankhyalabs/ezui/dist/collection/utils/constants');
|
|
12
12
|
require('@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata');
|
|
13
|
-
require('./dataunit-fetcher-
|
|
13
|
+
require('./dataunit-fetcher-6febd6c4.js');
|
|
14
14
|
require('./filter-item-type.enum-a7ffdaa6.js');
|
|
15
15
|
const formConfigFetcher = require('./form-config-fetcher-72cf0e3d.js');
|
|
16
16
|
const constants = require('./constants-6d82e405.js');
|
|
@@ -8,7 +8,7 @@ const utils = require('@sankhyalabs/ezui/dist/collection/utils');
|
|
|
8
8
|
const ConfigStorage = require('./ConfigStorage-d9d24844.js');
|
|
9
9
|
const DataFetcher = require('./DataFetcher-3a8ea521.js');
|
|
10
10
|
const authFetcher = require('./auth-fetcher-faa61f64.js');
|
|
11
|
-
const dataunitFetcher = require('./dataunit-fetcher-
|
|
11
|
+
const dataunitFetcher = require('./dataunit-fetcher-6febd6c4.js');
|
|
12
12
|
const ISave = require('./ISave-a66bb65e.js');
|
|
13
13
|
const SnkMessageBuilder = require('./SnkMessageBuilder-d9558dba.js');
|
|
14
14
|
const constants = require('./constants-6d82e405.js');
|
|
@@ -7,7 +7,7 @@ const core = require('@sankhyalabs/core');
|
|
|
7
7
|
const DataFetcher = require('./DataFetcher-3a8ea521.js');
|
|
8
8
|
const ISave = require('./ISave-a66bb65e.js');
|
|
9
9
|
require('./index-e3e39724.js');
|
|
10
|
-
const dataunitFetcher = require('./dataunit-fetcher-
|
|
10
|
+
const dataunitFetcher = require('./dataunit-fetcher-6febd6c4.js');
|
|
11
11
|
require('./filter-item-type.enum-a7ffdaa6.js');
|
|
12
12
|
require('./form-config-fetcher-72cf0e3d.js');
|
|
13
13
|
const constants = require('./constants-6d82e405.js');
|
|
@@ -9,7 +9,7 @@ require('./ISave-a66bb65e.js');
|
|
|
9
9
|
const index$1 = require('./index-e3e39724.js');
|
|
10
10
|
require('@sankhyalabs/ezui/dist/collection/utils/constants');
|
|
11
11
|
require('@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata');
|
|
12
|
-
require('./dataunit-fetcher-
|
|
12
|
+
require('./dataunit-fetcher-6febd6c4.js');
|
|
13
13
|
require('./filter-item-type.enum-a7ffdaa6.js');
|
|
14
14
|
require('./form-config-fetcher-72cf0e3d.js');
|
|
15
15
|
const constants = require('./constants-6d82e405.js');
|
|
@@ -9,11 +9,11 @@ const IFetchDataExporterParams = require('./IFetchDataExporterParams-e78ec415.js
|
|
|
9
9
|
const index = require('./index-e3e39724.js');
|
|
10
10
|
const constants = require('./constants-6d82e405.js');
|
|
11
11
|
const DataFetcher = require('./DataFetcher-3a8ea521.js');
|
|
12
|
-
const snkDataUnit = require('./snk-data-unit-
|
|
12
|
+
const snkDataUnit = require('./snk-data-unit-94757628.js');
|
|
13
13
|
require('./ISave-a66bb65e.js');
|
|
14
14
|
require('@sankhyalabs/ezui/dist/collection/utils/constants');
|
|
15
15
|
require('@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata');
|
|
16
|
-
require('./dataunit-fetcher-
|
|
16
|
+
require('./dataunit-fetcher-6febd6c4.js');
|
|
17
17
|
require('./filter-item-type.enum-a7ffdaa6.js');
|
|
18
18
|
require('./form-config-fetcher-72cf0e3d.js');
|
|
19
19
|
require('./PrintUtils-bcaeb82f.js');
|
|
@@ -4,7 +4,7 @@ const index = require('./index-1894343a.js');
|
|
|
4
4
|
const core = require('@sankhyalabs/core');
|
|
5
5
|
const utils = require('@sankhyalabs/ezui/dist/collection/utils');
|
|
6
6
|
const SnkMessageBuilder = require('./SnkMessageBuilder-d9558dba.js');
|
|
7
|
-
const dataunitFetcher = require('./dataunit-fetcher-
|
|
7
|
+
const dataunitFetcher = require('./dataunit-fetcher-6febd6c4.js');
|
|
8
8
|
const DataType = require('@sankhyalabs/core/dist/dataunit/metadata/DataType');
|
|
9
9
|
const GetSelectedRecordsIDsInfo = require('./GetSelectedRecordsIDsInfo-bd50caf1.js');
|
|
10
10
|
|
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
const snkDataUnit = require('./snk-data-unit-
|
|
5
|
+
const snkDataUnit = require('./snk-data-unit-94757628.js');
|
|
6
6
|
require('./index-1894343a.js');
|
|
7
7
|
require('@sankhyalabs/core');
|
|
8
8
|
require('@sankhyalabs/ezui/dist/collection/utils');
|
|
9
9
|
require('./SnkMessageBuilder-d9558dba.js');
|
|
10
|
-
require('./dataunit-fetcher-
|
|
10
|
+
require('./dataunit-fetcher-6febd6c4.js');
|
|
11
11
|
require('./DataFetcher-3a8ea521.js');
|
|
12
12
|
require('./PrintUtils-bcaeb82f.js');
|
|
13
13
|
require('@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata');
|
|
@@ -11,12 +11,12 @@ require('./ISave-a66bb65e.js');
|
|
|
11
11
|
const index$1 = require('./index-e3e39724.js');
|
|
12
12
|
require('@sankhyalabs/ezui/dist/collection/utils/constants');
|
|
13
13
|
require('@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata');
|
|
14
|
-
require('./dataunit-fetcher-
|
|
14
|
+
require('./dataunit-fetcher-6febd6c4.js');
|
|
15
15
|
require('./filter-item-type.enum-a7ffdaa6.js');
|
|
16
16
|
require('./form-config-fetcher-72cf0e3d.js');
|
|
17
17
|
const constants = require('./constants-6d82e405.js');
|
|
18
18
|
const taskbarElements = require('./taskbar-elements-a94d4318.js');
|
|
19
|
-
const snkGuidesViewer = require('./snk-guides-viewer-
|
|
19
|
+
const snkGuidesViewer = require('./snk-guides-viewer-315f8580.js');
|
|
20
20
|
const SnkMessageBuilder = require('./SnkMessageBuilder-d9558dba.js');
|
|
21
21
|
const utils = require('@sankhyalabs/ezui/dist/collection/utils');
|
|
22
22
|
require('./ConfigStorage-d9d24844.js');
|
|
@@ -8,11 +8,11 @@ const DataUnit = require('@sankhyalabs/core/dist/dataunit/DataUnit');
|
|
|
8
8
|
const utils = require('@sankhyalabs/ezui/dist/collection/utils');
|
|
9
9
|
require('./DataFetcher-3a8ea521.js');
|
|
10
10
|
require('./ISave-a66bb65e.js');
|
|
11
|
-
const SnkMultiSelectionListDataSource = require('./SnkMultiSelectionListDataSource-
|
|
11
|
+
const SnkMultiSelectionListDataSource = require('./SnkMultiSelectionListDataSource-f53b60c4.js');
|
|
12
12
|
const index$1 = require('./index-e3e39724.js');
|
|
13
13
|
require('@sankhyalabs/ezui/dist/collection/utils/constants');
|
|
14
14
|
require('@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata');
|
|
15
|
-
require('./dataunit-fetcher-
|
|
15
|
+
require('./dataunit-fetcher-6febd6c4.js');
|
|
16
16
|
require('./filter-item-type.enum-a7ffdaa6.js');
|
|
17
17
|
require('./form-config-fetcher-72cf0e3d.js');
|
|
18
18
|
require('./constants-6d82e405.js');
|
|
@@ -10,7 +10,7 @@ require('./ISave-a66bb65e.js');
|
|
|
10
10
|
const index$1 = require('./index-e3e39724.js');
|
|
11
11
|
require('@sankhyalabs/ezui/dist/collection/utils/constants');
|
|
12
12
|
require('@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata');
|
|
13
|
-
require('./dataunit-fetcher-
|
|
13
|
+
require('./dataunit-fetcher-6febd6c4.js');
|
|
14
14
|
require('./filter-item-type.enum-a7ffdaa6.js');
|
|
15
15
|
require('./form-config-fetcher-72cf0e3d.js');
|
|
16
16
|
const constants = require('./constants-6d82e405.js');
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
const snkGuidesViewer = require('./snk-guides-viewer-
|
|
5
|
+
const snkGuidesViewer = require('./snk-guides-viewer-315f8580.js');
|
|
6
6
|
require('./index-1894343a.js');
|
|
7
7
|
require('@sankhyalabs/core');
|
|
8
8
|
require('@sankhyalabs/core/dist/dataunit/DataUnit');
|
|
@@ -15,7 +15,7 @@ require('@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata');
|
|
|
15
15
|
require('./ISave-a66bb65e.js');
|
|
16
16
|
require('./index-e3e39724.js');
|
|
17
17
|
require('@sankhyalabs/ezui/dist/collection/utils/constants');
|
|
18
|
-
require('./dataunit-fetcher-
|
|
18
|
+
require('./dataunit-fetcher-6febd6c4.js');
|
|
19
19
|
require('@sankhyalabs/ezui/dist/collection/components/ez-grid/utils');
|
|
20
20
|
require('@sankhyalabs/core/dist/utils/SortingUtils');
|
|
21
21
|
require('./ResourceIDUtils-5ff86aa7.js');
|
|
@@ -9,7 +9,7 @@ const core = require('@sankhyalabs/core');
|
|
|
9
9
|
require('./index-e3e39724.js');
|
|
10
10
|
require('@sankhyalabs/ezui/dist/collection/utils/constants');
|
|
11
11
|
require('@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata');
|
|
12
|
-
require('./dataunit-fetcher-
|
|
12
|
+
require('./dataunit-fetcher-6febd6c4.js');
|
|
13
13
|
require('./filter-item-type.enum-a7ffdaa6.js');
|
|
14
14
|
const formConfigFetcher = require('./form-config-fetcher-72cf0e3d.js');
|
|
15
15
|
require('./constants-6d82e405.js');
|
|
@@ -9,7 +9,7 @@ require('./DataFetcher-3a8ea521.js');
|
|
|
9
9
|
require('./index-e3e39724.js');
|
|
10
10
|
require('@sankhyalabs/ezui/dist/collection/utils/constants');
|
|
11
11
|
require('@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata');
|
|
12
|
-
require('./dataunit-fetcher-
|
|
12
|
+
require('./dataunit-fetcher-6febd6c4.js');
|
|
13
13
|
require('./filter-item-type.enum-a7ffdaa6.js');
|
|
14
14
|
require('./form-config-fetcher-72cf0e3d.js');
|
|
15
15
|
require('./constants-6d82e405.js');
|
|
@@ -9,11 +9,11 @@ const constants = require('./constants-6d82e405.js');
|
|
|
9
9
|
const taskbarElements = require('./taskbar-elements-a94d4318.js');
|
|
10
10
|
require('./DataFetcher-3a8ea521.js');
|
|
11
11
|
require('./ISave-a66bb65e.js');
|
|
12
|
-
const SnkMultiSelectionListDataSource = require('./SnkMultiSelectionListDataSource-
|
|
12
|
+
const SnkMultiSelectionListDataSource = require('./SnkMultiSelectionListDataSource-f53b60c4.js');
|
|
13
13
|
const index$1 = require('./index-e3e39724.js');
|
|
14
14
|
require('@sankhyalabs/ezui/dist/collection/utils/constants');
|
|
15
15
|
require('@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata');
|
|
16
|
-
const dataunitFetcher = require('./dataunit-fetcher-
|
|
16
|
+
const dataunitFetcher = require('./dataunit-fetcher-6febd6c4.js');
|
|
17
17
|
require('./filter-item-type.enum-a7ffdaa6.js');
|
|
18
18
|
const formConfigFetcher = require('./form-config-fetcher-72cf0e3d.js');
|
|
19
19
|
const taskbarProcessor = require('./taskbar-processor-2fba34a8.js');
|
|
@@ -10,7 +10,7 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
10
10
|
}
|
|
11
11
|
return t;
|
|
12
12
|
};
|
|
13
|
-
import { ChangeOperation, DataType, DataUnit, DataUnitStorage } from
|
|
13
|
+
import { ChangeOperation, DataType, DataUnit, DataUnitStorage, } from '@sankhyalabs/core';
|
|
14
14
|
import { gql } from "graphql-request";
|
|
15
15
|
import { DataFetcher } from "../../DataFetcher";
|
|
16
16
|
import { DISTINCT_FILTER_NAME_PREFIX } from "@sankhyalabs/ezui/dist/collection/utils/constants";
|
|
@@ -140,7 +140,7 @@ export default class DataUnitFetcher {
|
|
|
140
140
|
}
|
|
141
141
|
metadata.fields.push(Object.assign(Object.assign({}, source), { properties }));
|
|
142
142
|
});
|
|
143
|
-
metadata.fields.sort((a, b) => a
|
|
143
|
+
metadata.fields.sort((a, b) => this.sortFieldsByGroup(a, b));
|
|
144
144
|
resolve(metadata);
|
|
145
145
|
})
|
|
146
146
|
.catch((error) => {
|
|
@@ -148,6 +148,28 @@ export default class DataUnitFetcher {
|
|
|
148
148
|
});
|
|
149
149
|
});
|
|
150
150
|
}
|
|
151
|
+
// Os campos devem ser separados em dois grupos: campos da própria entidade e campos que representam ligação com outra entidade.
|
|
152
|
+
// Além do grupo, a ordenação deve respeitar o atributo "order" de cada campo.
|
|
153
|
+
// Para saber se é um campo de relação, verificamos se o nome contém '.' (ex: 'Parceiro.CODPAR').
|
|
154
|
+
sortFieldsByGroup(a, b) {
|
|
155
|
+
const aIsRelation = a.name.includes('.');
|
|
156
|
+
const bIsRelation = b.name.includes('.');
|
|
157
|
+
// Se um é relação e outro não, campos próprios vêm primeiro
|
|
158
|
+
if (aIsRelation !== bIsRelation) {
|
|
159
|
+
return aIsRelation ? 1 : -1;
|
|
160
|
+
}
|
|
161
|
+
// Se ambos são relações, ordena por nome da entidade primeiro
|
|
162
|
+
if (aIsRelation && bIsRelation) {
|
|
163
|
+
const aEntity = a.name.split('.')[0];
|
|
164
|
+
const bEntity = b.name.split('.')[0];
|
|
165
|
+
if (aEntity !== bEntity) {
|
|
166
|
+
return aEntity.localeCompare(bEntity);
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
// Dentro do mesmo grupo (próprios ou mesma entidade de relação), ordena por order
|
|
170
|
+
return a.order - b.order;
|
|
171
|
+
}
|
|
172
|
+
;
|
|
151
173
|
loadSelectDistinct(dataUnit, fieldName, argument) {
|
|
152
174
|
const { parentRecordId, filters } = dataUnit.getLastLoadRequest() || {};
|
|
153
175
|
const filteredFilters = filters.filter(f => f.name !== `${DISTINCT_FILTER_NAME_PREFIX}${fieldName}`);
|
|
@@ -920,7 +920,7 @@ class DataUnitFetcher {
|
|
|
920
920
|
}
|
|
921
921
|
metadata.fields.push(Object.assign(Object.assign({}, source), { properties }));
|
|
922
922
|
});
|
|
923
|
-
metadata.fields.sort((a, b) => a
|
|
923
|
+
metadata.fields.sort((a, b) => this.sortFieldsByGroup(a, b));
|
|
924
924
|
resolve(metadata);
|
|
925
925
|
})
|
|
926
926
|
.catch((error) => {
|
|
@@ -928,6 +928,28 @@ class DataUnitFetcher {
|
|
|
928
928
|
});
|
|
929
929
|
});
|
|
930
930
|
}
|
|
931
|
+
// Os campos devem ser separados em dois grupos: campos da própria entidade e campos que representam ligação com outra entidade.
|
|
932
|
+
// Além do grupo, a ordenação deve respeitar o atributo "order" de cada campo.
|
|
933
|
+
// Para saber se é um campo de relação, verificamos se o nome contém '.' (ex: 'Parceiro.CODPAR').
|
|
934
|
+
sortFieldsByGroup(a, b) {
|
|
935
|
+
const aIsRelation = a.name.includes('.');
|
|
936
|
+
const bIsRelation = b.name.includes('.');
|
|
937
|
+
// Se um é relação e outro não, campos próprios vêm primeiro
|
|
938
|
+
if (aIsRelation !== bIsRelation) {
|
|
939
|
+
return aIsRelation ? 1 : -1;
|
|
940
|
+
}
|
|
941
|
+
// Se ambos são relações, ordena por nome da entidade primeiro
|
|
942
|
+
if (aIsRelation && bIsRelation) {
|
|
943
|
+
const aEntity = a.name.split('.')[0];
|
|
944
|
+
const bEntity = b.name.split('.')[0];
|
|
945
|
+
if (aEntity !== bEntity) {
|
|
946
|
+
return aEntity.localeCompare(bEntity);
|
|
947
|
+
}
|
|
948
|
+
}
|
|
949
|
+
// Dentro do mesmo grupo (próprios ou mesma entidade de relação), ordena por order
|
|
950
|
+
return a.order - b.order;
|
|
951
|
+
}
|
|
952
|
+
;
|
|
931
953
|
loadSelectDistinct(dataUnit, fieldName, argument) {
|
|
932
954
|
const { parentRecordId, filters } = dataUnit.getLastLoadRequest() || {};
|
|
933
955
|
const filteredFilters = filters.filter(f => f.name !== `${DISTINCT_FILTER_NAME_PREFIX}${fieldName}`);
|
|
@@ -4,7 +4,7 @@ import { SortMode, ApplicationContext, ObjectUtils, StringUtils, NumberUtils, Da
|
|
|
4
4
|
import { D as DataExporterOption } from './index-b40568ff.js';
|
|
5
5
|
import '@sankhyalabs/ezui/dist/collection/utils/constants';
|
|
6
6
|
import { UserInterface } from '@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata';
|
|
7
|
-
import { P as PreloadManager } from './dataunit-fetcher-
|
|
7
|
+
import { P as PreloadManager } from './dataunit-fetcher-21c43ec7.js';
|
|
8
8
|
import './filter-item-type.enum-d45e026f.js';
|
|
9
9
|
import './form-config-fetcher-fcc7b62f.js';
|
|
10
10
|
import './constants-7b422de0.js';
|
|
@@ -920,7 +920,7 @@ class DataUnitFetcher {
|
|
|
920
920
|
}
|
|
921
921
|
metadata.fields.push(Object.assign(Object.assign({}, source), { properties }));
|
|
922
922
|
});
|
|
923
|
-
metadata.fields.sort((a, b) => a
|
|
923
|
+
metadata.fields.sort((a, b) => this.sortFieldsByGroup(a, b));
|
|
924
924
|
resolve(metadata);
|
|
925
925
|
})
|
|
926
926
|
.catch((error) => {
|
|
@@ -928,6 +928,28 @@ class DataUnitFetcher {
|
|
|
928
928
|
});
|
|
929
929
|
});
|
|
930
930
|
}
|
|
931
|
+
// Os campos devem ser separados em dois grupos: campos da própria entidade e campos que representam ligação com outra entidade.
|
|
932
|
+
// Além do grupo, a ordenação deve respeitar o atributo "order" de cada campo.
|
|
933
|
+
// Para saber se é um campo de relação, verificamos se o nome contém '.' (ex: 'Parceiro.CODPAR').
|
|
934
|
+
sortFieldsByGroup(a, b) {
|
|
935
|
+
const aIsRelation = a.name.includes('.');
|
|
936
|
+
const bIsRelation = b.name.includes('.');
|
|
937
|
+
// Se um é relação e outro não, campos próprios vêm primeiro
|
|
938
|
+
if (aIsRelation !== bIsRelation) {
|
|
939
|
+
return aIsRelation ? 1 : -1;
|
|
940
|
+
}
|
|
941
|
+
// Se ambos são relações, ordena por nome da entidade primeiro
|
|
942
|
+
if (aIsRelation && bIsRelation) {
|
|
943
|
+
const aEntity = a.name.split('.')[0];
|
|
944
|
+
const bEntity = b.name.split('.')[0];
|
|
945
|
+
if (aEntity !== bEntity) {
|
|
946
|
+
return aEntity.localeCompare(bEntity);
|
|
947
|
+
}
|
|
948
|
+
}
|
|
949
|
+
// Dentro do mesmo grupo (próprios ou mesma entidade de relação), ordena por order
|
|
950
|
+
return a.order - b.order;
|
|
951
|
+
}
|
|
952
|
+
;
|
|
931
953
|
loadSelectDistinct(dataUnit, fieldName, argument) {
|
|
932
954
|
const { parentRecordId, filters } = dataUnit.getLastLoadRequest() || {};
|
|
933
955
|
const filteredFilters = filters.filter(f => f.name !== `${DISTINCT_FILTER_NAME_PREFIX}${fieldName}`);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { r as registerInstance, e as createEvent, h, f as Host, F as Fragment } from './index-04f73a26.js';
|
|
2
|
-
import { I as InMemoryLoader } from './dataunit-fetcher-
|
|
2
|
+
import { I as InMemoryLoader } from './dataunit-fetcher-21c43ec7.js';
|
|
3
3
|
import './DataFetcher-1dd7e8c0.js';
|
|
4
4
|
import { P as PesquisaFetcher } from './ISave-498c4831.js';
|
|
5
5
|
import '@sankhyalabs/core';
|
|
@@ -6,7 +6,7 @@ import './ISave-498c4831.js';
|
|
|
6
6
|
import './index-b40568ff.js';
|
|
7
7
|
import '@sankhyalabs/ezui/dist/collection/utils/constants';
|
|
8
8
|
import '@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata';
|
|
9
|
-
import './dataunit-fetcher-
|
|
9
|
+
import './dataunit-fetcher-21c43ec7.js';
|
|
10
10
|
import './filter-item-type.enum-d45e026f.js';
|
|
11
11
|
import { F as FormConfigFetcher } from './form-config-fetcher-fcc7b62f.js';
|
|
12
12
|
import { O as ORDER_VALUES } from './constants-7b422de0.js';
|
|
@@ -4,7 +4,7 @@ import { ApplicationUtils } from '@sankhyalabs/ezui/dist/collection/utils';
|
|
|
4
4
|
import { C as ConfigStorage } from './ConfigStorage-d15d2014.js';
|
|
5
5
|
import { d as dist, D as DataFetcher, U as UrlUtils } from './DataFetcher-1dd7e8c0.js';
|
|
6
6
|
import { A as AutorizationType, a as AuthFetcher } from './auth-fetcher-69cbda8d.js';
|
|
7
|
-
import { P as PreloadManager, D as DataUnitFetcher } from './dataunit-fetcher-
|
|
7
|
+
import { P as PreloadManager, D as DataUnitFetcher } from './dataunit-fetcher-21c43ec7.js';
|
|
8
8
|
import { P as PesquisaFetcher } from './ISave-498c4831.js';
|
|
9
9
|
import { S as SnkMessageBuilder } from './SnkMessageBuilder-c0bc4424.js';
|
|
10
10
|
import { T as TEMPLATES_SKELETON } from './constants-7b422de0.js';
|
|
@@ -3,7 +3,7 @@ import { ApplicationContext, DataType, Action, UserInterface, StringUtils, DataU
|
|
|
3
3
|
import { D as DataFetcher } from './DataFetcher-1dd7e8c0.js';
|
|
4
4
|
import { S as SaveErrorsEnum } from './ISave-498c4831.js';
|
|
5
5
|
import './index-b40568ff.js';
|
|
6
|
-
import { P as PreloadManager, D as DataUnitFetcher, I as InMemoryLoader } from './dataunit-fetcher-
|
|
6
|
+
import { P as PreloadManager, D as DataUnitFetcher, I as InMemoryLoader } from './dataunit-fetcher-21c43ec7.js';
|
|
7
7
|
import './filter-item-type.enum-d45e026f.js';
|
|
8
8
|
import './form-config-fetcher-fcc7b62f.js';
|
|
9
9
|
import { V as VIEW_MODE } from './constants-7b422de0.js';
|
|
@@ -5,7 +5,7 @@ import './ISave-498c4831.js';
|
|
|
5
5
|
import { P as PresentationMode, E as ExporterStrategy } from './index-b40568ff.js';
|
|
6
6
|
import '@sankhyalabs/ezui/dist/collection/utils/constants';
|
|
7
7
|
import '@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata';
|
|
8
|
-
import './dataunit-fetcher-
|
|
8
|
+
import './dataunit-fetcher-21c43ec7.js';
|
|
9
9
|
import './filter-item-type.enum-d45e026f.js';
|
|
10
10
|
import './form-config-fetcher-fcc7b62f.js';
|
|
11
11
|
import { V as VIEW_MODE } from './constants-7b422de0.js';
|
|
@@ -5,11 +5,11 @@ import { I as IExportType } from './IFetchDataExporterParams-d73bed3d.js';
|
|
|
5
5
|
import { D as DataExporterOption, a as DataExporterType, b as DataExporterFormat } from './index-b40568ff.js';
|
|
6
6
|
import { R as REPORT_LAUNCHER_RESOURCE_ID } from './constants-7b422de0.js';
|
|
7
7
|
import { D as DataFetcher } from './DataFetcher-1dd7e8c0.js';
|
|
8
|
-
import { S as SnkDataUnit } from './snk-data-unit-
|
|
8
|
+
import { S as SnkDataUnit } from './snk-data-unit-3b06a0f3.js';
|
|
9
9
|
import './ISave-498c4831.js';
|
|
10
10
|
import '@sankhyalabs/ezui/dist/collection/utils/constants';
|
|
11
11
|
import '@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata';
|
|
12
|
-
import './dataunit-fetcher-
|
|
12
|
+
import './dataunit-fetcher-21c43ec7.js';
|
|
13
13
|
import './filter-item-type.enum-d45e026f.js';
|
|
14
14
|
import './form-config-fetcher-fcc7b62f.js';
|
|
15
15
|
import './PrintUtils-3e4ff0f5.js';
|
|
@@ -2,7 +2,7 @@ import { r as registerInstance, e as createEvent, h, g as getElement, f as Host
|
|
|
2
2
|
import { ApplicationContext, Action, ObjectUtils, DataUnitAction, StringUtils } from '@sankhyalabs/core';
|
|
3
3
|
import { ApplicationUtils, DialogType } from '@sankhyalabs/ezui/dist/collection/utils';
|
|
4
4
|
import { O as OperationMap, S as SnkMessageBuilder } from './SnkMessageBuilder-c0bc4424.js';
|
|
5
|
-
import { g as getRecordValue, a as DatasetStrategy } from './dataunit-fetcher-
|
|
5
|
+
import { g as getRecordValue, a as DatasetStrategy } from './dataunit-fetcher-21c43ec7.js';
|
|
6
6
|
import { convertType } from '@sankhyalabs/core/dist/dataunit/metadata/DataType';
|
|
7
7
|
import { g as getSelectedRecordsIDsInfo } from './GetSelectedRecordsIDsInfo-9fa41508.js';
|
|
8
8
|
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
export { S as snk_data_unit } from './snk-data-unit-
|
|
1
|
+
export { S as snk_data_unit } from './snk-data-unit-3b06a0f3.js';
|
|
2
2
|
import './index-04f73a26.js';
|
|
3
3
|
import '@sankhyalabs/core';
|
|
4
4
|
import '@sankhyalabs/ezui/dist/collection/utils';
|
|
5
5
|
import './SnkMessageBuilder-c0bc4424.js';
|
|
6
|
-
import './dataunit-fetcher-
|
|
6
|
+
import './dataunit-fetcher-21c43ec7.js';
|
|
7
7
|
import './DataFetcher-1dd7e8c0.js';
|
|
8
8
|
import './PrintUtils-3e4ff0f5.js';
|
|
9
9
|
import '@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata';
|
|
@@ -7,12 +7,12 @@ import './ISave-498c4831.js';
|
|
|
7
7
|
import { P as PresentationMode } from './index-b40568ff.js';
|
|
8
8
|
import '@sankhyalabs/ezui/dist/collection/utils/constants';
|
|
9
9
|
import '@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata';
|
|
10
|
-
import './dataunit-fetcher-
|
|
10
|
+
import './dataunit-fetcher-21c43ec7.js';
|
|
11
11
|
import './filter-item-type.enum-d45e026f.js';
|
|
12
12
|
import './form-config-fetcher-fcc7b62f.js';
|
|
13
13
|
import { V as VIEW_MODE } from './constants-7b422de0.js';
|
|
14
14
|
import { T as TaskbarElement } from './taskbar-elements-97541bdd.js';
|
|
15
|
-
import { S as SnkGuidesViewer } from './snk-guides-viewer-
|
|
15
|
+
import { S as SnkGuidesViewer } from './snk-guides-viewer-a4e31f63.js';
|
|
16
16
|
import { S as SnkMessageBuilder } from './SnkMessageBuilder-c0bc4424.js';
|
|
17
17
|
import { buildFieldSearch, SHORTCUT_SEARCH_FIELD } from '@sankhyalabs/ezui/dist/collection/utils';
|
|
18
18
|
import './ConfigStorage-d15d2014.js';
|
|
@@ -4,11 +4,11 @@ import { SelectionMode } from '@sankhyalabs/core/dist/dataunit/DataUnit';
|
|
|
4
4
|
import { buildFieldSearch } from '@sankhyalabs/ezui/dist/collection/utils';
|
|
5
5
|
import './DataFetcher-1dd7e8c0.js';
|
|
6
6
|
import './ISave-498c4831.js';
|
|
7
|
-
import { C as CommonsExporter, a as CrudUtils, S as SnkMultiSelectionListDataSource, R as RmPrecisionCustomValueFormatter, b as ContinuousInsertUtils, c as ClientSideExporterProvider } from './SnkMultiSelectionListDataSource-
|
|
7
|
+
import { C as CommonsExporter, a as CrudUtils, S as SnkMultiSelectionListDataSource, R as RmPrecisionCustomValueFormatter, b as ContinuousInsertUtils, c as ClientSideExporterProvider } from './SnkMultiSelectionListDataSource-6e9496f0.js';
|
|
8
8
|
import { P as PresentationMode, E as ExporterStrategy } from './index-b40568ff.js';
|
|
9
9
|
import '@sankhyalabs/ezui/dist/collection/utils/constants';
|
|
10
10
|
import '@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata';
|
|
11
|
-
import './dataunit-fetcher-
|
|
11
|
+
import './dataunit-fetcher-21c43ec7.js';
|
|
12
12
|
import './filter-item-type.enum-d45e026f.js';
|
|
13
13
|
import './form-config-fetcher-fcc7b62f.js';
|
|
14
14
|
import './constants-7b422de0.js';
|
|
@@ -8,7 +8,7 @@ import './ISave-498c4831.js';
|
|
|
8
8
|
import { P as PresentationMode } from './index-b40568ff.js';
|
|
9
9
|
import '@sankhyalabs/ezui/dist/collection/utils/constants';
|
|
10
10
|
import '@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata';
|
|
11
|
-
import './dataunit-fetcher-
|
|
11
|
+
import './dataunit-fetcher-21c43ec7.js';
|
|
12
12
|
import './filter-item-type.enum-d45e026f.js';
|
|
13
13
|
import './form-config-fetcher-fcc7b62f.js';
|
|
14
14
|
import { V as VIEW_MODE } from './constants-7b422de0.js';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { S as snk_guides_viewer } from './snk-guides-viewer-
|
|
1
|
+
export { S as snk_guides_viewer } from './snk-guides-viewer-a4e31f63.js';
|
|
2
2
|
import './index-04f73a26.js';
|
|
3
3
|
import '@sankhyalabs/core';
|
|
4
4
|
import '@sankhyalabs/core/dist/dataunit/DataUnit';
|
|
@@ -11,7 +11,7 @@ import '@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata';
|
|
|
11
11
|
import './ISave-498c4831.js';
|
|
12
12
|
import './index-b40568ff.js';
|
|
13
13
|
import '@sankhyalabs/ezui/dist/collection/utils/constants';
|
|
14
|
-
import './dataunit-fetcher-
|
|
14
|
+
import './dataunit-fetcher-21c43ec7.js';
|
|
15
15
|
import '@sankhyalabs/ezui/dist/collection/components/ez-grid/utils';
|
|
16
16
|
import '@sankhyalabs/core/dist/utils/SortingUtils';
|
|
17
17
|
import './ResourceIDUtils-a114189a.js';
|
|
@@ -5,7 +5,7 @@ import { ApplicationContext } from '@sankhyalabs/core';
|
|
|
5
5
|
import './index-b40568ff.js';
|
|
6
6
|
import '@sankhyalabs/ezui/dist/collection/utils/constants';
|
|
7
7
|
import '@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata';
|
|
8
|
-
import './dataunit-fetcher-
|
|
8
|
+
import './dataunit-fetcher-21c43ec7.js';
|
|
9
9
|
import './filter-item-type.enum-d45e026f.js';
|
|
10
10
|
import { F as FormConfigFetcher } from './form-config-fetcher-fcc7b62f.js';
|
|
11
11
|
import './constants-7b422de0.js';
|
|
@@ -5,7 +5,7 @@ import './DataFetcher-1dd7e8c0.js';
|
|
|
5
5
|
import './index-b40568ff.js';
|
|
6
6
|
import '@sankhyalabs/ezui/dist/collection/utils/constants';
|
|
7
7
|
import '@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata';
|
|
8
|
-
import './dataunit-fetcher-
|
|
8
|
+
import './dataunit-fetcher-21c43ec7.js';
|
|
9
9
|
import './filter-item-type.enum-d45e026f.js';
|
|
10
10
|
import './form-config-fetcher-fcc7b62f.js';
|
|
11
11
|
import './constants-7b422de0.js';
|
|
@@ -5,11 +5,11 @@ import { V as VIEW_MODE, S as SIMPLE_CRUD_MODE } from './constants-7b422de0.js';
|
|
|
5
5
|
import { T as TaskbarElement } from './taskbar-elements-97541bdd.js';
|
|
6
6
|
import './DataFetcher-1dd7e8c0.js';
|
|
7
7
|
import './ISave-498c4831.js';
|
|
8
|
-
import { S as SnkMultiSelectionListDataSource, R as RmPrecisionCustomValueFormatter, b as ContinuousInsertUtils, a as CrudUtils, c as ClientSideExporterProvider } from './SnkMultiSelectionListDataSource-
|
|
8
|
+
import { S as SnkMultiSelectionListDataSource, R as RmPrecisionCustomValueFormatter, b as ContinuousInsertUtils, a as CrudUtils, c as ClientSideExporterProvider } from './SnkMultiSelectionListDataSource-6e9496f0.js';
|
|
9
9
|
import { P as PresentationMode } from './index-b40568ff.js';
|
|
10
10
|
import '@sankhyalabs/ezui/dist/collection/utils/constants';
|
|
11
11
|
import '@sankhyalabs/core/dist/dataunit/metadata/UnitMetadata';
|
|
12
|
-
import { I as InMemoryLoader } from './dataunit-fetcher-
|
|
12
|
+
import { I as InMemoryLoader } from './dataunit-fetcher-21c43ec7.js';
|
|
13
13
|
import './filter-item-type.enum-d45e026f.js';
|
|
14
14
|
import { F as FormConfigFetcher } from './form-config-fetcher-fcc7b62f.js';
|
|
15
15
|
import { T as TaskbarProcessor } from './taskbar-processor-3436124c.js';
|