diff --git a/packages/nc-gui/components/ProjectTreeView.vue b/packages/nc-gui/components/ProjectTreeView.vue index 8d60721999..3cf0a5c074 100644 --- a/packages/nc-gui/components/ProjectTreeView.vue +++ b/packages/nc-gui/components/ProjectTreeView.vue @@ -448,7 +448,7 @@ - + @@ -515,21 +515,21 @@ mdi-heart - + Sponsor Us - + mdi-heart Sponsor Us - + mdi-heart diff --git a/packages/nc-gui/components/project/spreadsheet/components/expandedForm.vue b/packages/nc-gui/components/project/spreadsheet/components/expandedForm.vue index e7b09fa25c..db83850773 100644 --- a/packages/nc-gui/components/project/spreadsheet/components/expandedForm.vue +++ b/packages/nc-gui/components/project/spreadsheet/components/expandedForm.vue @@ -357,7 +357,7 @@ export default { }, async reload() { // const id = this.meta.columns.filter((c) => c.pk).map(c => this.localState[c._cn]).join('___'); - const where = this.meta.columns.filter((c) => c.pk).map(c => `(${c._cn},eq,${this.value[c._cn]})`).join('~and'); + const where = this.meta.columns.filter((c) => c.pk).map(c => `(${c._cn},eq,${this.localState[c._cn]})`).join('~and'); this.$set(this, 'changedColumns', {}); // this.localState = await this.api.read(id); const data = await this.api.list({...(this.queryParams || {}), where}) || [{}]; @@ -452,12 +452,12 @@ export default { /* todo: refactor */ .row-col { & > div > input, - //& > div div > input, + //& > div div > input, & > div > .xc-input > input, - & > div > .xc-input >div > input, + & > div > .xc-input > div > input, & > div > select, & > div > .xc-input > select, - & > div textarea { + & > div textarea:not(.inputarea) { border: 1px solid #7f828b33; padding: 1px 5px; font-size: .8rem; @@ -487,10 +487,10 @@ export default { //& > div div > input, & > div > input, & > div > .xc-input > input, - & > div > .xc-input >div > input, + & > div > .xc-input > div > input, & > div > select, & > div > .xc-input > select, - & > div textarea { + & > div textarea:not(.inputarea) { background: #1e1e1e; } } @@ -501,12 +501,12 @@ export default { .row-col { & > div > input, - //& > div div > input, + //& > div div > input, & > div > .xc-input > input, - & > div > .xc-input >div > input, + & > div > .xc-input > div > input, & > div > select, & > div > .xc-input > select, - & > div textarea { + & > div textarea:not(.inputarea) { background: white; } } diff --git a/packages/nc-gui/components/project/spreadsheet/components/pagination.vue b/packages/nc-gui/components/project/spreadsheet/components/pagination.vue index eb0fe10390..61f90a8099 100644 --- a/packages/nc-gui/components/project/spreadsheet/components/pagination.vue +++ b/packages/nc-gui/components/project/spreadsheet/components/pagination.vue @@ -51,5 +51,4 @@ export default { diff --git a/packages/nc-gui/components/project/spreadsheet/components/spreadsheetNavDrawer.vue b/packages/nc-gui/components/project/spreadsheet/components/spreadsheetNavDrawer.vue index efa8e4f8f4..f4c9166cc3 100644 --- a/packages/nc-gui/components/project/spreadsheet/components/spreadsheetNavDrawer.vue +++ b/packages/nc-gui/components/project/spreadsheet/components/spreadsheetNavDrawer.vue @@ -264,7 +264,7 @@
+ :class="{'pt-6 pb-4' : !isForm , 'pt-4 pb-3':isForm}"> No item{{ bt ? '' : 's' }} found