@evergis/react 4.0.82 → 4.0.84

package/dist/react.esm.js

@@ -11475,6 +11475,11 @@ const buildSearchCondition = (attributeAlias, query) => `${attributeAlias} LIKE
 const buildNamesCondition = (attributeName, names) => `${attributeName} in ${formatConditionValue({ value: names })}`;
 /** Запрос пачки записей по их значениям (`attributeValue`) — для восстановления `defaultValue`. */
 const buildValuesCondition = (attributeValue, values) => `${attributeValue} in ${formatConditionValue({ value: values })}`;
+/**
+ * Оборачивает запрос query-datasource подзапросом с WHERE-условием дерева.
+ * У `api.eql.getPagedQueryResult` нет поля conditions, поэтому условие вшивается в сам запрос.
+ */
+const wrapQueryWithCondition = (query, condition) => `SELECT * FROM (${query}) WHERE ${condition}`;
 /** Группирует выбранные id по уровню в объектное значение фильтра `{ l{N}: [ids] }`. */
 const buildFilterValue = (selected) => {
     const result = {};
@@ -11575,7 +11580,8 @@ const useTreeFilterData = (type, filterName) => {
     const configFilter = useMemo(() => getConfigFilter(filterName, currentPage?.filters), [filterName, currentPage?.filters]);
     const { relatedDataSource, attributeName = DEFAULT_ATTRIBUTE_NAME, attributeValue, attributeAlias = DEFAULT_ATTRIBUTE_NAME, attributeParentName, attributeLevel, attributeHasChildren, limit = DEFAULT_DATA_SOURCE_LIMIT, } = configFilter ?? {};
     const valueAttribute = attributeValue ?? attributeName;
-    const layerName = useMemo(() => currentPage?.dataSources?.find(({ name }) => name === relatedDataSource)?.layerName, [currentPage?.dataSources, relatedDataSource]);
+    const dataSource = useMemo(() => currentPage?.dataSources?.find(({ name }) => name === relatedDataSource), [currentPage?.dataSources, relatedDataSource]);
+    const { layerName, query: sourceQuery, ds } = dataSource ?? {};
     const mapNode = useCallback(({ properties }) => {
         const hasChildren = attributeHasChildren ? !!properties[attributeHasChildren] : false;
         const data = {
@@ -11592,12 +11598,18 @@ const useTreeFilterData = (type, filterName) => {
         };
     }, [valueAttribute, attributeName, attributeAlias, attributeParentName, attributeLevel, attributeHasChildren]);
     const runQuery = useCallback(async (condition) => {
-        if (!layerName) {
-            return [];
+        // Datasource на основе слоя: условие уходит как conditions слоя.
+        if (layerName) {
+            const response = await api.layers.getFeatures(layerName, { withGeom: false, limit, conditions: [condition] });
+            return response.features ?? [];
+        }
+        // Datasource типа query: условие вшивается в EQL подзапросом.
+        if (sourceQuery) {
+            const response = await api.eql.getPagedQueryResult({ saveInHistory: false }, { ds, query: wrapQueryWithCondition(sourceQuery, condition), limit, offset: 0 });
+            return response.features ?? [];
         }
-        const response = await api.layers.getFeatures(layerName, { withGeom: false, limit, conditions: [condition] });
-        return response.features ?? [];
-    }, [api, layerName, limit]);
+        return [];
+    }, [api, layerName, sourceQuery, ds, limit]);
     const loadLevelOne = useCallback(async () => {
         if (!attributeLevel) {
             return [];