Skip to content

Commit d40bbf7

Browse files
committed
fix: updated fetch-limit to filter-limit
1 parent d593476 commit d40bbf7

File tree

2 files changed

+61
-31
lines changed

2 files changed

+61
-31
lines changed

demo/index.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@
3232
<button actions="upload">upload</button>
3333
</form>
3434

35-
<!-- <form>
36-
<div type="file" directory multiple></div>
37-
<button actions="upload">upload</button>
38-
</form> -->
3935
<form>
4036
<input type="file" directory template_id="file-preview" />
4137

@@ -55,6 +51,11 @@
5551
<div>id: {{id}}</div>
5652
</div>
5753

54+
<form>
55+
<div type="file" directory></div>
56+
<button actions="upload">upload</button>
57+
</form>
58+
5859
<!-- <script src="../dist/CoCreate-file.js"></script> -->
5960
<script src="../../../CoCreateJS/dist/CoCreate.js"></script>
6061
<!-- <script src="https://cdn.cocreate.app/latest/CoCreate.min.js"></script> -->

src/client.js

Lines changed: 56 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import observer from '@cocreate/observer';
22
import crud from '@cocreate/crud-client';
3-
import action from '@cocreate/actions';
3+
import actions from '@cocreate/actions';
44
import render from '@cocreate/render';
55
import '@cocreate/element-prototype';
66

@@ -263,14 +263,19 @@ async function fileFormAction(data) {
263263
const action = data.name
264264
const form = data.element.closest('form')
265265
let inputs = form.querySelectorAll('input[type="file"]')
266+
// if (action === 'export') {
267+
// Export(inputs)
268+
// } else if (action === 'download') {
269+
// save(inputs[i])
270+
// }
266271
for (let i = 0; i < inputs.length; i++) {
267272
if (action === 'upload')
268273
upload(inputs[i])
269-
else if (action === 'download' || action === 'saveLocally' || action === 'saveAs') {
274+
else if (action === 'saveLocally' || action === 'saveAs') {
270275
save(inputs[i])
271276
}
272277
else if (action === 'export') {
273-
// Export(inputs[i])
278+
Export(inputs[i])
274279
}
275280
else if (action === 'import') {
276281
Import(inputs[i])
@@ -405,7 +410,10 @@ async function Import(input) {
405410
const data = files.reduce((result, { src }) => {
406411
try {
407412
const parsedSrc = JSON.parse(src);
408-
result.push(parsedSrc);
413+
if (Array.isArray(parsedSrc))
414+
result.push(...parsedSrc);
415+
else
416+
result.push(parsedSrc);
409417
} catch (error) {
410418
console.error(`Error parsing JSON: ${error}`);
411419
}
@@ -417,21 +425,41 @@ async function Import(input) {
417425
return response
418426
}
419427

420-
async function Export(btn) {
421-
const item_id = btn.getAttribute('template_id');
422-
let item = this.items.get(item_id)
423-
if (!item) return;
428+
async function Export(btn, inputs) {
429+
let data = crud.getAttributes(btn);
430+
const template_id = btn.getAttribute('template_id');
424431

432+
if (data.storage || data.database || data.collection) {
433+
let name = data.name
434+
if (data.document_id) {
435+
data.document = { _id: data.document_id }
436+
delete data.document_id
437+
delete data.name
438+
}
439+
data = await crud.readDocument(data);
425440

426-
let Item = new Object(item)
427-
Item.filter.startIndex = 0;
428-
delete Item.el
429-
delete Item.count
441+
if (name) {
442+
data = data.document[0][name]
443+
}
430444

431-
let data;
432-
if (crud) {
433-
data = await crud.readDocument(Item);
445+
} else if (template_id) {
446+
console.log('export json data used to render templates')
447+
} else {
448+
data = getFiles(inputs)
434449
}
450+
// let item = this.items.get(item_id)
451+
// if (!item) return;
452+
453+
454+
// let Item = new Object(item)
455+
// Item.filter.startIndex = 0;
456+
// delete Item.el
457+
// delete Item.count
458+
459+
// let data;
460+
// if (crud) {
461+
// data = await crud.readDocument(Item);
462+
// }
435463
// TODO: get from local data source
436464
exportFile(data);
437465
}
@@ -549,19 +577,20 @@ observer.init({
549577
callback: mutation => renderFiles(mutation.target)
550578
});
551579

552-
action.init({
553-
name: ["upload", "download", "saveLocally", "import", "export"],
554-
callback: (data) => {
555-
fileFormAction(data)
556-
}
557-
})
558-
559-
action.init({
560-
name: ["createFile", "deleteFile", "createDirectory", "deleteDirectory"],
561-
callback: (data) => {
562-
fileRenderAction(data)
580+
actions.init(
581+
{
582+
name: ["upload", "download", "saveLocally", "import", "export"],
583+
callback: (action) => {
584+
fileFormAction(action)
585+
}
586+
},
587+
{
588+
name: ["createFile", "deleteFile", "createDirectory", "deleteDirectory"],
589+
callback: (action) => {
590+
fileRenderAction(action)
591+
}
563592
}
564-
})
593+
)
565594

566595
init()
567596

0 commit comments

Comments
 (0)