import { RelationTypes, UITypes } from 'nocodb-sdk'
import { getUIDTIcon } from '~/components/project/spreadsheet/helpers/uiTypes'
+import FieldListAutoCompleteDropdown from '~/components/project/spreadsheet/components/FieldListAutoCompleteDropdown'
export default {
name: 'SortListMenu',
+ components: { FieldListAutoCompleteDropdown },
props: {
fieldList: Array,
value: [Array, Object],
diff --git a/packages/nc-gui/components/project/spreadsheet/components/editableCell/DateTimePickerCell.vue b/packages/nc-gui/components/project/spreadsheet/components/editableCell/DateTimePickerCell.vue
index 4e9d631689..07abd59972 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/editableCell/DateTimePickerCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/editableCell/DateTimePickerCell.vue
@@ -32,17 +32,19 @@ export default {
value: [String, Date, Number], ignoreFocus: Boolean
},
computed: {
+ isMysql() {
+ return ['mysql', 'mysql2'].indexOf(this.$store.getters['project/GtrClientType'])
+ },
localState: {
get() {
if (!this.value) {
return this.value
}
-
return (/^\d+$/.test(this.value) ? dayjs(+this.value) : dayjs(this.value))
.format('YYYY-MM-DD HH:mm')
},
set(value) {
- if (this.$parent.sqlUi.name === 'MysqlUi') {
+ if (this.isMysql) {
this.$emit('input', value && dayjs(value).format('YYYY-MM-DD HH:mm:ss'))
} else {
this.$emit('input', value && dayjs(value).format('YYYY-MM-DD HH:mm:ssZ'))
diff --git a/packages/nc-gui/components/project/spreadsheet/components/editableCell/EditableAttachmentCell.vue b/packages/nc-gui/components/project/spreadsheet/components/editableCell/EditableAttachmentCell.vue
index 05dd6c2cb6..d98e2b4758 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/editableCell/EditableAttachmentCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/editableCell/EditableAttachmentCell.vue
@@ -62,7 +62,11 @@
-
+
mdi-loading mdi-spin
@@ -76,9 +80,15 @@
>
mdi-plus
- Attachment
+
+ Attachment
-
+
mdi-plus
@@ -110,6 +120,8 @@
Attach File
+
+
@@ -261,7 +273,8 @@ export default {
showImage: false,
selectedImage: null,
dragOver: false,
- localFilesState: []
+ localFilesState: [],
+ urlString: ''
}),
watch: {
value(val, prev) {
@@ -286,6 +299,18 @@ export default {
mounted() {
},
methods: {
+ async uploadByUrl() {
+ const data = await this.$api.storage.uploadByUrl(
+ {
+ path: ['noco', this.projectName, this.meta.title, this.column.title].join('/')
+ },
+ [{
+ url: this.urlString
+ }]
+ )
+
+ this.localState.push(...data)
+ },
openUrl(url, target) {
window.open(url, target)
},
diff --git a/packages/nc-gui/components/project/spreadsheet/components/editableCell/TimePickerCell.vue b/packages/nc-gui/components/project/spreadsheet/components/editableCell/TimePickerCell.vue
index 92dbe8d1b6..cdaa9605c6 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/editableCell/TimePickerCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/editableCell/TimePickerCell.vue
@@ -15,6 +15,7 @@