Skip to content

Commit eb8e767

Browse files
committed
fix tree slot and rich text box
1 parent fb7beb7 commit eb8e767

File tree

2 files changed

+37
-40
lines changed

2 files changed

+37
-40
lines changed

src/utils/crud/components/CrudTreeClientMode.vue

+5-4
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,13 @@
130130
<v-col>
131131
<span class="tree-item__field-value">
132132
<slot
133-
:name="`field:${header.value}`"
134-
:value="item[header.value]"
133+
:name="`field:${field.name}`"
134+
:value="field.value"
135135
:item="item"
136136
>
137137
<list-item-field
138-
:value="item[header.value]"
139-
:text-mode="textMode(item, header.value)"
138+
:value="field.value"
139+
:text-mode="textMode(item, field.name)"
140140
/>
141141
</slot>
142142
</span>
@@ -207,6 +207,7 @@ export default {
207207
const computeFields = (item) => {
208208
return this.tableFields.map(field => {
209209
return {
210+
name: field.name,
210211
label: field.text,
211212
value: item[field.name],
212213
}

src/utils/crud/components/field-types/RichTextBox.vue

+32-36
Original file line numberDiff line numberDiff line change
@@ -46,41 +46,6 @@ export default {
4646
field: {
4747
type: Object,
4848
},
49-
availableExtensions: {
50-
type: Array,
51-
default: () => {
52-
return [
53-
'History',
54-
'Bold',
55-
'Italic',
56-
'Underline',
57-
'Strike',
58-
'Paragraph',
59-
'ListItem',
60-
'BulletList',
61-
'OrderedList',
62-
{
63-
name: 'Heading',
64-
options: {
65-
levels: [
66-
1,
67-
2,
68-
3,
69-
4,
70-
5,
71-
6,
72-
],
73-
},
74-
},
75-
'HardBreak',
76-
'HorizontalRule',
77-
'Blockquote',
78-
'Code',
79-
'Link',
80-
'Image',
81-
]
82-
},
83-
},
8449
},
8550
data: () => ({
8651
content: '',
@@ -102,11 +67,42 @@ export default {
10267
History,
10368
Image,
10469
},
70+
availableExtensions: [
71+
'History',
72+
'Bold',
73+
'Italic',
74+
'Underline',
75+
'Strike',
76+
'Paragraph',
77+
'ListItem',
78+
'BulletList',
79+
'OrderedList',
80+
{
81+
name: 'Heading',
82+
options: {
83+
levels: [
84+
1,
85+
2,
86+
3,
87+
4,
88+
5,
89+
6,
90+
],
91+
},
92+
},
93+
'HardBreak',
94+
'HorizontalRule',
95+
'Blockquote',
96+
'Code',
97+
'Link',
98+
'Image',
99+
],
105100
}),
106101
computed: {
107102
extensions () {
108103
const extensions = []
109-
for (const extension of this.availableExtensions) {
104+
const selectedExtensions = this.field.richTextBoxOperations || this.availableExtensions
105+
for (const extension of selectedExtensions) {
110106
if (extension) {
111107
if (typeof extension === 'string' && this.extensionsExists(extension)) {
112108
extensions.push(this.extensionsMap[extension])

0 commit comments

Comments
 (0)