diff --git a/packages/nc-gui/components/cell/Currency.vue b/packages/nc-gui/components/cell/Currency.vue index ae5eda0d8e..be170ec3b3 100644 --- a/packages/nc-gui/components/cell/Currency.vue +++ b/packages/nc-gui/components/cell/Currency.vue @@ -79,7 +79,7 @@ onMounted(() => { v-model="vModel" type="number" class="w-full h-full text-sm border-none rounded-md outline-none" - :placeholder="isEditColumn ? '(Optional) Enter default value' : ''" + :placeholder="isEditColumn ? 'Enter default value (Optional)' : ''" @blur="submitCurrency" @keydown.down.stop @keydown.left.stop diff --git a/packages/nc-gui/components/cell/DatePicker.vue b/packages/nc-gui/components/cell/DatePicker.vue index d66d9594bb..dec3b379b8 100644 --- a/packages/nc-gui/components/cell/DatePicker.vue +++ b/packages/nc-gui/components/cell/DatePicker.vue @@ -84,7 +84,7 @@ watch( const placeholder = computed(() => { if (isEditColumn.value && modelValue === null) { - return '(Optional) Select Default Date' + return 'Select default date (Optional)' } else if (modelValue === null && showNull.value) { return 'NULL' } else if (isDateInvalid.value) { diff --git a/packages/nc-gui/components/cell/DateTimePicker.vue b/packages/nc-gui/components/cell/DateTimePicker.vue index 9a61bfeb02..a64636a64b 100644 --- a/packages/nc-gui/components/cell/DateTimePicker.vue +++ b/packages/nc-gui/components/cell/DateTimePicker.vue @@ -137,7 +137,7 @@ watch( const placeholder = computed(() => { if (isEditColumn.value && modelValue === null) { - return '(Optional) Select Default Date' + return 'Select default date (Optional)' } else if (modelValue === null && showNull.value) { return 'NULL' } else if (isDateInvalid.value) { diff --git a/packages/nc-gui/components/cell/Decimal.vue b/packages/nc-gui/components/cell/Decimal.vue index ecde0bae93..669f9d3af1 100644 --- a/packages/nc-gui/components/cell/Decimal.vue +++ b/packages/nc-gui/components/cell/Decimal.vue @@ -97,7 +97,7 @@ watch(isExpandedFormOpen, () => { class="outline-none !py-2 !px-1 border-none rounded-md w-full h-full !text-sm" type="number" :step="precision" - :placeholder="isEditColumn ? '(Optional) Enter default value' : ''" + :placeholder="isEditColumn ? 'Enter default value (Optional)' : ''" style="letter-spacing: 0.06rem" @blur="editEnabled = false" @keydown.down.stop="onKeyDown" diff --git a/packages/nc-gui/components/cell/Duration.vue b/packages/nc-gui/components/cell/Duration.vue index 7ebcb681f3..5f894753c9 100644 --- a/packages/nc-gui/components/cell/Duration.vue +++ b/packages/nc-gui/components/cell/Duration.vue @@ -40,7 +40,7 @@ const isEditColumn = inject(EditColumnInj, ref(false)) const durationType = computed(() => parseProp(column?.value?.meta)?.duration || 0) const durationPlaceholder = computed(() => - isEditColumn.value ? '(Optional) Enter default value' : durationOptions[durationType.value].title, + isEditColumn.value ? 'Enter default value (Optional)' : durationOptions[durationType.value].title, ) const localState = computed({ diff --git a/packages/nc-gui/components/cell/Email.vue b/packages/nc-gui/components/cell/Email.vue index 84a3142ca3..8d53cbf177 100644 --- a/packages/nc-gui/components/cell/Email.vue +++ b/packages/nc-gui/components/cell/Email.vue @@ -71,7 +71,7 @@ watch( :ref="focus" v-model="vModel" class="w-full outline-none text-sm px-1 py-2" - :placeholder="isEditColumn ? '(Optional) Enter default value' : ''" + :placeholder="isEditColumn ? 'Enter default value (Optional)' : ''" @blur="editEnabled = false" @keydown.down.stop @keydown.left.stop diff --git a/packages/nc-gui/components/cell/Float.vue b/packages/nc-gui/components/cell/Float.vue index 884a0904f1..39e2aa1d89 100644 --- a/packages/nc-gui/components/cell/Float.vue +++ b/packages/nc-gui/components/cell/Float.vue @@ -51,7 +51,7 @@ const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value class="outline-none px-1 border-none w-full h-full text-sm" type="number" step="0.1" - :placeholder="isEditColumn ? '(Optional) Enter default value' : ''" + :placeholder="isEditColumn ? 'Enter default value (Optional)' : ''" @blur="editEnabled = false" @keydown.down.stop @keydown.left.stop diff --git a/packages/nc-gui/components/cell/Integer.vue b/packages/nc-gui/components/cell/Integer.vue index 0d348569d0..9c36b6a209 100644 --- a/packages/nc-gui/components/cell/Integer.vue +++ b/packages/nc-gui/components/cell/Integer.vue @@ -88,7 +88,7 @@ function onKeyDown(e: any) { class="outline-none py-2 px-1 border-none w-full h-full text-sm" type="number" style="letter-spacing: 0.06rem" - :placeholder="isEditColumn ? '(Optional) Enter default value' : ''" + :placeholder="isEditColumn ? 'Enter default value (Optional)' : ''" @blur="editEnabled = false" @keydown="onKeyDown" @keydown.down.stop diff --git a/packages/nc-gui/components/cell/MultiSelect.vue b/packages/nc-gui/components/cell/MultiSelect.vue index a1e5985404..f7fb74bc55 100644 --- a/packages/nc-gui/components/cell/MultiSelect.vue +++ b/packages/nc-gui/components/cell/MultiSelect.vue @@ -387,7 +387,7 @@ const selectedOpts = computed(() => { v-model:value="vModel" mode="multiple" class="w-full overflow-hidden" - :placeholder="isEditColumn ? '(Optional) Select default value' : ''" + :placeholder="isEditColumn ? 'Select default value (Optional)' : ''" :bordered="false" clear-icon show-search diff --git a/packages/nc-gui/components/cell/Percent.vue b/packages/nc-gui/components/cell/Percent.vue index ec6a442d11..6083e82733 100644 --- a/packages/nc-gui/components/cell/Percent.vue +++ b/packages/nc-gui/components/cell/Percent.vue @@ -42,7 +42,7 @@ const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value class="w-full !text-sm !border-none !outline-none focus:ring-0 text-base p-1" :class="{ '!px-2': editEnabled }" type="number" - :placeholder="isEditColumn ? '(Optional) Enter default value' : ''" + :placeholder="isEditColumn ? 'Enter default value (Optional)' : ''" @blur="editEnabled = false" @keydown.down.stop @keydown.left.stop diff --git a/packages/nc-gui/components/cell/PhoneNumber.vue b/packages/nc-gui/components/cell/PhoneNumber.vue index e0f4848e37..920d002f3f 100644 --- a/packages/nc-gui/components/cell/PhoneNumber.vue +++ b/packages/nc-gui/components/cell/PhoneNumber.vue @@ -61,7 +61,7 @@ watch( :ref="focus" v-model="vModel" class="w-full outline-none text-sm px-1 py-2" - :placeholder="isEditColumn ? '(Optional) Enter default value' : ''" + :placeholder="isEditColumn ? 'Enter default value (Optional)' : ''" @blur="editEnabled = false" @keydown.down.stop @keydown.left.stop diff --git a/packages/nc-gui/components/cell/SingleSelect.vue b/packages/nc-gui/components/cell/SingleSelect.vue index 2a04203bc6..afaa0e7aa6 100644 --- a/packages/nc-gui/components/cell/SingleSelect.vue +++ b/packages/nc-gui/components/cell/SingleSelect.vue @@ -303,7 +303,7 @@ const selectedOpt = computed(() => { v-model:value="vModel" class="w-full overflow-hidden" :class="{ 'caret-transparent': !hasEditRoles }" - :placeholder="isEditColumn ? '(Optional) Select default option' : ''" + :placeholder="isEditColumn ? 'Select default option (Optional)' : ''" :allow-clear="!column.rqd && editAllowed" :bordered="false" :open="isOpen && editAllowed" diff --git a/packages/nc-gui/components/cell/Text.vue b/packages/nc-gui/components/cell/Text.vue index 69b9dab35f..ce10a94160 100644 --- a/packages/nc-gui/components/cell/Text.vue +++ b/packages/nc-gui/components/cell/Text.vue @@ -33,7 +33,7 @@ const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value :ref="focus" v-model="vModel" class="h-full w-full outline-none p-2 bg-transparent" - :placeholder="isEditColumn ? '(Optional) Enter default value' : ''" + :placeholder="isEditColumn ? 'Enter default value (Optional)' : ''" @blur="editEnabled = false" @keydown.down.stop @keydown.left.stop diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue index e43cc39bf8..8434e9508f 100644 --- a/packages/nc-gui/components/cell/TextArea.vue +++ b/packages/nc-gui/components/cell/TextArea.vue @@ -81,7 +81,7 @@ onClickOutside(inputWrapperRef, (e) => { :style="{ minHeight: `${height}px`, }" - :placeholder="isEditColumn ? '(Optional) Enter default value' : ''" + :placeholder="isEditColumn ? 'Enter default value (Optional)' : ''" @blur="editEnabled = false" @keydown.alt.enter.stop @keydown.shift.enter.stop diff --git a/packages/nc-gui/components/cell/TimePicker.vue b/packages/nc-gui/components/cell/TimePicker.vue index 6d0be016ea..0428de9d07 100644 --- a/packages/nc-gui/components/cell/TimePicker.vue +++ b/packages/nc-gui/components/cell/TimePicker.vue @@ -89,7 +89,7 @@ watch( const placeholder = computed(() => { if (isEditColumn.value && modelValue === null) { - return '(Optional) Select Default time' + return 'Select default time (Optional)' } else if (modelValue === null && showNull.value) { return 'NULL' } else if (isTimeInvalid.value) { diff --git a/packages/nc-gui/components/cell/Url.vue b/packages/nc-gui/components/cell/Url.vue index 1f3db5942d..6243e473bf 100644 --- a/packages/nc-gui/components/cell/Url.vue +++ b/packages/nc-gui/components/cell/Url.vue @@ -91,7 +91,7 @@ watch( v-if="editEnabled" :ref="focus" v-model="vModel" - :placeholder="isEditColumn ? '(Optional) Enter default URL' : ''" + :placeholder="isEditColumn ? 'Enter default URL (Optional)' : ''" class="outline-none text-sm w-full px-2 py-2 bg-transparent h-full" @blur="editEnabled = false" @keydown.down.stop diff --git a/packages/nc-gui/components/cell/YearPicker.vue b/packages/nc-gui/components/cell/YearPicker.vue index 243f4707d3..e2e096eb99 100644 --- a/packages/nc-gui/components/cell/YearPicker.vue +++ b/packages/nc-gui/components/cell/YearPicker.vue @@ -76,7 +76,7 @@ watch( const placeholder = computed(() => { if (isEditColumn.value && modelValue === null) { - return '(Optional) Select default year' + return 'Select default year (Optional)' } else if (modelValue === null && showNull.value) { return 'NULL' } else if (isYearInvalid.value) {