amis-core 6.13.0-beta.8 → 6.13.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.js +4 -2
- package/esm/SchemaRenderer.js +4 -4
- 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 +2 -2
- package/esm/actions/Action.js +60 -15
- package/esm/actions/AjaxAction.js +2 -2
- package/esm/actions/BreakAction.js +1 -1
- package/esm/actions/BroadcastAction.js +1 -1
- package/esm/actions/CmptAction.js +48 -43
- package/esm/actions/ContinueAction.js +1 -1
- package/esm/actions/CopyAction.js +1 -1
- package/esm/actions/CustomAction.js +7 -7
- package/esm/actions/DialogAction.js +8 -8
- package/esm/actions/DrawerAction.js +8 -8
- package/esm/actions/EmailAction.js +1 -1
- package/esm/actions/EventAction.js +9 -9
- 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 +7 -7
- 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 +7 -7
- package/esm/components/PopOver.js +9 -7
- 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.d.ts +4 -4
- package/esm/index.js +8 -8
- package/esm/locale.js +1 -1
- package/esm/polyfills.js +1 -1
- package/esm/renderers/Form.d.ts +7 -1
- package/esm/renderers/Form.js +72 -21
- package/esm/renderers/Item.d.ts +75 -33
- package/esm/renderers/Item.js +8 -2
- package/esm/renderers/Options.d.ts +14 -8
- 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.d.ts +0 -1
- package/esm/renderers/wrapControl.js +21 -11
- package/esm/store/app.d.ts +1 -0
- package/esm/store/app.js +14 -8
- package/esm/store/combo.d.ts +126 -0
- package/esm/store/combo.js +24 -2
- package/esm/store/crud.d.ts +1 -0
- package/esm/store/crud.js +5 -2
- package/esm/store/form.d.ts +50 -0
- package/esm/store/form.js +3 -3
- package/esm/store/formItem.d.ts +1 -0
- package/esm/store/formItem.js +4 -2
- 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.d.ts +5 -0
- package/esm/store/modal.js +14 -2
- package/esm/store/node.js +1 -1
- package/esm/store/pagination.js +1 -1
- package/esm/store/root.d.ts +3 -0
- package/esm/store/root.js +73 -20
- package/esm/store/service.js +8 -8
- package/esm/store/status.js +1 -1
- package/esm/store/table.d.ts +102 -1
- package/esm/store/table.js +9 -3
- package/esm/store/table2.js +1 -1
- package/esm/theme.js +1 -1
- package/esm/types.d.ts +10 -6
- 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 +12 -12
- package/esm/utils/debug.js +1 -1
- 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 -2
- 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 +3 -3
- 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.d.ts +1 -1
- package/esm/utils/index.js +9 -9
- 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.js +1 -1
- 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.d.ts +3 -1
- package/esm/utils/resize-sensor.js +63 -29
- package/esm/utils/resolveCondition.js +2 -2
- package/esm/utils/resolveVariable.js +1 -1
- package/esm/utils/resolveVariableAndFilter.js +4 -3
- 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.d.ts +12 -1
- package/esm/utils/style-helper.js +30 -18
- package/esm/utils/style.d.ts +13 -0
- package/esm/utils/style.js +44 -4
- package/esm/utils/toNumber.js +1 -1
- package/esm/utils/tokenize.js +1 -1
- package/esm/utils/tpl-builtin.d.ts +1 -0
- package/esm/utils/tpl-builtin.js +7 -3
- 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 +2 -2
- package/esm/utils/visitedCache.js +1 -1
- package/lib/Root.js +1 -1
- package/lib/RootRenderer.d.ts +1 -1
- package/lib/RootRenderer.js +4 -2
- package/lib/SchemaRenderer.js +3 -3
- 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 +2 -2
- package/lib/actions/Action.js +62 -14
- package/lib/actions/AjaxAction.js +2 -2
- package/lib/actions/BreakAction.js +1 -1
- package/lib/actions/BroadcastAction.js +1 -1
- package/lib/actions/CmptAction.js +48 -43
- package/lib/actions/ContinueAction.js +1 -1
- package/lib/actions/CopyAction.js +1 -1
- package/lib/actions/CustomAction.js +7 -7
- package/lib/actions/DialogAction.js +8 -8
- package/lib/actions/DrawerAction.js +8 -8
- package/lib/actions/EmailAction.js +1 -1
- package/lib/actions/EventAction.js +9 -9
- 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 +7 -7
- 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 +7 -7
- package/lib/components/PopOver.js +9 -7
- 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.d.ts +4 -4
- package/lib/index.js +12 -6
- package/lib/locale.js +1 -1
- package/lib/polyfills.js +1 -1
- package/lib/renderers/Form.d.ts +7 -1
- package/lib/renderers/Form.js +71 -20
- package/lib/renderers/Item.d.ts +75 -33
- package/lib/renderers/Item.js +8 -2
- package/lib/renderers/Options.d.ts +14 -8
- 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.d.ts +0 -1
- package/lib/renderers/wrapControl.js +21 -11
- package/lib/store/app.d.ts +1 -0
- package/lib/store/app.js +14 -8
- package/lib/store/combo.d.ts +150 -25
- package/lib/store/combo.js +24 -2
- package/lib/store/crud.d.ts +1 -0
- package/lib/store/crud.js +5 -2
- package/lib/store/form.d.ts +60 -11
- package/lib/store/form.js +3 -3
- package/lib/store/formItem.d.ts +1 -0
- package/lib/store/formItem.js +4 -2
- 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.d.ts +5 -0
- package/lib/store/modal.js +14 -2
- package/lib/store/node.js +1 -1
- package/lib/store/pagination.js +1 -1
- package/lib/store/root.d.ts +3 -1
- package/lib/store/root.js +72 -19
- package/lib/store/service.js +8 -8
- package/lib/store/status.js +1 -1
- package/lib/store/table.d.ts +122 -22
- package/lib/store/table.js +9 -3
- package/lib/store/table2.js +1 -1
- package/lib/theme.js +1 -1
- package/lib/types.d.ts +10 -6
- 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 +12 -12
- package/lib/utils/debug.js +1 -1
- 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 -2
- 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 +3 -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/index.d.ts +1 -1
- package/lib/utils/index.js +22 -20
- 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.js +1 -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.d.ts +3 -1
- package/lib/utils/resize-sensor.js +64 -28
- package/lib/utils/resolveCondition.js +2 -2
- package/lib/utils/resolveVariable.js +1 -1
- package/lib/utils/resolveVariableAndFilter.js +3 -2
- 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.d.ts +12 -1
- package/lib/utils/style-helper.js +30 -17
- package/lib/utils/style.d.ts +13 -0
- package/lib/utils/style.js +45 -3
- package/lib/utils/toNumber.js +1 -1
- package/lib/utils/tokenize.js +1 -1
- package/lib/utils/tpl-builtin.d.ts +1 -0
- package/lib/utils/tpl-builtin.js +7 -2
- 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 +2 -2
- package/lib/utils/visitedCache.js +1 -1
- package/package.json +5 -3
package/lib/WithStore.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.13.0
|
|
2
|
+
* amis-core v6.13.0
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -146,7 +146,7 @@ function HocStoreFactory(renderer) {
|
|
|
146
146
|
(props.data &&
|
|
147
147
|
prevProps.data &&
|
|
148
148
|
props.data.__super !== prevProps.data.__super))) {
|
|
149
|
-
store.initData(object.extendObject(props.data, tslib.__assign(tslib.__assign(tslib.__assign(
|
|
149
|
+
store.initData(object.extendObject(props.data, 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.data))), ((_c = props.updatePristineAfterStoreDataReInit) !== null && _c !== void 0 ? _c : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false, (_d = props.data) === null || _d === void 0 ? void 0 : _d.__changeReason);
|
|
150
150
|
}
|
|
151
151
|
}
|
|
152
152
|
else if (shouldSync === true ||
|
package/lib/actions/Action.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.13.0
|
|
2
|
+
* amis-core v6.13.0
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -9,7 +9,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
|
9
9
|
|
|
10
10
|
var tslib = require('tslib');
|
|
11
11
|
var omit = require('lodash/omit');
|
|
12
|
-
require('../utils/helper.js');
|
|
13
12
|
var tpl = require('../utils/tpl.js');
|
|
14
13
|
require('amis-formula');
|
|
15
14
|
require('moment');
|
|
@@ -19,6 +18,42 @@ require('@rc-component/mini-decimal');
|
|
|
19
18
|
var dataMapping = require('../utils/dataMapping.js');
|
|
20
19
|
require('../utils/filter.js');
|
|
21
20
|
var debug = require('../utils/debug.js');
|
|
21
|
+
require('../utils/api.js');
|
|
22
|
+
require('file-saver');
|
|
23
|
+
require('../utils/browser.js');
|
|
24
|
+
require('../utils/ColorScale.js');
|
|
25
|
+
require('../utils/columnsSplit.js');
|
|
26
|
+
require('../utils/DataSchema.js');
|
|
27
|
+
require('../utils/DataScope.js');
|
|
28
|
+
require('../utils/dom.js');
|
|
29
|
+
require('../utils/errors.js');
|
|
30
|
+
require('../utils/helper.js');
|
|
31
|
+
require('lodash/isPlainObject');
|
|
32
|
+
require('lodash/isObject');
|
|
33
|
+
require('lodash/isString');
|
|
34
|
+
require('lodash/isBoolean');
|
|
35
|
+
require('../utils/highlight.js');
|
|
36
|
+
require('../utils/icon.js');
|
|
37
|
+
require('../utils/image.js');
|
|
38
|
+
require('lodash/isEqual');
|
|
39
|
+
require('lodash/debounce');
|
|
40
|
+
require('../utils/resize-sensor.js');
|
|
41
|
+
require('react');
|
|
42
|
+
require('react-overlays/useRootClose');
|
|
43
|
+
require('react-dom');
|
|
44
|
+
require('../utils/SimpleMap.js');
|
|
45
|
+
require('lodash/mapValues');
|
|
46
|
+
require('lodash/camelCase');
|
|
47
|
+
require('lodash/cloneDeep');
|
|
48
|
+
require('lodash/map');
|
|
49
|
+
require('lodash/isEmpty');
|
|
50
|
+
require('lodash/kebabCase');
|
|
51
|
+
require('uncontrollable');
|
|
52
|
+
require('hoist-non-react-statics');
|
|
53
|
+
require('../utils/validations.js');
|
|
54
|
+
require('../utils/resolveCondition.js');
|
|
55
|
+
require('mobx');
|
|
56
|
+
require('../utils/Animation.js');
|
|
22
57
|
|
|
23
58
|
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
24
59
|
|
|
@@ -178,7 +213,16 @@ var runActions = function (actions, renderer, event) { return tslib.__awaiter(vo
|
|
|
178
213
|
e_1 = _c.sent();
|
|
179
214
|
ignore = (_b = actionConfig.ignoreError) !== null && _b !== void 0 ? _b : false;
|
|
180
215
|
if (!ignore) {
|
|
181
|
-
|
|
216
|
+
// 通过标记 stop 来阻止后续动作执行
|
|
217
|
+
// 不要抛出,避免后续的代码逻辑不执行,同时避免 unhandled promise rejection
|
|
218
|
+
event.stopPropagation();
|
|
219
|
+
event.preventDefault();
|
|
220
|
+
console.error("".concat(actionConfig.actionType, " \u52A8\u4F5C\u6267\u884C\u5931\u8D25\uFF0C\u539F\u56E0\uFF1A").concat(e_1.message || '未知'));
|
|
221
|
+
// throw Error(
|
|
222
|
+
// `${actionConfig.actionType} 动作执行失败,原因:${
|
|
223
|
+
// e.message || '未知'
|
|
224
|
+
// }`
|
|
225
|
+
// );
|
|
182
226
|
}
|
|
183
227
|
return [3 /*break*/, 6];
|
|
184
228
|
case 6:
|
|
@@ -224,9 +268,7 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
|
|
|
224
268
|
__rendererData: rendererProto // 部分组件交互后会有更新,如果想要获取那部分数据,可以通过事件数据获取
|
|
225
269
|
};
|
|
226
270
|
}
|
|
227
|
-
mergeData = object.
|
|
228
|
-
? object.createObject(rendererProto.__super, additional)
|
|
229
|
-
: additional, rendererProto), event.data);
|
|
271
|
+
mergeData = object.injectObjectChain(event.data, additional);
|
|
230
272
|
expression = (_e = action.expression) !== null && _e !== void 0 ? _e : action.execOn;
|
|
231
273
|
isStop = false;
|
|
232
274
|
if (!expression) return [3 /*break*/, 2];
|
|
@@ -288,9 +330,12 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
|
|
|
288
330
|
console.debug("[".concat(action.actionType, "] action args, data"), args, data);
|
|
289
331
|
debug.debug('action', "run action ".concat(action.actionType, " with args"), args);
|
|
290
332
|
debug.debug('action', "run action ".concat(action.actionType, " with data"), data);
|
|
333
|
+
_y.label = 5;
|
|
334
|
+
case 5:
|
|
335
|
+
_y.trys.push([5, , 9, 10]);
|
|
291
336
|
stopped = false;
|
|
292
337
|
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)];
|
|
293
|
-
case
|
|
338
|
+
case 6:
|
|
294
339
|
actionResult = _y.sent();
|
|
295
340
|
// 二次确认弹窗如果取消,则终止后续动作
|
|
296
341
|
if ((action === null || action === void 0 ? void 0 : action.actionType) === 'confirmDialog' && !actionResult) {
|
|
@@ -298,19 +343,22 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
|
|
|
298
343
|
preventDefault = true; // 这种对表单项change比较有意义,例如switch切换时弹确认弹窗,如果取消后不能把switch修改了
|
|
299
344
|
}
|
|
300
345
|
stopPropagation = false;
|
|
301
|
-
if (!action.stopPropagation) return [3 /*break*/,
|
|
346
|
+
if (!action.stopPropagation) return [3 /*break*/, 8];
|
|
302
347
|
return [4 /*yield*/, tpl.evalExpressionWithConditionBuilderAsync(action.stopPropagation, mergeData, false)];
|
|
303
|
-
case 6:
|
|
304
|
-
stopPropagation = _y.sent();
|
|
305
|
-
_y.label = 7;
|
|
306
348
|
case 7:
|
|
307
|
-
|
|
308
|
-
|
|
349
|
+
stopPropagation = _y.sent();
|
|
350
|
+
_y.label = 8;
|
|
351
|
+
case 8:
|
|
309
352
|
// 阻止原有动作执行
|
|
310
353
|
preventDefault && event.preventDefault();
|
|
311
354
|
// 阻止后续动作执行
|
|
312
355
|
(stopPropagation || stopped) && event.stopPropagation();
|
|
313
|
-
return [
|
|
356
|
+
return [3 /*break*/, 10];
|
|
357
|
+
case 9:
|
|
358
|
+
console.debug("[".concat(action.actionType, "] action end event"), event);
|
|
359
|
+
(_x = console.groupEnd) === null || _x === void 0 ? void 0 : _x.call(console);
|
|
360
|
+
return [7 /*endfinally*/];
|
|
361
|
+
case 10: return [2 /*return*/];
|
|
314
362
|
}
|
|
315
363
|
});
|
|
316
364
|
}); };
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.13.0
|
|
2
|
+
* amis-core v6.13.0
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -50,7 +50,7 @@ var AjaxAction = /** @class */ (function () {
|
|
|
50
50
|
silent = ((_b = action === null || action === void 0 ? void 0 : action.options) === null || _b === void 0 ? void 0 : _b.silent) || (action === null || action === void 0 ? void 0 : action.api).silent;
|
|
51
51
|
messages = (_c = action === null || action === void 0 ? void 0 : action.api) === null || _c === void 0 ? void 0 : _c.messages;
|
|
52
52
|
api$1 = api.normalizeApi(action.api);
|
|
53
|
-
if (!
|
|
53
|
+
if (!api$1.sendOn) return [3 /*break*/, 2];
|
|
54
54
|
return [4 /*yield*/, tpl.evalExpressionWithConditionBuilderAsync(api$1.sendOn, (_d = action.data) !== null && _d !== void 0 ? _d : {}, false)];
|
|
55
55
|
case 1:
|
|
56
56
|
sendOn = _q.sent();
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.13.0
|
|
2
|
+
* amis-core v6.13.0
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -26,10 +26,10 @@ var CmptAction = /** @class */ (function () {
|
|
|
26
26
|
CmptAction.prototype.run = function (action, renderer, event) {
|
|
27
27
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6;
|
|
28
28
|
return tslib.__awaiter(this, void 0, void 0, function () {
|
|
29
|
-
var key, dataMergeMode, path, topStore, beforeSetData, res, component, msg, result,
|
|
30
|
-
var _9, _10, _11, _12, _13
|
|
31
|
-
return tslib.__generator(this, function (
|
|
32
|
-
switch (
|
|
29
|
+
var key, dataMergeMode, path, topStore, beforeSetData, res, component, msg, result, valid, _7, e_1, result, e_2;
|
|
30
|
+
var _8, _9, _10, _11, _12, _13;
|
|
31
|
+
return tslib.__generator(this, function (_14) {
|
|
32
|
+
switch (_14.label) {
|
|
33
33
|
case 0:
|
|
34
34
|
key = action.componentId || action.componentName;
|
|
35
35
|
dataMergeMode = action.dataMergeMode || 'merge';
|
|
@@ -43,17 +43,24 @@ var CmptAction = /** @class */ (function () {
|
|
|
43
43
|
if (!(beforeSetData && typeof beforeSetData === 'function')) return [3 /*break*/, 2];
|
|
44
44
|
return [4 /*yield*/, beforeSetData(renderer, action, event)];
|
|
45
45
|
case 1:
|
|
46
|
-
res =
|
|
46
|
+
res = _14.sent();
|
|
47
47
|
if (res === false) {
|
|
48
48
|
return [2 /*return*/];
|
|
49
49
|
}
|
|
50
|
-
|
|
50
|
+
_14.label = 2;
|
|
51
51
|
case 2:
|
|
52
52
|
component = Action.getTargetComponent(action, renderer, event, key);
|
|
53
53
|
// 如果key指定了,但是没找到组件,则报错
|
|
54
54
|
if (key && !component) {
|
|
55
55
|
msg = "\u5C1D\u8BD5\u6267\u884C\u4E00\u4E2A\u4E0D\u5B58\u5728\u7684\u76EE\u6807\u7EC4\u4EF6\u52A8\u4F5C\uFF08".concat(key, "\uFF09\uFF0C\u8BF7\u68C0\u67E5\u76EE\u6807\u7EC4\u4EF6\u975E\u9690\u85CF\u72B6\u6001\uFF0C\u4E14\u6B63\u786E\u6307\u5B9A\u4E86componentId\u6216componentName");
|
|
56
|
-
|
|
56
|
+
// cmpAction 可以容忍错误,除非 ignoreError 强制设置成了 false
|
|
57
|
+
if (action.ignoreError === false) {
|
|
58
|
+
throw Error(msg);
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
console.warn(msg);
|
|
62
|
+
}
|
|
63
|
+
return [2 /*return*/];
|
|
57
64
|
}
|
|
58
65
|
if (action.actionType === 'setValue') {
|
|
59
66
|
if (component === null || component === void 0 ? void 0 : component.setData) {
|
|
@@ -66,84 +73,82 @@ var CmptAction = /** @class */ (function () {
|
|
|
66
73
|
if (!(action.actionType === 'reload')) return [3 /*break*/, 4];
|
|
67
74
|
return [4 /*yield*/, ((_k = component === null || component === void 0 ? void 0 : component.reload) === null || _k === void 0 ? void 0 : _k.call(component, undefined, action.data, event.data, undefined, dataMergeMode === 'override', tslib.__assign(tslib.__assign({}, action.args), { resetPage: (_m = (_l = action.args) === null || _l === void 0 ? void 0 : _l.resetPage) !== null && _m !== void 0 ? _m : action.resetPage })))];
|
|
68
75
|
case 3:
|
|
69
|
-
result =
|
|
76
|
+
result = _14.sent();
|
|
70
77
|
if (result && action.outputVar) {
|
|
71
|
-
event.setData(object.extendObject(event.data, (
|
|
72
|
-
|
|
73
|
-
|
|
78
|
+
event.setData(object.extendObject(event.data, (_8 = {},
|
|
79
|
+
_8[action.outputVar] = result,
|
|
80
|
+
_8)));
|
|
74
81
|
}
|
|
75
82
|
return [2 /*return*/, result];
|
|
76
83
|
case 4:
|
|
77
84
|
if (!(action.actionType === 'validateFormItem' &&
|
|
78
85
|
((_p = factory.getRendererByName((_o = component === null || component === void 0 ? void 0 : component.props) === null || _o === void 0 ? void 0 : _o.type)) === null || _p === void 0 ? void 0 : _p.isFormItem))) return [3 /*break*/, 11];
|
|
79
|
-
|
|
80
|
-
_15.label = 5;
|
|
86
|
+
_14.label = 5;
|
|
81
87
|
case 5:
|
|
82
|
-
|
|
88
|
+
_14.trys.push([5, 9, , 10]);
|
|
83
89
|
return [4 /*yield*/, ((_r = component === null || component === void 0 ? void 0 : (_q = component.props).onValidate) === null || _r === void 0 ? void 0 : _r.call(_q))];
|
|
84
90
|
case 6:
|
|
85
|
-
|
|
86
|
-
if (
|
|
91
|
+
_7 = (_14.sent());
|
|
92
|
+
if (!_7) return [3 /*break*/, 8];
|
|
87
93
|
return [4 /*yield*/, ((_s = component === null || component === void 0 ? void 0 : component.validate) === null || _s === void 0 ? void 0 : _s.call(component))];
|
|
88
94
|
case 7:
|
|
89
|
-
|
|
90
|
-
|
|
95
|
+
_7 = !(_14.sent());
|
|
96
|
+
_14.label = 8;
|
|
91
97
|
case 8:
|
|
92
|
-
valid =
|
|
98
|
+
valid = _7;
|
|
93
99
|
if (valid) {
|
|
94
|
-
event.setData(object.createObject(event.data, (
|
|
95
|
-
|
|
100
|
+
event.setData(object.createObject(event.data, (_9 = {},
|
|
101
|
+
_9[action.outputVar || "".concat(action.actionType, "Result")] = {
|
|
96
102
|
error: '',
|
|
97
103
|
value: (_u = (_t = component === null || component === void 0 ? void 0 : component.props) === null || _t === void 0 ? void 0 : _t.formItem) === null || _u === void 0 ? void 0 : _u.value
|
|
98
104
|
},
|
|
99
|
-
|
|
100
|
-
dispatchEvent_1 && dispatchEvent_1('formItemValidateSucc', data);
|
|
105
|
+
_9)));
|
|
101
106
|
}
|
|
102
107
|
else {
|
|
103
|
-
event.setData(object.createObject(event.data, (
|
|
104
|
-
|
|
105
|
-
error:
|
|
108
|
+
event.setData(object.createObject(event.data, (_10 = {},
|
|
109
|
+
_10[action.outputVar || "".concat(action.actionType, "Result")] = {
|
|
110
|
+
error: typeof valid === 'string'
|
|
111
|
+
? valid
|
|
112
|
+
: (((_w = (_v = component === null || component === void 0 ? void 0 : component.props) === null || _v === void 0 ? void 0 : _v.formItem) === null || _w === void 0 ? void 0 : _w.errors) || []).join(','),
|
|
106
113
|
value: (_y = (_x = component === null || component === void 0 ? void 0 : component.props) === null || _x === void 0 ? void 0 : _x.formItem) === null || _y === void 0 ? void 0 : _y.value
|
|
107
114
|
},
|
|
108
|
-
|
|
109
|
-
dispatchEvent_1 && dispatchEvent_1('formItemValidateError', data);
|
|
115
|
+
_10)));
|
|
110
116
|
}
|
|
111
117
|
return [3 /*break*/, 10];
|
|
112
118
|
case 9:
|
|
113
|
-
e_1 =
|
|
114
|
-
event.setData(object.createObject(event.data, (
|
|
115
|
-
|
|
119
|
+
e_1 = _14.sent();
|
|
120
|
+
event.setData(object.createObject(event.data, (_11 = {},
|
|
121
|
+
_11[action.outputVar || "".concat(action.actionType, "Result")] = {
|
|
116
122
|
error: e_1.message || '未知错误',
|
|
117
123
|
value: (_0 = (_z = component === null || component === void 0 ? void 0 : component.props) === null || _z === void 0 ? void 0 : _z.formItem) === null || _0 === void 0 ? void 0 : _0.value
|
|
118
124
|
},
|
|
119
|
-
|
|
120
|
-
dispatchEvent_1 && dispatchEvent_1('formItemValidateError', data);
|
|
125
|
+
_11)));
|
|
121
126
|
return [3 /*break*/, 10];
|
|
122
127
|
case 10: return [2 /*return*/];
|
|
123
128
|
case 11:
|
|
124
|
-
|
|
129
|
+
_14.trys.push([11, 13, , 14]);
|
|
125
130
|
return [4 /*yield*/, ((_1 = component === null || component === void 0 ? void 0 : component.doAction) === null || _1 === void 0 ? void 0 : _1.call(component, action, event.data, true, action.args))];
|
|
126
131
|
case 12:
|
|
127
|
-
result =
|
|
132
|
+
result = _14.sent();
|
|
128
133
|
if (['validate', 'submit'].includes(action.actionType)) {
|
|
129
|
-
event.setData(object.createObject(event.data, (
|
|
130
|
-
|
|
134
|
+
event.setData(object.createObject(event.data, (_12 = {},
|
|
135
|
+
_12[action.outputVar || "".concat(action.actionType, "Result")] = {
|
|
131
136
|
error: '',
|
|
132
137
|
payload: (_2 = result === null || result === void 0 ? void 0 : result.__payload) !== null && _2 !== void 0 ? _2 : (_4 = (_3 = component === null || component === void 0 ? void 0 : component.props) === null || _3 === void 0 ? void 0 : _3.store) === null || _4 === void 0 ? void 0 : _4.data,
|
|
133
138
|
responseData: result === null || result === void 0 ? void 0 : result.__response
|
|
134
139
|
},
|
|
135
|
-
|
|
140
|
+
_12)));
|
|
136
141
|
}
|
|
137
142
|
return [2 /*return*/, result];
|
|
138
143
|
case 13:
|
|
139
|
-
e_2 =
|
|
140
|
-
event.setData(object.createObject(event.data, (
|
|
141
|
-
|
|
144
|
+
e_2 = _14.sent();
|
|
145
|
+
event.setData(object.createObject(event.data, (_13 = {},
|
|
146
|
+
_13[action.outputVar || "".concat(action.actionType, "Result")] = {
|
|
142
147
|
error: e_2.message,
|
|
143
148
|
errors: e_2.name === 'ValidateError' ? e_2.detail : e_2,
|
|
144
149
|
payload: (_6 = (_5 = component === null || component === void 0 ? void 0 : component.props) === null || _5 === void 0 ? void 0 : _5.store) === null || _6 === void 0 ? void 0 : _6.data
|
|
145
150
|
},
|
|
146
|
-
|
|
151
|
+
_13)));
|
|
147
152
|
return [3 /*break*/, 14];
|
|
148
153
|
case 14: return [2 /*return*/];
|
|
149
154
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.13.0
|
|
2
|
+
* amis-core v6.13.0
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -8,27 +8,27 @@
|
|
|
8
8
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
9
9
|
|
|
10
10
|
var tslib = require('tslib');
|
|
11
|
+
require('amis-formula');
|
|
12
|
+
require('moment');
|
|
13
|
+
require('lodash/isPlainObject');
|
|
14
|
+
require('../utils/memoryParse.js');
|
|
15
|
+
require('@rc-component/mini-decimal');
|
|
16
|
+
require('../utils/filter.js');
|
|
11
17
|
var api = require('../utils/api.js');
|
|
12
18
|
require('file-saver');
|
|
13
19
|
require('../utils/browser.js');
|
|
14
20
|
require('../utils/ColorScale.js');
|
|
15
21
|
require('../utils/columnsSplit.js');
|
|
16
|
-
require('lodash/isPlainObject');
|
|
17
|
-
require('amis-formula');
|
|
18
|
-
require('../utils/memoryParse.js');
|
|
19
22
|
require('../utils/DataSchema.js');
|
|
20
23
|
require('../utils/DataScope.js');
|
|
21
|
-
require('moment');
|
|
22
24
|
require('../utils/debug.js');
|
|
23
25
|
require('../utils/dom.js');
|
|
24
26
|
require('../utils/errors.js');
|
|
25
27
|
require('../utils/tpl.js');
|
|
26
28
|
require('../utils/helper.js');
|
|
27
|
-
require('../utils/filter.js');
|
|
28
29
|
require('lodash/isObject');
|
|
29
30
|
require('lodash/isString');
|
|
30
31
|
require('lodash/isBoolean');
|
|
31
|
-
require('@rc-component/mini-decimal');
|
|
32
32
|
require('../utils/highlight.js');
|
|
33
33
|
require('../utils/icon.js');
|
|
34
34
|
require('../utils/image.js');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.13.0
|
|
2
|
+
* amis-core v6.13.0
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -8,28 +8,28 @@
|
|
|
8
8
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
9
9
|
|
|
10
10
|
var tslib = require('tslib');
|
|
11
|
+
require('amis-formula');
|
|
12
|
+
require('moment');
|
|
13
|
+
var object = require('../utils/object.js');
|
|
14
|
+
require('../utils/memoryParse.js');
|
|
15
|
+
require('@rc-component/mini-decimal');
|
|
16
|
+
require('lodash/isPlainObject');
|
|
17
|
+
require('../utils/filter.js');
|
|
11
18
|
require('../utils/api.js');
|
|
12
19
|
require('file-saver');
|
|
13
20
|
require('../utils/browser.js');
|
|
14
21
|
require('../utils/ColorScale.js');
|
|
15
22
|
require('../utils/columnsSplit.js');
|
|
16
|
-
var object = require('../utils/object.js');
|
|
17
|
-
require('../utils/memoryParse.js');
|
|
18
|
-
require('amis-formula');
|
|
19
|
-
require('lodash/isPlainObject');
|
|
20
23
|
require('../utils/DataSchema.js');
|
|
21
24
|
require('../utils/DataScope.js');
|
|
22
|
-
require('moment');
|
|
23
25
|
require('../utils/debug.js');
|
|
24
26
|
require('../utils/dom.js');
|
|
25
27
|
require('../utils/errors.js');
|
|
26
28
|
var tpl = require('../utils/tpl.js');
|
|
27
29
|
require('../utils/helper.js');
|
|
28
|
-
require('../utils/filter.js');
|
|
29
30
|
require('lodash/isObject');
|
|
30
31
|
require('lodash/isString');
|
|
31
32
|
require('lodash/isBoolean');
|
|
32
|
-
require('@rc-component/mini-decimal');
|
|
33
33
|
require('../utils/highlight.js');
|
|
34
34
|
require('../utils/icon.js');
|
|
35
35
|
require('../utils/image.js');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.13.0
|
|
2
|
+
* amis-core v6.13.0
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -8,28 +8,28 @@
|
|
|
8
8
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
9
9
|
|
|
10
10
|
var tslib = require('tslib');
|
|
11
|
+
require('amis-formula');
|
|
12
|
+
require('moment');
|
|
13
|
+
var object = require('../utils/object.js');
|
|
14
|
+
require('../utils/memoryParse.js');
|
|
15
|
+
require('@rc-component/mini-decimal');
|
|
16
|
+
require('lodash/isPlainObject');
|
|
17
|
+
require('../utils/filter.js');
|
|
11
18
|
require('../utils/api.js');
|
|
12
19
|
require('file-saver');
|
|
13
20
|
require('../utils/browser.js');
|
|
14
21
|
require('../utils/ColorScale.js');
|
|
15
22
|
require('../utils/columnsSplit.js');
|
|
16
|
-
var object = require('../utils/object.js');
|
|
17
|
-
require('../utils/memoryParse.js');
|
|
18
|
-
require('amis-formula');
|
|
19
|
-
require('lodash/isPlainObject');
|
|
20
23
|
require('../utils/DataSchema.js');
|
|
21
24
|
require('../utils/DataScope.js');
|
|
22
|
-
require('moment');
|
|
23
25
|
require('../utils/debug.js');
|
|
24
26
|
require('../utils/dom.js');
|
|
25
27
|
require('../utils/errors.js');
|
|
26
28
|
require('../utils/tpl.js');
|
|
27
29
|
require('../utils/helper.js');
|
|
28
|
-
require('../utils/filter.js');
|
|
29
30
|
require('lodash/isObject');
|
|
30
31
|
require('lodash/isString');
|
|
31
32
|
require('lodash/isBoolean');
|
|
32
|
-
require('@rc-component/mini-decimal');
|
|
33
33
|
require('../utils/highlight.js');
|
|
34
34
|
require('../utils/icon.js');
|
|
35
35
|
require('../utils/image.js');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.13.0
|
|
2
|
+
* amis-core v6.13.0
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -8,24 +8,26 @@
|
|
|
8
8
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
9
9
|
|
|
10
10
|
var tslib = require('tslib');
|
|
11
|
+
require('amis-formula');
|
|
12
|
+
require('moment');
|
|
13
|
+
var object = require('../utils/object.js');
|
|
14
|
+
require('../utils/memoryParse.js');
|
|
15
|
+
require('@rc-component/mini-decimal');
|
|
16
|
+
var resolveVariableAndFilterForAsync = require('../utils/resolveVariableAndFilterForAsync.js');
|
|
17
|
+
require('lodash/isPlainObject');
|
|
18
|
+
require('../utils/filter.js');
|
|
11
19
|
require('../utils/api.js');
|
|
12
20
|
require('file-saver');
|
|
13
21
|
require('../utils/browser.js');
|
|
14
22
|
require('../utils/ColorScale.js');
|
|
15
23
|
require('../utils/columnsSplit.js');
|
|
16
|
-
var object = require('../utils/object.js');
|
|
17
|
-
require('../utils/memoryParse.js');
|
|
18
|
-
require('amis-formula');
|
|
19
|
-
require('lodash/isPlainObject');
|
|
20
24
|
require('../utils/DataSchema.js');
|
|
21
25
|
require('../utils/DataScope.js');
|
|
22
|
-
require('moment');
|
|
23
26
|
require('../utils/debug.js');
|
|
24
27
|
require('../utils/dom.js');
|
|
25
28
|
require('../utils/errors.js');
|
|
26
29
|
require('../utils/tpl.js');
|
|
27
30
|
require('../utils/helper.js');
|
|
28
|
-
require('../utils/filter.js');
|
|
29
31
|
var formula = require('../utils/formula.js');
|
|
30
32
|
require('../utils/highlight.js');
|
|
31
33
|
require('../utils/icon.js');
|
|
@@ -33,13 +35,11 @@ require('../utils/image.js');
|
|
|
33
35
|
require('lodash/isEqual');
|
|
34
36
|
var Action = require('./Action.js');
|
|
35
37
|
require('lodash/debounce');
|
|
36
|
-
var resolveVariableAndFilterForAsync = require('../utils/resolveVariableAndFilterForAsync.js');
|
|
37
38
|
require('../utils/resize-sensor.js');
|
|
38
39
|
require('react');
|
|
39
40
|
require('react-overlays/useRootClose');
|
|
40
41
|
require('react-dom');
|
|
41
42
|
require('../utils/SimpleMap.js');
|
|
42
|
-
require('@rc-component/mini-decimal');
|
|
43
43
|
require('lodash/mapValues');
|
|
44
44
|
require('lodash/camelCase');
|
|
45
45
|
require('lodash/cloneDeep');
|