amis-core 6.12.0 → 6.13.0-beta.1
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.js +1 -1
- package/esm/SchemaRenderer.js +1 -1
- package/esm/Scoped.js +1 -1
- package/esm/StatusScoped.js +1 -1
- package/esm/StyleManager.js +1 -1
- package/esm/WithRootStore.js +1 -1
- package/esm/WithStore.js +1 -1
- package/esm/actions/Action.d.ts +1 -0
- package/esm/actions/Action.js +25 -17
- 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 +54 -56
- package/esm/actions/ContinueAction.js +1 -1
- package/esm/actions/CopyAction.js +1 -1
- package/esm/actions/CustomAction.js +1 -1
- package/esm/actions/DialogAction.js +1 -1
- package/esm/actions/DrawerAction.js +1 -1
- package/esm/actions/EmailAction.js +1 -1
- package/esm/actions/EventAction.js +1 -1
- package/esm/actions/LinkAction.js +1 -1
- package/esm/actions/LoopAction.js +1 -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/Animations.js +1 -1
- package/esm/components/CustomStyle.js +1 -1
- package/esm/components/ErrorBoundary.js +1 -1
- package/esm/components/LazyComponent.js +1 -1
- package/esm/components/Overlay.js +1 -1
- package/esm/components/PopOver.js +1 -1
- package/esm/env.js +1 -1
- package/esm/envOverwrite.js +1 -1
- package/esm/factory.js +1 -1
- package/esm/globalVar.js +1 -1
- package/esm/globalVarClientHandler.js +1 -1
- package/esm/globalVarDefaultValueHandler.js +1 -1
- package/esm/index.js +6 -6
- package/esm/locale.js +1 -1
- package/esm/polyfills.js +1 -1
- package/esm/renderers/Form.js +1 -1
- package/esm/renderers/Item.js +1 -1
- package/esm/renderers/Options.js +1 -1
- 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 +1 -1
- package/esm/store/app.js +1 -1
- package/esm/store/combo.js +1 -1
- package/esm/store/crud.js +2 -2
- package/esm/store/form.js +1 -1
- package/esm/store/formItem.js +1 -1
- package/esm/store/iRenderer.js +1 -1
- package/esm/store/index.js +1 -1
- 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 +1 -1
- package/esm/store/root.js +1 -1
- package/esm/store/service.js +1 -1
- package/esm/store/status.js +1 -1
- package/esm/store/table.js +1 -1
- package/esm/store/table2.js +1 -1
- package/esm/theme.js +1 -1
- 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/animations.js +1 -1
- package/esm/utils/api.js +1 -1
- 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 +1 -1
- package/esm/utils/decodeEntity.js +1 -1
- package/esm/utils/dom.js +6 -2
- 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 +1 -1
- package/esm/utils/getPageId.js +1 -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.js +1 -1
- package/esm/utils/highlight.js +1 -1
- package/esm/utils/icon.js +1 -1
- package/esm/utils/image.js +1 -1
- package/esm/utils/index.js +1 -1
- package/esm/utils/isPureVariable.js +1 -1
- 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/loopTooMuch.js +1 -1
- package/esm/utils/makeSorter.js +1 -1
- package/esm/utils/math.d.ts +1 -0
- package/esm/utils/math.js +16 -2
- package/esm/utils/memoryParse.js +1 -1
- package/esm/utils/normalizeLink.js +1 -1
- package/esm/utils/normalizeOptions.js +1 -1
- 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 +14 -11
- package/esm/utils/resolveCondition.js +1 -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 +1 -1
- package/esm/utils/toNumber.js +1 -1
- package/esm/utils/tokenize.js +1 -1
- package/esm/utils/tpl-builtin.js +1 -1
- package/esm/utils/tpl-lodash.js +1 -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 +1 -1
- package/esm/utils/visitedCache.js +1 -1
- package/lib/Root.js +1 -1
- package/lib/RootRenderer.js +1 -1
- package/lib/SchemaRenderer.js +1 -1
- package/lib/Scoped.js +1 -1
- package/lib/StatusScoped.js +1 -1
- package/lib/StyleManager.js +1 -1
- package/lib/WithRootStore.js +1 -1
- package/lib/WithStore.js +1 -1
- package/lib/actions/Action.d.ts +1 -0
- package/lib/actions/Action.js +25 -16
- 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 +53 -55
- package/lib/actions/ContinueAction.js +1 -1
- package/lib/actions/CopyAction.js +1 -1
- package/lib/actions/CustomAction.js +1 -1
- package/lib/actions/DialogAction.js +1 -1
- package/lib/actions/DrawerAction.js +1 -1
- package/lib/actions/EmailAction.js +1 -1
- package/lib/actions/EventAction.js +1 -1
- package/lib/actions/LinkAction.js +1 -1
- package/lib/actions/LoopAction.js +1 -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/Animations.js +1 -1
- package/lib/components/CustomStyle.js +1 -1
- package/lib/components/ErrorBoundary.js +1 -1
- package/lib/components/LazyComponent.js +1 -1
- package/lib/components/Overlay.js +1 -1
- package/lib/components/PopOver.js +1 -1
- package/lib/env.js +1 -1
- package/lib/envOverwrite.js +1 -1
- package/lib/factory.js +1 -1
- package/lib/globalVar.js +1 -1
- package/lib/globalVarClientHandler.js +1 -1
- package/lib/globalVarDefaultValueHandler.js +1 -1
- package/lib/index.js +6 -4
- package/lib/locale.js +1 -1
- package/lib/polyfills.js +1 -1
- package/lib/renderers/Form.js +1 -1
- package/lib/renderers/Item.js +1 -1
- package/lib/renderers/Options.js +1 -1
- 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 +1 -1
- package/lib/store/app.js +1 -1
- package/lib/store/combo.d.ts +24 -24
- package/lib/store/combo.js +1 -1
- package/lib/store/crud.js +2 -2
- package/lib/store/form.d.ts +10 -10
- package/lib/store/form.js +1 -1
- package/lib/store/formItem.js +1 -1
- package/lib/store/iRenderer.js +1 -1
- package/lib/store/index.js +1 -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 +1 -1
- package/lib/store/root.js +1 -1
- package/lib/store/service.js +1 -1
- package/lib/store/status.js +1 -1
- package/lib/store/table.d.ts +20 -20
- package/lib/store/table.js +1 -1
- package/lib/store/table2.js +1 -1
- package/lib/theme.js +1 -1
- 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/animations.js +1 -1
- package/lib/utils/api.js +1 -1
- 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 +1 -1
- package/lib/utils/decodeEntity.js +1 -1
- package/lib/utils/dom.js +6 -2
- 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 +1 -1
- package/lib/utils/getPageId.js +1 -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.js +1 -1
- package/lib/utils/highlight.js +1 -1
- package/lib/utils/icon.js +1 -1
- package/lib/utils/image.js +1 -1
- package/lib/utils/index.js +1 -1
- package/lib/utils/isPureVariable.js +1 -1
- 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/loopTooMuch.js +1 -1
- package/lib/utils/makeSorter.js +1 -1
- package/lib/utils/math.d.ts +1 -0
- package/lib/utils/math.js +16 -1
- package/lib/utils/memoryParse.js +1 -1
- package/lib/utils/normalizeLink.js +1 -1
- package/lib/utils/normalizeOptions.js +1 -1
- 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 +14 -11
- package/lib/utils/resolveCondition.js +1 -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 +1 -1
- package/lib/utils/toNumber.js +1 -1
- package/lib/utils/tokenize.js +1 -1
- package/lib/utils/tpl-builtin.js +1 -1
- package/lib/utils/tpl-lodash.js +1 -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 +1 -1
- package/lib/utils/visitedCache.js +1 -1
- package/package.json +2 -2
package/esm/utils/math.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.13.0-beta.1
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -51,6 +51,20 @@ function numberFormatter(num, precision) {
|
|
|
51
51
|
}
|
|
52
52
|
return ZERO.toFixed(finalP);
|
|
53
53
|
}
|
|
54
|
+
// 还原千分符格式化的值,并保留小数点后的精度
|
|
55
|
+
function numberReverter(value) {
|
|
56
|
+
if (!value)
|
|
57
|
+
return '';
|
|
58
|
+
var stringValue = value.toString();
|
|
59
|
+
var withoutCommas = stringValue.replace(/,/g, '');
|
|
60
|
+
// 如果原始字符串有小数点,保留小数部分的精度
|
|
61
|
+
if (stringValue.includes('.')) {
|
|
62
|
+
var decimalPlaces = stringValue.split('.')[1].length;
|
|
63
|
+
return Number(withoutCommas).toFixed(decimalPlaces);
|
|
64
|
+
}
|
|
65
|
+
// 对于整数,直接返回转换后的数字
|
|
66
|
+
return withoutCommas;
|
|
67
|
+
}
|
|
54
68
|
/**
|
|
55
69
|
* 判断一个数字是否为整数,且在给定范围内
|
|
56
70
|
*
|
|
@@ -81,4 +95,4 @@ function isIntegerInRange(num, options) {
|
|
|
81
95
|
}
|
|
82
96
|
}
|
|
83
97
|
|
|
84
|
-
export { isIntegerInRange, numberFormatter, safeAdd, safeSub };
|
|
98
|
+
export { isIntegerInRange, numberFormatter, numberReverter, safeAdd, safeSub };
|
package/esm/utils/memoryParse.js
CHANGED
package/esm/utils/object.js
CHANGED
package/esm/utils/offset.js
CHANGED
package/esm/utils/position.js
CHANGED
package/esm/utils/prettyBytes.js
CHANGED
package/esm/utils/replaceText.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.13.0-beta.1
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -172,18 +172,21 @@ function resizeSensor(element, callback, once, type) {
|
|
|
172
172
|
if (once) {
|
|
173
173
|
observer_1.disconnect();
|
|
174
174
|
}
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
if (
|
|
182
|
-
(
|
|
175
|
+
var entry = entries[0];
|
|
176
|
+
var cr = entry.contentRect;
|
|
177
|
+
// 变化大于0.5px时才触发回调,允许一定的误差
|
|
178
|
+
var widthChanged = Math.abs(cr.width - originWidth_1) > 0.5;
|
|
179
|
+
var heightChanged = Math.abs(cr.height - originHeight_1) > 0.5;
|
|
180
|
+
if (widthChanged || heightChanged) {
|
|
181
|
+
if (type === 'both') {
|
|
182
|
+
callback();
|
|
183
|
+
}
|
|
184
|
+
else if ((type === 'width' && widthChanged) ||
|
|
185
|
+
(type === 'height' && heightChanged)) {
|
|
183
186
|
callback();
|
|
184
|
-
originWidth_1 = cr.width;
|
|
185
|
-
originHeight_1 = cr.height;
|
|
186
187
|
}
|
|
188
|
+
originWidth_1 = cr.width;
|
|
189
|
+
originHeight_1 = cr.height;
|
|
187
190
|
}
|
|
188
191
|
});
|
|
189
192
|
observer_1.observe(element);
|
package/esm/utils/stripNumber.js
CHANGED
package/esm/utils/style.js
CHANGED
package/esm/utils/toNumber.js
CHANGED
package/esm/utils/tokenize.js
CHANGED
package/esm/utils/tpl-builtin.js
CHANGED
package/esm/utils/tpl-lodash.js
CHANGED
package/esm/utils/tpl.js
CHANGED
package/esm/utils/validateId.js
CHANGED
package/esm/utils/validations.js
CHANGED
package/lib/Root.js
CHANGED
package/lib/RootRenderer.js
CHANGED
package/lib/SchemaRenderer.js
CHANGED
package/lib/Scoped.js
CHANGED
package/lib/StatusScoped.js
CHANGED
package/lib/StyleManager.js
CHANGED
package/lib/WithRootStore.js
CHANGED
package/lib/WithStore.js
CHANGED
package/lib/actions/Action.d.ts
CHANGED
|
@@ -43,6 +43,7 @@ export interface RendererAction {
|
|
|
43
43
|
}
|
|
44
44
|
export declare const registerAction: (type: string, action: RendererAction) => void;
|
|
45
45
|
export declare const getActionByType: (type: string) => RendererAction;
|
|
46
|
+
export declare const getTargetComponent: (action: ListenerAction, renderer: ListenerContext, event: RendererEvent<any>, key?: string) => ListenerContext;
|
|
46
47
|
export declare const runActions: (actions: ListenerAction | ListenerAction[], renderer: ListenerContext, event: any) => Promise<void>;
|
|
47
48
|
export declare const runAction: (actionInstrance: RendererAction, actionConfig: ListenerAction, renderer: ListenerContext, event: any) => Promise<void>;
|
|
48
49
|
export declare const registerActionMappingIgnoreKey: (actionType: string, ignoreKey: string[], replace?: boolean) => void;
|
package/lib/actions/Action.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.13.0-beta.1
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -112,6 +112,16 @@ var getOmitActionProp = function (type) {
|
|
|
112
112
|
}
|
|
113
113
|
return omitList;
|
|
114
114
|
};
|
|
115
|
+
var getTargetComponent = function (action, renderer, event, key) {
|
|
116
|
+
var targetComponent = renderer;
|
|
117
|
+
if (key && event.context.scoped) {
|
|
118
|
+
var func = action.componentId ? 'getComponentById' : 'getComponentByName';
|
|
119
|
+
if (typeof event.context.scoped[func] === 'function') {
|
|
120
|
+
targetComponent = event.context.scoped[func](key);
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
return targetComponent;
|
|
124
|
+
};
|
|
115
125
|
var runActions = function (actions, renderer, event) { return tslib.__awaiter(void 0, void 0, void 0, function () {
|
|
116
126
|
var actions_1, actions_1_1, actionConfig, actionInstrance, e_1, ignore, e_2_1;
|
|
117
127
|
var e_2, _a;
|
|
@@ -197,9 +207,9 @@ var runActions = function (actions, renderer, event) { return tslib.__awaiter(vo
|
|
|
197
207
|
// 执行动作,与原有动作处理打通
|
|
198
208
|
var runAction = function (actionInstrance, actionConfig, renderer, event) { return tslib.__awaiter(void 0, void 0, void 0, function () {
|
|
199
209
|
var additional, action, rendererProto, mergeData, expression, isStop, preventDefault, key, api, cmptFlag, targetComponent, args, afterMappingData, actionData, data, stopped, actionResult, stopPropagation;
|
|
200
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x
|
|
201
|
-
return tslib.__generator(this, function (
|
|
202
|
-
switch (
|
|
210
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
|
|
211
|
+
return tslib.__generator(this, function (_y) {
|
|
212
|
+
switch (_y.label) {
|
|
203
213
|
case 0:
|
|
204
214
|
additional = {
|
|
205
215
|
event: event
|
|
@@ -222,8 +232,8 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
|
|
|
222
232
|
if (!expression) return [3 /*break*/, 2];
|
|
223
233
|
return [4 /*yield*/, tpl.evalExpressionWithConditionBuilderAsync(expression, mergeData, true)];
|
|
224
234
|
case 1:
|
|
225
|
-
isStop = !(
|
|
226
|
-
|
|
235
|
+
isStop = !(_y.sent());
|
|
236
|
+
_y.label = 2;
|
|
227
237
|
case 2:
|
|
228
238
|
if (isStop) {
|
|
229
239
|
return [2 /*return*/];
|
|
@@ -232,8 +242,8 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
|
|
|
232
242
|
if (!action.preventDefault) return [3 /*break*/, 4];
|
|
233
243
|
return [4 /*yield*/, tpl.evalExpressionWithConditionBuilderAsync(action.preventDefault, mergeData, false)];
|
|
234
244
|
case 3:
|
|
235
|
-
preventDefault =
|
|
236
|
-
|
|
245
|
+
preventDefault = _y.sent();
|
|
246
|
+
_y.label = 4;
|
|
237
247
|
case 4:
|
|
238
248
|
key = {
|
|
239
249
|
componentId: dataMapping.dataMapping(action.componentId, mergeData),
|
|
@@ -258,9 +268,7 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
|
|
|
258
268
|
(_v = action.args) === null || _v === void 0 ? true : delete _v.messages;
|
|
259
269
|
}
|
|
260
270
|
cmptFlag = key.componentId || key.componentName;
|
|
261
|
-
targetComponent = cmptFlag
|
|
262
|
-
? (_w = event.context.scoped) === null || _w === void 0 ? void 0 : _w[action.componentId ? 'getComponentById' : 'getComponentByName'](cmptFlag)
|
|
263
|
-
: renderer;
|
|
271
|
+
targetComponent = getTargetComponent(action, renderer, event, cmptFlag);
|
|
264
272
|
args = dataMapping.dataMapping(action.args, mergeData, function (key) {
|
|
265
273
|
var _a;
|
|
266
274
|
var curCmptType = (_a = targetComponent === null || targetComponent === void 0 ? void 0 : targetComponent.props) === null || _a === void 0 ? void 0 : _a.type;
|
|
@@ -276,14 +284,14 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
|
|
|
276
284
|
!['ajax', 'download', 'dialog', 'drawer'].includes(action.actionType) // 避免非法配置影响对actionData的判断,导致动作配置中的数据映射失败
|
|
277
285
|
? actionData
|
|
278
286
|
: mergeData;
|
|
279
|
-
(
|
|
287
|
+
(_w = console.group) === null || _w === void 0 ? void 0 : _w.call(console, "run action ".concat(action.actionType));
|
|
280
288
|
console.debug("[".concat(action.actionType, "] action args, data"), args, data);
|
|
281
289
|
debug.debug('action', "run action ".concat(action.actionType, " with args"), args);
|
|
282
290
|
debug.debug('action', "run action ".concat(action.actionType, " with data"), data);
|
|
283
291
|
stopped = false;
|
|
284
292
|
return [4 /*yield*/, actionInstrance.run(tslib.__assign(tslib.__assign(tslib.__assign({}, action), { args: args, rawData: actionConfig.data, data: action.actionType === 'reload' ? actionData : data }), key), renderer, event, mergeData)];
|
|
285
293
|
case 5:
|
|
286
|
-
actionResult =
|
|
294
|
+
actionResult = _y.sent();
|
|
287
295
|
// 二次确认弹窗如果取消,则终止后续动作
|
|
288
296
|
if ((action === null || action === void 0 ? void 0 : action.actionType) === 'confirmDialog' && !actionResult) {
|
|
289
297
|
stopped = true;
|
|
@@ -293,11 +301,11 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
|
|
|
293
301
|
if (!action.stopPropagation) return [3 /*break*/, 7];
|
|
294
302
|
return [4 /*yield*/, tpl.evalExpressionWithConditionBuilderAsync(action.stopPropagation, mergeData, false)];
|
|
295
303
|
case 6:
|
|
296
|
-
stopPropagation =
|
|
297
|
-
|
|
304
|
+
stopPropagation = _y.sent();
|
|
305
|
+
_y.label = 7;
|
|
298
306
|
case 7:
|
|
299
307
|
console.debug("[".concat(action.actionType, "] action end event"), event);
|
|
300
|
-
(
|
|
308
|
+
(_x = console.groupEnd) === null || _x === void 0 ? void 0 : _x.call(console);
|
|
301
309
|
// 阻止原有动作执行
|
|
302
310
|
preventDefault && event.preventDefault();
|
|
303
311
|
// 阻止后续动作执行
|
|
@@ -354,6 +362,7 @@ registerComponentActionMappingIgnoreMap({
|
|
|
354
362
|
});
|
|
355
363
|
|
|
356
364
|
exports.getActionByType = getActionByType;
|
|
365
|
+
exports.getTargetComponent = getTargetComponent;
|
|
357
366
|
exports.registerAction = registerAction;
|
|
358
367
|
exports.registerActionMappingIgnoreKey = registerActionMappingIgnoreKey;
|
|
359
368
|
exports.registerActionMappingIgnoreMap = registerActionMappingIgnoreMap;
|