Merge remote-tracking branch 'origin/2.2' into 2.x

Author: kingjia90

public/js/pimcore/element/helpers/gridCellEditor.js

@@ -88,9 +88,20 @@ Ext.define('pimcore.element.helpers.gridCellEditor', {
             bodyStyle: "padding: 10px;"
         });
         let width = 700;
-        if (tagType === 'manyToManyObjectRelation' && fieldInfo.layout.width && fieldInfo.layout.width !== '100%') {
+
+        if (tagType === 'manyToOneRelation') {
+            width = sumWidths(
+                formPanel.config.items[0].items.items[0].width,
+                formPanel.config.items[0].labelWidth + 140
+            );
+        } else if (
+            tagType.endsWith('Relation') &&
+            fieldInfo.layout?.width &&
+            fieldInfo.layout?.width !== '100%'
+        ) {
             width = sumWidths(fieldInfo.layout.width, 25);
         }
+
         this.editWin = new Ext.Window({
             modal: false,
             title: t("edit") + " " + fieldInfo.layout.title,

public/js/pimcore/element/helpers/gridColumnConfig.js

@@ -433,8 +433,6 @@ pimcore.element.helpers.gridColumnConfig = {
             containerType: "filterByRelationWindow"
         });
 
-        editor.fieldConfig.width = 300;
-
             const activeFilter = this.grid.getStore().getFilters().items;
 
             for (let filter of activeFilter) {
@@ -495,9 +493,17 @@ pimcore.element.helpers.gridColumnConfig = {
 
         const title = t("filter_by_relation_field") + " " + fieldInfo.text;
         let width = 700;
-        if (tagType === 'manyToManyObjectRelation' && fieldInfo.layout.layout.width && fieldInfo.layout.layout.width !== '100%') {
-            width = sumWidths(fieldInfo.layout.layout.width, 25);
-        }
+       if (tagType === 'manyToOneRelation') {
+                width = sumWidths(
+                    formPanel.config.items[0].items.items[0].width,
+                    formPanel.config.items[0].labelWidth + 140
+                );
+            } else if (
+                tagType === 'manyToManyObjectRelation' &&
+                fieldInfo.layout?.layout.width &&
+                fieldInfo.layout?.layout.width !== '100%') {
+            width = sumWidths(fieldInfo.layout.layout.width, 25);}
+
         this.filterByRelationWindow = new Ext.Window({
             autoScroll: true,
             modal: false,

public/js/pimcore/object/edit.js

@@ -86,6 +86,12 @@ pimcore.object.edit = Class.create({
 
                 //only include changed values in save response.
                 if(currentField.isDirty()) {
+                    if (currentField.context?.subContainerType === 'block') {
+                        currentField.getValue().map((item, index) => {
+                            if('oIndex' in item)
+                                item.oIndex = index;
+                        });
+                    }
                     values[currentField.getName()] =  currentField.getValue();
                 }
             }