Skip to content

Commit b8a3e5f

Browse files
committed
Rename non-wrapping to wrapping fields in record list configurator
1 parent 6bf7ee3 commit b8a3e5f

6 files changed

Lines changed: 25 additions & 34 deletions

File tree

client/web/compose/src/components/ModuleFields/Viewer/String.vue

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,5 @@ import base from './base'
1919
2020
export default {
2121
extends: base,
22-
23-
computed: {
24-
classes () {
25-
const classes = []
26-
const { fieldID } = this.field
27-
const { textStyles = {} } = this.extraOptions
28-
29-
if (this.field.isMulti || this.field.options.multiLine) {
30-
classes.push('multiline')
31-
} else if (textStyles.noWrapFields && textStyles.noWrapFields.includes(fieldID)) {
32-
classes.push('text-nowrap')
33-
}
34-
35-
return classes
36-
},
37-
},
3822
}
3923
</script>

client/web/compose/src/components/ModuleFields/Viewer/base.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export default {
7373
7474
if (this.field.isMulti) {
7575
classes.push('multiline')
76-
} else if (textStyles.noWrapFields && textStyles.noWrapFields.includes(fieldID)) {
76+
} else if (!textStyles.wrappedFields || !textStyles.wrappedFields.includes(fieldID)) {
7777
classes.push('text-nowrap')
7878
}
7979

client/web/compose/src/components/PageBlocks/RecordListBase.vue

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2298,15 +2298,19 @@ export default {
22982298
cursor: pointer;
22992299
}
23002300
2301-
th .required::after {
2302-
content: "*";
2303-
display: inline-block;
2304-
color: var(--primary);
2305-
vertical-align: sub;
2306-
margin-left: 2px;
2307-
width: 10px;
2308-
height: 16px;
2309-
overflow: hidden;
2301+
th {
2302+
min-width: 13rem;
2303+
2304+
&.required::after {
2305+
content: "*";
2306+
display: inline-block;
2307+
color: var(--primary);
2308+
vertical-align: sub;
2309+
margin-left: 2px;
2310+
width: 10px;
2311+
height: 16px;
2312+
overflow: hidden;
2313+
}
23102314
}
23112315
23122316
tr:hover td.actions {

client/web/compose/src/components/PageBlocks/RecordListConfigurator.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,11 @@
141141
size="sm"
142142
variant="light"
143143
:module="recordListModule"
144-
:fields="options.textStyles.noWrapFields || []"
144+
:fields="options.textStyles.wrappedFields || []"
145145
:field-subset="options.fields.length ? options.fields : recordListModule.fields"
146146
@updateFields="onUpdateTextWrapOption"
147147
>
148-
{{ $t('recordList.record.configureNonWrappingFelids') }}
148+
{{ $t('recordList.record.configureWrappedFields') }}
149149
</column-picker>
150150
</b-form-group>
151151
</b-col>
@@ -1064,8 +1064,8 @@ export default {
10641064
},
10651065
10661066
onUpdateTextWrapOption (fields = []) {
1067-
if (this.options.textStyles.noWrapFields) {
1068-
this.options.textStyles.noWrapFields = fields.map(f => f.fieldID)
1067+
if (this.options.textStyles.wrappedFields) {
1068+
this.options.textStyles.wrappedFields = fields.map(f => f.fieldID)
10691069
}
10701070
},
10711071
},

lib/js/src/compose/types/page-block/record-list.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export interface Options {
7272
openRecordInEditMode: boolean;
7373

7474
textStyles: {
75-
noWrapFields: Array<string>
75+
wrappedFields: Array<string>
7676
}
7777
}
7878

@@ -132,7 +132,7 @@ const defaults: Readonly<Options> = Object.freeze({
132132
openRecordInEditMode: false,
133133

134134
textStyles: {
135-
noWrapFields: [],
135+
wrappedFields: [],
136136
},
137137
})
138138

@@ -218,7 +218,10 @@ export class PageBlockRecordList extends PageBlock {
218218
}
219219

220220
if (o.textStyles) {
221-
this.options.textStyles = o.textStyles
221+
this.options.textStyles = {
222+
...this.options.textStyles,
223+
...o.textStyles,
224+
}
222225
}
223226
}
224227

locale/en/corteza-webapp-compose/block.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ recordList:
570570
recordSelectorDisplayOptions: On record value click
571571
addRecordOptions: On add record click
572572
textStyles: Text Styles
573-
configureNonWrappingFelids: Configure non-wrapping fields
573+
configureWrappedFields: Select fields that will be wrapped
574574
showFullText: Show full text
575575
recordPage: record page
576576
refField:

0 commit comments

Comments
 (0)