qwc2 2026.8.28 → 2026.9.2

package/components/AttributeTableWidget.js

@@ -216,7 +216,7 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
       var forceReload = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var stateChange = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       _this.setState(function (state) {
-        var _this$props$filter$fi, _newState$curEditConf, _fieldMap$newState$fi, _fieldMap$newState$so, _newState$sortField;
+        var _this$props$layers$fi, _this$props$layers$fi2, _this$props$filter$fi, _newState$curEditConf, _fieldMap$newState$fi, _fieldMap$newState$so, _newState$sortField;
         selectedLayer = selectedLayer || state.selectedLayer;
         var _selectedLayer$split = selectedLayer.split("#"),
           _selectedLayer$split2 = _slicedToArray(_selectedLayer$split, 2),
@@ -224,27 +224,27 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
           layerName = _selectedLayer$split2[1];
         var newState = _objectSpread(_objectSpread({}, state), stateChange);
         var editConfig = _this.props.editConfigs[wmsName][layerName];
+        var fieldTranslations = (_this$props$layers$fi = (_this$props$layers$fi2 = _this.props.layers.find(function (layer) {
+          return layer.wms_name === wmsName;
+        })) === null || _this$props$layers$fi2 === void 0 || (_this$props$layers$fi2 = _this$props$layers$fi2.translations) === null || _this$props$layers$fi2 === void 0 || (_this$props$layers$fi2 = _this$props$layers$fi2.layers) === null || _this$props$layers$fi2 === void 0 || (_this$props$layers$fi2 = _this$props$layers$fi2[layerName]) === null || _this$props$layers$fi2 === void 0 ? void 0 : _this$props$layers$fi2.fields) !== null && _this$props$layers$fi !== void 0 ? _this$props$layers$fi : {};
         var fields = (_this.props.showDisplayFieldOnly ? editConfig.fields.filter(function (field) {
           return field.name === editConfig.displayField;
         }) : editConfig.fields.filter(function (field) {
           var _field$constraints;
           return _this.props.showHiddenFields || ((_field$constraints = field.constraints) === null || _field$constraints === void 0 ? void 0 : _field$constraints.hidden) !== true;
         })).map(function (field) {
+          var _fieldTranslations$fi;
           return _objectSpread(_objectSpread({}, field), {}, {
-            name: _this.translateFieldName(field.name)
+            name: (_fieldTranslations$fi = fieldTranslations === null || fieldTranslations === void 0 ? void 0 : fieldTranslations[field.name]) !== null && _fieldTranslations$fi !== void 0 ? _fieldTranslations$fi : field.name
           });
         });
         if (selectedLayer !== state.loadedLayer) {
-          var _this$props$layers$fi, _this$props$layers$fi2;
           KeyValCache.clear();
           FeatureCache.clear();
           Object.assign(newState, AttributeTableWidget.defaultState);
           newState.limitToExtent = state.limitToExtent;
           newState.curEditConfig = editConfig;
           newState.curFields = fields;
-          newState.fieldTranslations = (_this$props$layers$fi = (_this$props$layers$fi2 = _this.props.layers.find(function (layer) {
-            return layer.wms_name === wmsName;
-          })) === null || _this$props$layers$fi2 === void 0 || (_this$props$layers$fi2 = _this$props$layers$fi2.translations) === null || _this$props$layers$fi2 === void 0 || (_this$props$layers$fi2 = _this$props$layers$fi2.layers) === null || _this$props$layers$fi2 === void 0 || (_this$props$layers$fi2 = _this$props$layers$fi2[layerName]) === null || _this$props$layers$fi2 === void 0 ? void 0 : _this$props$layers$fi2.fields) !== null && _this$props$layers$fi !== void 0 ? _this$props$layers$fi : {};
         }
         newState.selectedLayer = selectedLayer;
         newState.selectedFeatures = {};
@@ -707,10 +707,6 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
         }, options);
       }
     });
-    _defineProperty(_this, "translateFieldName", function (fieldName) {
-      var _this$state$fieldTran, _this$state$fieldTran2;
-      return (_this$state$fieldTran = (_this$state$fieldTran2 = _this.state.fieldTranslations) === null || _this$state$fieldTran2 === void 0 ? void 0 : _this$state$fieldTran2[fieldName]) !== null && _this$state$fieldTran !== void 0 ? _this$state$fieldTran : fieldName;
-    });
     _this.changedFiles = {};
     _this.state = AttributeTableWidget.defaultState;
     _this.table = null;
@@ -886,12 +882,14 @@ var AttributeTableWidget = /*#__PURE__*/function (_React$Component) {
           value: ""
         }, LocaleUtils.tr("common.select")), showIdColumn ? /*#__PURE__*/React.createElement("div", {
           value: "<id>"
-        }, this.translateFieldName(primaryKey)) : null, this.state.curFields.map(function (field) {
+        }, this.state.curFields.find(function (field) {
+          return field.id === primaryKey;
+        }).name) : null, this.state.curFields.map(function (field) {
           if (field.id !== primaryKey) {
             return /*#__PURE__*/React.createElement("option", {
               key: field.id,
               value: field.id
-            }, _this2.translateFieldName(field.name));
+            }, field.name);
           }
           return null;
         })), /*#__PURE__*/React.createElement(ComboBox, {
@@ -1129,7 +1127,6 @@ _defineProperty(AttributeTableWidget, "defaultState", {
   loadedLayer: "",
   curEditConfig: null,
   curFields: null,
-  fieldTranslations: null,
   features: [],
   allFeatures: null,
   totFeatureCount: 0,

package/components/EditComboField.js

@@ -111,6 +111,7 @@ var EditComboField = /*#__PURE__*/function (_React$Component) {
           value = _this$itemValueLabel2.value,
           label = _this$itemValueLabel2.label;
         return /*#__PURE__*/React.createElement("div", {
+          className: "edit-single-select-item",
           key: _this.props.fieldId + index,
           value: String(value)
         }, label);