mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-23 04:25:21 +08:00
# Conflicts: # jsowell-ui/.env.development # jsowell-ui/.env.staging # jsowell-ui/bin/build-sit.bat # jsowell-ui/bin/build.bat # jsowell-ui/src/api/adapayMember/adapayMember.js # jsowell-ui/src/api/pile/merchant.js # jsowell-ui/src/router/index.js # jsowell-ui/src/views/financial/financeDetail.vue # jsowell-ui/src/views/financial/merchant.vue # jsowell-ui/src/views/homeIndex/homeIndex.vue # jsowell-ui/src/views/login.vue # jsowell-ui/src/views/pile/basic/detail.vue # jsowell-ui/src/views/pile/station/components/SiteInfo.vue # jsowell-ui/src/views/pile/station/detail.vue # jsowell-ui/src/views/pile/station/orderReport.vue
30 lines
1.1 KiB
JavaScript
30 lines
1.1 KiB
JavaScript
"use strict";
|
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
var Observable_1 = require("../Observable");
|
|
var isScheduler_1 = require("../util/isScheduler");
|
|
var mergeAll_1 = require("../operators/mergeAll");
|
|
var fromArray_1 = require("./fromArray");
|
|
function merge() {
|
|
var observables = [];
|
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
observables[_i] = arguments[_i];
|
|
}
|
|
var concurrent = Number.POSITIVE_INFINITY;
|
|
var scheduler = null;
|
|
var last = observables[observables.length - 1];
|
|
if (isScheduler_1.isScheduler(last)) {
|
|
scheduler = observables.pop();
|
|
if (observables.length > 1 && typeof observables[observables.length - 1] === 'number') {
|
|
concurrent = observables.pop();
|
|
}
|
|
}
|
|
else if (typeof last === 'number') {
|
|
concurrent = observables.pop();
|
|
}
|
|
if (scheduler === null && observables.length === 1 && observables[0] instanceof Observable_1.Observable) {
|
|
return observables[0];
|
|
}
|
|
return mergeAll_1.mergeAll(concurrent)(fromArray_1.fromArray(observables, scheduler));
|
|
}
|
|
exports.merge = merge;
|
|
//# sourceMappingURL=merge.js.map
|