Merge branch 'feature/104546' into develop

SnowdogApps · May 14, 2024 · f145a8a · f145a8a
2 parents 56a10d8 + 6f95108
commit f145a8a
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 7 deletions.
diff --git a/view/adminhtml/layout/snowmenu_menu_create.xml b/view/adminhtml/layout/snowmenu_menu_create.xml
@@ -2,5 +2,8 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"
 >
+    <head>
+        <css src="Snowdog_Menu::css/lib/v-select.css"/>
+    </head>
     <update handle="snowmenu_menu_edit"/>
 </page>
diff --git a/view/adminhtml/layout/snowmenu_menu_edit.xml b/view/adminhtml/layout/snowmenu_menu_edit.xml
@@ -2,6 +2,9 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"
 >
+    <head>
+        <css src="Snowdog_Menu::css/lib/v-select.css"/>
+    </head>
     <body>
         <referenceContainer name="content">
             <uiComponent name="snowmenu_menu_form"/>

diff --git a/view/adminhtml/web/css/lib/v-select.css b/view/adminhtml/web/css/lib/v-select.css
diff --git a/view/adminhtml/web/css/source/_module.less b/view/adminhtml/web/css/source/_module.less
@@ -1,4 +1,3 @@
-@import './lib/_v-select.less';
 @import './lib/_vue-treeselect.less';
 
 @import './blocks/_image-upload';

diff --git a/view/adminhtml/web/css/source/lib/_v-select.less b/view/adminhtml/web/css/source/lib/_v-select.less
diff --git a/view/adminhtml/web/js/lib/vue-select.js b/view/adminhtml/web/js/lib/vue-select.js
diff --git a/view/adminhtml/web/vue/field-type/autocomplete.vue b/view/adminhtml/web/vue/field-type/autocomplete.vue
@@ -129,14 +129,14 @@
                     },
                     set(option) {
                         if (option && typeof option === 'object') {
-                            this.item[this.itemKey] = option.value.toString();
-                            this.item[this.itemIdKey] = option.id.toString();
+                            this.$set(this.item, this.itemKey, option.value.toString());
+                            this.$set(this.item, this.itemIdKey, option.id.toString());
                         }
                         else if (option && typeof option === 'string') {
-                            this.item[this.itemKey] = option;
+                            this.$set(this.item, this.itemKey, option);
                         }
                         else {
-                          this.item[this.itemKey] = this.defaultSelectedOption ? this.defaultSelectedOption.value.toString() : '';
+                            this.$set(this.item, this.itemKey, this.defaultSelectedOption ? this.defaultSelectedOption.value.toString() : '');
                         }
                     }
                 },

diff --git a/view/adminhtml/web/vue/menu-type/cms-block.vue b/view/adminhtml/web/vue/menu-type/cms-block.vue
@@ -4,6 +4,7 @@
         :description="config.translation.blockId"
         :item="item"
         item-key="content"
+        item-id-key="selected_item_id"
         :options="config.fieldData.cms_block.snowMenuAutoCompleteField.options"
         :config="config"
     />