From 9ca4b3f92f6f00e327286d8ef99171a621cee7d0 Mon Sep 17 00:00:00 2001 From: "guokai.jgk" Date: Wed, 25 Nov 2020 19:56:18 +0800 Subject: [PATCH 1/2] fix: polyfill Promise.allSettled --- packages/datasource-engine/package.json | 2 ++ .../datasource-engine/src/core/reloadDataSourceFactory.ts | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/datasource-engine/package.json b/packages/datasource-engine/package.json index 6fcb7214d..ad39079bb 100644 --- a/packages/datasource-engine/package.json +++ b/packages/datasource-engine/package.json @@ -19,10 +19,12 @@ "dependencies": { "@ali/lowcode-datasource-types": "^1.0.21", "@ali/lowcode-types": "^1.0.20", + "promise.allsettled": "^1.0.2", "typescript": "^3.9.7" }, "devDependencies": { "@ava/babel": "^1.0.1", + "@types/promise.allsettled": "^1.0.3", "@types/sinon": "^9.0.5", "ava": "3.11.1", "get-port": "^5.1.1", diff --git a/packages/datasource-engine/src/core/reloadDataSourceFactory.ts b/packages/datasource-engine/src/core/reloadDataSourceFactory.ts index 87a111ca0..39388aa1a 100644 --- a/packages/datasource-engine/src/core/reloadDataSourceFactory.ts +++ b/packages/datasource-engine/src/core/reloadDataSourceFactory.ts @@ -1,4 +1,8 @@ import { DataSourceMap, RuntimeDataSource, RuntimeDataSourceConfig } from '@ali/lowcode-types'; +import allSettled from 'promise.allsettled'; + +// 兼容低版本的浏览器 +const promiseSettled = typeof Promise.allSettled === 'function' ? Promise.allSettled : allSettled; export const reloadDataSourceFactory = ( dataSource: RuntimeDataSource, @@ -56,7 +60,7 @@ export const reloadDataSourceFactory = ( } } - await Promise.allSettled(allAsyncLoadings); + await promiseSettled(allAsyncLoadings); // 所有的初始化请求都结束之后，调用钩子函数 From 2e07aa3886164f4ab71d4a3b38eadcb607c03f3a Mon Sep 17 00:00:00 2001 From: "guokai.jgk" Date: Wed, 25 Nov 2020 19:56:45 +0800 Subject: [PATCH 2/2] v1.0.23-alpha.1 --- packages/datasource-engine/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/datasource-engine/package.json b/packages/datasource-engine/package.json index ad39079bb..ec83122b6 100644 --- a/packages/datasource-engine/package.json +++ b/packages/datasource-engine/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-datasource-engine", - "version": "1.0.22", + "version": "1.0.23-alpha.1", "description": "DataSource Engine for lowcode", "main": "dist/index.js", "typings": "dist/index.d.ts",