This commit is contained in:
syuilo 2018-06-08 07:43:12 +09:00
parent c6d3088374
commit 3d40a7df00
6 changed files with 11 additions and 32 deletions

View File

@ -1,10 +1,10 @@
<template> <template>
<x-widgets-column v-if="column.type == 'widgets'" :column="column" :is-stacked="isStacked" :is-active="isActive"/> <x-widgets-column v-if="column.type == 'widgets'" :column="column" :is-stacked="isStacked"/>
<x-notifications-column v-else-if="column.type == 'notifications'" :column="column" :is-stacked="isStacked" :is-active="isActive"/> <x-notifications-column v-else-if="column.type == 'notifications'" :column="column" :is-stacked="isStacked"/>
<x-tl-column v-else-if="column.type == 'home'" :column="column" :is-stacked="isStacked" :is-active="isActive"/> <x-tl-column v-else-if="column.type == 'home'" :column="column" :is-stacked="isStacked"/>
<x-tl-column v-else-if="column.type == 'local'" :column="column" :is-stacked="isStacked" :is-active="isActive"/> <x-tl-column v-else-if="column.type == 'local'" :column="column" :is-stacked="isStacked"/>
<x-tl-column v-else-if="column.type == 'global'" :column="column" :is-stacked="isStacked" :is-active="isActive"/> <x-tl-column v-else-if="column.type == 'global'" :column="column" :is-stacked="isStacked"/>
<x-tl-column v-else-if="column.type == 'list'" :column="column" :is-stacked="isStacked" :is-active="isActive"/> <x-tl-column v-else-if="column.type == 'list'" :column="column" :is-stacked="isStacked"/>
</template> </template>
<script lang="ts"> <script lang="ts">
@ -29,11 +29,6 @@ export default Vue.extend({
type: Boolean, type: Boolean,
required: false, required: false,
default: false default: false
},
isActive: {
type: Boolean,
required: false,
default: true
} }
} }
}); });

View File

@ -25,10 +25,6 @@ export default Vue.extend({
type: Boolean, type: Boolean,
required: true required: true
}, },
isActive: {
type: Boolean,
required: true
},
name: { name: {
type: String, type: String,
required: false required: false
@ -57,7 +53,7 @@ export default Vue.extend({
data() { data() {
return { return {
count: 0, count: 0,
active: this.isActive active: true
}; };
}, },

View File

@ -1,5 +1,5 @@
<template> <template>
<x-column :name="name" :column="column" :is-stacked="isStacked" :is-active="isActive"> <x-column :name="name" :column="column" :is-stacked="isStacked">
<span slot="header">%fa:bell R%{{ name }}</span> <span slot="header">%fa:bell R%{{ name }}</span>
<x-notifications/> <x-notifications/>
@ -25,10 +25,6 @@ export default Vue.extend({
isStacked: { isStacked: {
type: Boolean, type: Boolean,
required: true required: true
},
isActive: {
type: Boolean,
required: true
} }
}, },

View File

@ -1,5 +1,5 @@
<template> <template>
<x-column :menu="menu" :name="name" :column="column" :is-stacked="isStacked" :is-active="isActive"> <x-column :menu="menu" :name="name" :column="column" :is-stacked="isStacked">
<span slot="header"> <span slot="header">
<template v-if="column.type == 'home'">%fa:home%</template> <template v-if="column.type == 'home'">%fa:home%</template>
<template v-if="column.type == 'local'">%fa:R comments%</template> <template v-if="column.type == 'local'">%fa:R comments%</template>
@ -38,10 +38,6 @@ export default Vue.extend({
isStacked: { isStacked: {
type: Boolean, type: Boolean,
required: true required: true
},
isActive: {
type: Boolean,
required: true
} }
}, },

View File

@ -4,7 +4,7 @@
<template v-for="ids in layout"> <template v-for="ids in layout">
<div v-if="ids.length > 1" class="folder"> <div v-if="ids.length > 1" class="folder">
<template v-for="id, i in ids"> <template v-for="id, i in ids">
<x-column-core :ref="id" :key="id" :column="columns.find(c => c.id == id)" :is-stacked="true" :is-active="i == 0"/> <x-column-core :ref="id" :key="id" :column="columns.find(c => c.id == id)" :is-stacked="true"/>
</template> </template>
</div> </div>
<x-column-core v-else :ref="ids[0]" :key="ids[0]" :column="columns.find(c => c.id == ids[0])"/> <x-column-core v-else :ref="ids[0]" :key="ids[0]" :column="columns.find(c => c.id == ids[0])"/>

View File

@ -1,5 +1,5 @@
<template> <template>
<x-column :menu="menu" :naked="true" :narrow="true" :name="name" :column="column" :is-stacked="isStacked" :is-active="isActive" class="wtdtxvecapixsepjtcupubtsmometobz"> <x-column :menu="menu" :naked="true" :narrow="true" :name="name" :column="column" :is-stacked="isStacked" class="wtdtxvecapixsepjtcupubtsmometobz">
<span slot="header">%fa:calculator%{{ name }}</span> <span slot="header">%fa:calculator%{{ name }}</span>
<div class="gqpwvtwtprsbmnssnbicggtwqhmylhnq"> <div class="gqpwvtwtprsbmnssnbicggtwqhmylhnq">
@ -72,10 +72,6 @@ export default Vue.extend({
isStacked: { isStacked: {
type: Boolean, type: Boolean,
required: true required: true
},
isActive: {
type: Boolean,
required: true
} }
}, },