summaryrefslogtreecommitdiffstats
path: root/webapp/src
diff options
context:
space:
mode:
authorUdo Walter2019-03-05 02:32:48 +0100
committerUdo Walter2019-03-05 02:32:48 +0100
commit763d7d345bb9cbbdfc08d2bde4365241b6cffd88 (patch)
treea73a6588c0a232091628aff11753c91c4f4f0ea9 /webapp/src
parent[server/setup] Move (initial) setup in it's own api file (diff)
downloadbas-763d7d345bb9cbbdfc08d2bde4365241b6cffd88.tar.gz
bas-763d7d345bb9cbbdfc08d2bde4365241b6cffd88.tar.xz
bas-763d7d345bb9cbbdfc08d2bde4365241b6cffd88.zip
[webapp] migrate from vue cli 2 to vue cli 3
Diffstat (limited to 'webapp/src')
-rw-r--r--webapp/src/components/ConfiguratorModuleConfig.vue4
-rw-r--r--webapp/src/components/DataTableSearch.vue1
-rw-r--r--webapp/src/components/GroupModuleClientView.vue5
-rw-r--r--webapp/src/components/GroupModuleDialog.vue3
-rw-r--r--webapp/src/components/GroupModuleGroupView.vue5
-rw-r--r--webapp/src/components/SelectBox.vue6
6 files changed, 16 insertions, 8 deletions
diff --git a/webapp/src/components/ConfiguratorModuleConfig.vue b/webapp/src/components/ConfiguratorModuleConfig.vue
index 45dc352..946492b 100644
--- a/webapp/src/components/ConfiguratorModuleConfig.vue
+++ b/webapp/src/components/ConfiguratorModuleConfig.vue
@@ -98,14 +98,12 @@
<script>
import draggable from 'vuedraggable'
-import ComponentSearchTable from '@/components/ComponentSearchTable'
import { mapState } from 'vuex'
export default {
name: 'ConfiguratorModuleConfig',
components: {
- draggable,
- ComponentSearchTable
+ draggable
},
data () {
return {
diff --git a/webapp/src/components/DataTableSearch.vue b/webapp/src/components/DataTableSearch.vue
index cb4bc67..01c2125 100644
--- a/webapp/src/components/DataTableSearch.vue
+++ b/webapp/src/components/DataTableSearch.vue
@@ -109,6 +109,7 @@ export default {
else if (this.regex && !this.caseSensitive) return (s, item, key) => s.text.regexCI.test(str(item, key))
else if (!this.regex && this.caseSensitive) return (s, item, key) => str(item, key).indexOf(s.text.raw) !== -1
else if (!this.regex && !this.caseSensitive) return (s, item, key) => str(item, key).toUpperCase().indexOf(s.text.upper) !== -1
+ return () => false
}
},
watch: {
diff --git a/webapp/src/components/GroupModuleClientView.vue b/webapp/src/components/GroupModuleClientView.vue
index eec3e58..5f6ec5e 100644
--- a/webapp/src/components/GroupModuleClientView.vue
+++ b/webapp/src/components/GroupModuleClientView.vue
@@ -46,7 +46,7 @@
<div class="info-text">
<select-box v-if="editMode" v-model="groups" :items="groupList" class="info-input" hide-details></select-box>
<div v-else class="chip-container">
- <v-chip v-for="(group, index) in client.groups" :key="group.id" v-if="index < 5" small label style="width: calc(50% - 8px)">
+ <v-chip v-for="group in firstGroups" :key="group.id" small label style="width: calc(50% - 8px)">
<span class="chip-text">{{ group.name || group.id }}</span>
</v-chip>
<span v-if="client.groups && client.groups.length > 5" class="and-more">+ {{ client.groups.length - 5 }} {{ $t('more') }}</span>
@@ -179,6 +179,9 @@ export default {
return [
{ key: 'name', text: this.$t('name') }
]
+ },
+ firstGroups () {
+ return this.client.groups.slice(0, 5)
}
},
watch: {
diff --git a/webapp/src/components/GroupModuleDialog.vue b/webapp/src/components/GroupModuleDialog.vue
index 3f809e9..4e38c0b 100644
--- a/webapp/src/components/GroupModuleDialog.vue
+++ b/webapp/src/components/GroupModuleDialog.vue
@@ -128,7 +128,7 @@
:item-size="24"
page-mode
>
- <div slot-scope="{ item, index }">[{{ item.id }}] {{ item.name }}</div>
+ <div slot-scope="{ item }">[{{ item.id }}] {{ item.name }}</div>
</RecycleScroller>
</div>
</v-card-text>
@@ -193,6 +193,7 @@ export default {
items () {
if (this.dialog.info.type === 'group') return this.$store.state.groups.groupList
if (this.dialog.info.type === 'client') return this.$store.state.groups.clientList
+ return []
},
dialogAction () {
return this.dialog.info ? this.dialog.info.action : undefined
diff --git a/webapp/src/components/GroupModuleGroupView.vue b/webapp/src/components/GroupModuleGroupView.vue
index deda78b..fcfd390 100644
--- a/webapp/src/components/GroupModuleGroupView.vue
+++ b/webapp/src/components/GroupModuleGroupView.vue
@@ -58,7 +58,7 @@
<div class="info-text">
<select-box v-if="editMode" v-model="parents" :items="groupList" class="info-input" hide-details></select-box>
<div v-else class="chip-container">
- <v-chip v-for="(parent, index) in group.parents" :key="parent.id" v-if="index < 5" small label style="width: calc(50% - 8px)">
+ <v-chip v-for="parent in firstParents" :key="parent.id" small label style="width: calc(50% - 8px)">
<span class="chip-text">{{ parent.name || parent.id }}</span>
</v-chip>
<span v-if="group.parents && group.parents.length > 5" class="and-more">+ {{ group.parents.length - 5 }} {{ $t('more') }}</span>
@@ -211,6 +211,9 @@ export default {
return [
{ key: 'name', text: this.$t('name') }
]
+ },
+ firstParents () {
+ return this.group.parents.slice(0, 5)
}
},
watch: {
diff --git a/webapp/src/components/SelectBox.vue b/webapp/src/components/SelectBox.vue
index 59797af..98a207c 100644
--- a/webapp/src/components/SelectBox.vue
+++ b/webapp/src/components/SelectBox.vue
@@ -23,9 +23,8 @@
<v-chip
class="item-chip"
:style="{ width: 'calc(' + (100 / maxColumns) + '% - 8px)' }"
- v-for="(item, index) in value"
+ v-for="(item, index) in firstValueItems"
:key="item[idKey]"
- v-if="index < maxShow"
small
label
close
@@ -118,6 +117,9 @@ export default {
maxShow () {
return this.maxColumns * this.maxRows - 1
},
+ firstValueItems () {
+ return this.value.slice(0, this.maxShow)
+ },
computedTextHeading () {
return this.textHeading === undefined ? this.$t('name') : this.textHeading
},