Skip to content

Commit 75aadc5

Browse files
committed
Merge branch 'develop'
Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
2 parents 6f475fb + d5a1c57 commit 75aadc5

File tree

13 files changed

+42
-22
lines changed

13 files changed

+42
-22
lines changed

src/components/ui/AppBtnToggle.vue

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<template>
22
<v-btn-toggle
3+
v-model="inputValue"
34
v-bind="$attrs"
45
:class="{
56
'elevation-2': !disabled
@@ -11,12 +12,15 @@
1112
</template>
1213

1314
<script lang="ts">
14-
import { Component, Prop, Vue } from 'vue-property-decorator'
15+
import { Component, Prop, VModel, Vue } from 'vue-property-decorator'
1516
1617
@Component({
1718
inheritAttrs: false
1819
})
19-
export default class AppBtn extends Vue {
20+
export default class AppBtnToggle extends Vue {
21+
@VModel()
22+
inputValue?: unknown
23+
2024
@Prop({ type: Boolean })
2125
disabled?: boolean
2226
}

src/components/ui/AppColumnPicker.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export default class AppColumnPicker extends Vue {
6666
@Prop({ type: String, required: true })
6767
readonly keyName!: string
6868
69-
@Prop({ type: Array<AppDataTableHeader>, required: true })
69+
@Prop({ type: Array, required: true })
7070
readonly headers!: AppDataTableHeader[]
7171
7272
get configurableHeaders (): AppDataTableHeader[] {

src/components/ui/AppDataTableRow.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ export type DefaultGetterFunction = typeof defaultGetter
7373
inheritAttrs: false
7474
})
7575
export default class AppDataTableRow extends Vue {
76-
@Prop({ type: Array<DataTableHeader> })
76+
@Prop({ type: Array, required: true })
7777
readonly headers!: DataTableHeader[]
7878
79-
@Prop({ type: Object })
79+
@Prop({ type: Object, required: true })
8080
readonly item!: unknown
8181
8282
@Prop({ type: Boolean })

src/components/ui/AppNamedSlider.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export default class AppNamedSlider extends Vue {
9999
@Prop({ type: String, required: true })
100100
readonly label!: string
101101
102-
@Prop({ type: Array<InputValidationRules> })
102+
@Prop({ type: Array })
103103
readonly rules?: InputValidationRules[]
104104
105105
@Prop({ type: Boolean })

src/components/ui/AppNamedTextField.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export default class AppNamedTextField extends Mixins(StateMixin) {
7979
@Prop({ type: String })
8080
readonly suffix!: string
8181
82-
@Prop({ type: Array<InputValidationRules> })
82+
@Prop({ type: Array })
8383
readonly rules?: InputValidationRules[]
8484
8585
handleReset () {

src/components/ui/AppUpDownBtnGroup.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import { Component, Vue, Prop } from 'vue-property-decorator'
3131
3232
@Component({})
3333
export default class AppUpDownBtnGroup extends Vue {
34-
@Prop({ type: Array<number>, required: true })
34+
@Prop({ type: Array, required: true })
3535
readonly values!: number[]
3636
3737
@Prop({ type: String })

src/components/widgets/bedmesh/BedMeshChart.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default class BedMeshChart extends Mixins(BrowserMixin) {
2929
@Prop({ type: Array, required: true })
3030
readonly data!: []
3131
32-
@Prop({ type: Array<GraphicComponentOption>, default: () => [] })
32+
@Prop({ type: Array, default: () => [] })
3333
readonly graphics!: GraphicComponentOption[]
3434
3535
@Prop({ type: Object, default: () => {} })

src/components/widgets/filesystem/FileSystemBrowser.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,13 @@ import type { DefaultGetterFunction } from '@/components/ui/AppDataTableRow.vue'
131131
}
132132
})
133133
export default class FileSystemBrowser extends Mixins(FilesMixin) {
134-
@VModel({ type: Array<FileBrowserEntry>, required: true })
134+
@VModel({ type: Array, required: true })
135135
selected!: FileBrowserEntry[]
136136
137137
@Prop({ type: String, required: true })
138138
readonly root!: string
139139
140-
@Prop({ type: Array<FileBrowserEntry>, required: true })
140+
@Prop({ type: Array, required: true })
141141
readonly files!: FileBrowserEntry[]
142142
143143
@Prop({ type: Boolean })
@@ -147,7 +147,7 @@ export default class FileSystemBrowser extends Mixins(FilesMixin) {
147147
readonly loading?: boolean
148148
149149
// Currently defined list of headers.
150-
@Prop({ type: Array<DataTableHeader>, required: true })
150+
@Prop({ type: Array, required: true })
151151
readonly headers!: DataTableHeader[]
152152
153153
@Prop({ type: String })

src/components/widgets/filesystem/FileSystemToolbar.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,11 @@ export default class FileSystemToolbar extends Mixins(StatesMixin) {
174174
readonly name!: string
175175
176176
// Can be a list of roots, or a single root.
177-
@Prop({ type: Array<string> })
177+
@Prop({ type: Array })
178178
readonly roots?: string[]
179179
180180
// Currently defined list of headers.
181-
@Prop({ type: Array<AppDataTableHeader> })
181+
@Prop({ type: Array })
182182
readonly headers?: AppDataTableHeader[]
183183
184184
// The current path

src/components/widgets/job-queue/JobQueueBrowser.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ type QueueJobWithKey = QueuedJob & {
6363
6464
@Component({})
6565
export default class JobQueueBrowser extends Mixins(StateMixin) {
66-
@VModel({ type: Array<QueuedJob>, default: () => [] })
66+
@VModel({ type: Array, default: () => [] })
6767
selected!: QueuedJob[]
6868
6969
@Prop({ type: Boolean })
@@ -72,7 +72,7 @@ export default class JobQueueBrowser extends Mixins(StateMixin) {
7272
@Prop({ type: Boolean })
7373
readonly bulkActions?: boolean
7474
75-
@Prop({ type: Array<DataTableHeader>, required: true })
75+
@Prop({ type: Array, required: true })
7676
readonly headers!: DataTableHeader[]
7777
7878
get jobs (): QueuedJob[] {

0 commit comments

Comments
 (0)