fix(nc-gui): some pr review comments

nocodb · May 10, 2024 · 8580205 · 8580205
1 parent 1b3a643
commit 8580205
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 25 deletions.
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
@@ -32,6 +32,7 @@ const isCommentMode = ref(false)
 
 const showCommentInputBoxShadow = ref(false)
 
+
 const focusCommentInput: VNodeRef = (el) => {
   if (el) {
     if (parseInt((el.$el as HTMLTextAreaElement)?.style?.height ?? '') > 82) {
@@ -186,7 +187,7 @@ watch(commentsWrapperEl, () => {
                               {{ log.display_name?.trim() || log.user || 'Shared source' }}
                             </template>
                             <span
-                              class="text-ellipsis overflow-hidden font-bold text-gray-800"
+                              class="text-ellipsis overflow-hidden text-gray-700"
                               :style="{
                                 wordBreak: 'keep-all',
                                 whiteSpace: 'nowrap',
@@ -271,11 +272,7 @@ watch(commentsWrapperEl, () => {
                     @keydown.stop
                     @keydown.enter.exact.prevent="saveComment"
                   />
-                  <div
-                    v-if="showCommentInputBoxShadow"
-                    class="expanded-form-comment-input-shadow"
-                    :class="`valju-${comment?.split('\n').length}`"
-                  ></div>
+                  <div v-if="showCommentInputBoxShadow" class="expanded-form-comment-input-shadow"></div>
                 </div>
                 <NcButton
                   v-e="['a:row-expand:comment:save']"
@@ -434,12 +431,8 @@ watch(commentsWrapperEl, () => {
 
   .expanded-form-comment-input-shadow {
     @apply absolute top-1px left-1px h-3 w-[98%] z-0 rounded-t-lg  pointer-events-none;
-  }
 
-  &:focus-within {
-    .expanded-form-comment-input-shadow {
-      box-shadow: 0px 12px 12px 0px rgba(255, 255, 255, 0.65) inset;
-    }
+    box-shadow: 0px 12px 12px 0px rgba(255, 255, 255, 0.65) inset;
   }
 }
 :deep(.expanded-form-comment-input) {

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -619,19 +619,6 @@ export default {
           </div>
         </div>
         <div class="flex gap-2">
-          <NcButton
-            v-if="!isMobileMode"
-            v-e="['c:row-expand:save']"
-            :disabled="changedColumns.size === 0 && !isUnsavedFormExist"
-            :loading="isSaving"
-            class="nc-expand-form-save-btn !xs:(text-base) !h-7 !px-2"
-            data-testid="nc-expanded-form-save"
-            type="primary"
-            size="xsmall"
-            @click="save"
-          >
-            <div class="xs:px-1">{{ newRecordSubmitBtnText ?? 'Save Record' }}</div>
-          </NcButton>
           <NcButton
             v-if="!isNew && rowId && !isMobileMode"
             :disabled="isLoading"
@@ -650,6 +637,19 @@ export default {
               {{ isRecordLinkCopied ? $t('labels.copiedRecordURL') : $t('labels.copyRecordURL') }}
             </div>
           </NcButton>
+          <NcButton
+            v-if="!isMobileMode"
+            v-e="['c:row-expand:save']"
+            :disabled="changedColumns.size === 0 && !isUnsavedFormExist"
+            :loading="isSaving"
+            class="nc-expand-form-save-btn !xs:(text-base) !h-7 !px-2"
+            data-testid="nc-expanded-form-save"
+            type="primary"
+            size="xsmall"
+            @click="save"
+          >
+            <div class="xs:px-1">{{ newRecordSubmitBtnText ?? 'Save Record' }}</div>
+          </NcButton>
           <NcDropdown v-if="!isNew && rowId && !isMobileMode" placement="bottomRight">
             <NcButton type="text" size="xsmall" class="nc-expand-form-more-actions !w-7 !h-7" :disabled="isLoading">
               <GeneralIcon icon="threeDotVertical" class="text-md" :class="isLoading ? 'text-gray-300' : 'text-gray-700'" />
@@ -786,7 +786,7 @@ export default {
               <div class="flex-grow h-px mr-1 bg-gray-100"></div>
               <NcButton
                 :size="isMobileMode ? 'medium' : 'small'"
-                class="flex-shrink !text-sm overflow-hidden"
+                class="flex-shrink !text-sm overflow-hidden !text-gray-500 !font-weight-500"
                 type="secondary"
                 @click="toggleHiddenFields"
               >