@@ -1999,7 +2026,9 @@
const supportBtn = document.getElementById('homeSupportBtn');
const supportText = document.getElementById('homeSupportText');
const rustdeskIconButtons = computersModal ? computersModal.querySelectorAll('.js-open-rustdesk') : [];
- const manageIconRenameForms = computersModal ? computersModal.querySelectorAll('.js-manage-icon-rename-form') : [];
+ const computerContextMenu = document.getElementById('homeComputerContextMenu');
+ const computerContextConnect = document.getElementById('homeComputerContextConnect');
+ const computerContextRename = document.getElementById('homeComputerContextRename');
if (supportBtn && supportText) {
supportBtn.addEventListener('click', () => {
const isVisible = supportText.classList.toggle('hidden') === false;
@@ -2927,68 +2956,92 @@
if (rustdeskCancelBtn) {
rustdeskCancelBtn.addEventListener('click', () => hideRustdeskConnecting());
}
- const renameFormsByComputerId = new Map();
- if (manageIconRenameForms && manageIconRenameForms.length) {
- manageIconRenameForms.forEach((formEl) => {
- const compId = (formEl.getAttribute('data-computer-id') || '').trim();
- if (compId) renameFormsByComputerId.set(compId, formEl);
- });
+ let contextComputerButton = null;
+ function hideComputerContextMenu() {
+ if (computerContextMenu) computerContextMenu.classList.add('hidden');
+ contextComputerButton = null;
}
- function submitIconRename(btn) {
+ function showComputerContextMenu(event, btn) {
+ if (!computerContextMenu || !btn) return;
+ event.preventDefault();
+ contextComputerButton = btn;
+ computerContextMenu.classList.remove('hidden');
+ const menuWidth = computerContextMenu.offsetWidth;
+ const menuHeight = computerContextMenu.offsetHeight;
+ const left = Math.max(4, Math.min(event.clientX, window.innerWidth - menuWidth - 4));
+ const top = Math.max(4, Math.min(event.clientY, window.innerHeight - menuHeight - 4));
+ computerContextMenu.style.left = `${left}px`;
+ computerContextMenu.style.top = `${top}px`;
+ if (computerContextConnect) computerContextConnect.focus();
+ }
+ async function renameComputerIcon(btn) {
if (!btn) return;
- const compId = (btn.getAttribute('data-computer-id') || '').trim();
- if (!compId) return;
- const formEl = renameFormsByComputerId.get(compId);
- if (!formEl) return;
- const labelField = formEl.querySelector('input[name="icon_label"]');
- const currentLabel = labelField ? (labelField.value || '').trim() : (btn.getAttribute('data-icon-label') || '').trim();
+ const sourceId = (btn.getAttribute('data-computer-id') || '').trim();
+ const sourceType = (btn.getAttribute('data-source-type') || 'computer').trim();
+ const currentLabel = (btn.getAttribute('data-icon-label') || '').trim();
+ const defaultLabel = (btn.getAttribute('data-default-icon-label') || '').trim();
+ if (!sourceId) return;
const nextLabel = window.prompt(
- 'Введите новое имя иконки (пустое значение вернет имя по умолчанию):',
+ `Введите новое имя компьютера.\nПустое значение вернёт имя по умолчанию: ${defaultLabel}`,
currentLabel,
);
if (nextLabel === null) return;
- if (labelField) labelField.value = nextLabel.trim();
- formEl.submit();
+ const cleanLabel = nextLabel.trim();
+ try {
+ const response = await fetch('/computers/manage-icon-label', {
+ method: 'POST',
+ headers: {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify({
+ source_type: sourceType,
+ source_id: sourceId,
+ icon_label: cleanLabel,
+ }),
+ });
+ const payload = await response.json().catch(() => ({}));
+ if (!response.ok || !payload.ok) {
+ throw new Error(payload.error || `HTTP ${response.status}`);
+ }
+ const renderedLabel = cleanLabel || defaultLabel;
+ const label = btn.querySelector('.home-computers-manage-btn__label');
+ if (label) label.textContent = renderedLabel;
+ btn.setAttribute('data-icon-label', renderedLabel);
+ } catch (error) {
+ window.alert(`Не удалось переименовать компьютер: ${error.message || error}`);
+ }
}
if (rustdeskIconButtons && rustdeskIconButtons.length) {
rustdeskIconButtons.forEach((btn) => {
- const canRename = renameFormsByComputerId.has((btn.getAttribute('data-computer-id') || '').trim());
- let longPressTimer = null;
- let longPressTriggered = false;
- const LONG_PRESS_MS = 650;
- const startLongPress = (event) => {
- if (!canRename) return;
- if (event.type === 'mousedown' && event.button !== 0) return;
- longPressTriggered = false;
- if (longPressTimer) window.clearTimeout(longPressTimer);
- longPressTimer = window.setTimeout(() => {
- longPressTimer = null;
- longPressTriggered = true;
- submitIconRename(btn);
- }, LONG_PRESS_MS);
- };
- const cancelLongPress = () => {
- if (!longPressTimer) return;
- window.clearTimeout(longPressTimer);
- longPressTimer = null;
- };
- btn.addEventListener('mousedown', startLongPress);
- btn.addEventListener('touchstart', startLongPress, { passive: true });
- btn.addEventListener('mouseup', cancelLongPress);
- btn.addEventListener('mouseleave', cancelLongPress);
- btn.addEventListener('touchend', cancelLongPress);
- btn.addEventListener('touchcancel', cancelLongPress);
- btn.addEventListener('click', (e) => {
- if (longPressTriggered) {
- e.preventDefault();
- e.stopPropagation();
- longPressTriggered = false;
- return;
- }
- openRustdeskForButton(btn);
- });
+ btn.addEventListener('click', () => openRustdeskForButton(btn));
+ btn.addEventListener('contextmenu', (event) => showComputerContextMenu(event, btn));
});
}
+ if (computerContextConnect) {
+ computerContextConnect.addEventListener('click', () => {
+ const btn = contextComputerButton;
+ hideComputerContextMenu();
+ openRustdeskForButton(btn);
+ });
+ }
+ if (computerContextRename) {
+ computerContextRename.addEventListener('click', () => {
+ const btn = contextComputerButton;
+ hideComputerContextMenu();
+ renameComputerIcon(btn);
+ });
+ }
+ document.addEventListener('click', (event) => {
+ if (computerContextMenu && !computerContextMenu.contains(event.target)) {
+ hideComputerContextMenu();
+ }
+ });
+ document.addEventListener('keydown', (event) => {
+ if (event.key === 'Escape') hideComputerContextMenu();
+ });
+ window.addEventListener('resize', hideComputerContextMenu);
+ window.addEventListener('scroll', hideComputerContextMenu, true);
if (projectorsBtn) {
projectorsBtn.addEventListener('click', () => toggleProjectors(true, projectorsBtn));
}
 }})
- {% if session.get('role') in ('admin','storekeeper') and comp.source_type == 'computer' %}
-
- {% endif %}
{% endfor %}
@@ -1059,6 +1082,10 @@
+