amis-core 6.7.0 → 6.9.0-rc.0
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/esm/Root.js +1 -1
- package/esm/RootRenderer.d.ts +1 -1
- package/esm/RootRenderer.js +24 -2
- package/esm/SchemaRenderer.d.ts +0 -1
- package/esm/SchemaRenderer.js +43 -20
- package/esm/Scoped.js +2 -1
- package/esm/StatusScoped.js +1 -1
- package/esm/WithRootStore.js +1 -1
- package/esm/WithStore.js +8 -8
- package/esm/actions/Action.js +2 -1
- package/esm/actions/AjaxAction.js +1 -1
- package/esm/actions/BreakAction.js +1 -1
- package/esm/actions/BroadcastAction.js +1 -1
- package/esm/actions/CmptAction.js +1 -1
- package/esm/actions/ContinueAction.js +1 -1
- package/esm/actions/CopyAction.js +1 -1
- package/esm/actions/CustomAction.js +2 -1
- package/esm/actions/DialogAction.js +3 -1
- package/esm/actions/DrawerAction.js +2 -1
- package/esm/actions/EmailAction.js +1 -1
- package/esm/actions/EventAction.js +2 -1
- package/esm/actions/LinkAction.js +1 -1
- package/esm/actions/LoopAction.js +2 -1
- package/esm/actions/PageAction.js +1 -1
- package/esm/actions/ParallelAction.js +1 -1
- package/esm/actions/PrintAction.js +1 -1
- package/esm/actions/StatusAction.js +1 -1
- package/esm/actions/SwitchAction.js +1 -1
- package/esm/actions/ToastAction.js +1 -1
- package/esm/actions/WaitAction.js +1 -1
- package/esm/components/CustomStyle.js +1 -1
- package/esm/components/ErrorBoundary.js +1 -1
- package/esm/components/LazyComponent.d.ts +40 -2
- package/esm/components/LazyComponent.js +13 -7
- package/esm/components/Overlay.js +2 -1
- package/esm/components/PopOver.d.ts +1 -1
- package/esm/components/PopOver.js +2 -1
- package/esm/env.js +1 -1
- package/esm/envOverwrite.js +1 -1
- package/esm/factory.d.ts +13 -2
- package/esm/factory.js +157 -45
- package/esm/index.d.ts +4 -4
- package/esm/index.js +5 -5
- package/esm/locale.js +2 -1
- package/esm/polyfills.js +1 -1
- package/esm/renderers/Form.js +44 -18
- package/esm/renderers/Item.d.ts +97 -12
- package/esm/renderers/Item.js +164 -125
- package/esm/renderers/Options.d.ts +3 -3
- package/esm/renderers/Options.js +43 -19
- package/esm/renderers/Placeholder.js +1 -1
- package/esm/renderers/builtin.js +1 -1
- package/esm/renderers/register.js +1 -1
- package/esm/renderers/wrapControl.js +2 -1
- package/esm/store/app.js +2 -1
- package/esm/store/combo.d.ts +408 -0
- package/esm/store/combo.js +1 -1
- package/esm/store/crud.js +2 -1
- package/esm/store/form.d.ts +170 -0
- package/esm/store/form.js +2 -1
- package/esm/store/formItem.d.ts +5 -0
- package/esm/store/formItem.js +30 -8
- package/esm/store/iRenderer.js +2 -1
- package/esm/store/index.d.ts +1 -0
- package/esm/store/index.js +3 -2
- package/esm/store/list.js +1 -1
- package/esm/store/manager.js +1 -1
- package/esm/store/modal.js +1 -1
- package/esm/store/node.js +1 -1
- package/esm/store/pagination.js +2 -1
- package/esm/store/root.d.ts +2 -0
- package/esm/store/root.js +46 -21
- package/esm/store/service.js +2 -1
- package/esm/store/status.js +1 -1
- package/esm/store/table.d.ts +379 -21
- package/esm/store/table.js +84 -54
- package/esm/store/table2.js +1 -1
- package/esm/theme.js +1 -1
- package/esm/types.d.ts +4 -2
- package/esm/utils/Animation.js +1 -1
- package/esm/utils/ColorScale.js +1 -1
- package/esm/utils/DataSchema.js +1 -1
- package/esm/utils/DataScope.js +1 -1
- package/esm/utils/RootClose.js +1 -1
- package/esm/utils/SimpleMap.js +1 -1
- package/esm/utils/api.d.ts +21 -1
- package/esm/utils/api.js +133 -41
- package/esm/utils/arraySlice.js +1 -1
- package/esm/utils/attachmentAdpator.js +1 -1
- package/esm/utils/autobind.js +1 -1
- package/esm/utils/browser.js +1 -1
- package/esm/utils/columnsSplit.js +1 -1
- package/esm/utils/concatData.js +1 -1
- package/esm/utils/dataMapping.js +1 -1
- package/esm/utils/date.js +1 -1
- package/esm/utils/debug.js +17 -3
- package/esm/utils/decodeEntity.js +1 -1
- package/esm/utils/dom.js +1 -1
- package/esm/utils/errors.js +1 -1
- package/esm/utils/escapeHtml.js +1 -1
- package/esm/utils/filter-schema.js +1 -1
- package/esm/utils/filter.js +1 -1
- package/esm/utils/formatDuration.js +1 -1
- package/esm/utils/formula.js +2 -1
- package/esm/utils/getVariable.js +1 -1
- package/esm/utils/grammar.js +1 -1
- package/esm/utils/handleAction.js +1 -1
- package/esm/utils/helper.d.ts +4 -1
- package/esm/utils/helper.js +20 -4
- package/esm/utils/highlight.js +1 -1
- package/esm/utils/icon.js +1 -1
- package/esm/utils/image.js +1 -1
- package/esm/utils/isPureVariable.js +2 -2
- package/esm/utils/json-schema-2-amis-schema.js +1 -1
- package/esm/utils/keyToPath.js +1 -1
- package/esm/utils/labelToString.js +1 -1
- package/esm/utils/makeSorter.js +1 -1
- package/esm/utils/math.js +1 -1
- package/esm/utils/memoryParse.d.ts +2 -1
- package/esm/utils/memoryParse.js +10 -6
- package/esm/utils/normalizeLink.js +1 -1
- package/esm/utils/normalizeOptions.js +1 -1
- package/esm/utils/object.d.ts +2 -4
- package/esm/utils/object.js +1 -1
- package/esm/utils/offset.js +1 -1
- package/esm/utils/offsetParent.js +1 -1
- package/esm/utils/optionValueCompare.js +1 -1
- package/esm/utils/position.js +1 -1
- package/esm/utils/prettyBytes.js +1 -1
- package/esm/utils/printElement.js +1 -1
- package/esm/utils/renderer-event.js +1 -1
- package/esm/utils/replaceText.js +1 -1
- package/esm/utils/resize-sensor.js +30 -1
- package/esm/utils/resolveCondition.js +2 -1
- package/esm/utils/resolveVariable.js +1 -1
- package/esm/utils/resolveVariableAndFilter.js +1 -1
- package/esm/utils/resolveVariableAndFilterForAsync.js +1 -1
- package/esm/utils/scrollPosition.js +1 -1
- package/esm/utils/string2regExp.js +1 -1
- package/esm/utils/stripNumber.js +1 -1
- package/esm/utils/style-helper.js +1 -1
- package/esm/utils/style.js +2 -1
- package/esm/utils/toNumber.js +1 -1
- package/esm/utils/tokenize.js +1 -1
- package/esm/utils/tpl-builtin.js +2 -1
- package/esm/utils/tpl-lodash.js +2 -1
- package/esm/utils/tpl.js +1 -1
- package/esm/utils/uncontrollable.js +1 -1
- package/esm/utils/validateId.js +1 -1
- package/esm/utils/validations.js +2 -1
- package/esm/utils/visitedCache.d.ts +46 -0
- package/esm/utils/visitedCache.js +124 -0
- package/lib/Root.js +1 -1
- package/lib/RootRenderer.js +23 -1
- package/lib/SchemaRenderer.d.ts +0 -1
- package/lib/SchemaRenderer.js +41 -18
- package/lib/Scoped.js +2 -1
- package/lib/StatusScoped.js +1 -1
- package/lib/WithRootStore.js +1 -1
- package/lib/WithStore.js +8 -8
- package/lib/actions/Action.js +2 -1
- package/lib/actions/AjaxAction.js +1 -1
- package/lib/actions/BreakAction.js +1 -1
- package/lib/actions/BroadcastAction.js +1 -1
- package/lib/actions/CmptAction.js +1 -1
- package/lib/actions/ContinueAction.js +1 -1
- package/lib/actions/CopyAction.js +1 -1
- package/lib/actions/CustomAction.js +2 -1
- package/lib/actions/DialogAction.js +3 -1
- package/lib/actions/DrawerAction.js +2 -1
- package/lib/actions/EmailAction.js +1 -1
- package/lib/actions/EventAction.js +2 -1
- package/lib/actions/LinkAction.js +1 -1
- package/lib/actions/LoopAction.js +2 -1
- package/lib/actions/PageAction.js +1 -1
- package/lib/actions/ParallelAction.js +1 -1
- package/lib/actions/PrintAction.js +1 -1
- package/lib/actions/StatusAction.js +1 -1
- package/lib/actions/SwitchAction.js +1 -1
- package/lib/actions/ToastAction.js +1 -1
- package/lib/actions/WaitAction.js +1 -1
- package/lib/components/CustomStyle.js +1 -1
- package/lib/components/ErrorBoundary.js +1 -1
- package/lib/components/LazyComponent.d.ts +40 -2
- package/lib/components/LazyComponent.js +14 -7
- package/lib/components/Overlay.js +2 -1
- package/lib/components/PopOver.d.ts +1 -1
- package/lib/components/PopOver.js +2 -1
- package/lib/env.js +1 -1
- package/lib/envOverwrite.js +1 -1
- package/lib/factory.d.ts +13 -2
- package/lib/factory.js +161 -44
- package/lib/index.d.ts +4 -4
- package/lib/index.js +10 -2
- package/lib/locale.js +2 -1
- package/lib/polyfills.js +1 -1
- package/lib/renderers/Form.js +41 -15
- package/lib/renderers/Item.d.ts +98 -13
- package/lib/renderers/Item.js +163 -124
- package/lib/renderers/Options.d.ts +3 -3
- package/lib/renderers/Options.js +43 -19
- package/lib/renderers/Placeholder.js +1 -1
- package/lib/renderers/builtin.js +1 -1
- package/lib/renderers/register.js +1 -1
- package/lib/renderers/wrapControl.js +2 -1
- package/lib/store/app.js +2 -1
- package/lib/store/combo.d.ts +432 -25
- package/lib/store/combo.js +1 -1
- package/lib/store/crud.js +3 -2
- package/lib/store/form.d.ts +180 -11
- package/lib/store/form.js +2 -1
- package/lib/store/formItem.d.ts +5 -0
- package/lib/store/formItem.js +30 -8
- package/lib/store/iRenderer.js +2 -1
- package/lib/store/index.d.ts +1 -0
- package/lib/store/index.js +3 -1
- package/lib/store/list.js +1 -1
- package/lib/store/manager.js +1 -1
- package/lib/store/modal.js +1 -1
- package/lib/store/node.js +1 -1
- package/lib/store/pagination.js +2 -1
- package/lib/store/root.d.ts +2 -0
- package/lib/store/root.js +44 -19
- package/lib/store/service.js +2 -1
- package/lib/store/status.js +1 -1
- package/lib/store/table.d.ts +399 -42
- package/lib/store/table.js +84 -54
- package/lib/store/table2.js +1 -1
- package/lib/theme.js +1 -1
- package/lib/types.d.ts +4 -2
- package/lib/utils/Animation.js +1 -1
- package/lib/utils/ColorScale.js +1 -1
- package/lib/utils/DataSchema.js +1 -1
- package/lib/utils/DataScope.js +1 -1
- package/lib/utils/RootClose.js +1 -1
- package/lib/utils/SimpleMap.js +1 -1
- package/lib/utils/api.d.ts +21 -1
- package/lib/utils/api.js +136 -40
- package/lib/utils/arraySlice.js +1 -1
- package/lib/utils/attachmentAdpator.js +1 -1
- package/lib/utils/autobind.js +1 -1
- package/lib/utils/browser.js +1 -1
- package/lib/utils/columnsSplit.js +1 -1
- package/lib/utils/concatData.js +1 -1
- package/lib/utils/dataMapping.js +1 -1
- package/lib/utils/date.js +1 -1
- package/lib/utils/debug.js +18 -4
- package/lib/utils/decodeEntity.js +1 -1
- package/lib/utils/dom.js +1 -1
- package/lib/utils/errors.js +1 -1
- package/lib/utils/escapeHtml.js +1 -1
- package/lib/utils/filter-schema.js +1 -1
- package/lib/utils/filter.js +1 -1
- package/lib/utils/formatDuration.js +1 -1
- package/lib/utils/formula.js +2 -1
- package/lib/utils/getVariable.js +1 -1
- package/lib/utils/grammar.js +1 -1
- package/lib/utils/handleAction.js +1 -1
- package/lib/utils/helper.d.ts +4 -1
- package/lib/utils/helper.js +19 -3
- package/lib/utils/highlight.js +1 -1
- package/lib/utils/icon.js +1 -1
- package/lib/utils/image.js +1 -1
- package/lib/utils/isPureVariable.js +2 -2
- package/lib/utils/json-schema-2-amis-schema.js +1 -1
- package/lib/utils/keyToPath.js +1 -1
- package/lib/utils/labelToString.js +1 -1
- package/lib/utils/makeSorter.js +1 -1
- package/lib/utils/math.js +1 -1
- package/lib/utils/memoryParse.d.ts +2 -1
- package/lib/utils/memoryParse.js +10 -6
- package/lib/utils/normalizeLink.js +1 -1
- package/lib/utils/normalizeOptions.js +1 -1
- package/lib/utils/object.d.ts +2 -4
- package/lib/utils/object.js +1 -1
- package/lib/utils/offset.js +1 -1
- package/lib/utils/offsetParent.js +1 -1
- package/lib/utils/optionValueCompare.js +1 -1
- package/lib/utils/position.js +1 -1
- package/lib/utils/prettyBytes.js +1 -1
- package/lib/utils/printElement.js +1 -1
- package/lib/utils/renderer-event.js +1 -1
- package/lib/utils/replaceText.js +1 -1
- package/lib/utils/resize-sensor.js +30 -1
- package/lib/utils/resolveCondition.js +2 -1
- package/lib/utils/resolveVariable.js +1 -1
- package/lib/utils/resolveVariableAndFilter.js +1 -1
- package/lib/utils/resolveVariableAndFilterForAsync.js +1 -1
- package/lib/utils/scrollPosition.js +1 -1
- package/lib/utils/string2regExp.js +1 -1
- package/lib/utils/stripNumber.js +1 -1
- package/lib/utils/style-helper.js +1 -1
- package/lib/utils/style.js +2 -1
- package/lib/utils/toNumber.js +1 -1
- package/lib/utils/tokenize.js +1 -1
- package/lib/utils/tpl-builtin.js +2 -1
- package/lib/utils/tpl-lodash.js +2 -1
- package/lib/utils/tpl.js +1 -1
- package/lib/utils/uncontrollable.js +1 -1
- package/lib/utils/validateId.js +1 -1
- package/lib/utils/validations.js +2 -1
- package/lib/utils/visitedCache.d.ts +46 -0
- package/lib/utils/visitedCache.js +128 -0
- package/package.json +2 -2
package/esm/utils/validateId.js
CHANGED
package/esm/utils/validations.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.9.0-rc.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -8,6 +8,7 @@ import moment from 'moment';
|
|
|
8
8
|
import { filter } from './tpl.js';
|
|
9
9
|
import 'amis-formula';
|
|
10
10
|
import isPlainObject from 'lodash/isPlainObject';
|
|
11
|
+
import './memoryParse.js';
|
|
11
12
|
import { isPureVariable } from './isPureVariable.js';
|
|
12
13
|
import '@rc-component/mini-decimal';
|
|
13
14
|
import { resolveVariableAndFilter } from './resolveVariableAndFilter.js';
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @description 缓存值的单元
|
|
3
|
+
*/
|
|
4
|
+
export type CacheEntry<V> = {
|
|
5
|
+
value: V;
|
|
6
|
+
visitCount: number;
|
|
7
|
+
};
|
|
8
|
+
/**
|
|
9
|
+
* 自动清理访问次数最少key的Map,次数相同时优先淘汰旧项
|
|
10
|
+
* 每次触发清理的计数基于容量的百分比
|
|
11
|
+
* @class VisitedCache
|
|
12
|
+
* @template K - 缓存key的类型
|
|
13
|
+
* @template V - 缓存value的类型
|
|
14
|
+
*/
|
|
15
|
+
export default class VisitedCache<K, V> {
|
|
16
|
+
private capacity;
|
|
17
|
+
private cache;
|
|
18
|
+
private visitCountOrder;
|
|
19
|
+
private keyOrderMatrixForByCount;
|
|
20
|
+
private releaseCount;
|
|
21
|
+
/**
|
|
22
|
+
*
|
|
23
|
+
* @param capacity 容量
|
|
24
|
+
* @param releasePercent 清理数量占容量百分比
|
|
25
|
+
*/
|
|
26
|
+
constructor(capacity: number, releasePercent?: number);
|
|
27
|
+
/**
|
|
28
|
+
* 更新现存项目的缓存顺序
|
|
29
|
+
* @param key
|
|
30
|
+
* @param entry
|
|
31
|
+
*/
|
|
32
|
+
private updateCacheEntryOrder;
|
|
33
|
+
/**
|
|
34
|
+
*
|
|
35
|
+
* @param {K} key
|
|
36
|
+
* @returns {(V | undefined)}
|
|
37
|
+
*/
|
|
38
|
+
get(key: K): V | undefined;
|
|
39
|
+
/**
|
|
40
|
+
*
|
|
41
|
+
* @param {K} key
|
|
42
|
+
* @param {V} value
|
|
43
|
+
*/
|
|
44
|
+
set(key: K, value: V): void;
|
|
45
|
+
has(key: K): boolean;
|
|
46
|
+
}
|
|
@@ -0,0 +1,124 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* amis-core v6.9.0-rc.0
|
|
3
|
+
* Copyright 2018-2024 fex
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
import { __spreadArray, __read } from 'tslib';
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* 自动清理访问次数最少key的Map,次数相同时优先淘汰旧项
|
|
10
|
+
* 每次触发清理的计数基于容量的百分比
|
|
11
|
+
* @class VisitedCache
|
|
12
|
+
* @template K - 缓存key的类型
|
|
13
|
+
* @template V - 缓存value的类型
|
|
14
|
+
*/
|
|
15
|
+
var VisitedCache = /** @class */ (function () {
|
|
16
|
+
/**
|
|
17
|
+
*
|
|
18
|
+
* @param capacity 容量
|
|
19
|
+
* @param releasePercent 清理数量占容量百分比
|
|
20
|
+
*/
|
|
21
|
+
function VisitedCache(capacity, releasePercent) {
|
|
22
|
+
this.visitCountOrder = [];
|
|
23
|
+
this.keyOrderMatrixForByCount = {};
|
|
24
|
+
this.capacity = capacity;
|
|
25
|
+
this.cache = new Map();
|
|
26
|
+
this.releaseCount = (this.capacity * (releasePercent || 1 / 8)) >> 0 || 1;
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* 更新现存项目的缓存顺序
|
|
30
|
+
* @param key
|
|
31
|
+
* @param entry
|
|
32
|
+
*/
|
|
33
|
+
VisitedCache.prototype.updateCacheEntryOrder = function (key, entry, nextVisitCount) {
|
|
34
|
+
var oldVisitCount = entry.visitCount;
|
|
35
|
+
var oldKeyOrder = this.keyOrderMatrixForByCount[oldVisitCount];
|
|
36
|
+
if (Array.isArray(oldKeyOrder)) {
|
|
37
|
+
// 从key为旧访问次数的顺序数组中删除
|
|
38
|
+
var oldKeyIndex = oldKeyOrder.indexOf(key);
|
|
39
|
+
if (oldKeyIndex !== -1) {
|
|
40
|
+
oldKeyOrder.splice(oldKeyIndex, 1);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
// 相同访问量,更新访问顺序
|
|
44
|
+
this.keyOrderMatrixForByCount[nextVisitCount] = Array.isArray(this.keyOrderMatrixForByCount[nextVisitCount])
|
|
45
|
+
? __spreadArray(__spreadArray([], __read(this.keyOrderMatrixForByCount[nextVisitCount]), false), [key], false) : [key];
|
|
46
|
+
entry.visitCount = nextVisitCount;
|
|
47
|
+
// 重新按照访问量排序
|
|
48
|
+
this.visitCountOrder = __spreadArray([], __read(new Set(__spreadArray(__spreadArray([], __read(this.visitCountOrder), false), [nextVisitCount], false))), false).sort(function (a, b) { return a - b; });
|
|
49
|
+
};
|
|
50
|
+
/**
|
|
51
|
+
*
|
|
52
|
+
* @param {K} key
|
|
53
|
+
* @returns {(V | undefined)}
|
|
54
|
+
*/
|
|
55
|
+
VisitedCache.prototype.get = function (key) {
|
|
56
|
+
if (this.cache.has(key)) {
|
|
57
|
+
var entry = this.cache.get(key);
|
|
58
|
+
if (entry !== undefined) {
|
|
59
|
+
var visitCount = entry.visitCount;
|
|
60
|
+
// 更新访问顺序
|
|
61
|
+
this.updateCacheEntryOrder(key, entry, visitCount + 1);
|
|
62
|
+
return entry.value;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
return undefined;
|
|
66
|
+
};
|
|
67
|
+
/**
|
|
68
|
+
*
|
|
69
|
+
* @param {K} key
|
|
70
|
+
* @param {V} value
|
|
71
|
+
*/
|
|
72
|
+
VisitedCache.prototype.set = function (key, value) {
|
|
73
|
+
// 更新现存项的值和访问次数及新鲜度
|
|
74
|
+
if (this.cache.has(key)) {
|
|
75
|
+
var entry = this.cache.get(key);
|
|
76
|
+
if (entry !== undefined) {
|
|
77
|
+
var visitCount = entry.visitCount;
|
|
78
|
+
this.updateCacheEntryOrder(key, entry, visitCount + 1);
|
|
79
|
+
entry.value = value;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
// 先进行清理
|
|
84
|
+
if (this.cache.size === this.capacity) {
|
|
85
|
+
// TODO 依据最大容量的1/10进行释放,试试效果
|
|
86
|
+
var dynamicReleaseCount = this.releaseCount;
|
|
87
|
+
// const dynamicReleaseCount =
|
|
88
|
+
// (this.keyOrderMatrixForByCount[this.visitCountOrder[this.visitCountOrder.length - 1]].length / (this.capacity)) >>
|
|
89
|
+
// 0 || 1
|
|
90
|
+
var findIndex = 0;
|
|
91
|
+
var released = 0;
|
|
92
|
+
while (released < dynamicReleaseCount &&
|
|
93
|
+
findIndex <= this.visitCountOrder.length - 1) {
|
|
94
|
+
// 最少访问的次数
|
|
95
|
+
var targetCount = this.visitCountOrder[findIndex];
|
|
96
|
+
// 查看其中有没有项
|
|
97
|
+
var targetKeyOrder = this.keyOrderMatrixForByCount[targetCount];
|
|
98
|
+
if (!targetKeyOrder.length) {
|
|
99
|
+
findIndex++;
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
while (targetKeyOrder.length > 0 &&
|
|
103
|
+
released < dynamicReleaseCount) {
|
|
104
|
+
this.cache.delete(targetKeyOrder.shift());
|
|
105
|
+
released++;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
var newEntry = {
|
|
111
|
+
visitCount: 1,
|
|
112
|
+
value: value
|
|
113
|
+
};
|
|
114
|
+
this.cache.set(key, newEntry);
|
|
115
|
+
this.updateCacheEntryOrder(key, newEntry, 1);
|
|
116
|
+
}
|
|
117
|
+
};
|
|
118
|
+
VisitedCache.prototype.has = function (key) {
|
|
119
|
+
return this.cache.has(key);
|
|
120
|
+
};
|
|
121
|
+
return VisitedCache;
|
|
122
|
+
}());
|
|
123
|
+
|
|
124
|
+
export { VisitedCache as default };
|
package/lib/Root.js
CHANGED
package/lib/RootRenderer.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.9.0-rc.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -20,6 +20,8 @@ var mapValues = require('lodash/mapValues');
|
|
|
20
20
|
var fileSaver = require('file-saver');
|
|
21
21
|
var api = require('./utils/api.js');
|
|
22
22
|
var ReactDOM = require('react-dom');
|
|
23
|
+
var LazyComponent = require('./components/LazyComponent.js');
|
|
24
|
+
var factory = require('./factory.js');
|
|
23
25
|
|
|
24
26
|
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
25
27
|
|
|
@@ -55,6 +57,23 @@ var RootRenderer = /** @class */ (function (_super) {
|
|
|
55
57
|
'handleDrawerClose',
|
|
56
58
|
'handlePageVisibilityChange'
|
|
57
59
|
]);
|
|
60
|
+
_this.store.init(function () {
|
|
61
|
+
if (!factory.hasAsyncRenderers()) {
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
var schema = props.schema;
|
|
65
|
+
var types = ['tpl', 'dialog', 'drawer'];
|
|
66
|
+
helper.JSONTraverse(schema, function (value, key) {
|
|
67
|
+
if (key === 'type') {
|
|
68
|
+
types.push(value);
|
|
69
|
+
// form 依赖 panel
|
|
70
|
+
if (value === 'form') {
|
|
71
|
+
types.push('panel');
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
});
|
|
75
|
+
return factory.loadAsyncRenderersByType(types);
|
|
76
|
+
});
|
|
58
77
|
return _this;
|
|
59
78
|
}
|
|
60
79
|
RootRenderer.prototype.componentDidMount = function () {
|
|
@@ -353,6 +372,9 @@ var RootRenderer = /** @class */ (function (_super) {
|
|
|
353
372
|
if (store.runtimeError) {
|
|
354
373
|
return this.renderRuntimeError();
|
|
355
374
|
}
|
|
375
|
+
else if (!store.ready) {
|
|
376
|
+
return _J$X_(LazyComponent["default"], { className: "RootLoader" });
|
|
377
|
+
}
|
|
356
378
|
return (_J$X_(React__default["default"].Fragment, null,
|
|
357
379
|
render(pathPrefix, schema, tslib.__assign(tslib.__assign({}, rest), { topStore: this.store, data: this.store.downStream, context: store.context, onAction: this.handleAction })),
|
|
358
380
|
this.renderSpinner(),
|
package/lib/SchemaRenderer.d.ts
CHANGED
|
@@ -23,7 +23,6 @@ export declare class SchemaRenderer extends React.Component<SchemaRendererProps,
|
|
|
23
23
|
unbindEvent: (() => void) | undefined;
|
|
24
24
|
isStatic: any;
|
|
25
25
|
constructor(props: SchemaRendererProps);
|
|
26
|
-
componentDidMount(): void;
|
|
27
26
|
componentWillUnmount(): void;
|
|
28
27
|
shouldComponentUpdate(nextProps: SchemaRendererProps): boolean;
|
|
29
28
|
resolveRenderer(props: SchemaRendererProps, force?: boolean): any;
|
package/lib/SchemaRenderer.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.9.0-rc.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -26,6 +26,7 @@ var mobx = require('mobx');
|
|
|
26
26
|
require('amis-formula');
|
|
27
27
|
require('moment');
|
|
28
28
|
require('lodash/isPlainObject');
|
|
29
|
+
require('./utils/memoryParse.js');
|
|
29
30
|
require('@rc-component/mini-decimal');
|
|
30
31
|
var resolveVariableAndFilter = require('./utils/resolveVariableAndFilter.js');
|
|
31
32
|
require('./utils/filter.js');
|
|
@@ -101,10 +102,6 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
101
102
|
}, function () { return _this.forceUpdate(); });
|
|
102
103
|
return _this;
|
|
103
104
|
}
|
|
104
|
-
SchemaRenderer.prototype.componentDidMount = function () {
|
|
105
|
-
// 这里无法区分监听的是不是广播,所以又bind一下,主要是为了绑广播
|
|
106
|
-
this.unbindEvent = rendererEvent.bindEvent(this.cRef);
|
|
107
|
-
};
|
|
108
105
|
SchemaRenderer.prototype.componentWillUnmount = function () {
|
|
109
106
|
var _a, _b;
|
|
110
107
|
(_a = this.reaction) === null || _a === void 0 ? void 0 : _a.call(this);
|
|
@@ -180,7 +177,15 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
180
177
|
};
|
|
181
178
|
SchemaRenderer.prototype.childRef = function (ref) {
|
|
182
179
|
var _this = this;
|
|
183
|
-
|
|
180
|
+
var _a;
|
|
181
|
+
// todo 这里有个问题,就是注意以下的这段注释
|
|
182
|
+
// > // 原来表单项的 visible: false 和 hidden: true 表单项的值和验证是有效的
|
|
183
|
+
// > 而 visibleOn 和 hiddenOn 是无效的,
|
|
184
|
+
// > 这个本来就是个bug,但是已经被广泛使用了
|
|
185
|
+
// > 我只能继续实现这个bug了
|
|
186
|
+
// 这样会让子组件去根据是 hidden 的情况去渲染个 null,这样会导致这里 ref 有值,但是 ref.getWrappedInstance() 为 null
|
|
187
|
+
// 这样会和直接渲染的组件时有些区别,至少 cRef 的指向是不一样的
|
|
188
|
+
while ((_a = ref === null || ref === void 0 ? void 0 : ref.getWrappedInstance) === null || _a === void 0 ? void 0 : _a.call(ref)) {
|
|
184
189
|
ref = ref.getWrappedInstance();
|
|
185
190
|
}
|
|
186
191
|
if (ref && !ref.props) {
|
|
@@ -188,6 +193,10 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
188
193
|
get: function () { return _this.props; }
|
|
189
194
|
});
|
|
190
195
|
}
|
|
196
|
+
if (ref) {
|
|
197
|
+
// 这里无法区分监听的是不是广播,所以又bind一下,主要是为了绑广播
|
|
198
|
+
this.unbindEvent = rendererEvent.bindEvent(this.ref);
|
|
199
|
+
}
|
|
191
200
|
this.cRef = ref;
|
|
192
201
|
};
|
|
193
202
|
SchemaRenderer.prototype.dispatchEvent = function (e, data, renderer // for didmount
|
|
@@ -209,7 +218,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
209
218
|
var omitList = RENDERER_TRANSMISSION_OMIT_PROPS.concat();
|
|
210
219
|
if (this.renderer) {
|
|
211
220
|
var Component = this.renderer.component;
|
|
212
|
-
Component.propsList &&
|
|
221
|
+
(Component === null || Component === void 0 ? void 0 : Component.propsList) &&
|
|
213
222
|
omitList.push.apply(omitList, Component.propsList);
|
|
214
223
|
}
|
|
215
224
|
return render("".concat($path).concat(region ? "/".concat(region) : ''), node || '', tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign({}, omit__default["default"](rest, omitList)), { defaultStatic: (_c = (_b = (((_a = this.renderer) === null || _a === void 0 ? void 0 : _a.type) &&
|
|
@@ -226,12 +235,12 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
226
235
|
SchemaRenderer.prototype.render = function () {
|
|
227
236
|
var e_1, _a;
|
|
228
237
|
var _this = this;
|
|
229
|
-
var _b, _c, _d, _e, _f, _g;
|
|
230
|
-
var
|
|
238
|
+
var _b, _c, _d, _e, _f, _g, _h;
|
|
239
|
+
var _j = this.props; _j.$path; var __ = _j.schema, rootStore = _j.rootStore, statusStore = _j.statusStore, render = _j.render, propKey = _j.key, rest = tslib.__rest(_j, ["$path", "schema", "rootStore", "statusStore", "render", "key"]);
|
|
231
240
|
if (__ == null) {
|
|
232
241
|
return null;
|
|
233
242
|
}
|
|
234
|
-
var
|
|
243
|
+
var _k = this.resolveRenderer(this.props), $path = _k.path, schema = _k.schema;
|
|
235
244
|
var theme = this.props.env.theme;
|
|
236
245
|
if (Array.isArray(schema)) {
|
|
237
246
|
return render($path, schema, rest);
|
|
@@ -288,7 +297,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
288
297
|
return null;
|
|
289
298
|
}
|
|
290
299
|
else if (!this.renderer) {
|
|
291
|
-
return rest.invisible ? null : (_J$X_(LazyComponent["default"],
|
|
300
|
+
return rest.invisible ? null : (_J$X_(LazyComponent["default"], { defaultVisible: true, getComponent: function () { return tslib.__awaiter(_this, void 0, void 0, function () {
|
|
292
301
|
var result;
|
|
293
302
|
return tslib.__generator(this, function (_a) {
|
|
294
303
|
switch (_a.label) {
|
|
@@ -302,10 +311,24 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
302
311
|
return [2 /*return*/, function () { return result; }];
|
|
303
312
|
}
|
|
304
313
|
this.reRender();
|
|
305
|
-
return [2 /*return*/, function () { return factory.
|
|
314
|
+
return [2 /*return*/, function () { return factory.loadRendererError(schema, $path); }];
|
|
315
|
+
}
|
|
316
|
+
});
|
|
317
|
+
}); } }));
|
|
318
|
+
}
|
|
319
|
+
else if (this.renderer.getComponent && !this.renderer.component) {
|
|
320
|
+
// 处理异步渲染器
|
|
321
|
+
return rest.invisible ? null : (_J$X_(LazyComponent["default"], { defaultVisible: true, getComponent: function () { return tslib.__awaiter(_this, void 0, void 0, function () {
|
|
322
|
+
return tslib.__generator(this, function (_a) {
|
|
323
|
+
switch (_a.label) {
|
|
324
|
+
case 0: return [4 /*yield*/, factory.loadAsyncRenderer(this.renderer)];
|
|
325
|
+
case 1:
|
|
326
|
+
_a.sent();
|
|
327
|
+
this.reRender();
|
|
328
|
+
return [2 /*return*/, function () { return null; }];
|
|
306
329
|
}
|
|
307
330
|
});
|
|
308
|
-
}); }
|
|
331
|
+
}); } }));
|
|
309
332
|
}
|
|
310
333
|
var renderer = this.renderer;
|
|
311
334
|
schema = factory.filterSchema(schema, renderer, rest);
|
|
@@ -329,9 +352,9 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
329
352
|
}
|
|
330
353
|
var supportRef = ((_e = Component.prototype) === null || _e === void 0 ? void 0 : _e.isReactComponent) ||
|
|
331
354
|
Component.$$typeof === Symbol.for('react.forward_ref');
|
|
332
|
-
var props = tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign({}, theme.getRendererConfig(renderer.name)), restSchema), helper.chainEvents(rest, restSchema)), exprProps), {
|
|
355
|
+
var props = tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign({}, (_f = renderer.defaultProps) === null || _f === void 0 ? void 0 : _f.call(renderer, schema.type, schema)), theme.getRendererConfig(renderer.name)), restSchema), helper.chainEvents(rest, restSchema)), exprProps), {
|
|
333
356
|
// value: defaultValue, // 备注: 此处并没有将value传递给渲染器
|
|
334
|
-
defaultData: (
|
|
357
|
+
defaultData: (_g = restSchema.defaultData) !== null && _g !== void 0 ? _g : defaultData, defaultValue: (_h = restSchema.defaultValue) !== null && _h !== void 0 ? _h : defaultValue, defaultActiveKey: defaultActiveKey, propKey: propKey, $path: $path, $schema: schema, render: this.renderChild, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent, mobileUI: schema.useMobileUI === false ? false : rest.mobileUI });
|
|
335
358
|
// style 支持公式
|
|
336
359
|
if (schema.style) {
|
|
337
360
|
props.style = style.buildStyle(schema.style, detectData);
|
|
@@ -354,8 +377,8 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
354
377
|
// 自动解析变量模式,主要是方便直接引入第三方组件库,无需为了支持变量封装一层
|
|
355
378
|
if (renderer.autoVar) {
|
|
356
379
|
try {
|
|
357
|
-
for (var
|
|
358
|
-
var key =
|
|
380
|
+
for (var _l = tslib.__values(Object.keys(schema)), _m = _l.next(); !_m.done; _m = _l.next()) {
|
|
381
|
+
var key = _m.value;
|
|
359
382
|
if (typeof props[key] === 'string' && formula.isExpression(props[key])) {
|
|
360
383
|
props[key] = resolveVariableAndFilter.resolveVariableAndFilter(props[key], props.data, '| raw');
|
|
361
384
|
}
|
|
@@ -364,7 +387,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
364
387
|
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
365
388
|
finally {
|
|
366
389
|
try {
|
|
367
|
-
if (
|
|
390
|
+
if (_m && !_m.done && (_a = _l.return)) _a.call(_l);
|
|
368
391
|
}
|
|
369
392
|
finally { if (e_1) throw e_1.error; }
|
|
370
393
|
}
|
package/lib/Scoped.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.9.0-rc.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -19,6 +19,7 @@ var tokenize = require('./utils/tokenize.js');
|
|
|
19
19
|
var isPureVariable = require('./utils/isPureVariable.js');
|
|
20
20
|
require('@rc-component/mini-decimal');
|
|
21
21
|
var getVariable = require('./utils/getVariable.js');
|
|
22
|
+
require('./utils/memoryParse.js');
|
|
22
23
|
var dataMapping = require('./utils/dataMapping.js');
|
|
23
24
|
require('./utils/filter.js');
|
|
24
25
|
var helper = require('./utils/helper.js');
|
package/lib/StatusScoped.js
CHANGED
package/lib/WithRootStore.js
CHANGED
package/lib/WithStore.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.9.0-rc.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -19,6 +19,7 @@ require('amis-formula');
|
|
|
19
19
|
require('moment');
|
|
20
20
|
var object = require('./utils/object.js');
|
|
21
21
|
var tokenize = require('./utils/tokenize.js');
|
|
22
|
+
require('./utils/memoryParse.js');
|
|
22
23
|
require('@rc-component/mini-decimal');
|
|
23
24
|
var dataMapping = require('./utils/dataMapping.js');
|
|
24
25
|
require('./utils/filter.js');
|
|
@@ -142,7 +143,7 @@ function HocStoreFactory(renderer) {
|
|
|
142
143
|
(props.data &&
|
|
143
144
|
prevProps.data &&
|
|
144
145
|
props.data.__super !== prevProps.data.__super))) {
|
|
145
|
-
store.initData(object.extendObject(props.data, tslib.__assign(tslib.__assign(tslib.__assign({}, (store.hasRemoteData ? store.data : null)), this.formatData(props.defaultData)), this.formatData(props.data))), ((_c = props.updatePristineAfterStoreDataReInit) !== null && _c !== void 0 ? _c : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
|
|
146
|
+
store.initData(object.extendObject(props.data, tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign({}, this.formatData(dataMapping.dataMapping(this.props.defaultData, this.props.data, ignoreSchemaProps))), (store.hasRemoteData ? store.data : null)), this.formatData(props.defaultData)), this.formatData(props.data))), ((_c = props.updatePristineAfterStoreDataReInit) !== null && _c !== void 0 ? _c : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
|
|
146
147
|
}
|
|
147
148
|
}
|
|
148
149
|
else if (shouldSync === true ||
|
|
@@ -153,19 +154,18 @@ function HocStoreFactory(renderer) {
|
|
|
153
154
|
(props.syncSuperStore !== false &&
|
|
154
155
|
helper.isSuperDataModified(props.data, prevProps.data, store)))) {
|
|
155
156
|
if (props.store && props.scope === props.data) {
|
|
156
|
-
store.initData(object.createObject(props.store.data, props.syncSuperStore === false
|
|
157
|
-
? tslib.__assign({}, store.data) : helper.syncDataFromSuper(store.data, props.store.data, prevProps.scope, store, props.syncSuperStore === true)), ((_d = props.updatePristineAfterStoreDataReInit) !== null && _d !== void 0 ? _d : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
|
|
157
|
+
store.initData(object.createObject(props.store.data, tslib.__assign(tslib.__assign({}, this.formatData(dataMapping.dataMapping(this.props.defaultData, this.props.data, ignoreSchemaProps))), (props.syncSuperStore === false
|
|
158
|
+
? tslib.__assign({}, store.data) : helper.syncDataFromSuper(store.data, props.store.data, prevProps.scope, store, props.syncSuperStore === true)))), ((_d = props.updatePristineAfterStoreDataReInit) !== null && _d !== void 0 ? _d : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
|
|
158
159
|
}
|
|
159
160
|
else if (props.data && props.data.__super) {
|
|
160
|
-
store.initData(object.extendObject(props.data,
|
|
161
|
-
// 有远程数据
|
|
161
|
+
store.initData(object.extendObject(props.data, tslib.__assign(tslib.__assign({}, this.formatData(dataMapping.dataMapping(this.props.defaultData, this.props.data, ignoreSchemaProps))), // 有远程数据
|
|
162
162
|
// 或者顶级 store
|
|
163
|
-
store.hasRemoteData || !store.path.includes('/')
|
|
163
|
+
(store.hasRemoteData || !store.path.includes('/')
|
|
164
164
|
? tslib.__assign(tslib.__assign({}, store.data), props.data) : // combo 不需要同步,如果要同步,在 Combo.tsx 里面已经实现了相关逻辑
|
|
165
165
|
// 目前主要的问题是,如果 combo 中表单项名字和 combo 本身的名字一样,会导致里面的值会被覆盖成数组
|
|
166
166
|
((_e = props.store) === null || _e === void 0 ? void 0 : _e.storeType) === 'ComboStore'
|
|
167
167
|
? undefined
|
|
168
|
-
: helper.syncDataFromSuper(tslib.__assign(tslib.__assign({}, store.pristineDiff), props.data), props.data.__super, prevProps.data.__super, store, false)), ((_f = props.updatePristineAfterStoreDataReInit) !== null && _f !== void 0 ? _f : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
|
|
168
|
+
: helper.syncDataFromSuper(tslib.__assign(tslib.__assign({}, store.pristineDiff), props.data), props.data.__super, prevProps.data.__super, store, false)))), ((_f = props.updatePristineAfterStoreDataReInit) !== null && _f !== void 0 ? _f : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
|
|
169
169
|
}
|
|
170
170
|
else {
|
|
171
171
|
store.initData(object.createObject(props.scope, props.data), ((_g = props.updatePristineAfterStoreDataReInit) !== null && _g !== void 0 ? _g : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
|
package/lib/actions/Action.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.9.0-rc.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -14,6 +14,7 @@ var tpl = require('../utils/tpl.js');
|
|
|
14
14
|
require('amis-formula');
|
|
15
15
|
require('moment');
|
|
16
16
|
var object = require('../utils/object.js');
|
|
17
|
+
require('../utils/memoryParse.js');
|
|
17
18
|
require('@rc-component/mini-decimal');
|
|
18
19
|
var dataMapping = require('../utils/dataMapping.js');
|
|
19
20
|
require('../utils/filter.js');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.9.0-rc.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -14,6 +14,7 @@ require('../utils/ColorScale.js');
|
|
|
14
14
|
require('../utils/columnsSplit.js');
|
|
15
15
|
require('lodash/isPlainObject');
|
|
16
16
|
require('amis-formula');
|
|
17
|
+
require('../utils/memoryParse.js');
|
|
17
18
|
require('../utils/DataSchema.js');
|
|
18
19
|
require('../utils/DataScope.js');
|
|
19
20
|
require('moment');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.9.0-rc.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -13,6 +13,7 @@ require('../utils/browser.js');
|
|
|
13
13
|
require('../utils/ColorScale.js');
|
|
14
14
|
require('../utils/columnsSplit.js');
|
|
15
15
|
var object = require('../utils/object.js');
|
|
16
|
+
require('../utils/memoryParse.js');
|
|
16
17
|
require('amis-formula');
|
|
17
18
|
require('lodash/isPlainObject');
|
|
18
19
|
require('../utils/DataSchema.js');
|
|
@@ -120,6 +121,7 @@ var CloseDialogAction = /** @class */ (function () {
|
|
|
120
121
|
var _a, _b;
|
|
121
122
|
return tslib.__awaiter(this, void 0, void 0, function () {
|
|
122
123
|
return tslib.__generator(this, function (_c) {
|
|
124
|
+
// todo 支持 waitForAction,等待弹窗关闭后再执行后续动作
|
|
123
125
|
if (action.componentId) {
|
|
124
126
|
// 关闭指定弹窗
|
|
125
127
|
event.context.scoped.closeById(action.componentId);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.9.0-rc.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -13,6 +13,7 @@ require('../utils/browser.js');
|
|
|
13
13
|
require('../utils/ColorScale.js');
|
|
14
14
|
require('../utils/columnsSplit.js');
|
|
15
15
|
var object = require('../utils/object.js');
|
|
16
|
+
require('../utils/memoryParse.js');
|
|
16
17
|
require('amis-formula');
|
|
17
18
|
require('lodash/isPlainObject');
|
|
18
19
|
require('../utils/DataSchema.js');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.9.0-rc.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -13,6 +13,7 @@ require('../utils/browser.js');
|
|
|
13
13
|
require('../utils/ColorScale.js');
|
|
14
14
|
require('../utils/columnsSplit.js');
|
|
15
15
|
var object = require('../utils/object.js');
|
|
16
|
+
require('../utils/memoryParse.js');
|
|
16
17
|
require('amis-formula');
|
|
17
18
|
require('lodash/isPlainObject');
|
|
18
19
|
require('../utils/DataSchema.js');
|