From 7387da13644762c63320fb4458363c7900e202f9 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Fri, 22 Jul 2022 15:33:59 +0800 Subject: [PATCH] feat(gui-v2): add json editor & refactor import state --- .../nc-gui-v2/components/dlg/FileImport.vue | 41 +++++++++++-------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/packages/nc-gui-v2/components/dlg/FileImport.vue b/packages/nc-gui-v2/components/dlg/FileImport.vue index 2e3bba6bca..e516cd8534 100644 --- a/packages/nc-gui-v2/components/dlg/FileImport.vue +++ b/packages/nc-gui-v2/components/dlg/FileImport.vue @@ -20,19 +20,23 @@ const { modelValue, importType } = defineProps() const toast = useToast() const emit = defineEmits(['update:modelValue']) const activeKey = ref('upload') -const fileList = ref([]) -const urlValidator = ref() +const jsonEditorRef = ref() +const loading = ref(false) const useForm = Form.useForm -const formState = reactive({ + +const importState = ref({ + fileList: [], url: '', + json: {}, }) + const validators = computed(() => { return { url: [fieldRequiredValidator], } }) -const { resetFields, validate, validateInfos } = useForm(formState, validators) +const { resetFields, validate, validateInfos } = useForm(importState, validators) const handleDrop = (e: DragEvent) => { console.log(e) @@ -80,6 +84,10 @@ const handleChange = (info: UploadChangeParam) => { } } +const formatJson = () => { + jsonEditorRef.value.format() +} + const handleSubmit = () => { if (activeKey.value === 'upload') { // TODO @@ -97,13 +105,12 @@ const handleSubmit = () => {