resize works, but not ideal

This commit is contained in:
2025-11-19 23:26:01 +01:00
parent 2adc151e8e
commit 4bbd92920e
2 changed files with 405 additions and 308 deletions

View File

@@ -30,6 +30,8 @@
<button id="zoom-out">-</button> <button id="zoom-out">-</button>
</div> </div>
</div> </div>
<div id="resize-handle" style="position: absolute; display: none; border: 2px dashed #4A90E2; z-index: 10;"></div>
<div class="canvas-container"> <div class="canvas-container">
<div id="paper"></div> <div id="paper"></div>
</div> </div>
@@ -38,350 +40,435 @@
<script src="https://code.jquery.com/ui/1.13.2/jquery-ui.min.js"></script> <script src="https://code.jquery.com/ui/1.13.2/jquery-ui.min.js"></script>
<script src="joint.js"></script> <script src="joint.js"></script>
<script> <script>
let selectedElement = null; let selectedElement = null;
let activeElementView = null; let activeElementView = null;
let clipboard = null; let clipboard = null;
let zoomLevel = 1.0; let zoomLevel = 1.0;
$(document).ready(function () { $(document).ready(function () {
//init paper - Start //init paper - Start
const graph = new joint.dia.Graph(); const graph = new joint.dia.Graph();
const paper = new joint.dia.Paper({ const paper = new joint.dia.Paper({
el: $('#paper'), el: $('#paper'),
model: graph, model: graph,
width: window.innerWidth, width: window.innerWidth,
height: window.innerHeight, height: window.innerHeight,
gridSize: 20, gridSize: 20,
});
//init paper - END
// obwódka i znaczek usuwanie
function createToolsView() {
return new joint.dia.ToolsView({
tools: [
new joint.elementTools.Boundary({
padding: 10,
}),
new joint.elementTools.Remove({
focusOpacity: 0.5,
})
]
}); });
} //init paper - END
//create shape - START const $resizeHandle = $('#resize-handle');
function createRectangle(paperX, paperY) {
const rect = new joint.shapes.standard.Rectangle({
position: { x: paperX - 40, y: paperY - 24 },
size: { width: 80, height: 48 },
attrs: {
body: {
fill: 'transparent',
stroke: '#000000',
strokeWidth: 1
},
label: {
text: ''
}
}
});
graph.addCell(rect);
const elementView = rect.findView(paper);
elementView.addTools(createToolsView());
}
function createDiamond(paperX, paperY) { // obwódka i znaczek usuwanie
const rect = new joint.shapes.standard.Rectangle({ function createToolsView() {
position: { x: paperX - 24, y: paperY - 24 }, return new joint.dia.ToolsView({
size: { width: 48, height: 48 }, tools: [
angle: 45, new joint.elementTools.Boundary({
attrs: { padding: 10,
body: { }),
fill: 'transparent', new joint.elementTools.Remove({
stroke: '#000000', focusOpacity: 0.5,
strokeWidth: 1 })
}, ]
label: {
text: ''
}
}
});
graph.addCell(rect);
const elementView = rect.findView(paper);
elementView.addTools(createToolsView());
}
function createEllipse(paperX, paperY) {
const rect = new joint.shapes.standard.Ellipse({
position: { x: paperX - 40, y: paperY - 24 },
size: { width: 80, height: 48 },
attrs: {
body: {
fill: 'transparent',
stroke: '#000000',
strokeWidth: 1
},
label: {
text: ''
}
}
});
graph.addCell(rect);
const elementView = rect.findView(paper);
elementView.addTools(createToolsView());
}
function createText(paperX, paperY) {
const textBlock = new joint.shapes.standard.TextBlock({
position: { x: paperX - 40, y: paperY - 24 },
size: { width: 80, height: 48 },
attrs: {
body: {
fill: 'transparent',
stroke: '#000000',
strokeWidth: 1,
strokeDasharray: '5,5'
},
label: {
text: 'Tekst...',
fill: '#000000'
}
}
});
graph.addCell(textBlock);
const elementView = textBlock.findView(paper);
elementView.addTools(createToolsView());
}
//create shape - END
//init draggalble - START
$('.shape').draggable({
helper: function () {
const $clone = $(this).clone();
$clone.css({
opacity: 0.8,
cursor: 'grabbing',
borderColor: '#000',
color: '#000',
}); });
return $clone; }
},
cursor: 'move',
revert: 'invalid',
appendTo: 'body',
zIndex: 1000
});
$('#paper').droppable({ function showResizeHandle(elementView) {
accept: '.shape', if (!elementView) return;
drop: function (event, ui) {
const shapeType = ui.helper.data('type');
const containerOffset = $(this).offset(); const bbox = elementView.model.getBBox();
const x = event.pageX - containerOffset.left; const clientRect = paper.localToClientRect(bbox);
const y = event.pageY - containerOffset.top;
$resizeHandle.css({
left: clientRect.x,
top: clientRect.y,
width: clientRect.width,
height: clientRect.height
}).show();
if ($resizeHandle.data('ui-resizable')) {
$resizeHandle.resizable('destroy');
}
let originalBBox;
$resizeHandle.resizable({
handles: 'n, e, s, w, ne, se, sw, nw',
start: function(event, ui) {
if (activeElementView) {
activeElementView.hideTools();
}
originalBBox = selectedElement.getBBox();
},
resize: function(event, ui) {
if (selectedElement && originalBBox) {
const scale = paper.scale();
const newWidth = ui.size.width / scale.sx;
const newHeight = ui.size.height / scale.sy;
const newX = originalBBox.x + (ui.position.left - ui.originalPosition.left) / scale.sx;
const newY = originalBBox.y + (ui.position.top - ui.originalPosition.top) / scale.sy;
if (selectedElement.get('angle')) {
// Для повернутых фигур используем другой подход
selectedElement.resize(newWidth, newHeight, { direction: 'center' });
} else {
selectedElement.position(newX, newY);
selectedElement.resize(newWidth, newHeight);
}
}
},
stop: function(event, ui) {
if (activeElementView) {
activeElementView.showTools();
// Обновляем позицию маркера после изменения размера
showResizeHandle(activeElementView);
}
originalBBox = null;
}
});
}
function hideResizeHandle() {
if ($resizeHandle.data('ui-resizable')) {
$resizeHandle.resizable('destroy');
}
$resizeHandle.hide();
}
//create shape - START
function createRectangle(paperX, paperY) {
const rect = new joint.shapes.standard.Rectangle({
position: { x: paperX - 40, y: paperY - 24 },
size: { width: 80, height: 48 },
attrs: {
body: {
fill: 'transparent',
stroke: '#000000',
strokeWidth: 1
},
label: {
text: ''
}
}
});
graph.addCell(rect);
const elementView = rect.findView(paper);
elementView.addTools(createToolsView());
}
function createDiamond(paperX, paperY) {
const rect = new joint.shapes.standard.Rectangle({
position: { x: paperX - 24, y: paperY - 24 },
size: { width: 48, height: 48 },
angle: 45,
attrs: {
body: {
fill: 'transparent',
stroke: '#000000',
strokeWidth: 1
},
label: {
text: ''
}
}
});
graph.addCell(rect);
const elementView = rect.findView(paper);
elementView.addTools(createToolsView());
}
function createEllipse(paperX, paperY) {
const rect = new joint.shapes.standard.Ellipse({
position: { x: paperX - 40, y: paperY - 24 },
size: { width: 80, height: 48 },
attrs: {
body: {
fill: 'transparent',
stroke: '#000000',
strokeWidth: 1
},
label: {
text: ''
}
}
});
graph.addCell(rect);
const elementView = rect.findView(paper);
elementView.addTools(createToolsView());
}
function createText(paperX, paperY) {
const textBlock = new joint.shapes.standard.TextBlock({
position: { x: paperX - 40, y: paperY - 24 },
size: { width: 80, height: 48 },
attrs: {
body: {
fill: 'transparent',
stroke: '#000000',
strokeWidth: 1,
strokeDasharray: '5,5'
},
label: {
text: 'Tekst...',
fill: '#000000'
}
}
});
graph.addCell(textBlock);
const elementView = textBlock.findView(paper);
elementView.addTools(createToolsView());
}
//create shape - END
//init draggalble - START
$('.shape').draggable({
helper: function () {
const $clone = $(this).clone();
$clone.css({
opacity: 0.8,
cursor: 'grabbing',
borderColor: '#000',
color: '#000',
});
return $clone;
},
cursor: 'move',
revert: 'invalid',
appendTo: 'body',
zIndex: 1000
});
$('#paper').droppable({
accept: '.shape',
drop: function (event, ui) {
const shapeType = ui.helper.data('type');
const containerOffset = $(this).offset();
const x = event.pageX - containerOffset.left;
const y = event.pageY - containerOffset.top;
const scale = paper.scale();
const translate = paper.translate();
const paperX = (x - translate.tx) / scale.sx;
const paperY = (y - translate.ty) / scale.sy;
activeElementView = null;
selectedElement = null;
hideResizeHandle();
if (shapeType === 'rectangle') {
createRectangle(paperX, paperY);
} else if (shapeType === 'ellipse') {
createEllipse(paperX, paperY);
} else if (shapeType === 'diamond') {
createDiamond(paperX, paperY);
} else if (shapeType === 'text') {
createText(paperX, paperY);
}
const cells = graph.getCells();
if (cells.length > 0) {
const lastCell = cells[cells.length - 1];
const lastView = lastCell.findView(paper);
if (lastView && typeof lastView.hideTools === 'function') {
lastView.hideTools();
}
}
}
});
//init draggable - END
function updateStatus(message) {
// $('#status').text(message + ' | Zoom: ' + Math.round(zoomLevel * 100) + '%');
}
function getViewportCenter() {
const container = $('.canvas-container');
const scale = paper.scale(); const scale = paper.scale();
const translate = paper.translate(); const translate = paper.translate();
const paperX = (x - translate.tx) / scale.sx;
const paperY = (y - translate.ty) / scale.sy;
activeElementView = null; return {
selectedElement = null; x: (container.width() / 2 - translate.tx) / scale.sx,
y: (container.height() / 2 - translate.ty) / scale.sy
};
}
if (shapeType === 'rectangle') { function copyShape() {
createRectangle(paperX, paperY); if (selectedElement) {
} else if (shapeType === 'ellipse') { clipboard = selectedElement.clone();
createEllipse(paperX, paperY); updateStatus('Skopiowano element');
} else if (shapeType === 'diamond') { } else {
createDiamond(paperX, paperY); updateStatus('Brak zaznaczonego elementu');
} else if (shapeType === 'text') {
createText(paperX, paperY);
} }
const cells = graph.getCells(); }
if (cells.length > 0) {
const lastCell = cells[cells.length - 1]; function pasteShape() {
const lastView = lastCell.findView(paper); if (clipboard) {
if (lastView && typeof lastView.hideTools === 'function') { const center = getViewportCenter();
lastView.hideTools(); const pasted = clipboard.clone();
pasted.position(center.x + 20, center.y + 20);
graph.addCell(pasted);
const pastedView = pasted.findView(paper);
if (pastedView) {
pastedView.addTools(createToolsView());
pastedView.showTools();
if (activeElementView && activeElementView !== pastedView) {
activeElementView.hideTools();
}
activeElementView = pastedView;
} }
selectedElement = pasted;
showResizeHandle(pastedView);
updateStatus('Wklejono element');
} else {
updateStatus('Brak elementu w schowku');
} }
} }
});
//init draggable - END
function updateStatus(message) { function deleteShape() {
$('#status').text(message + ' | Zoom: ' + Math.round(zoomLevel * 100) + '%'); if (selectedElement) {
} selectedElement.remove();
selectedElement = null;
function getViewportCenter() { activeElementView = null;
const container = $('.canvas-container'); hideResizeHandle();
const scale = paper.scale(); updateStatus('Usunięto element');
const translate = paper.translate();
return {
x: (container.width() / 2 - translate.tx) / scale.sx,
y: (container.height() / 2 - translate.ty) / scale.sy
};
}
function copyShape() {
if (selectedElement) {
clipboard = selectedElement.clone();
updateStatus('Skopiowano element');
} else {
updateStatus('Brak zaznaczonego elementu');
}
}
function pasteShape() {
if (clipboard) {
const center = getViewportCenter();
const pasted = clipboard.clone();
pasted.position(center.x + 20, center.y + 20);
graph.addCell(pasted);
const pastedView = pasted.findView(paper);
if (pastedView) {
pastedView.addTools(createToolsView());
pastedView.showTools();
if (activeElementView && activeElementView !== pastedView) {
activeElementView.hideTools();
}
activeElementView = pastedView;
} }
selectedElement = pasted;
updateStatus('Wklejono element');
} else {
updateStatus('Brak elementu w schowku');
} }
}
function deleteShape() { $('#btn-delete').click(function() {
selectedElement.remove(); deleteShape()
selectedElement = null; });
updateStatus('Usunięto element');
}
$('#btn-delete').click(function() { $('#btn-copy').click(function() {
deleteShape() copyShape();
}); });
$('#btn-copy').click(function() { $('#btn-paste').click(function() {
copyShape(); pasteShape();
}); });
$('#btn-paste').click(function() {
pasteShape();
});
paper.on('element:pointerclick', function (elementView) { paper.on('element:pointerclick', function (elementView) {
if (activeElementView && activeElementView !== elementView) { if (activeElementView && activeElementView !== elementView) {
activeElementView.hideTools();
}
elementView.showTools();
activeElementView = elementView;
selectedElement = elementView.model;
});
let panStart = null;
paper.on('blank:pointerdown', function (evt) {
if (activeElementView) {
if (typeof activeElementView.hideTools === 'function') {
activeElementView.hideTools(); activeElementView.hideTools();
} }
if (typeof activeElementView.unhighlight === 'function') { elementView.showTools();
activeElementView.unhighlight(); activeElementView = elementView;
selectedElement = elementView.model;
showResizeHandle(elementView);
});
paper.on('element:pointermove', function(elementView) {
showResizeHandle(elementView);
});
let panStart = null;
paper.on('blank:pointerdown', function (evt) {
if (activeElementView) {
if (typeof activeElementView.hideTools === 'function') {
activeElementView.hideTools();
}
if (typeof activeElementView.unhighlight === 'function') {
activeElementView.unhighlight();
}
activeElementView = null;
} }
activeElementView = null; selectedElement = null;
} hideResizeHandle();
selectedElement = null; //ruszanie caloscia
//ruszanie caloscia panStart = {
panStart = { x: evt.clientX,
x: evt.clientX, y: evt.clientY,
y: evt.clientY, tx: paper.translate().tx,
tx: paper.translate().tx, ty: paper.translate().ty
ty: paper.translate().ty };
}; paper.$el.css('cursor', 'grabbing');
paper.$el.css('cursor', 'grabbing'); });
});
$(document).on('mousemove', function (evt) { $(document).on('mousemove', function (evt) {
if (panStart) { if (panStart) {
const dx = evt.clientX - panStart.x; const dx = evt.clientX - panStart.x;
const dy = evt.clientY - panStart.y; const dy = evt.clientY - panStart.y;
paper.translate(panStart.tx + dx, panStart.ty + dy); paper.translate(panStart.tx + dx, panStart.ty + dy);
} showResizeHandle(activeElementView);
});
$(document).on('mouseup', function () {
if (panStart) {
panStart = null;
paper.$el.css('cursor', 'default');
}
});
//add text to text block - START
paper.on('element:pointerdblclick', function (elementView) {
if (elementView.model.attributes.type === 'standard.TextBlock') {
const currentText = elementView.model.attr('label/text');
const newText = prompt('Edytuj tekst:', currentText);
if (newText != null) {
elementView.model.attr('label/text', newText);
} }
} });
});
$(document).on('keydown', function (e) { $(document).on('mouseup', function () {
if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === 'c') { if (panStart) {
e.preventDefault(); panStart = null;
copyShape(); paper.$el.css('cursor', 'default');
return; }
});
//add text to text block - START
paper.on('element:pointerdblclick', function (elementView) {
if (elementView.model.attributes.type === 'standard.TextBlock') {
const currentText = elementView.model.attr('label/text');
const newText = prompt('Edytuj tekst:', currentText);
if (newText != null) {
elementView.model.attr('label/text', newText);
}
}
});
$(document).on('keydown', function (e) {
if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === 'c') {
e.preventDefault();
copyShape();
return;
}
if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === 'v') {
e.preventDefault();
pasteShape();
return;
}
if (e.key === 'Delete' && selectedElement) {
deleteShape();
}
});
//add text to text block - END
// Zoom
const zoomStep = 0.2;
const minScale = 0.2;
const maxScale = 3.0;
function applyZoom(newScale, ox, oy) {
paper.scale(newScale, newScale, ox, oy);
showResizeHandle(activeElementView);
} }
if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === 'v') { $('#zoom-in').click(function () {
e.preventDefault(); const currentScale = paper.scale().sx;
pasteShape(); const newScale = Math.min(maxScale, currentScale + zoomStep);
return; applyZoom(newScale);
} });
if (e.key === 'Delete' && selectedElement) { $('#zoom-out').click(function () {
deleteShape(); const currentScale = paper.scale().sx;
} const newScale = Math.max(minScale, currentScale - zoomStep);
}); applyZoom(newScale);
//add text to text block - END });
// Zoom // Zoom za pomoca kolka myszy
const zoomStep = 0.2; paper.on('blank:mousewheel cell:mousewheel', function (evt, x, y, delta) {
const minScale = 0.2; evt.preventDefault();
const maxScale = 3.0; const oldScale = paper.scale().sx;
const zoomFactor = 0.2;
$('#zoom-in').click(function () { let newScale = oldScale * (1 + delta * zoomFactor);
const currentScale = paper.scale().sx; newScale = Math.max(minScale, Math.min(maxScale, newScale));
const newScale = Math.min(maxScale, currentScale + zoomStep); applyZoom(newScale, x, y);
paper.scale(newScale, newScale); });
}); });
$('#zoom-out').click(function () {
const currentScale = paper.scale().sx;
const newScale = Math.max(minScale, currentScale - zoomStep);
paper.scale(newScale, newScale);
});
// Zoom za pomoca kolka myszy
paper.on('blank:mousewheel cell:mousewheel', function (evt, x, y, delta) {
evt.preventDefault();
const oldScale = paper.scale().sx;
const zoomFactor = 0.2;
let newScale = oldScale * (1 + delta * zoomFactor);
newScale = Math.max(minScale, Math.min(maxScale, newScale));
paper.scale(newScale, newScale, x, y);
});
});
</script> </script>
</body> </body>

View File

@@ -240,6 +240,16 @@ body {
background: #999; background: #999;
} }
.ui-resizable-handle {
background: #4A90E2;
border: 1px solid #ffffff;
width: 10px;
height: 10px;
border-radius: 50%;
box-shadow: 0 0 5px rgba(0,0,0,0.2);
}
/* Responsive */ /* Responsive */
@media (max-width: 768px) { @media (max-width: 768px) {
.toolbar { .toolbar {