archive/bramw_baserow
1
0
Fork 0
mirror of https://gitlab.com/bramw/baserow.git synced 2025-04-10 23:50:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix-button-collection-field-type-fire-event' into 'develop'

Browse source 
Ensure the ButtonField can fire events again.

See merge request
This commit is contained in:
Peter Evans 2024-07-31 06:15:21 +00:00
commit 7840ad8547
2 changed files with 2 additions and 3 deletions
web-frontend/modules/builder
components/theme
TableThemeConfigBlock.vue
mixins
collectionField.js

2
web-frontend/modules/builder/components/theme/TableThemeConfigBlock.vue
View file

@ -331,7 +331,6 @@ import FontFamilySelector from '@baserow/modules/builder/components/FontFamilySe
import PixelValueSelector from '@baserow/modules/builder/components/PixelValueSelector'
import PaddingSelector from '@baserow/modules/builder/components/PaddingSelector'
import { required, integer, minValue, maxValue } from 'vuelidate/lib/validators'
import BaserowTable from '@baserow/modules/builder/components/elements/components/BaserowTable'
const minMax = {
table_border_size: {
@ -369,7 +368,6 @@ export default {
components: {
ThemeConfigBlockSection,
ResetButton,
BaserowTable,
HorizontalAlignmentsSelector,
FontFamilySelector,
PixelValueSelector,

3
web-frontend/modules/builder/mixins/collectionField.js
View file

@ -1,10 +1,11 @@
import element from '@baserow/modules/builder/mixins/element'
import { resolveColor } from '@baserow/modules/core/utils/colors'
import { ThemeConfigBlockType } from '@baserow/modules/builder/themeConfigBlockTypes'
import applicationContextMixin from '@baserow/modules/builder/mixins/applicationContext'
export default {
inject: ['workspace', 'builder', 'page', 'mode'],
mixins: [applicationContextMixin],
mixins: [element, applicationContextMixin],
props: {
element: {
type: Object,