@evergis/react 3.1.87 → 3.1.89

package/dist/components/Dashboard/types.d.ts

@@ -34,6 +34,11 @@ export interface ConfigRelatedResource {
     fileName?: string;
     methodName?: string;
 }
+export interface ConfigControl {
+    type: "dropdown" | "checkbox";
+    targetAttributeName: string;
+    attributeAlias?: string;
+}
 export interface BaseMapSettings {
     opacity?: number;
     showBuildings?: boolean;
@@ -48,7 +53,6 @@ export interface ConfigOptions {
     relatedResources?: ConfigRelatedResource[];
     statusColors?: Record<RemoteTaskStatus, string>;
     chartType?: "bar" | "line" | "pie" | "stack";
-    controlType?: "dropdown" | "checkbox";
     layerNames?: string[];
     layerName?: string;
     geometryType?: GeometryType | EditGeometryType;
@@ -128,7 +132,7 @@ export interface ConfigOptions {
     tabId?: string;
     column?: boolean;
     relatedDataSource?: string;
-    controlName?: string;
+    control?: ConfigControl;
     filterName?: string;
     searchFilterName?: string;
     colorAttribute?: string;
@@ -156,6 +160,7 @@ export interface ConfigDataSource {
     resourceId?: string;
     url?: string;
     type?: string;
+    autoSyncLayer?: boolean;
 }
 export interface EqlDataSource {
     items: FeatureDc[];

package/dist/index.js

@@ -7780,32 +7780,32 @@ const ElementControl = ({ elementConfig }) => {
     const { t } = useGlobalContext();
     const { attributes, layerInfo, dataSources, controls, changeControls } = useWidgetContext(exports.WidgetType.FeatureCard);
     const [value, setValue] = React.useState();
-    const { options, attributeName } = elementConfig || {};
-    const { relatedDataSource, label, width, controlName, placeholder = t("selectValue", { ns: "dashboard", defaultValue: "Выберите значение" }) } = options || {};
-    const attrName = controlName || attributeName;
+    const { options, attributeName, defaultValue } = elementConfig || {};
+    const { relatedDataSource, label, width, control, placeholder = t("selectValue", { ns: "dashboard", defaultValue: "Выберите значение" }) } = options || {};
+    const attribute = React.useMemo(() => attributes?.find(({ name }) => name === attributeName), [attributes, attributeName]);
     const dataSource = React.useMemo(() => getDataSource(relatedDataSource, dataSources), [relatedDataSource, dataSources]);
     const items = React.useMemo(() => {
-        if (!dataSource?.features?.length || !attrName) {
+        if (!dataSource?.features?.length || !attributeName) {
             return [];
         }
-        return dataSource.features.map(({ attributes }) => ({
-            value: attributes?.[attrName] || "",
-            text: attributes?.[attrName] || "",
+        return dataSource.features.map(item => ({
+            value: item.attributes?.[attributeName] || "",
+            text: item.attributes?.[control?.attributeAlias || attributeName] || "",
         }));
-    }, [dataSource?.features, attrName]);
+    }, [control?.attributeAlias, dataSource?.features, attributeName]);
     const isDisabled = React.useMemo(() => {
-        const attr = layerInfo?.configuration?.attributesConfiguration?.attributes?.find(({ attributeName }) => attributeName === attrName);
+        const attr = layerInfo?.configuration?.attributesConfiguration?.attributes?.find(item => item.attributeName === control?.targetAttributeName);
         return !attr?.isEditable;
-    }, [attrName, layerInfo?.configuration?.attributesConfiguration?.attributes]);
+    }, [control?.targetAttributeName, layerInfo?.configuration?.attributesConfiguration?.attributes]);
     const handleChange = React.useCallback(([option]) => {
         setValue(option?.value);
-        if (attrName && changeControls) {
+        if (attributeName && changeControls) {
             changeControls({
-                [attrName]: option?.value,
+                [attributeName]: option?.value,
             });
         }
-    }, [changeControls, attrName]);
-    return (jsxRuntime.jsx(uilibGl.Dropdown, { zIndex: 1000, width: `${width ?? DEFAULT_DROPDOWN_WIDTH}px`, label: label, options: items, value: controls?.[attrName] ?? value, placeholder: placeholder, disabled: isDisabled, onChange: handleChange }));
+    }, [changeControls, attributeName]);
+    return (jsxRuntime.jsx(uilibGl.Dropdown, { zIndex: 1000, width: `${width ?? DEFAULT_DROPDOWN_WIDTH}px`, label: label, options: items, value: controls?.[attributeName] ?? value ?? attribute?.value ?? defaultValue, placeholder: placeholder, disabled: isDisabled, onChange: handleChange }));
 };
 
 const StyledIconFontSizeMixin = styled.css `

package/dist/react.esm.js

@@ -7778,32 +7778,32 @@ const ElementControl = ({ elementConfig }) => {
     const { t } = useGlobalContext();
     const { attributes, layerInfo, dataSources, controls, changeControls } = useWidgetContext(WidgetType.FeatureCard);
     const [value, setValue] = useState();
-    const { options, attributeName } = elementConfig || {};
-    const { relatedDataSource, label, width, controlName, placeholder = t("selectValue", { ns: "dashboard", defaultValue: "Выберите значение" }) } = options || {};
-    const attrName = controlName || attributeName;
+    const { options, attributeName, defaultValue } = elementConfig || {};
+    const { relatedDataSource, label, width, control, placeholder = t("selectValue", { ns: "dashboard", defaultValue: "Выберите значение" }) } = options || {};
+    const attribute = useMemo(() => attributes?.find(({ name }) => name === attributeName), [attributes, attributeName]);
     const dataSource = useMemo(() => getDataSource(relatedDataSource, dataSources), [relatedDataSource, dataSources]);
     const items = useMemo(() => {
-        if (!dataSource?.features?.length || !attrName) {
+        if (!dataSource?.features?.length || !attributeName) {
             return [];
         }
-        return dataSource.features.map(({ attributes }) => ({
-            value: attributes?.[attrName] || "",
-            text: attributes?.[attrName] || "",
+        return dataSource.features.map(item => ({
+            value: item.attributes?.[attributeName] || "",
+            text: item.attributes?.[control?.attributeAlias || attributeName] || "",
         }));
-    }, [dataSource?.features, attrName]);
+    }, [control?.attributeAlias, dataSource?.features, attributeName]);
     const isDisabled = useMemo(() => {
-        const attr = layerInfo?.configuration?.attributesConfiguration?.attributes?.find(({ attributeName }) => attributeName === attrName);
+        const attr = layerInfo?.configuration?.attributesConfiguration?.attributes?.find(item => item.attributeName === control?.targetAttributeName);
         return !attr?.isEditable;
-    }, [attrName, layerInfo?.configuration?.attributesConfiguration?.attributes]);
+    }, [control?.targetAttributeName, layerInfo?.configuration?.attributesConfiguration?.attributes]);
     const handleChange = useCallback(([option]) => {
         setValue(option?.value);
-        if (attrName && changeControls) {
+        if (attributeName && changeControls) {
             changeControls({
-                [attrName]: option?.value,
+                [attributeName]: option?.value,
             });
         }
-    }, [changeControls, attrName]);
-    return (jsx(Dropdown, { zIndex: 1000, width: `${width ?? DEFAULT_DROPDOWN_WIDTH}px`, label: label, options: items, value: controls?.[attrName] ?? value, placeholder: placeholder, disabled: isDisabled, onChange: handleChange }));
+    }, [changeControls, attributeName]);
+    return (jsx(Dropdown, { zIndex: 1000, width: `${width ?? DEFAULT_DROPDOWN_WIDTH}px`, label: label, options: items, value: controls?.[attributeName] ?? value ?? attribute?.value ?? defaultValue, placeholder: placeholder, disabled: isDisabled, onChange: handleChange }));
 };
 
 const StyledIconFontSizeMixin = css `

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.1.87",
+  "version": "3.1.89",
   "name": "@evergis/react",
   "author": "Everpoint",
   "license": "MIT",
@@ -83,5 +83,5 @@
     "swiper": "^8.3.2",
     "wkt": "^0.1.1"
   },
-  "gitHead": "ddf2f4dacce4e1644224ad1b0d8abd2e1dfb1e83"
+  "gitHead": "2badfc31f3825666f28477a501eb7a76d34667e8"
 }