diff --git a/packages/nc-gui-v2/components.d.ts b/packages/nc-gui-v2/components.d.ts index 953f50dc03..870ebe047e 100644 --- a/packages/nc-gui-v2/components.d.ts +++ b/packages/nc-gui-v2/components.d.ts @@ -9,6 +9,7 @@ declare module '@vue/runtime-core' { export interface GlobalComponents { AAlert: typeof import('ant-design-vue/es')['Alert'] AAutoComplete: typeof import('ant-design-vue/es')['AutoComplete'] + ABadgeRibbon: typeof import('ant-design-vue/es')['BadgeRibbon'] AButton: typeof import('ant-design-vue/es')['Button'] ACard: typeof import('ant-design-vue/es')['Card'] ACarousel: typeof import('ant-design-vue/es')['Carousel'] @@ -57,6 +58,7 @@ declare module '@vue/runtime-core' { ATableColumn: typeof import('ant-design-vue/es')['TableColumn'] ATabPane: typeof import('ant-design-vue/es')['TabPane'] ATabs: typeof import('ant-design-vue/es')['Tabs'] + ATag: typeof import('ant-design-vue/es')['Tag'] ATextarea: typeof import('ant-design-vue/es')['Textarea'] ATimePicker: typeof import('ant-design-vue/es')['TimePicker'] ATooltip: typeof import('ant-design-vue/es')['Tooltip'] @@ -74,9 +76,11 @@ declare module '@vue/runtime-core' { MaterialSymbolsFileCopyOutline: typeof import('~icons/material-symbols/file-copy-outline')['default'] MaterialSymbolsMenu: typeof import('~icons/material-symbols/menu')['default'] MaterialSymbolsTranslate: typeof import('~icons/material-symbols/translate')['default'] + MdiAccountCircle: typeof import('~icons/mdi/account-circle')['default'] MdiAccountGroup: typeof import('~icons/mdi/account-group')['default'] MdiApi: typeof import('~icons/mdi/api')['default'] MdiArrowExpand: typeof import('~icons/mdi/arrow-expand')['default'] + MdiArrowExpandIcon: typeof import('~icons/mdi/arrow-expand-icon')['default'] MdiArrowLeftBold: typeof import('~icons/mdi/arrow-left-bold')['default'] MdiAt: typeof import('~icons/mdi/at')['default'] MdiCalculator: typeof import('~icons/mdi/calculator')['default'] @@ -86,6 +90,7 @@ declare module '@vue/runtime-core' { MdiCheck: typeof import('~icons/mdi/check')['default'] MdiChevronDown: typeof import('~icons/mdi/chevron-down')['default'] MdiCloseCircle: typeof import('~icons/mdi/close-circle')['default'] + MdiCloseThick: typeof import('~icons/mdi/close-thick')['default'] MdiContentCopy: typeof import('~icons/mdi/content-copy')['default'] MdiContentSave: typeof import('~icons/mdi/content-save')['default'] MdiDatabase: typeof import('~icons/mdi/database')['default'] @@ -105,6 +110,7 @@ declare module '@vue/runtime-core' { MdiHeart: typeof import('~icons/mdi/heart')['default'] MdiHook: typeof import('~icons/mdi/hook')['default'] MdiInformation: typeof import('~icons/mdi/information')['default'] + MdiKeyboardReturn: typeof import('~icons/mdi/keyboard-return')['default'] MdiLink: typeof import('~icons/mdi/link')['default'] MdiLinkVariantRemove: typeof import('~icons/mdi/link-variant-remove')['default'] MdiLogout: typeof import('~icons/mdi/logout')['default'] @@ -114,6 +120,7 @@ declare module '@vue/runtime-core' { MdiMoonFull: typeof import('~icons/mdi/moon-full')['default'] MdiNotebookCheckOutline: typeof import('~icons/mdi/notebook-check-outline')['default'] MdiOpenInNew: typeof import('~icons/mdi/open-in-new')['default'] + MdiOperator: typeof import('~icons/mdi/operator')['default'] MdiPlus: typeof import('~icons/mdi/plus')['default'] MdiPlusOutline: typeof import('~icons/mdi/plus-outline')['default'] MdiReload: typeof import('~icons/mdi/reload')['default'] @@ -122,6 +129,7 @@ declare module '@vue/runtime-core' { MdiSlack: typeof import('~icons/mdi/slack')['default'] MdiStar: typeof import('~icons/mdi/star')['default'] MdiStore: typeof import('~icons/mdi/store')['default'] + MdiTableArrowRight: typeof import('~icons/mdi/table-arrow-right')['default'] MdiTableBorder: typeof import('~icons/mdi/table-border')['default'] MdiThumbUp: typeof import('~icons/mdi/thumb-up')['default'] MdiTrashCan: typeof import('~icons/mdi/trash-can')['default'] diff --git a/packages/nc-gui-v2/components/cell/MultiSelect.vue b/packages/nc-gui-v2/components/cell/MultiSelect.vue index d33373e547..b8d7f78dc2 100644 --- a/packages/nc-gui-v2/components/cell/MultiSelect.vue +++ b/packages/nc-gui-v2/components/cell/MultiSelect.vue @@ -1,76 +1,196 @@ - + + diff --git a/packages/nc-gui-v2/components/cell/SingleSelect.vue b/packages/nc-gui-v2/components/cell/SingleSelect.vue index 75821474b8..598b1f584e 100644 --- a/packages/nc-gui-v2/components/cell/SingleSelect.vue +++ b/packages/nc-gui-v2/components/cell/SingleSelect.vue @@ -1,71 +1,100 @@ - - +const options = computed(() => { + if (column?.value.colOptions) { + const opts = column.value.colOptions + ? column.value.colOptions.options.filter((el: SelectOptionType) => el.title !== '') || [] + : [] + for (const op of opts.filter((el: SelectOptionType) => el.order === null)) { + op.title = op.title.replace(/^'/, '').replace(/'$/, '') + } + return opts + } + return [] +}) - + {{ $t('general.cancel') }} + + + + {{ $t('activity.saveRow') }} + + + + + diff --git a/packages/nc-gui-v2/components/smartsheet/expanded-form/index.vue b/packages/nc-gui-v2/components/smartsheet/expanded-form/index.vue new file mode 100644 index 0000000000..fdb11c7f0f --- /dev/null +++ b/packages/nc-gui-v2/components/smartsheet/expanded-form/index.vue @@ -0,0 +1,139 @@ + + + + + diff --git a/packages/nc-gui-v2/components/smartsheet/sidebar/MenuBottom.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/MenuBottom.vue index 477ee96354..d7e1058a09 100644 --- a/packages/nc-gui-v2/components/smartsheet/sidebar/MenuBottom.vue +++ b/packages/nc-gui-v2/components/smartsheet/sidebar/MenuBottom.vue @@ -12,9 +12,11 @@ const emits = defineEmits() const { $e } = useNuxtApp() const isView = ref(false) +let showApiSnippet = $ref(false) function onApiSnippet() { // get API snippet + showApiSnippet = true $e('a:view:api-snippet') } @@ -89,6 +91,7 @@ function onOpenModal(type: ViewTypes, title = '') { +