Skip to content

Commit f5d1b29

Browse files
yama-devyama-dev
authored
Merge pull request #7 from yama-dev/v0.4.9
V0.4.9
2 parents f711885 + 2a01f0b commit f5d1b29

File tree

7 files changed

+38
-30
lines changed

7 files changed

+38
-30
lines changed

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Get multi data library.
1616

1717
- npm -> [https://www.npmjs.com/package/js-multi-data-module](https://www.npmjs.com/package/js-multi-data-module)
1818

19-
- Standalone(CDN) -> [https://cdn.jsdelivr.net/gh/yama-dev/js-multi-data-module/dist/js-multi-data-module.js](https://cdn.jsdelivr.net/gh/yama-dev/js-multi-data-module/dist/js-multi-data-module.js)
19+
- Standalone(CDN) -> [https://cdn.jsdelivr.net/gh/yama-dev/js-multi-data-module@v0.4.9/dist/js-multi-data-module.js](https://cdn.jsdelivr.net/gh/yama-dev/js-multi-data-module@v0.4.9/dist/js-multi-data-module.js)
2020

2121
- Zip -> [yama-dev/js-multi-data-module](https://github.com/yama-dev/js-multi-data-module/releases/latest)
2222

@@ -85,8 +85,8 @@ import MULTI_DATA_MODULE from 'js-multi-data-module';
8585
}
8686
],
8787
on: {
88-
Update: function(data){
89-
console.log(data);
88+
Update: function(data, count){
89+
console.log(data, count);
9090
},
9191
Complete: function(data, list){
9292
console.log(data, list);

‎dist/js-multi-data-module.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/data/sample.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
{
44
"id": 123459,
55
"title": "title text.",
6-
"date": "2019.01.01",
6+
"date": "2019.01.03",
77
"article": "Lorem ipsum dolor sit amet,\rconsectetur adipisicing elit,\nsed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\r\nUt enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
88
"image": "https://placehold.jp/750x300.png",
99
"link": "/news/test12345/"
1010
},
1111
{
1212
"id": 123458,
1313
"title": "title text.",
14-
"date": "2019.01.01",
14+
"date": "2019.01.02",
1515
"article": "Lorem ipsum dolor sit amet,\rconsectetur adipisicing elit,\nsed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\r\nUt enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
1616
"image": "https://placehold.jp/750x300.png",
1717
"link": "/news/test12345/"

‎examples/data/sample.jsonp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ callback ({
33
{
44
"id": 123459,
55
"title": "title text.",
6-
"date": "2019.01.01",
6+
"date": "2019.01.03",
77
"article": "Lorem ipsum dolor sit amet,\rconsectetur adipisicing elit,\nsed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\r\nUt enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
88
"image": "https://placehold.jp/750x300.png",
99
"link": "/news/test12345/"
1010
},
1111
{
1212
"id": 123458,
1313
"title": "title text.",
14-
"date": "2019.01.01",
14+
"date": "2019.01.02",
1515
"article": "Lorem ipsum dolor sit amet,\rconsectetur adipisicing elit,\nsed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\r\nUt enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
1616
"image": "https://placehold.jp/750x300.png",
1717
"link": "/news/test12345/"

‎examples/index.html‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ <h2 class="mt-3 mb-3">MULTI DATA MODULE</h2>
6060
<h3>Demo</h3>
6161
<p>値を変更して動作が確認出来ます。</p>
6262
<form>
63+
<div class="form-group">
64+
<label for="inputFilePath">File Path.</label>
65+
<input id="inputFilePath" class="form-control" v-model="inputFilePath" placeholder="ex. ./path/to/data.json">
66+
</div>
6367
<div class="row">
6468
<div class="col">
6569
<div class="form-group">
@@ -84,7 +88,11 @@ <h3>Demo</h3>
8488
<div class="col">
8589
<div class="form-group">
8690
<label for="inputOrder">Order.</label>
87-
<input id="inputOrder" class="form-control" v-model="inputOrder" placeholder="">
91+
<select class="custom-select mr-sm-2" id="inputOrder" v-model="inputOrder">
92+
<option selected value="down">down</option>
93+
<option value="up">up</option>
94+
<option value=""></option>
95+
</select>
8896
</div>
8997
</div>
9098
<div class="col">
@@ -103,10 +111,6 @@ <h3>Demo</h3>
103111
</div>
104112
</div>
105113
</div>
106-
<div class="form-group">
107-
<label for="inputFilePath">File Path.</label>
108-
<input id="inputFilePath" class="form-control" v-model="inputFilePath" placeholder="ex. ./path/to/data.json">
109-
</div>
110114
<div class="form-group">
111115
<label>Code</label>
112116
<pre class="mt-2" style="border: 1px solid #ced4da; border-radius: .25rem;">
@@ -177,8 +181,8 @@ <h3>Advanced Use</h3>
177181
}
178182
],
179183
on: {
180-
Update: function(data){
181-
console.log(data);
184+
Update: function(data, count){
185+
console.log(data, count);
182186
},
183187
Complete: function(data, list){
184188
console.log(data, list);
@@ -315,11 +319,11 @@ <h3>Advanced Use</h3>
315319
}
316320
],
317321
on: {
318-
Update: function(data){
319-
console.log(data);
322+
Update: function(data, count){
323+
console.log(data, count);
320324
},
321-
Complete: function(data,list){
322-
console.log(data,list);
325+
Complete: function(data, list){
326+
console.log(data, list);
323327
_that.result = JSON.stringify(data,undefined,1);
324328
setTimeout(function(){
325329
_that.flgLoading = false;
@@ -342,7 +346,11 @@ <h3>Advanced Use</h3>
342346
_str += " <script>"+"\n";
343347
_str += " let MDM = new MULTI_DATA_MODULE({"+"\n";
344348
_str += " data_type: '"+this.inputDataType+"',"+"\n";
345-
_str += " order: '"+this.inputOrder+"',"+"\n";
349+
if(this.inputOrder == 'up' || this.inputOrder == 'down'){
350+
_str += " order: '"+this.inputOrder+"',"+"\n";
351+
} else {
352+
_str += " order: null,"+"\n";
353+
}
346354
_str += " orderProperty: '"+this.inputOrderProperty+"',"+"\n";
347355
_str += " filter: "+this.inputFilter+","+"\n";
348356
_str += " fetch_timeout: "+this.inputFetchTimeout+","+"\n";
@@ -356,11 +364,11 @@ <h3>Advanced Use</h3>
356364
_str += " }"+"\n";
357365
_str += " ],"+"\n";
358366
_str += " on: {"+"\n";
359-
_str += " Update: function(data){"+"\n";
360-
_str += " console.log(data);"+"\n";
367+
_str += " Update: function(data, count){"+"\n";
368+
_str += " console.log(data, count);"+"\n";
361369
_str += " },"+"\n";
362-
_str += " Complete: function(data,list){"+"\n";
363-
_str += " console.log(data,list);"+"\n";
370+
_str += " Complete: function(data, list){"+"\n";
371+
_str += " console.log(data, list);"+"\n";
364372
_str += " }"+"\n";
365373
_str += " }"+"\n";
366374
_str += " });"+"\n";

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "js-multi-data-module",
3-
"version": "0.4.8",
3+
"version": "0.4.9",
44
"description": "Get multi data library.",
55
"keywords": [
66
"multi-data",

‎src/js-multi-data-module.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export default class MULTI_DATA_MODULE {
114114
this.DataList[count] = [];
115115
}
116116

117-
this.OnUpdate(this.DataList[count]);
117+
this.OnUpdate(this.DataList[count], count);
118118

119119
count++;
120120
if(count < countMax){
@@ -131,7 +131,7 @@ export default class MULTI_DATA_MODULE {
131131
this.DataFix = this.DataFix.concat(['']);
132132
this.DataList[count] = [];
133133

134-
this.OnUpdate(this.DataList[count]);
134+
this.OnUpdate(this.DataList[count], count);
135135

136136
count++;
137137
if(count < countMax){
@@ -401,10 +401,10 @@ export default class MULTI_DATA_MODULE {
401401
this.OnComplete();
402402
}
403403

404-
OnUpdate(data){
404+
OnUpdate(data,count){
405405
// Callback function.
406406
if(this.On.Update && typeof(this.On.Update) === 'function'){
407-
this.On.Update(data);
407+
this.On.Update(data,count);
408408
}
409409
}
410410

0 commit comments

Comments
 (0)