mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: fix merge issue

Browse source
This commit is contained in:
Alex Grozav 2023-07-18 12:42:37 +03:00
parent 06c7db34b3
commit a3d0030104
3 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/design-system/src/components/N8nMenu/Menu.vue
View file

@ -97,7 +97,7 @@ export default defineComponent({
default: (): IMenuItem[] => [], default: (): IMenuItem[] => [],
}, },
modelValue: { modelValue: {
type: String, type: [String, Boolean],
default: '', default: '',
}, },
}, },

2
packages/editor-ui/src/components/SourceControlPullModal.ee.vue
View file

@ -7,7 +7,7 @@ import type { SourceControlStatus } from '@/Interface';
import { useI18n, useLoadingService, useToast } from '@/composables'; import { useI18n, useLoadingService, useToast } from '@/composables';
import { useSourceControlStore } from '@/stores/sourceControl.store'; import { useSourceControlStore } from '@/stores/sourceControl.store';
import { useUIStore } from '@/stores'; import { useUIStore } from '@/stores';
import { useRoute } from 'vue-router/composables'; import { useRoute } from 'vue-router';
const props = defineProps({ const props = defineProps({
data: { data: {

7
packages/editor-ui/src/views/NodeView.vue
View file

@ -96,13 +96,6 @@
/> />
<Suspense> <Suspense>
<NodeCreation <NodeCreation
v-if="!isReadOnly && !readOnlyEnv"
:create-node-active="createNodeActive"
:node-view-scale="nodeViewScale"
@toggleNodeCreator="onToggleNodeCreator"
@addNode="onAddNode"
/>
<node-creation
v-if="!isReadOnlyRoute && !readOnlyEnv" v-if="!isReadOnlyRoute && !readOnlyEnv"
:create-node-active="createNodeActive" :create-node-active="createNodeActive"
:node-view-scale="nodeViewScale" :node-view-scale="nodeViewScale"