mirror of
https://github.com/nocodb/nocodb.git
synced 2026-05-02 20:57:10 +00:00
* feat: Improved ui (#6156) * refactor: revert Signed-off-by: Pranav C <pranavxc@gmail.com> feat: shared base Signed-off-by: Pranav C <pranavxc@gmail.com> fix: remove duplicate import statement Signed-off-by: Pranav C <pranavxc@gmail.com> fix: disable starred & license menu Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: fix airtable wait issue Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: enable mysql in ci Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: fix checkbox order for sqlite Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: disable quick tests Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: fix dbType env variable for CI Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: workspace API access error fix Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: enable SQLite CI CD Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: use DB_TYPE env variable Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: enable SQLite UT Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: isHub cleanup Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: add check for EE Timezone spec Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> chore: cleanup Signed-off-by: Pranav C <pranavxc@gmail.com> chore: cleanup Signed-off-by: Pranav C <pranavxc@gmail.com> test: EE check fix Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> chore: test correction Signed-off-by: Pranav C <pranavxc@gmail.com> chore: sync latest changes Signed-off-by: Pranav C <pranavxc@gmail.com> test: set EE=false Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: set NC Edition to community in workflow file Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> chore: update sdk build command Signed-off-by: Pranav C <pranavxc@gmail.com> refactor: i18n and other changes Signed-off-by: Pranav C <pranavxc@gmail.com> feat: new ui Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: sync tests Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: lint Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: shared view/base related bugs Signed-off-by: Pranav C <pranavxc@gmail.com> * test: checkbox verification sort order fix Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: fix sqlite reset Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: enable selfhosted runners Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * docs: table ops (draft) Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * Docs: screenshots for table-operations.md * refactor: introduce missing buttons Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: get all fields Signed-off-by: Pranav C <pranavxc@gmail.com> * test: UT fix- new data API response Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: EE is false Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: webhook lookup as string in CE Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * fix: include created_at and updated_at Signed-off-by: Pranav C <pranavxc@gmail.com> * test: fix UT newDataAPI response for PG Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * fix: separate api for webhook related plugins Signed-off-by: Pranav C <pranavxc@gmail.com> * test: msyql filter corrections Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: mysql group by test corrections Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: fix datatype for rating field in groupby spec for pg Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: kanban datatype correction Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: column edit for mysql- rating field Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: misc fixes Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: enable 4 workers Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: enable 2 workers per shard only Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * docs: table CRUD * Rename table-operations.md to table-crud.md * Create column-crud.md * docs: row CRUD * Rename row.md to row-crud.md * docs: project crud * docs: toolbar (skeleton) * refactor: single page UI and bug fixes Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: sync tests playwright Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: add missing dependency Signed-off-by: Pranav C <pranavxc@gmail.com> * feat: single page ui, test corrections Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: tests Signed-off-by: Pranav C <pranavxc@gmail.com> * test: project rename test correction Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: remove only Signed-off-by: Pranav C <pranavxc@gmail.com> * test: remove wrong import statement Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: delete option not visible in project context menu Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: move ws access within isEE() Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: fix groupby * test: groupby fix Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * docs: signup & landing page * docs: project crud * docs: project-crud misc * docs: toolbar fields * docs: toolbar / filters * docs: toolbar / group by * docs: toolbar / sort * docs: toolbar / row height * docs: filters additional options * docs: file re-order Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * docs: add links to column types * docs: code snippets * docs: links * docs: lookup * docs: rollup * docs: formula * docs: primary key * docs: display value * docs: development setup * docs: swagger * fix(nc-gui): encodeURIComponent for row id - closes: #6202 * docs: language * docs: expanded record * docs: import airtable * docs: airtable * docs: webhook * docs: revert file rename Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * docs: account settings * docs: audit * docs: meta management * docs: project settings * docs: shared base * docs: shared view * docs: meta sync * docs: team-auth * docs: views * docs: fix URL * docs: URL corrections * fix: shared base, view related bugs Signed-off-by: Pranav C <pranavxc@gmail.com> * test: EE check for WSaccess Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: exclude EE tests Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * fix: missing project delete closes #6215 Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: merge existing project meta if found closes #6216 Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: merge existing project meta if found closes #6216 Signed-off-by: Pranav C <pranavxc@gmail.com> --------- Signed-off-by: Pranav C <pranavxc@gmail.com> Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> Co-authored-by: Raju Udava <86527202+dstala@users.noreply.github.com> Co-authored-by: DarkPhoenix2704 <anbarasun123@gmail.com> Co-authored-by: Wing-Kam Wong <wingkwong.code@gmail.com> * refactor: docs and other bug fixes Signed-off-by: Pranav C <pranavxc@gmail.com> * feat: populate default project on super admin signup Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: include created project details in signup response if avail, missing Dockerfile Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: use custom function for resolving ts path aliases Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: add missing generate script Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: webpack build correction - ts path resolve Signed-off-by: Pranav C <pranavxc@gmail.com> --------- Signed-off-by: Pranav C <pranavxc@gmail.com> Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> Co-authored-by: mertmit <mertmit99@gmail.com> Co-authored-by: Raju Udava <86527202+dstala@users.noreply.github.com> Co-authored-by: DarkPhoenix2704 <anbarasun123@gmail.com> Co-authored-by: Wing-Kam Wong <wingkwong.code@gmail.com>
154 lines
3.6 KiB
Vue
154 lines
3.6 KiB
Vue
<script setup lang="ts">
|
|
import JsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker'
|
|
import EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker'
|
|
import TypescriptWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker'
|
|
import type { editor as MonacoEditor } from 'monaco-editor'
|
|
import { deepCompare, isDrawerOrModalExist, onMounted, ref, watch } from '#imports'
|
|
|
|
interface Props {
|
|
modelValue: string | Record<string, any>
|
|
hideMinimap?: boolean
|
|
lang?: string
|
|
validate?: boolean
|
|
disableDeepCompare?: boolean
|
|
readOnly?: boolean
|
|
}
|
|
|
|
const { hideMinimap, lang = 'json', validate = true, disableDeepCompare = false, modelValue, readOnly } = defineProps<Props>()
|
|
|
|
const emits = defineEmits(['update:modelValue'])
|
|
|
|
const vModel = computed<string>({
|
|
get: () => {
|
|
if (typeof modelValue === 'object') {
|
|
return JSON.stringify(modelValue, null, 2)
|
|
} else {
|
|
return modelValue
|
|
}
|
|
},
|
|
set: (newVal: string | Record<string, any>) => {
|
|
if (typeof modelValue === 'object') {
|
|
try {
|
|
emits('update:modelValue', typeof newVal === 'object' ? newVal : JSON.parse(newVal))
|
|
} catch (e) {
|
|
console.error(e)
|
|
}
|
|
} else {
|
|
emits('update:modelValue', newVal)
|
|
}
|
|
},
|
|
})
|
|
|
|
const isValid = ref(true)
|
|
|
|
/**
|
|
* Adding monaco editor to Vite
|
|
*
|
|
* @ts-expect-error */
|
|
self.MonacoEnvironment = {
|
|
getWorker(_: any, label: string) {
|
|
switch (label) {
|
|
case 'json':
|
|
return new JsonWorker()
|
|
case 'typescript':
|
|
return new TypescriptWorker()
|
|
default:
|
|
return new EditorWorker()
|
|
}
|
|
},
|
|
}
|
|
|
|
const root = ref<HTMLDivElement>()
|
|
|
|
let editor: MonacoEditor.IStandaloneCodeEditor
|
|
|
|
const format = () => {
|
|
editor.setValue(JSON.stringify(JSON.parse(editor?.getValue() as string), null, 2))
|
|
}
|
|
|
|
defineExpose({
|
|
format,
|
|
isValid,
|
|
})
|
|
|
|
onMounted(async () => {
|
|
const { editor: monacoEditor, languages } = await import('monaco-editor')
|
|
|
|
if (root.value && lang) {
|
|
const model = monacoEditor.createModel(vModel.value, lang)
|
|
|
|
if (lang === 'json') {
|
|
// configure the JSON language support with schemas and schema associations
|
|
languages.json.jsonDefaults.setDiagnosticsOptions({
|
|
validate: validate as boolean,
|
|
})
|
|
}
|
|
|
|
editor = monacoEditor.create(root.value, {
|
|
model,
|
|
theme: 'vs',
|
|
foldingStrategy: 'indentation',
|
|
selectOnLineNumbers: true,
|
|
scrollbar: {
|
|
verticalScrollbarSize: 8,
|
|
horizontalScrollbarSize: 8,
|
|
},
|
|
tabSize: 2,
|
|
automaticLayout: true,
|
|
readOnly,
|
|
minimap: {
|
|
enabled: !hideMinimap,
|
|
},
|
|
})
|
|
|
|
editor.onDidChangeModelContent(async () => {
|
|
try {
|
|
isValid.value = true
|
|
|
|
if (disableDeepCompare || lang !== 'json') {
|
|
vModel.value = editor.getValue()
|
|
} else {
|
|
const obj = JSON.parse(editor.getValue())
|
|
|
|
if (!obj || !deepCompare(vModel.value, obj)) vModel.value = obj
|
|
}
|
|
} catch (e) {
|
|
isValid.value = false
|
|
console.log(e)
|
|
}
|
|
})
|
|
|
|
if (!isDrawerOrModalExist()) {
|
|
// auto focus on json cells only
|
|
editor.focus()
|
|
}
|
|
}
|
|
})
|
|
|
|
watch(vModel, (v) => {
|
|
if (!editor || !v) return
|
|
|
|
const editorValue = editor?.getValue()
|
|
if (!disableDeepCompare && lang === 'json') {
|
|
if (!editorValue || !deepCompare(JSON.parse(v), JSON.parse(editorValue))) {
|
|
editor.setValue(v)
|
|
}
|
|
} else {
|
|
if (editorValue !== v) editor.setValue(v)
|
|
}
|
|
})
|
|
|
|
watch(
|
|
() => readOnly,
|
|
(v) => {
|
|
if (!editor) return
|
|
|
|
editor.updateOptions({ readOnly: v })
|
|
},
|
|
)
|
|
</script>
|
|
|
|
<template>
|
|
<div ref="root"></div>
|
|
</template>
|