diff --git a/packages/nc-gui/components.d.ts b/packages/nc-gui/components.d.ts index e9ea1978af..dcb556c364 100644 --- a/packages/nc-gui/components.d.ts +++ b/packages/nc-gui/components.d.ts @@ -7,14 +7,12 @@ export {} declare module '@vue/runtime-core' { export interface GlobalComponents { - AAlert: typeof import('ant-design-vue/es')['Alert'] ABadgeRibbon: typeof import('ant-design-vue/es')['BadgeRibbon'] AButton: typeof import('ant-design-vue/es')['Button'] ACard: typeof import('ant-design-vue/es')['Card'] ACardMeta: typeof import('ant-design-vue/es')['CardMeta'] ACarousel: typeof import('ant-design-vue/es')['Carousel'] ACheckbox: typeof import('ant-design-vue/es')['Checkbox'] - ACheckboxGroup: typeof import('ant-design-vue/es')['CheckboxGroup'] ACol: typeof import('ant-design-vue/es')['Col'] ACollapse: typeof import('ant-design-vue/es')['Collapse'] ACollapsePanel: typeof import('ant-design-vue/es')['CollapsePanel'] @@ -34,7 +32,6 @@ declare module '@vue/runtime-core' { ALayoutContent: typeof import('ant-design-vue/es')['LayoutContent'] ALayoutFooter: typeof import('ant-design-vue/es')['LayoutFooter'] ALayoutHeader: typeof import('ant-design-vue/es')['LayoutHeader'] - ALayoutSider: typeof import('ant-design-vue/es')['LayoutSider'] AList: typeof import('ant-design-vue/es')['List'] AListItem: typeof import('ant-design-vue/es')['ListItem'] AListItemMeta: typeof import('ant-design-vue/es')['ListItemMeta'] @@ -67,8 +64,6 @@ declare module '@vue/runtime-core' { ATooltip: typeof import('ant-design-vue/es')['Tooltip'] ATypographyTitle: typeof import('ant-design-vue/es')['TypographyTitle'] AUploadDragger: typeof import('ant-design-vue/es')['UploadDragger'] - BiFiletypeJson: typeof import('~icons/bi/filetype-json')['default'] - BiFiletypeXlsx: typeof import('~icons/bi/filetype-xlsx')['default'] CilFullscreen: typeof import('~icons/cil/fullscreen')['default'] CilFullscreenExit: typeof import('~icons/cil/fullscreen-exit')['default'] ClarityColorPickerSolid: typeof import('~icons/clarity/color-picker-solid')['default'] @@ -77,66 +72,44 @@ declare module '@vue/runtime-core' { EvaEmailOutline: typeof import('~icons/eva/email-outline')['default'] IcBaselineMoreVert: typeof import('~icons/ic/baseline-more-vert')['default'] IcOutlineInsertDriveFile: typeof import('~icons/ic/outline-insert-drive-file')['default'] - IcRoundEdit: typeof import('~icons/ic/round-edit')['default'] - IcRoundKeyboardArrowDown: typeof import('~icons/ic/round-keyboard-arrow-down')['default'] - IcRoundSearch: typeof import('~icons/ic/round-search')['default'] - IcTwotoneWidthFull: typeof import('~icons/ic/twotone-width-full')['default'] - IcTwotoneWidthNormal: typeof import('~icons/ic/twotone-width-normal')['default'] LogosGoogleGmail: typeof import('~icons/logos/google-gmail')['default'] LogosRedditIcon: typeof import('~icons/logos/reddit-icon')['default'] - LogosSwagger: typeof import('~icons/logos/swagger')['default'] MaterialSymbolsArrowCircleLeftRounded: typeof import('~icons/material-symbols/arrow-circle-left-rounded')['default'] MaterialSymbolsArrowCircleRightRounded: typeof import('~icons/material-symbols/arrow-circle-right-rounded')['default'] MaterialSymbolsAttachFile: typeof import('~icons/material-symbols/attach-file')['default'] MaterialSymbolsChevronRightRounded: typeof import('~icons/material-symbols/chevron-right-rounded')['default'] - MaterialSymbolsCloseRounded: typeof import('~icons/material-symbols/close-rounded')['default'] MaterialSymbolsFileCopyOutline: typeof import('~icons/material-symbols/file-copy-outline')['default'] MaterialSymbolsRocketLaunchOutline: typeof import('~icons/material-symbols/rocket-launch-outline')['default'] - MaterialSymbolsSendOutline: typeof import('~icons/material-symbols/send-outline')['default'] MaterialSymbolsTranslate: typeof import('~icons/material-symbols/translate')['default'] MaterialSymbolsWarning: typeof import('~icons/material-symbols/warning')['default'] - MdiAccount: typeof import('~icons/mdi/account')['default'] MdiAccountCircle: typeof import('~icons/mdi/account-circle')['default'] - MdiAccountOutline: typeof import('~icons/mdi/account-outline')['default'] - MdiAccountPlusOutline: typeof import('~icons/mdi/account-plus-outline')['default'] MdiAlpha: typeof import('~icons/mdi/alpha')['default'] MdiAlphaA: typeof import('~icons/mdi/alpha-a')['default'] - MdiApi: typeof import('~icons/mdi/api')['default'] MdiArrowExpand: typeof import('~icons/mdi/arrow-expand')['default'] MdiArrowLeftBold: typeof import('~icons/mdi/arrow-left-bold')['default'] MdiAt: typeof import('~icons/mdi/at')['default'] - MdiBackburger: typeof import('~icons/mdi/backburger')['default'] MdiBookOpenOutline: typeof import('~icons/mdi/book-open-outline')['default'] - MdiBugOutline: typeof import('~icons/mdi/bug-outline')['default'] MdiCalculator: typeof import('~icons/mdi/calculator')['default'] MdiCalendarMonth: typeof import('~icons/mdi/calendar-month')['default'] MdiCardsHeart: typeof import('~icons/mdi/cards-heart')['default'] MdiCellphoneMessage: typeof import('~icons/mdi/cellphone-message')['default'] MdiChat: typeof import('~icons/mdi/chat')['default'] MdiCheck: typeof import('~icons/mdi/check')['default'] - MdiChevronDown: typeof import('~icons/mdi/chevron-down')['default'] MdiChevronLeft: typeof import('~icons/mdi/chevron-left')['default'] MdiClose: typeof import('~icons/mdi/close')['default'] MdiCloseBox: typeof import('~icons/mdi/close-box')['default'] MdiCloseCircle: typeof import('~icons/mdi/close-circle')['default'] - MdiCloseCircleOutline: typeof import('~icons/mdi/close-circle-outline')['default'] MdiCloseThick: typeof import('~icons/mdi/close-thick')['default'] MdiCodeJson: typeof import('~icons/mdi/code-json')['default'] - MdiCog: typeof import('~icons/mdi/cog')['default'] MdiCommentTextOutline: typeof import('~icons/mdi/comment-text-outline')['default'] - MdiContentCopy: typeof import('~icons/mdi/content-copy')['default'] MdiContentSave: typeof import('~icons/mdi/content-save')['default'] - MdiCurrencyUsd: typeof import('~icons/mdi/currency-usd')['default'] MdiDatabaseOutline: typeof import('~icons/mdi/database-outline')['default'] - MdiDelete: typeof import('~icons/mdi/delete')['default'] MdiDeleteOutline: typeof import('~icons/mdi/delete-outline')['default'] MdiDiscord: typeof import('~icons/mdi/discord')['default'] MdiDotsVertical: typeof import('~icons/mdi/dots-vertical')['default'] MdiDownload: typeof import('~icons/mdi/download')['default'] MdiDownloadOutline: typeof import('~icons/mdi/download-outline')['default'] MdiDrag: typeof import('~icons/mdi/drag')['default'] - MdiDragVertical: typeof import('~icons/mdi/drag-vertical')['default'] - MdiDramaMasks: typeof import('~icons/mdi/drama-masks')['default'] MdiEditOutline: typeof import('~icons/mdi/edit-outline')['default'] MdiEmail: typeof import('~icons/mdi/email')['default'] MdiEmailArrowRightOutline: typeof import('~icons/mdi/email-arrow-right-outline')['default'] @@ -144,14 +117,10 @@ declare module '@vue/runtime-core' { MdiExport: typeof import('~icons/mdi/export')['default'] MdiEyeCircleOutline: typeof import('~icons/mdi/eye-circle-outline')['default'] MdiEyeOffOutline: typeof import('~icons/mdi/eye-off-outline')['default'] - MdiFileDocumentOutline: typeof import('~icons/mdi/file-document-outline')['default'] - MdiFileExcel: typeof import('~icons/mdi/file-excel')['default'] - MdiFileEyeOutline: typeof import('~icons/mdi/file-eye-outline')['default'] MdiFilePlusOutline: typeof import('~icons/mdi/file-plus-outline')['default'] MdiFileUploadOutline: typeof import('~icons/mdi/file-upload-outline')['default'] MdiFilterOutline: typeof import('~icons/mdi/filter-outline')['default'] MdiFlag: typeof import('~icons/mdi/flag')['default'] - MdiFolder: typeof import('~icons/mdi/folder')['default'] MdiFunction: typeof import('~icons/mdi/function')['default'] MdiGestureDoubleTap: typeof import('~icons/mdi/gesture-double-tap')['default'] MdiGithub: typeof import('~icons/mdi/github')['default'] @@ -165,26 +134,21 @@ declare module '@vue/runtime-core' { MdiLink: typeof import('~icons/mdi/link')['default'] MdiLinkVariant: typeof import('~icons/mdi/link-variant')['default'] MdiLinkVariantRemove: typeof import('~icons/mdi/link-variant-remove')['default'] - MdiLoading: typeof import('~icons/mdi/loading')['default'] MdiLogin: typeof import('~icons/mdi/login')['default'] MdiLogout: typeof import('~icons/mdi/logout')['default'] MdiMagnify: typeof import('~icons/mdi/magnify')['default'] - MdiMenu: typeof import('~icons/mdi/menu')['default'] MdiMenuDown: typeof import('~icons/mdi/menu-down')['default'] MdiMicrosoftTeams: typeof import('~icons/mdi/microsoft-teams')['default'] - MdiMinusCircleOutline: typeof import('~icons/mdi/minus-circle-outline')['default'] MdiMoonFull: typeof import('~icons/mdi/moon-full')['default'] MdiNumeric: typeof import('~icons/mdi/numeric')['default'] MdiOpenInNew: typeof import('~icons/mdi/open-in-new')['default'] MdiOpenInNewIcon: typeof import('~icons/mdi/open-in-new-icon')['default'] MdiPencil: typeof import('~icons/mdi/pencil')['default'] MdiPlus: typeof import('~icons/mdi/plus')['default'] - MdiPlusCircleOutline: typeof import('~icons/mdi/plus-circle-outline')['default'] MdiPlusOutline: typeof import('~icons/mdi/plus-outline')['default'] MdiRefresh: typeof import('~icons/mdi/refresh')['default'] MdiReload: typeof import('~icons/mdi/reload')['default'] MdiRocketLaunchOutline: typeof import('~icons/mdi/rocket-launch-outline')['default'] - MdiScriptTextKeyOutline: typeof import('~icons/mdi/script-text-key-outline')['default'] MdiScriptTextOutline: typeof import('~icons/mdi/script-text-outline')['default'] MdiSlack: typeof import('~icons/mdi/slack')['default'] MdiSort: typeof import('~icons/mdi/sort')['default'] @@ -197,7 +161,6 @@ declare module '@vue/runtime-core' { MdiTableLarge: typeof import('~icons/mdi/table-large')['default'] MdiText: typeof import('~icons/mdi/text')['default'] MdiThumbUp: typeof import('~icons/mdi/thumb-up')['default'] - MdiTrashCan: typeof import('~icons/mdi/trash-can')['default'] MdiTwitter: typeof import('~icons/mdi/twitter')['default'] MdiUpload: typeof import('~icons/mdi/upload')['default'] MdiUploadOutline: typeof import('~icons/mdi/upload-outline')['default'] @@ -206,7 +169,6 @@ declare module '@vue/runtime-core' { MdiWhatsapp: typeof import('~icons/mdi/whatsapp')['default'] MdiXml: typeof import('~icons/mdi/xml')['default'] MiCircleWarning: typeof import('~icons/mi/circle-warning')['default'] - PhFileCsv: typeof import('~icons/ph/file-csv')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] } diff --git a/packages/nc-gui/components/shared-view/AskPassword.vue b/packages/nc-gui/components/shared-view/AskPassword.vue index a12e00a433..ab9680cc88 100644 --- a/packages/nc-gui/components/shared-view/AskPassword.vue +++ b/packages/nc-gui/components/shared-view/AskPassword.vue @@ -1,18 +1,19 @@ - + diff --git a/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue b/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue index 186c477713..09d06566ca 100644 --- a/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue @@ -16,15 +16,16 @@ import { onMounted, useColumnCreateStoreOrThrow, useDebounceFn, + useVModel, validateDateWithUnknownFormat, } from '#imports' -interface Props { - value: Record -} +const props = defineProps<{ + value: any +}>() -const props = defineProps() const emit = defineEmits(['update:value']) + const vModel = useVModel(props, 'value', emit) const { setAdditionalValidations, validateInfos, sqlUi, column } = useColumnCreateStoreOrThrow() @@ -619,6 +620,7 @@ onMounted(() => { @change="handleInputDeb" /> + Hint: Use {} to reference columns, e.g: {column_name}. For more, please check out @@ -644,16 +646,19 @@ onMounted(() => { {{ item.text }} + {{ item.description }} Syntax: {{ item.syntax }} Examples: + ({{ idx + 1 }}): {{ example }} + @@ -663,7 +668,9 @@ onMounted(() => { + + diff --git a/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue b/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue index 288691f1f0..9596c76b0f 100644 --- a/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue @@ -1,15 +1,15 @@ - { - clickCount = clickCount + 1 - debug = clickCount >= 4 - } - " - > + - + - + - + - + diff --git a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue index db3fb430ed..0edc2503aa 100644 --- a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue +++ b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue @@ -1,7 +1,6 @@ @@ -130,6 +133,7 @@ const getIcon = (c: ColumnType) => + :options="coverOptions" dropdown-class-name="nc-dropdown-cover-image" @click.stop - > + /> + + @@ -159,10 +165,13 @@ const getIcon = (c: ColumnType) => > + {{ field.title }} + + @@ -176,11 +185,13 @@ const getIcon = (c: ColumnType) => {{ $t('activity.showSystemFields') }} + {{ $t('general.showAll') }} + {{ $t('general.hideAll') }} diff --git a/packages/nc-gui/components/smartsheet/toolbar/LockType.vue b/packages/nc-gui/components/smartsheet/toolbar/LockType.vue index 947606bfed..2744f2dd11 100644 --- a/packages/nc-gui/components/smartsheet/toolbar/LockType.vue +++ b/packages/nc-gui/components/smartsheet/toolbar/LockType.vue @@ -2,8 +2,8 @@ import MdiLockOutlineIcon from '~icons/mdi/lock-outline' import MdiAccountIcon from '~icons/mdi/account' import MdiAccountGroupIcon from '~icons/mdi/account-group' - import { LockType } from '~/lib' +import { ActiveViewInj, inject } from '#imports' const { type, hideTick } = defineProps<{ hideTick?: boolean; type: LockType }>() @@ -35,11 +35,15 @@ const selectedView = inject(ActiveViewInj) + + + {{ $t(types[type].title) }} + {{ $t(types[type].subtitle) }} diff --git a/packages/nc-gui/components/smartsheet/toolbar/MoreActions.vue b/packages/nc-gui/components/smartsheet/toolbar/MoreActions.vue index f322e5f39b..1dfed6fccc 100644 --- a/packages/nc-gui/components/smartsheet/toolbar/MoreActions.vue +++ b/packages/nc-gui/components/smartsheet/toolbar/MoreActions.vue @@ -1,10 +1,6 @@ @@ -12,8 +12,9 @@ const selectedView = inject(ActiveViewInj) class="nc-view-icon group-hover:hidden" :style="{ color: viewIcons[selectedView?.type].color }" /> - {{ - selectedView?.title - }} + + + {{ selectedView?.title }} + diff --git a/packages/nc-gui/pages/[projectType]/view/[viewId].vue b/packages/nc-gui/pages/[projectType]/view/[viewId].vue index 6187bce03c..987eb4bec7 100644 --- a/packages/nc-gui/pages/[projectType]/view/[viewId].vue +++ b/packages/nc-gui/pages/[projectType]/view/[viewId].vue @@ -1,11 +1,11 @@