Browse Source

Merge pull request #1936 from nocodb/fix-monaco

fix: monaco editor dialog closes on click
pull/1951/head
աɨռɢӄաօռɢ 2 years ago committed by GitHub
parent
commit
31f3724850
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      packages/nc-gui/components/project/spreadsheet/mixins/cell.js
  2. 7
      packages/nc-gui/components/project/spreadsheet/views/xcGridView.vue

2
packages/nc-gui/components/project/spreadsheet/mixins/cell.js

@ -45,7 +45,7 @@ export default {
return this.abstractType === 'datetime' || this.uiDatatype === 'DateTime' return this.abstractType === 'datetime' || this.uiDatatype === 'DateTime'
}, },
isJSON() { isJSON() {
return this.abstractType === 'json' || this.uiDatatype === 'JSON' return this.uiDatatype === 'JSON'
}, },
isEnum() { isEnum() {
return this.uiDatatype === 'SingleSelect' return this.uiDatatype === 'SingleSelect'

7
packages/nc-gui/components/project/spreadsheet/views/xcGridView.vue

@ -729,9 +729,12 @@ export default {
}, },
onClickOutside() { onClickOutside() {
if ( if (
this.meta.columns && (this.meta.columns &&
this.meta.columns[this.selected.col] && this.meta.columns[this.selected.col] &&
this.meta.columns[this.selected.col].virtual this.meta.columns[this.selected.col].virtual) ||
(this.availableColumns &&
this.availableColumns[this.editEnabled.col] &&
this.availableColumns[this.editEnabled.col].uidt === "JSON")
) { ) {
return; return;
} }

Loading…
Cancel
Save