@evergis/react 4.0.86 → 4.0.88

package/dist/index.js

@@ -7624,13 +7624,14 @@ const RoundedBackgroundContainerWrapper = styled(uilibGl.Flex) `
 const ALIAS_DEFAULT_MAX_LENGTH = 28;
 const RoundedBackgroundContainer = React.memo(({ type, elementConfig, feature, renderElement, }) => {
     const { t } = useGlobalContext();
-    const { dataSources } = useWidgetContext(type);
-    const { attributes } = useRelatedDataSourceAttributes({
+    const { dataSources, attributes: ctxAttributes } = useWidgetContext(type);
+    const { attributes: dsAttributes } = useRelatedDataSourceAttributes({
         type,
         elementConfig,
         dataSources,
         feature,
     });
+    const attributes = lodash.isEmpty(dsAttributes) ? ctxAttributes : dsAttributes;
     const { id, options, style, children } = elementConfig || {};
     const { maxLength, wordBreak, center, fontColor, innerTemplateStyle, inlineUnits, big, bigIcon, hideEmpty, colorAttribute } = options || {};
     const iconElement = children?.find(item => item.id === "icon");
@@ -9170,11 +9171,12 @@ const HeaderLayerIcon = ({ noFeature }) => {
 };
 
 const FeatureCardDefaultHeader = ({ noFeature }) => {
+    const { themeName: pageThemeName } = useGlobalContext();
     const { config } = useWidgetConfig(exports.WidgetType.FeatureCard);
     const { header } = config || {};
     const { options } = header || {};
     const { themeName, withPadding, column, height, overlay } = options || {};
-    return (jsxRuntime.jsx(DefaultHeaderWrapper, { withPadding: withPadding, height: height, "$noFeature": noFeature, children: jsxRuntime.jsx(uilibGl.ThemeProvider, { theme: getThemeByName(themeName), children: jsxRuntime.jsx(Header, { "$overlay": overlay, "$isRow": !column, "$noFeature": noFeature, children: jsxRuntime.jsxs(HeaderFrontView, { isDefault: !column, children: [jsxRuntime.jsxs(HeaderContainer, { children: [jsxRuntime.jsx(HeaderLayerIcon, { noFeature: noFeature }), jsxRuntime.jsx(HeaderTitle, { noFeature: noFeature })] }), jsxRuntime.jsx(FeatureCardButtons, {})] }) }) }) }));
+    return (jsxRuntime.jsx(uilibGl.ThemeProvider, { theme: getThemeByName(themeName ?? pageThemeName), children: jsxRuntime.jsx(DefaultHeaderWrapper, { withPadding: withPadding, height: height, "$noFeature": noFeature, children: jsxRuntime.jsx(Header, { "$overlay": overlay, "$isRow": !column, "$noFeature": noFeature, children: jsxRuntime.jsxs(HeaderFrontView, { isDefault: !column, children: [jsxRuntime.jsxs(HeaderContainer, { children: [jsxRuntime.jsx(HeaderLayerIcon, { noFeature: noFeature }), jsxRuntime.jsx(HeaderTitle, { noFeature: noFeature })] }), jsxRuntime.jsx(FeatureCardButtons, {})] }) }) }) }));
 };
 
 const ImageContainerButton = styled(uilibGl.FlatButton) `
@@ -10195,7 +10197,7 @@ const BackgroundHeaderWrapper = styled.div `
       content: "";
       position: absolute;
       inset: 0;
-      z-index: 0;
+      z-index: 100;
       pointer-events: none;
       background: ${({ $bgColor }) => $bgColor || "linear-gradient(96.55deg, #FFFCD3 0%, #B4DC47 100%)"};
     }
@@ -10217,7 +10219,7 @@ const FeatureCardBackgroundHeader = () => {
     const { options } = header || {};
     const { fontColor, bgColor, height, overlay, bigIcon, withPadding, bottomBlur, themeName, column } = options || {};
     const renderElement = useHeaderRender(header);
-    return (jsxRuntime.jsx(BackgroundHeaderWrapper, { "$fontColor": fontColor, "$bgColor": bgColor, "$height": height, "$bigIcon": bigIcon, "$withPadding": withPadding, "$bottomBlur": bottomBlur, children: jsxRuntime.jsx(uilibGl.ThemeProvider, { theme: getThemeByName(themeName ?? pageThemeName), children: jsxRuntime.jsxs(Header, { "$overlay": overlay, "$isRow": !column, children: [jsxRuntime.jsxs(HeaderFrontView, { children: [jsxRuntime.jsxs(HeaderContainer, { column: column, children: [jsxRuntime.jsx(HeaderLayerIcon, {}), jsxRuntime.jsx(FeatureCardTitle, { title: renderElement({
+    return (jsxRuntime.jsx(uilibGl.ThemeProvider, { theme: getThemeByName(themeName ?? pageThemeName), children: jsxRuntime.jsx(BackgroundHeaderWrapper, { "$fontColor": fontColor, "$bgColor": bgColor, "$height": height, "$bigIcon": bigIcon, "$withPadding": withPadding, "$bottomBlur": bottomBlur, children: jsxRuntime.jsxs(Header, { "$overlay": overlay, "$isRow": !column, children: [jsxRuntime.jsxs(HeaderFrontView, { children: [jsxRuntime.jsxs(HeaderContainer, { column: column, children: [jsxRuntime.jsx(HeaderLayerIcon, {}), jsxRuntime.jsx(FeatureCardTitle, { title: renderElement({
                                             id: "title",
                                             wrap: false,
                                         }), description: renderElement({
@@ -10238,7 +10240,7 @@ const FeatureCardSlideshowHeader = () => {
     const { options } = header || {};
     const { height, fontColor, withPadding, themeName, column, overlay } = options || {};
     const renderElement = useHeaderRender(header);
-    return (jsxRuntime.jsx(SlideshowHeaderWrapper, { fontColor: fontColor, withPadding: withPadding, height: height, big: true, children: jsxRuntime.jsx(uilibGl.ThemeProvider, { theme: getThemeByName(themeName), children: jsxRuntime.jsxs(Header, { "$overlay": overlay, "$isRow": !column, children: [jsxRuntime.jsxs(HeaderFrontView, { children: [jsxRuntime.jsxs(HeaderContainer, { column: column, children: [jsxRuntime.jsx(HeaderLayerIcon, {}), jsxRuntime.jsx(FeatureCardTitle, { title: renderElement({
+    return (jsxRuntime.jsx(uilibGl.ThemeProvider, { theme: getThemeByName(themeName), children: jsxRuntime.jsx(SlideshowHeaderWrapper, { fontColor: fontColor, withPadding: withPadding, height: height, big: true, children: jsxRuntime.jsxs(Header, { "$overlay": overlay, "$isRow": !column, children: [jsxRuntime.jsxs(HeaderFrontView, { children: [jsxRuntime.jsxs(HeaderContainer, { column: column, children: [jsxRuntime.jsx(HeaderLayerIcon, {}), jsxRuntime.jsx(FeatureCardTitle, { title: renderElement({
                                             id: "title",
                                             wrap: false,
                                         }), description: renderElement({
@@ -12853,7 +12855,18 @@ const useDataSources = ({ type: widgetType, config, attributes, filters, layerPa
         if (!diffFilterNames.length)
             return;
         const filteredDataSources = configDataSources?.filter(({ parameters = {}, query }) => lodash.isNil(query) ||
-            diffFilterNames.some(diffFilterName => Object.keys(parameters).some(paramName => parameters[paramName] === `${FILTER_PREFIX}${diffFilterName}`)));
+            diffFilterNames.some(diffFilterName => {
+                // Плейсхолдер параметра может ссылаться на фильтр целиком (`%name`)
+                // либо на его свойство — уровень tree-фильтра или границу range
+                // (`%name.lN`, `%name.min`, `%name.max`). Граница `.` обязательна,
+                // иначе `%name` ложно матчит `%name2.l1`.
+                const placeholder = `${FILTER_PREFIX}${diffFilterName}`;
+                return Object.keys(parameters).some(paramName => {
+                    const paramValue = parameters[paramName];
+                    return (typeof paramValue === "string" &&
+                        (paramValue === placeholder || paramValue.startsWith(`${placeholder}.`)));
+                });
+            }));
         if (!filteredDataSources?.length) {
             return;
         }