...
 
Commits (2)
{
"name": "dm5-tableview",
"version": "0.2.0-SNAPSHOT",
"version": "0.3.0",
"description": "",
"author": "Daniel Mania & Malte Reißig",
"license": "AGPL-3.0",
......
......@@ -7,7 +7,7 @@
<name>DMX Tableview</name>
<groupId>systems.dmx</groupId>
<artifactId>dmx-tableview</artifactId>
<version>0.3.0-SNAPSHOT</version>
<version>0.3.0</version>
<packaging>bundle</packaging>
<parent>
......
......@@ -7,8 +7,7 @@
{{filteredRowCount}} of {{rowCount}} entries
</div>
<el-main>
<el-input
size="medium" class="global-search" placeholder="Search" v-model="filter.global">
<el-input clearable size="medium" class="global-search" placeholder="Search" v-model="filter.global">
</el-input>
<dm5-csv-button :data="csvData"></dm5-csv-button>
</el-main>
......@@ -28,7 +27,7 @@
<template slot="header" slot-scope="scope">
<div class="title">{{ column.value }}</div>
<a @click.stop>
<el-input v-model="filter[column.uri]" placeholder="Filter" size="mini"></el-input>
<el-input clearable v-model="filter[column.uri]" placeholder="Filter" size="mini"></el-input>
</a>
</template>
......@@ -153,13 +152,12 @@ export default {
let filteredRows = filteredData.filter(row =>
{
let isMatch = true;
for (let column of this.columns) {
if (this.filter[column.uri]) {
isMatch = isMatch && this.matches(row, column.uri);
if (this.filter[column.uri] && !this.matches(row, column.uri)) {
return false;
}
}
return isMatch;
return true
}
)
......@@ -268,10 +266,14 @@ export default {
.el-table th .el-input {
padding-left: 0em;
width: 75%;
margin-right: .5em;
}
.el-table {
width: 100%;
}
.el-table th div {
padding-right: .5em;
}
.el-table .cell {
word-break: break-word;
}
......
......@@ -10,7 +10,7 @@ import Vuex from 'vuex'
// 1) configure English as UI language
locale.use(lang)
console.log('[Tableview] 2019/08/17')
console.log('[Tableview] 2019/09/02')
// 2) Register Tableview UI components
Vue.use(Table)
......@@ -28,7 +28,7 @@ Vue.use(Vuex)
const store = new Vuex.Store({
state: {
tableviewName: "DMX Tableview 0.3.0-SNAPSHOT",
tableviewName: "DMX Tableview...",
clientId: Math.floor(Number.MAX_SAFE_INTEGER * Math.random())
},
actions: {
......