diff --git a/.github/workflows/release-nightly-dev.yml b/.github/workflows/release-nightly-dev.yml index 1dda89956f..3a4f780804 100644 --- a/.github/workflows/release-nightly-dev.yml +++ b/.github/workflows/release-nightly-dev.yml @@ -49,13 +49,13 @@ jobs: NPM_TOKEN: "${{ secrets.NPM_TOKEN }}" # Build executables and publish to GitHub - release-executables: - needs: [set-tag, release-npm] - uses: ./.github/workflows/release-timely-executables.yml - with: - tag: ${{ needs.set-tag.outputs.current_version }}-${{ needs.set-tag.outputs.nightly_build_tag }} - secrets: - NC_GITHUB_TOKEN: "${{ secrets.NC_GITHUB_TOKEN }}" + # release-executables: + # needs: [set-tag, release-npm] + # uses: ./.github/workflows/release-timely-executables.yml + # with: + # tag: ${{ needs.set-tag.outputs.current_version }}-${{ needs.set-tag.outputs.nightly_build_tag }} + # secrets: + # NC_GITHUB_TOKEN: "${{ secrets.NC_GITHUB_TOKEN }}" # Build docker image and push to docker hub release-docker: diff --git a/packages/nc-gui/components.d.ts b/packages/nc-gui/components.d.ts index d50df09e5f..4d04cde70e 100644 --- a/packages/nc-gui/components.d.ts +++ b/packages/nc-gui/components.d.ts @@ -124,6 +124,7 @@ declare module '@vue/runtime-core' { MdiArrowDownDropCircleOutline: typeof import('~icons/mdi/arrow-down-drop-circle-outline')['default'] MdiArrowExpand: typeof import('~icons/mdi/arrow-expand')['default'] MdiArrowLeftBold: typeof import('~icons/mdi/arrow-left-bold')['default'] + MdiArrowULeftBottom: typeof import('~icons/mdi/arrow-u-left-bottom')['default'] MdiAt: typeof import('~icons/mdi/at')['default'] MdiBackburger: typeof import('~icons/mdi/backburger')['default'] MdiBookOpenOutline: typeof import('~icons/mdi/book-open-outline')['default'] diff --git a/packages/nc-gui/components/smartsheet/column/SelectOptions.vue b/packages/nc-gui/components/smartsheet/column/SelectOptions.vue index c7169640dc..6999debf89 100644 --- a/packages/nc-gui/components/smartsheet/column/SelectOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/SelectOptions.vue @@ -3,6 +3,14 @@ import Draggable from 'vuedraggable' import { UITypes } from 'nocodb-sdk' import { IsKanbanInj, enumColor, onMounted, useColumnCreateStoreOrThrow, useVModel, watch } from '#imports' +interface Option { + color: string + title: string + id?: string + fk_colum_id?: string + order?: number +} + const props = defineProps<{ value: any }>() @@ -13,7 +21,10 @@ const vModel = useVModel(props, 'value', emit) const { setAdditionalValidations, validateInfos, isPg, isMysql } = useColumnCreateStoreOrThrow() -let options = $ref([]) +let options = $ref([]) +let renderedOptions = $ref<(Option & { status?: 'remove' })[]>([]) +let savedDefaultOption = $ref