MightyPork/datatable.directory
1
0
Fork 1
Code Issues 25 Pull Requests Releases Wiki Activity

use control-group for add-rows widget, fix paginator overflowing with hundreds of items

Browse Source
This commit is contained in:
MightyPork
2018-08-10 20:46:43 +02:00
parent a3df7a724c
commit 23f27e6f34
2 changed files with 44 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Tables/Changeset.php
+12 -2
View File
@@ -619,9 +619,19 @@ class Changeset
return $c->cast(null); return $c->cast(null);
})->all(); })->all();
foreach ($this->newColumns as $k => $obj) {
$cols[] = $c = new Column($obj);
$c->markAsNew();
$emptyTpl[$k] = $c->cast(null);
}
$this->newRows = array_filter($this->newRows, function ($r) use ($emptyTpl) { $this->newRows = array_filter($this->newRows, function ($r) use ($emptyTpl) {
$emptyTpl['_id'] = $r['_id']; foreach ($r as $k => $val) {
return $emptyTpl != $r; if ($k[0] == '_') continue;
if ($val != $emptyTpl[$k]) return true;
}
return false;
}); });
} }
} }
resources/assets/js/components/RowsEditor.vue
+32 -25
View File
@@ -11,36 +11,43 @@ Rows are identified by row._id, columns by col.id
<template> <template>
<div> <div>
<div class="col-md-12 d-flex mt-3"> <div class="col-md-12 d-flex flex-wrap">
<div v-if="hasPages" v-html="pager"></div> <div class="mt-3">
<div v-if="hasPages" v-html="pager"></div>
</div>
<div class="flex-grow-1"></div> <div class="flex-grow-1"></div>
<form :action="route" method="POST" v-if="newRows" class="form-inline mr-2"> <div class="d-flex flex-nowrap mt-3">
<input type="hidden" name="_token" :value="csrf"> <form :action="route" method="POST" v-if="newRows" class="form-inline mr-2">
<input type="hidden" name="action" value="rows.add"> <input type="hidden" name="_token" :value="csrf">
<input type="hidden" name="redirect" :value="pageUrl"> <input type="hidden" name="action" value="rows.add">
<input name="count" id="newrow-count" type="number" <input type="hidden" name="redirect" :value="pageUrl">
min=1 step=1 value=1 class="form-control mr-1" style="width: 8em"> <div class="input-group">
<button class="btn btn-outline-success">Add Rows</button> <input name="count" id="newrow-count" type="number"
</form> min=1 step=1 value=1 class="form-control" style="width: 6em">
<div class="input-group-append">
<button class="btn btn-outline-success">Add Rows</button>
</div>
</div>
</form>
<a :href="loadCsvUrl" class="btn btn-outline-success mr-2" v-if="newRows && loadCsvUrl"> <a :href="loadCsvUrl" class="btn btn-outline-success mr-2" v-if="newRows && loadCsvUrl">
<v-icon class="fa-file-excel-o fa-pr" alt="CSV"></v-icon><!-- <v-icon class="fa-file-excel-o fa-pr" alt="CSV"></v-icon><!--
-->CSV -->CSV
</a> </a>
<form :action="route" method="POST" v-if="newRows" class="form-inline mr-2"> <form :action="route" method="POST" v-if="newRows" class="form-inline mr-2">
<input type="hidden" name="_token" :value="csrf"> <input type="hidden" name="_token" :value="csrf">
<input type="hidden" name="action" value="row.remove-empty-new"> <input type="hidden" name="action" value="row.remove-empty-new">
<input type="hidden" name="redirect" :value="pageUrl"> <input type="hidden" name="redirect" :value="pageUrl">
<button class="btn btn-outline-danger">Remove Empty</button> <button class="btn btn-outline-danger">Remove Empty</button>
</form> </form>
<button @click="saveAllChanges" type="button" <button @click="saveAllChanges" type="button"
:class="['btn', this.dirtyRows ? 'btn-info' : 'btn-outline-secondary']"> :class="['btn', this.dirtyRows ? 'btn-info' : 'btn-outline-secondary']">
Save Rows Save Rows
</button> </button>
</div>
</div> </div>
<div class="col-md-12 mt-3"> <div class="col-md-12 mt-3">