vgapp 1.1.1 → 1.1.2

package/app/modules/vgformsender/js/vgformsender.js

@@ -274,13 +274,18 @@ class VGFormSender extends BaseModule {
 	 * @param {FormData|null} data - Дополнительные данные для отправки
 	 */
 	request(event, data = null) {
-		const _this = this;
-		const mergeFormData = (target, source) => {
-			source.forEach((value, key) => {
-				target.set(key, value);
-			});
-			return target;
-		}
+		const _this = this;
+		const mergeFormData = (target, source) => {
+			const replacedKeys = new Set();
+			source.forEach((value, key) => {
+				if (!replacedKeys.has(key)) {
+					target.delete(key);
+					replacedKeys.add(key);
+				}
+				target.append(key, value);
+			});
+			return target;
+		}
 
 		_this._alertBefore();
 
@@ -777,4 +782,4 @@ EventHandler.on(document, EVENT_SUBMIT_DATA_API, function (event) {
 	}
 })
 
-export default VGFormSender;
+export default VGFormSender;

package/app/modules/vgselect/js/vgselect.js

@@ -46,12 +46,12 @@ const EVENT_KEY_CLEAR           = `${NAME_KEY}.clear`;
 const EVENT_KEY_ERROR           = `${NAME_KEY}.error`;
 const EVENT_KEY_LOAD_NEXT       = `${NAME_KEY}.loadNext`;
 
-const SELECTOR_DATA_TOGGLE      = '[data-vg-toggle="select"]';
-const SELECTOR_CURRENT          = `.${CLASS_NAME_CURRENT}`;
-const SELECTOR_DROPDOWN         = `.${CLASS_NAME_DROPDOWN}`;
-const SELECTOR_SEARCH_INPUT     = `.${CLASS_NAME_SEARCH} input`;
-const SELECTOR_LIST             = `.${CLASS_NAME_LIST}`;
-const SELECTOR_LOAD_MORE_BTN    = `.${CLASS_NAME_LOAD_MORE}`;
+const SELECTOR_DATA_TOGGLE      = '[data-vg-toggle="select"]';
+const SELECTOR_CURRENT          = `.${CLASS_NAME_CURRENT}`;
+const SELECTOR_DROPDOWN         = `.${CLASS_NAME_DROPDOWN}`;
+const SELECTOR_SEARCH_INPUT     = `.${CLASS_NAME_SEARCH} input`;
+const SELECTOR_LIST             = `.${CLASS_NAME_LIST}`;
+const SELECTOR_LOAD_MORE_BTN    = `.${CLASS_NAME_LOAD_MORE}`;
 const DATA_ATTR_COPY_EXCLUDE_DEFAULT = ['inited', 'updating', 'exclude'];
 
 /**
@@ -68,8 +68,8 @@ class VGSelect extends BaseModule {
 	constructor(element, params = {}) {
 		super(element, params);
 
-		this._params = this._getParams(element, mergeDeepObject({
-			lang: document.documentElement.lang || 'ru',
+		this._params = this._getParams(element, mergeDeepObject({
+			lang: document.documentElement.lang || 'ru',
 			// Dropdown placement behavior:
 			// - none: default CSS positioning (no JS)
 			// - auto: choose top/bottom based on available space in overflow ancestor/viewport
@@ -88,10 +88,10 @@ class VGSelect extends BaseModule {
 				perpage: 20,
 				loadMoreText: 'Загрузить ещё',
 			},
-			close: true,
-			tree: false,
-			exclude: '',
-			placeholder: '',
+			close: true,
+			tree: false,
+			exclude: 'data-filter-param',
+			placeholder: '',
 			onInit: null,
 			onShow: null,
 			onHide: null,
@@ -254,33 +254,32 @@ class VGSelect extends BaseModule {
 		parent.appendChild(frag);
 	}
 
-	static _isTreeEnabled(selector, params = {}) {
-		if (typeof params.tree === 'boolean') return params.tree;
-		if (selector?.dataset && typeof selector.dataset.tree !== 'undefined') {
-			return normalizeData(selector.dataset.tree) === true;
-		}
-
-		return false;
-	}
-
-	static _getDataAttrCopyExclusions(selector, params = {}) {
-		const rawExclude = typeof params.exclude === 'string'
-			? params.exclude
-			: (selector.dataset.exclude || '');
-		const customExcluded = rawExclude
-			.split(',')
-			.map(item => this._normalizeDataAttrKey(item))
-			.filter(Boolean);
-
-		return new Set([...DATA_ATTR_COPY_EXCLUDE_DEFAULT, ...customExcluded]);
-	}
-
+	static _isTreeEnabled(selector, params = {}) {
+		if (typeof params.tree === 'boolean') return params.tree;
+		if (selector?.dataset && typeof selector.dataset.tree !== 'undefined') {
+			return normalizeData(selector.dataset.tree) === true;
+		}
+
+		return false;
+	}
+
+	static _getDataAttrCopyExclusions(selector, params = {}) {
+		const rawExclude = typeof params.exclude === 'string'
+			? params.exclude
+			: (selector.dataset.exclude || '');
+		const customExcluded = rawExclude
+			.split(',')
+			.map(item => this._normalizeDataAttrKey(item))
+			.filter(Boolean);
+
+		return new Set([...DATA_ATTR_COPY_EXCLUDE_DEFAULT, ...customExcluded]);
+	}
+
 	static _normalizeDataAttrKey(value) {
 		return String(value || '')
 			.trim()
 			.replace(/^data-/, '')
-			.toLowerCase()
-			.replace(/-([a-z0-9])/g, (_, chr) => chr.toUpperCase());
+			.toLowerCase();
 	}
 
 	/**
@@ -339,14 +338,14 @@ class VGSelect extends BaseModule {
 			container.classList.add('disabled');
 		}
 
-		const elData = Manipulator.get(selector);
-		if (!isEmptyObj(elData)) {
-			const excludeDataAttrs = this._getDataAttrCopyExclusions(selector, params);
-			Object.keys(elData).forEach(key => {
-				if (excludeDataAttrs.has(key)) return;
-				Manipulator.set(container, `data-${key}`, elData[key]);
-			});
-		}
+		const elData = Manipulator.get(selector);
+		if (!isEmptyObj(elData)) {
+			const excludeDataAttrs = this._getDataAttrCopyExclusions(selector, params);
+			Object.keys(elData).forEach(key => {
+				if (excludeDataAttrs.has(key)) return;
+				Manipulator.set(container, `data-${key}`, elData[key]);
+			});
+		}
 
 		const placeholder = selector.dataset.placeholder || '';
 		const isMultiple = selector.multiple;
@@ -401,8 +400,6 @@ class VGSelect extends BaseModule {
 		this.updateUI(selector);
 		const instance = VGSelect.getInstance(container);
 
-		console.log(instance);
-
 		let searchInput = null;
 		if (Manipulator.has(selector, 'data-search-enabled')) {
 			const search = document.createElement('div');
@@ -791,26 +788,28 @@ class VGSelect extends BaseModule {
 	 * @param {string} value - Значение для выбора
 	 * @param {Object} [data] - Дополнительные данные
 	 */
-	static changeSelector(select, value, data = {}) {
-		const container = select.nextElementSibling;
-		const instance = container ? VGSelect.getInstance(container) : null;
-		const prevValue = select.value;
-
-		select.setAttribute('data-updating', 'true');
-		try {
-			const opt = select.querySelector(`option[value="${CSS.escape(normalizeData(value))}"]`);
+	static changeSelector(select, value, data = {}) {
+		const container = select.nextElementSibling;
+		const instance = container ? VGSelect.getInstance(container) : null;
+
+		select.setAttribute('data-updating', 'true');
+		try {
+			const opt = select.querySelector(`option[value="${CSS.escape(normalizeData(value))}"]`);
 			if (!opt) {
 				instance?._triggerEvent(EVENT_KEY_ERROR, { error: 'Option not found', value });
 				return;
 			}
 
-			const oldValue = select.value;
-			const wasSelected = opt.selected;
-			const selectedText = opt.textContent.trim();
-
-			[...select.options].forEach(o => o.selected = false);
-			opt.selected = true;
-			select.value = opt.value;
+			const wasSelected = opt.selected;
+			const selectedText = opt.textContent.trim();
+
+			if (select.multiple) {
+				opt.selected = data?.selected === false ? false : true;
+			} else {
+				[...select.options].forEach(o => o.selected = false);
+				opt.selected = true;
+				select.value = opt.value;
+			}
 
 			this.updateUI(select);
 
@@ -833,9 +832,9 @@ class VGSelect extends BaseModule {
 	 * @param {number} index
 	 * @param {Object} [data]
 	 */
-	static changeSelectorByIndex(select, index, data = {}) {
-		const container = select.nextElementSibling;
-		const instance = container ? VGSelect.getInstance(container) : null;
+	static changeSelectorByIndex(select, index, data = {}) {
+		const container = select.nextElementSibling;
+		const instance = container ? VGSelect.getInstance(container) : null;
 
 		select.setAttribute('data-updating', 'true');
 		try {
@@ -845,13 +844,17 @@ class VGSelect extends BaseModule {
 				return;
 			}
 
-			const wasSelected = opt.selected;
-			const selectedText = opt.textContent.trim();
-			const value = opt.value;
-
-			[...select.options].forEach(o => o.selected = false);
-			opt.selected = true;
-			select.value = opt.value;
+			const wasSelected = opt.selected;
+			const selectedText = opt.textContent.trim();
+			const value = opt.value;
+
+			if (select.multiple) {
+				opt.selected = data?.selected === false ? false : true;
+			} else {
+				[...select.options].forEach(o => o.selected = false);
+				opt.selected = true;
+				select.value = opt.value;
+			}
 
 			this.updateUI(select);
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vgapp",
-	"version": "1.1.1",
+	"version": "1.1.2",
 	"description": "",
 	"author": {
 		"name": "Vegas Studio",