github
/
nocodb
mirror of https://github.com/nocodb/nocodb
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

fix: style

pull/6464/head
DarkPhoenix2704 1 year ago
parent
cb05f06f32
commit
fa09631c14
2 changed files with 16 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
  2. 12
      packages/nc-gui/components/smartsheet/expanded-form/index.vue

25
packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
Unescape View File

@ -3,9 +3,8 @@ import type { VNodeRef } from '@vue/runtime-core'
import type { AuditType } from 'nocodb-sdk' import type { AuditType } from 'nocodb-sdk'
import { Icon } from '@iconify/vue' import { Icon } from '@iconify/vue'
import { ref, timeAgo, useExpandedFormStoreOrThrow, useGlobal, useRoles, watch } from '#imports' import { ref, timeAgo, useExpandedFormStoreOrThrow, useGlobal, useRoles, watch } from '#imports'
import FileIcon from '~icons/nc-icons/file'
const { loadCommentsAndLogs, commentsAndLogs, isYou, saveComment, comment, updateComment } = useExpandedFormStoreOrThrow() const { loadCommentsAndLogs, commentsAndLogs, saveComment, comment, updateComment } = useExpandedFormStoreOrThrow()
const commentsWrapperEl = ref<HTMLDivElement>() const commentsWrapperEl = ref<HTMLDivElement>()
@ -101,7 +100,7 @@ watch(
</script> </script>
<template> <template>
<div class="flex flex-col w-full h-[500px] bg-gray-50 rounded-lg"> <div class="flex flex-col w-full h-[540px] bg-gray-50 rounded-lg">
<div class="bg-white rounded-t-lg border-gray-200 border-b-1"> <div class="bg-white rounded-t-lg border-gray-200 border-b-1">
<div class="flex flex-row gap-2 m-2 p-1 bg-gray-100 rounded-lg"> <div class="flex flex-row gap-2 m-2 p-1 bg-gray-100 rounded-lg">
<div <div
@ -111,8 +110,8 @@ watch(
}" }"
@click="tab = 'comments'" @click="tab = 'comments'"
> >
<div class="tab-title gap-1 nc-tab"> <div class="tab-title gap-2 nc-tab">
<MdiMessageOutline class="h-5 w-5" /> <MdiMessageOutline class="h-4 w-4" />
Comments Comments
</div> </div>
</div> </div>
@ -123,8 +122,8 @@ watch(
}" }"
@click="tab = 'audits'" @click="tab = 'audits'"
> >
<div class="tab-title nc-tab"> <div class="tab-title gap-2 nc-tab">
<MdiFileDocumentOutline class="h-5 w-5" /> <MdiFileDocumentOutline class="h-4 w-4" />
Audits Audits
</div> </div>
</div> </div>
@ -134,7 +133,7 @@ watch(
<div <div
v-if="tab === 'comments'" v-if="tab === 'comments'"
ref="commentsWrapperEl" ref="commentsWrapperEl"
class="flex flex-col m-1 p-1 !h-[399px] overflow-y-scroll nc-scrollbar-md space-y-2" class="flex flex-col m-1 p-1 !h-[407px] overflow-y-scroll nc-scrollbar-md space-y-2"
> >
<template v-if="comments.length === 0"> <template v-if="comments.length === 0">
<div class="flex flex-col text-center justify-center h-full"> <div class="flex flex-col text-center justify-center h-full">
@ -180,7 +179,7 @@ watch(
<NcButton type="secondary" size="sm" @click="onCancel"> Cancel </NcButton> <NcButton type="secondary" size="sm" @click="onCancel"> Cancel </NcButton>
<NcButton size="sm" @click="onEditComment"> Save </NcButton> <NcButton size="sm" @click="onEditComment"> Save </NcButton>
</div> </div>
<div v-if="log.id !== editLog?.id" class="text-sm text-gray-500"> <div v-if="log.id !== editLog?.id" class="text-xs text-gray-500">
{{ log.created_at !== log.updated_at ? `Edited ${timeAgo(log.updated_at)}` : timeAgo(log.created_at) }} {{ log.created_at !== log.updated_at ? `Edited ${timeAgo(log.updated_at)}` : timeAgo(log.created_at) }}
</div> </div>
</div> </div>
@ -188,9 +187,9 @@ watch(
</div> </div>
</template> </template>
</div> </div>
<div v-else ref="commentsWrapperEl" class="flex flex-col m-1 p-1 !h-[459px] overflow-y-scroll nc-scrollbar-md space-y-2"> <div v-else ref="commentsWrapperEl" class="flex flex-col m-1 p-1 !h-[465px] overflow-y-scroll nc-scrollbar-md space-y-2">
<template v-if="audits.length === 0"> <template v-if="audits.length === 0">
<div class="flex flex-col mb-14 text-center justify-center h-full"> <div class="flex flex-col text-center justify-center h-full">
<div class="text-center text-3xl text-gray-600"> <div class="text-center text-3xl text-gray-600">
<MdiHistory /> <MdiHistory />
</div> </div>
@ -209,7 +208,7 @@ watch(
</span> </span>
</div> </div>
</div> </div>
<div class="text-sm text-gray-700"> <div class="text-sm font-medium text-gray-700">
{{ log.description.split('.')[1] }} {{ log.description.split('.')[1] }}
</div> </div>
<div v-if="log.id !== editLog?.id" class="text-xs text-gray-500"> <div v-if="log.id !== editLog?.id" class="text-xs text-gray-500">
@ -237,7 +236,7 @@ watch(
<style scoped> <style scoped>
.tab .tab-title { .tab .tab-title {
@apply min-w-0 flex justify-center gap-1 font-semibold items-center py-1; @apply min-w-0 flex justify-center gap-1 font-semibold items-center;
word-break: 'keep-all'; word-break: 'keep-all';
white-space: 'nowrap'; white-space: 'nowrap';
display: 'inline'; display: 'inline';

12
packages/nc-gui/components/smartsheet/expanded-form/index.vue
Unescape View File

@ -342,7 +342,8 @@ export default {
:key="key" :key="key"
v-model:visible="isExpanded" v-model:visible="isExpanded"
:footer="null" :footer="null"
:width="commentsDrawer && isUIAllowed('commentList') ? 'min(90vw,1000px)' : 'min(90vw,800px)'" :width="commentsDrawer && isUIAllowed('commentList') ? 'min(90vw,1280px)' : 'min(90vw,1280px)'"
height="min(90vh,856px)"
:body-style="{ padding: 0 }" :body-style="{ padding: 0 }"
:closable="false" :closable="false"
class="nc-drawer-expanded-form" class="nc-drawer-expanded-form"
@ -408,12 +409,7 @@ export default {
</div> </div>
</div> </div>
<div class="flex flex-row w-full gap-4"> <div class="flex flex-row w-full gap-4">
<div <div class="fle relative w-full flex-col">
class="fle relative w-full flex-col"
:class="{
'!w-4/6': !isNew,
}"
>
<div <div
class="flex flex-col !pb-12 nc-scrollbar-md h-[540px] overflow-y-scroll items-center w-full bg-white border-1 border-gray-200 rounded-xl p-4" class="flex flex-col !pb-12 nc-scrollbar-md h-[540px] overflow-y-scroll items-center w-full bg-white border-1 border-gray-200 rounded-xl p-4"
> >
@ -506,7 +502,7 @@ export default {
</div> </div>
<div <div
v-if="!isNew && commentsDrawer && isUIAllowed('commentList')" v-if="!isNew && commentsDrawer && isUIAllowed('commentList')"
class="nc-comments-drawer border-1 border-gray-200 w-2/6 rounded-lg min-w-0" class="nc-comments-drawer border-1 border-gray-200 w-[380px] rounded-lg min-w-0"
:class="{ active: commentsDrawer && isUIAllowed('commentList') }" :class="{ active: commentsDrawer && isUIAllowed('commentList') }"
> >
<LazySmartsheetExpandedFormComments /> <LazySmartsheetExpandedFormComments />

Write Preview
Loading…
Cancel
Save