@mjhls/mjh-framework 1.0.125 → 1.0.126
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/index.es.js +45 -28
- package/dist/index.es.js.map +1 -1
- package/dist/index.js +45 -28
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
package/dist/index.es.js
CHANGED
|
@@ -12692,35 +12692,52 @@ var MasterDeck = function (_React$Component) {
|
|
|
12692
12692
|
data = _this$state.data,
|
|
12693
12693
|
query = _this$state.query,
|
|
12694
12694
|
page = _this$state.page;
|
|
12695
|
-
var
|
|
12695
|
+
var _this$props = _this.props,
|
|
12696
|
+
client = _this$props.client,
|
|
12697
|
+
dataHandler = _this$props.dataHandler;
|
|
12696
12698
|
|
|
12697
12699
|
|
|
12698
|
-
var params = _extends({}, _this.params, { from: from, to: to
|
|
12699
|
-
// const queryUpdated = query.replace('$from', params.from).replace('$to', params.to)
|
|
12700
|
-
// const query = '*[_type == "article" && defined(title) && defined(thumbnail)][$from...$to] { title, summary, thumbnail { asset-> }, url }'
|
|
12701
|
-
});client.fetch(query, params).then(function (dataArr) {
|
|
12702
|
-
if (_this.pointer && _this.pointerArray) {
|
|
12703
|
-
var pointer = _this.pointer;
|
|
12704
|
-
dataArr = dataArr[_this.pointerArray][pointer];
|
|
12705
|
-
}
|
|
12706
|
-
dataArr = dataArr.map(function (item) {
|
|
12707
|
-
return _extends({}, item, {
|
|
12708
|
-
pageNumber: page
|
|
12709
|
-
});
|
|
12710
|
-
});
|
|
12700
|
+
var params = _extends({}, _this.params, { from: from, to: to });
|
|
12711
12701
|
|
|
12712
|
-
|
|
12713
|
-
|
|
12714
|
-
|
|
12715
|
-
|
|
12716
|
-
|
|
12717
|
-
|
|
12718
|
-
|
|
12719
|
-
return {
|
|
12720
|
-
scrolling: false
|
|
12721
|
-
};
|
|
12702
|
+
if (dataHandler) {
|
|
12703
|
+
var dataHandlerPromise = new Promise(function (resolve, reject) {
|
|
12704
|
+
try {
|
|
12705
|
+
var result = dataHandler(params);
|
|
12706
|
+
resolve(result);
|
|
12707
|
+
} catch (e) {
|
|
12708
|
+
reject(e);
|
|
12722
12709
|
}
|
|
12723
12710
|
});
|
|
12711
|
+
dataHandlerPromise.then(function (dataArr) {
|
|
12712
|
+
loadDataFinished(data, dataArr, page);
|
|
12713
|
+
});
|
|
12714
|
+
} else {
|
|
12715
|
+
client.fetch(query, params).then(function (dataArr) {
|
|
12716
|
+
loadDataFinished(data, dataArr, page);
|
|
12717
|
+
});
|
|
12718
|
+
}
|
|
12719
|
+
}, _this.loadDataFinished = function (data, dataArr, page) {
|
|
12720
|
+
if (_this.pointer && _this.pointerArray) {
|
|
12721
|
+
var pointer = _this.pointer;
|
|
12722
|
+
dataArr = dataArr[_this.pointerArray][pointer];
|
|
12723
|
+
}
|
|
12724
|
+
dataArr = dataArr.map(function (item) {
|
|
12725
|
+
return _extends({}, item, {
|
|
12726
|
+
pageNumber: page
|
|
12727
|
+
});
|
|
12728
|
+
});
|
|
12729
|
+
|
|
12730
|
+
_this.setState(function () {
|
|
12731
|
+
if (dataArr.length > 0) {
|
|
12732
|
+
return {
|
|
12733
|
+
data: [].concat(toConsumableArray(data), toConsumableArray(dataArr)),
|
|
12734
|
+
scrolling: true
|
|
12735
|
+
};
|
|
12736
|
+
} else {
|
|
12737
|
+
return {
|
|
12738
|
+
scrolling: false
|
|
12739
|
+
};
|
|
12740
|
+
}
|
|
12724
12741
|
});
|
|
12725
12742
|
}, _this.urlFor = function (source) {
|
|
12726
12743
|
var client = _this.props.client;
|
|
@@ -12738,10 +12755,10 @@ var MasterDeck = function (_React$Component) {
|
|
|
12738
12755
|
}
|
|
12739
12756
|
}, _this.changePageNumber = function (pageNumber) {
|
|
12740
12757
|
console.log(pageNumber);
|
|
12741
|
-
var _this$
|
|
12742
|
-
seoPaginate = _this$
|
|
12743
|
-
pageview = _this$
|
|
12744
|
-
router = _this$
|
|
12758
|
+
var _this$props2 = _this.props,
|
|
12759
|
+
seoPaginate = _this$props2.seoPaginate,
|
|
12760
|
+
pageview = _this$props2.pageview,
|
|
12761
|
+
router = _this$props2.router;
|
|
12745
12762
|
var currentPage = _this.state.currentPage;
|
|
12746
12763
|
|
|
12747
12764
|
if (seoPaginate) {
|