mirror of
https://github.com/n8n-io/n8n.git
synced 2025-03-05 20:50:17 -08:00
🐛 Fix issues in read-only mode #39
This commit is contained in:
parent
2cdfb69e0c
commit
5718330e29
|
@ -65,6 +65,7 @@ export const nodeBase = mixins(nodeIndex).extend({
|
||||||
'name',
|
'name',
|
||||||
'nodeId',
|
'nodeId',
|
||||||
'instance',
|
'instance',
|
||||||
|
'isReadOnly',
|
||||||
],
|
],
|
||||||
methods: {
|
methods: {
|
||||||
__addNode (node: INodeUi) {
|
__addNode (node: INodeUi) {
|
||||||
|
@ -182,7 +183,7 @@ export const nodeBase = mixins(nodeIndex).extend({
|
||||||
endpoint: inputData.endpoint,
|
endpoint: inputData.endpoint,
|
||||||
endpointStyle: inputData.endpointStyle,
|
endpointStyle: inputData.endpointStyle,
|
||||||
isSource: false,
|
isSource: false,
|
||||||
isTarget: true,
|
isTarget: !this.isReadOnly,
|
||||||
parameters: {
|
parameters: {
|
||||||
nodeIndex: this.nodeIndex,
|
nodeIndex: this.nodeIndex,
|
||||||
type: inputName,
|
type: inputName,
|
||||||
|
@ -246,7 +247,7 @@ export const nodeBase = mixins(nodeIndex).extend({
|
||||||
maxConnections: inputData.maxConnections,
|
maxConnections: inputData.maxConnections,
|
||||||
endpoint: inputData.endpoint,
|
endpoint: inputData.endpoint,
|
||||||
endpointStyle: inputData.endpointStyle,
|
endpointStyle: inputData.endpointStyle,
|
||||||
isSource: true,
|
isSource: !this.isReadOnly,
|
||||||
isTarget: false,
|
isTarget: false,
|
||||||
parameters: {
|
parameters: {
|
||||||
nodeIndex: this.nodeIndex,
|
nodeIndex: this.nodeIndex,
|
||||||
|
@ -275,6 +276,7 @@ export const nodeBase = mixins(nodeIndex).extend({
|
||||||
this.instance.addEndpoint(this.nodeName, newEndpointData);
|
this.instance.addEndpoint(this.nodeName, newEndpointData);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (this.isReadOnly === false) {
|
||||||
// Make nodes draggable
|
// Make nodes draggable
|
||||||
this.instance.draggable(this.nodeName, {
|
this.instance.draggable(this.nodeName, {
|
||||||
grid: [10, 10],
|
grid: [10, 10],
|
||||||
|
@ -330,6 +332,7 @@ export const nodeBase = mixins(nodeIndex).extend({
|
||||||
},
|
},
|
||||||
filter: '.node-description, .node-description .node-name, .node-description .node-subtitle',
|
filter: '.node-description, .node-description .node-name, .node-description .node-subtitle',
|
||||||
});
|
});
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
isCtrlKeyPressed (e: MouseEvent | KeyboardEvent): boolean {
|
isCtrlKeyPressed (e: MouseEvent | KeyboardEvent): boolean {
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
:id="'node-' + getNodeIndex(nodeData.name)"
|
:id="'node-' + getNodeIndex(nodeData.name)"
|
||||||
:key="getNodeIndex(nodeData.name)"
|
:key="getNodeIndex(nodeData.name)"
|
||||||
:name="nodeData.name"
|
:name="nodeData.name"
|
||||||
|
:isReadOnly="isReadOnly"
|
||||||
:instance="instance"
|
:instance="instance"
|
||||||
></node>
|
></node>
|
||||||
</div>
|
</div>
|
||||||
|
@ -102,6 +103,9 @@
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import Vue from 'vue';
|
import Vue from 'vue';
|
||||||
|
import {
|
||||||
|
OverlaySpec,
|
||||||
|
} from 'jsplumb';
|
||||||
import { MessageBoxInputData } from 'element-ui/types/message-box';
|
import { MessageBoxInputData } from 'element-ui/types/message-box';
|
||||||
import { jsPlumb, Endpoint, OnConnectionBindInfo } from 'jsplumb';
|
import { jsPlumb, Endpoint, OnConnectionBindInfo } from 'jsplumb';
|
||||||
import { NODE_NAME_PREFIX, PLACEHOLDER_EMPTY_WORKFLOW_ID } from '@/constants';
|
import { NODE_NAME_PREFIX, PLACEHOLDER_EMPTY_WORKFLOW_ID } from '@/constants';
|
||||||
|
@ -1013,21 +1017,9 @@ export default mixins(
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
initNodeView () {
|
initNodeView () {
|
||||||
this.instance.importDefaults({
|
const connectionOverlays: OverlaySpec[] = [];
|
||||||
// notice the 'curviness' argument to this Bezier curve.
|
if (this.isReadOnly === false) {
|
||||||
// the curves on this page are far smoother
|
connectionOverlays.push.apply(connectionOverlays, [
|
||||||
// than the curves on the first demo, which use the default curviness value.
|
|
||||||
// Connector: ["Bezier", { curviness: 80 }],
|
|
||||||
Connector: ['Bezier', { curviness: 40 }],
|
|
||||||
// @ts-ignore
|
|
||||||
Endpoint: ['Dot', { radius: 5 }],
|
|
||||||
DragOptions: { cursor: 'pointer', zIndex: 5000 },
|
|
||||||
PaintStyle: { strokeWidth: 2, stroke: '#334455' },
|
|
||||||
EndpointStyle: { radius: 9, fill: '#acd', stroke: 'red' },
|
|
||||||
// EndpointStyle: {},
|
|
||||||
HoverPaintStyle: { stroke: '#ff6d5a', lineWidth: 4 },
|
|
||||||
EndpointHoverStyle: { fill: '#ff6d5a', stroke: '#acd' },
|
|
||||||
ConnectionOverlays: [
|
|
||||||
[
|
[
|
||||||
'Arrow',
|
'Arrow',
|
||||||
{
|
{
|
||||||
|
@ -1045,7 +1037,24 @@ export default mixins(
|
||||||
location: 0.5,
|
location: 0.5,
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
],
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.instance.importDefaults({
|
||||||
|
// notice the 'curviness' argument to this Bezier curve.
|
||||||
|
// the curves on this page are far smoother
|
||||||
|
// than the curves on the first demo, which use the default curviness value.
|
||||||
|
// Connector: ["Bezier", { curviness: 80 }],
|
||||||
|
Connector: ['Bezier', { curviness: 40 }],
|
||||||
|
// @ts-ignore
|
||||||
|
Endpoint: ['Dot', { radius: 5 }],
|
||||||
|
DragOptions: { cursor: 'pointer', zIndex: 5000 },
|
||||||
|
PaintStyle: { strokeWidth: 2, stroke: '#334455' },
|
||||||
|
EndpointStyle: { radius: 9, fill: '#acd', stroke: 'red' },
|
||||||
|
// EndpointStyle: {},
|
||||||
|
HoverPaintStyle: { stroke: '#ff6d5a', lineWidth: 4 },
|
||||||
|
EndpointHoverStyle: { fill: '#ff6d5a', stroke: '#acd' },
|
||||||
|
ConnectionOverlays: connectionOverlays,
|
||||||
Container: '#node-view',
|
Container: '#node-view',
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -1100,6 +1109,10 @@ export default mixins(
|
||||||
info.connection.setConnector(['Straight']);
|
info.connection.setConnector(['Straight']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// @ts-ignore
|
||||||
|
info.connection.removeOverlay('drop-add-node');
|
||||||
|
|
||||||
|
if (this.isReadOnly === false) {
|
||||||
// Display the connection-delete button only on hover
|
// Display the connection-delete button only on hover
|
||||||
let timer: NodeJS.Timeout | undefined;
|
let timer: NodeJS.Timeout | undefined;
|
||||||
info.connection.bind('mouseover', (connection: IConnection) => {
|
info.connection.bind('mouseover', (connection: IConnection) => {
|
||||||
|
@ -1117,9 +1130,6 @@ export default mixins(
|
||||||
}, 500);
|
}, 500);
|
||||||
});
|
});
|
||||||
|
|
||||||
// @ts-ignore
|
|
||||||
info.connection.removeOverlay('drop-add-node');
|
|
||||||
|
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
info.connection.addOverlay([
|
info.connection.addOverlay([
|
||||||
'Label',
|
'Label',
|
||||||
|
@ -1135,6 +1145,7 @@ export default mixins(
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
// Display input names if they exist on connection
|
// Display input names if they exist on connection
|
||||||
const targetNodeTypeData: INodeTypeDescription = this.$store.getters.nodeType(targetNode.type);
|
const targetNodeTypeData: INodeTypeDescription = this.$store.getters.nodeType(targetNode.type);
|
||||||
|
@ -1329,6 +1340,7 @@ export default mixins(
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
this.instance.connect({
|
this.instance.connect({
|
||||||
uuids: uuid,
|
uuids: uuid,
|
||||||
|
detachable: !this.isReadOnly,
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
// When nodes get connected it gets saved automatically to the storage
|
// When nodes get connected it gets saved automatically to the storage
|
||||||
|
|
Loading…
Reference in a new issue