clone/nocodb
1
0
Fork 0
mirror of https://github.com/nocodb/nocodb.git synced 2026-05-02 16:16:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Fixed issue with loading table and view from sidebar, fixed node click for mobile in sidebar

Browse Source
This commit is contained in:
Muhammed Mustafa
2023-09-25 13:39:10 +00:00
parent f0c9f251d8
commit e5bca2499b
7 changed files with 27 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
View File

@@ -231,7 +231,7 @@ const addNewProjectChildEntity = async () => {
// todo: temp
const isSharedBase = ref(false)
const onTouchStart = async (project: NcProject, ignoreNavigation?: boolean, toggleIsExpanded?: boolean) => {
const onProjectClick = async (project: NcProject, ignoreNavigation?: boolean, toggleIsExpanded?: boolean) => {
if (!project) {
return
}
@@ -275,12 +275,6 @@ const onTouchStart = async (project: NcProject, ignoreNavigation?: boolean, togg
}
}
const onProjectClick = async (project: NcProject, ignoreNavigation?: boolean, toggleIsExpanded?: boolean) => {
if (isMobileMode.value) return
onTouchStart(project, ignoreNavigation, toggleIsExpanded)
}
function openErdView(base: BaseType) {
activeBaseId.value = base.id
isErdModalOpen.value = !isErdModalOpen.value
@@ -401,7 +395,6 @@ const DlgProjectDuplicateOnOk = async (jobData: { id: string; project_id: string
size="xxsmall"
class="nc-sidebar-node-btn nc-sidebar-expand ml-0.75 !xs:visible"
@click="onProjectClick(project, true, true)"
@touchstart="onTouchStart(project, true, true)"
>
<GeneralIcon
icon="triangleFill"
@@ -410,7 +403,7 @@ const DlgProjectDuplicateOnOk = async (jobData: { id: string; project_id: string
/>
</NcButton>
<div class="flex items-center mr-1" @click="onProjectClick(project)" @touchstart="onTouchStart(project)">
<div class="flex items-center mr-1" @click="onProjectClick(project)">
<div class="flex items-center select-none w-6 h-full">
<a-spin
v-if="project.isLoading"
@@ -446,19 +439,14 @@ const DlgProjectDuplicateOnOk = async (jobData: { id: string; project_id: string
/>
<span
v-else
class="capitalize text-ellipsis overflow-hidden select-none"
class="nc-sidebar-node-title capitalize text-ellipsis overflow-hidden select-none"
:style="{ wordBreak: 'keep-all', whiteSpace: 'nowrap', display: 'inline' }"
:class="{ 'text-black font-semibold': activeProjectId === project.id && projectViewOpen }"
@click="onProjectClick(project)"
@touchstart="onTouchStart(project)"
>
{{ project.title }}
</span>
<div
:class="{ 'flex flex-grow h-full': !editMode }"
@click="onProjectClick(project)"
@touchstart="onTouchStart(project)"
></div>
<div :class="{ 'flex flex-grow h-full': !editMode }" @click="onProjectClick(project)"></div>
<NcDropdown v-model:visible="isOptionsOpen" :trigger="['click']">
<NcButton