amis-core 6.11.0-beta.1 → 6.11.0-beta.2
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.d.ts +3 -0
- package/esm/Root.js +1 -1
- package/esm/RootRenderer.js +14 -8
- package/esm/SchemaRenderer.d.ts +2 -0
- package/esm/SchemaRenderer.js +32 -9
- 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.js +1 -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 +6 -2
- 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.d.ts +1 -0
- package/esm/factory.js +1 -1
- package/esm/globalVar.d.ts +173 -0
- package/esm/globalVar.js +122 -0
- package/esm/globalVarClientHandler.d.ts +1 -0
- package/esm/globalVarClientHandler.js +65 -0
- package/esm/globalVarDefaultValueHandler.d.ts +1 -0
- package/esm/globalVarDefaultValueHandler.js +28 -0
- package/esm/index.d.ts +3 -0
- package/esm/index.js +8 -5
- package/esm/locale.js +1 -1
- package/esm/polyfills.js +1 -1
- package/esm/renderers/Form.d.ts +3 -1
- package/esm/renderers/Form.js +39 -24
- package/esm/renderers/Item.d.ts +11 -19
- package/esm/renderers/Item.js +17 -2
- 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.d.ts +8 -0
- package/esm/store/crud.js +24 -17
- package/esm/store/form.js +14 -5
- 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.d.ts +14 -1
- package/esm/store/list.js +45 -17
- 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.d.ts +14 -0
- package/esm/store/root.js +483 -12
- package/esm/store/service.js +1 -1
- package/esm/store/status.js +1 -1
- package/esm/store/table.d.ts +16 -2
- package/esm/store/table.js +83 -26
- package/esm/store/table2.js +1 -1
- package/esm/theme.js +1 -1
- package/esm/types.d.ts +3 -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/animations.js +1 -1
- package/esm/utils/api.d.ts +1 -0
- package/esm/utils/api.js +18 -6
- 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 +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 +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.d.ts +5 -0
- package/esm/utils/helper.js +3 -2
- 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 +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.js +1 -1
- 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.d.ts +3 -0
- package/lib/Root.js +1 -1
- package/lib/RootRenderer.js +13 -7
- package/lib/SchemaRenderer.d.ts +2 -0
- package/lib/SchemaRenderer.js +32 -9
- 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.js +1 -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 +6 -2
- 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.d.ts +1 -0
- package/lib/factory.js +1 -1
- package/lib/globalVar.d.ts +173 -0
- package/lib/globalVar.js +130 -0
- package/lib/globalVarClientHandler.d.ts +1 -0
- package/lib/globalVarClientHandler.js +67 -0
- package/lib/globalVarDefaultValueHandler.d.ts +1 -0
- package/lib/globalVarDefaultValueHandler.js +30 -0
- package/lib/index.d.ts +3 -0
- package/lib/index.js +13 -4
- package/lib/locale.js +1 -1
- package/lib/polyfills.js +1 -1
- package/lib/renderers/Form.d.ts +3 -1
- package/lib/renderers/Form.js +37 -21
- package/lib/renderers/Item.d.ts +11 -19
- package/lib/renderers/Item.js +17 -2
- 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.d.ts +8 -0
- package/lib/store/crud.js +23 -16
- package/lib/store/form.d.ts +10 -10
- package/lib/store/form.js +14 -5
- 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.d.ts +14 -1
- package/lib/store/list.js +44 -16
- 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.d.ts +13 -0
- package/lib/store/root.js +487 -11
- package/lib/store/service.js +1 -1
- package/lib/store/status.js +1 -1
- package/lib/store/table.d.ts +36 -22
- package/lib/store/table.js +82 -25
- package/lib/store/table2.js +1 -1
- package/lib/theme.js +1 -1
- package/lib/types.d.ts +3 -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/animations.js +1 -1
- package/lib/utils/api.d.ts +1 -0
- package/lib/utils/api.js +18 -5
- 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 +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 +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.d.ts +5 -0
- package/lib/utils/helper.js +3 -2
- 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 +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.js +1 -1
- 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/loopTooMuch.js
CHANGED
package/esm/utils/makeSorter.js
CHANGED
package/esm/utils/math.js
CHANGED
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
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.d.ts
CHANGED
|
@@ -5,10 +5,13 @@ import { TranslateFn } from './locale';
|
|
|
5
5
|
import { IRendererStore } from './store';
|
|
6
6
|
import { SchemaNode } from './types';
|
|
7
7
|
import { StatusScopedProps } from './StatusScoped';
|
|
8
|
+
import { GlobalVariableItem } from './globalVar';
|
|
8
9
|
export interface RootRenderProps {
|
|
10
|
+
globalVars?: Array<GlobalVariableItem>;
|
|
9
11
|
location?: Location;
|
|
10
12
|
theme?: string;
|
|
11
13
|
data?: Record<string, any>;
|
|
14
|
+
context?: Record<string, any>;
|
|
12
15
|
locale?: string;
|
|
13
16
|
[propName: string]: any;
|
|
14
17
|
}
|
package/lib/Root.js
CHANGED
package/lib/RootRenderer.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.11.0-beta.
|
|
2
|
+
* amis-core v6.11.0-beta.2
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -48,6 +48,7 @@ var RootRenderer = /** @class */ (function (_super) {
|
|
|
48
48
|
_this.store.updateContext(props.context);
|
|
49
49
|
_this.store.initData(props.data);
|
|
50
50
|
_this.store.updateLocation(props.location, (_a = _this.props.env) === null || _a === void 0 ? void 0 : _a.parseLocation);
|
|
51
|
+
_this.store.setGlobalVars(props.globalVars);
|
|
51
52
|
// 将数据里面的函数批量的绑定到 this 上
|
|
52
53
|
helper.bulkBindFunctions(_this, [
|
|
53
54
|
'handleAction',
|
|
@@ -93,6 +94,10 @@ var RootRenderer = /** @class */ (function (_super) {
|
|
|
93
94
|
RootRenderer.prototype.componentDidUpdate = function (prevProps) {
|
|
94
95
|
var _a;
|
|
95
96
|
var props = this.props;
|
|
97
|
+
// 更新全局变量
|
|
98
|
+
if (props.globalVars !== prevProps.globalVars) {
|
|
99
|
+
this.store.setGlobalVars(props.globalVars);
|
|
100
|
+
}
|
|
96
101
|
if (props.location !== prevProps.location) {
|
|
97
102
|
this.store.updateLocation(props.location, (_a = this.props.env) === null || _a === void 0 ? void 0 : _a.parseLocation);
|
|
98
103
|
}
|
|
@@ -193,11 +198,12 @@ var RootRenderer = /** @class */ (function (_super) {
|
|
|
193
198
|
});
|
|
194
199
|
}
|
|
195
200
|
else if (action.actionType === 'toast') {
|
|
196
|
-
(_b = (_a = action.toast) === null || _a === void 0 ? void 0 : _a.items) === null || _b === void 0 ? void 0 : _b.forEach(function (
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
+
(_b = (_a = action.toast) === null || _a === void 0 ? void 0 : _a.items) === null || _b === void 0 ? void 0 : _b.forEach(function (_a) {
|
|
202
|
+
var level = _a.level, body = _a.body, title = _a.title, item = tslib.__rest(_a, ["level", "body", "title"]);
|
|
203
|
+
env.notify(level || 'info', body
|
|
204
|
+
? render('body', body, tslib.__assign(tslib.__assign({}, _this.props), { data: ctx, context: store.context }))
|
|
205
|
+
: '', tslib.__assign(tslib.__assign(tslib.__assign({}, action.toast), item), { title: title
|
|
206
|
+
? render('title', title, tslib.__assign(tslib.__assign({}, _this.props), { data: ctx, context: store.context }))
|
|
201
207
|
: null, mobileUI: mobileUI }));
|
|
202
208
|
});
|
|
203
209
|
}
|
|
@@ -373,7 +379,7 @@ var RootRenderer = /** @class */ (function (_super) {
|
|
|
373
379
|
store.action.drawer)), { type: 'drawer' }), tslib.__assign(tslib.__assign({}, rest), { key: 'drawer', topStore: this.store, data: store.drawerData, context: store.context, onConfirm: this.handleDrawerConfirm, onClose: this.handleDrawerClose, show: store.drawerOpen, onAction: this.handleAction }));
|
|
374
380
|
};
|
|
375
381
|
RootRenderer.prototype.render = function () {
|
|
376
|
-
var _a = this.props, pathPrefix = _a.pathPrefix, schema = _a.schema, render = _a.render
|
|
382
|
+
var _a = this.props, pathPrefix = _a.pathPrefix, schema = _a.schema, render = _a.render; _a.globalVars; var rest = tslib.__rest(_a, ["pathPrefix", "schema", "render", "globalVars"]);
|
|
377
383
|
var store = this.store;
|
|
378
384
|
if (store.runtimeError) {
|
|
379
385
|
return this.renderRuntimeError();
|
package/lib/SchemaRenderer.d.ts
CHANGED
|
@@ -19,6 +19,7 @@ export declare class SchemaRenderer extends React.Component<SchemaRendererProps,
|
|
|
19
19
|
cRef: any;
|
|
20
20
|
schema: any;
|
|
21
21
|
path: string;
|
|
22
|
+
tmpData: any;
|
|
22
23
|
toDispose: Array<() => any>;
|
|
23
24
|
unbindEvent: (() => void) | undefined;
|
|
24
25
|
unbindGlobalEvent: (() => void) | undefined;
|
|
@@ -26,6 +27,7 @@ export declare class SchemaRenderer extends React.Component<SchemaRendererProps,
|
|
|
26
27
|
constructor(props: SchemaRendererProps);
|
|
27
28
|
componentWillUnmount(): void;
|
|
28
29
|
shouldComponentUpdate(nextProps: SchemaRendererProps): boolean;
|
|
30
|
+
handleGlobalVarChange(): void;
|
|
29
31
|
resolveRenderer(props: SchemaRendererProps, force?: boolean): any;
|
|
30
32
|
getWrappedInstance(): any;
|
|
31
33
|
refFn(ref: any): void;
|
package/lib/SchemaRenderer.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.11.0-beta.
|
|
2
|
+
* amis-core v6.11.0-beta.2
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -25,15 +25,17 @@ var mobxStateTree = require('mobx-state-tree');
|
|
|
25
25
|
var mobx = require('mobx');
|
|
26
26
|
require('amis-formula');
|
|
27
27
|
require('moment');
|
|
28
|
-
require('
|
|
28
|
+
var object = require('./utils/object.js');
|
|
29
29
|
require('./utils/memoryParse.js');
|
|
30
30
|
require('@rc-component/mini-decimal');
|
|
31
31
|
var resolveVariableAndFilter = require('./utils/resolveVariableAndFilter.js');
|
|
32
|
+
require('lodash/isPlainObject');
|
|
32
33
|
require('./utils/filter.js');
|
|
33
34
|
var style = require('./utils/style.js');
|
|
34
35
|
var formula = require('./utils/formula.js');
|
|
35
36
|
var tpl = require('./utils/tpl.js');
|
|
36
37
|
var Animations = require('./components/Animations.js');
|
|
38
|
+
var globalVar = require('./globalVar.js');
|
|
37
39
|
|
|
38
40
|
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
39
41
|
|
|
@@ -96,13 +98,16 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
96
98
|
_this.reRender = _this.reRender.bind(_this);
|
|
97
99
|
_this.resolveRenderer(_this.props);
|
|
98
100
|
_this.dispatchEvent = _this.dispatchEvent.bind(_this);
|
|
101
|
+
_this.handleGlobalVarChange = _this.handleGlobalVarChange.bind(_this);
|
|
102
|
+
var schema = props.schema;
|
|
99
103
|
// 监听statusStore更新
|
|
100
104
|
_this.toDispose.push(mobx.reaction(function () {
|
|
101
105
|
var _a, _b, _c;
|
|
102
|
-
var id = tpl.filter(
|
|
103
|
-
var name = tpl.filter(
|
|
106
|
+
var id = tpl.filter(schema.id, props.data);
|
|
107
|
+
var name = tpl.filter(schema.name, props.data);
|
|
104
108
|
return "".concat((_a = props.statusStore.visibleState[id]) !== null && _a !== void 0 ? _a : props.statusStore.visibleState[name]).concat((_b = props.statusStore.disableState[id]) !== null && _b !== void 0 ? _b : props.statusStore.disableState[name]).concat((_c = props.statusStore.staticState[id]) !== null && _c !== void 0 ? _c : props.statusStore.staticState[name]);
|
|
105
109
|
}, function () { return _this.forceUpdate(); }));
|
|
110
|
+
_this.toDispose.push(globalVar.observeGlobalVars(schema, props.topStore, _this.handleGlobalVarChange));
|
|
106
111
|
return _this;
|
|
107
112
|
}
|
|
108
113
|
SchemaRenderer.prototype.componentWillUnmount = function () {
|
|
@@ -133,6 +138,20 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
133
138
|
}
|
|
134
139
|
return false;
|
|
135
140
|
};
|
|
141
|
+
SchemaRenderer.prototype.handleGlobalVarChange = function () {
|
|
142
|
+
var _this = this;
|
|
143
|
+
var _a;
|
|
144
|
+
var handler = (_a = this.renderer) === null || _a === void 0 ? void 0 : _a.onGlobalVarChanged;
|
|
145
|
+
var newData = object.cloneObject(this.props.data);
|
|
146
|
+
// 如果渲染器自己做了实现,且返回 false,则不再继续往下执行
|
|
147
|
+
if ((handler === null || handler === void 0 ? void 0 : handler(this.cRef, this.props.schema, newData)) === false) {
|
|
148
|
+
return;
|
|
149
|
+
}
|
|
150
|
+
this.tmpData = newData;
|
|
151
|
+
this.forceUpdate(function () {
|
|
152
|
+
delete _this.tmpData;
|
|
153
|
+
});
|
|
154
|
+
};
|
|
136
155
|
SchemaRenderer.prototype.resolveRenderer = function (props, force) {
|
|
137
156
|
if (force === void 0) { force = false; }
|
|
138
157
|
var schema = props.schema;
|
|
@@ -234,7 +253,9 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
234
253
|
? false
|
|
235
254
|
: undefined)) !== null && _b !== void 0 ? _b : this.isStatic) !== null && _c !== void 0 ? _c : (_.staticOn
|
|
236
255
|
? tpl.evalExpression(_.staticOn, rest.data)
|
|
237
|
-
: (_d = _.static) !== null && _d !== void 0 ? _d : rest.defaultStatic) }), subProps), { data: subProps.data
|
|
256
|
+
: (_d = _.static) !== null && _d !== void 0 ? _d : rest.defaultStatic) }), subProps), { data: this.tmpData && subProps.data === this.props.data
|
|
257
|
+
? this.tmpData
|
|
258
|
+
: subProps.data || rest.data, env: env }));
|
|
238
259
|
};
|
|
239
260
|
SchemaRenderer.prototype.reRender = function () {
|
|
240
261
|
this.resolveRenderer(this.props, true);
|
|
@@ -244,7 +265,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
244
265
|
var e_1, _a;
|
|
245
266
|
var _this = this;
|
|
246
267
|
var _b, _c, _d, _e, _f, _g, _h;
|
|
247
|
-
var _j = this.props; _j.$path; var __ = _j.schema, rootStore = _j.rootStore, statusStore = _j.statusStore, render = _j.render,
|
|
268
|
+
var _j = this.props; _j.$path; var __ = _j.schema, rootStore = _j.rootStore, statusStore = _j.statusStore, render = _j.render, rest = tslib.__rest(_j, ["$path", "schema", "rootStore", "statusStore", "render"]);
|
|
248
269
|
if (__ == null) {
|
|
249
270
|
return null;
|
|
250
271
|
}
|
|
@@ -294,12 +315,12 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
294
315
|
else if (schema.component && reactIs.isValidElementType(schema.component)) {
|
|
295
316
|
var isSFC = !(schema.component.prototype instanceof React__default["default"].Component);
|
|
296
317
|
var defaultData_1 = schema.data, defaultValue_1 = schema.value, // render时的value改放defaultValue中
|
|
297
|
-
defaultActiveKey_1 = schema.activeKey, restSchema_1 = tslib.__rest(schema, ["data", "value", "activeKey"]);
|
|
318
|
+
defaultActiveKey_1 = schema.activeKey, propKey_1 = schema.key, restSchema_1 = tslib.__rest(schema, ["data", "value", "activeKey", "key"]);
|
|
298
319
|
return rest.invisible
|
|
299
320
|
? null
|
|
300
321
|
: _J$X_(schema.component, tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign({}, rest), restSchema_1), exprProps), {
|
|
301
322
|
// value: defaultValue, // 备注: 此处并没有将value传递给渲染器
|
|
302
|
-
defaultData: defaultData_1, defaultValue: defaultValue_1, defaultActiveKey: defaultActiveKey_1, propKey:
|
|
323
|
+
defaultData: defaultData_1, defaultValue: defaultValue_1, defaultActiveKey: defaultActiveKey_1, propKey: propKey_1, $path: $path, $schema: schema, ref: isSFC ? undefined : this.refFn, forwardedRef: isSFC ? this.refFn : undefined, render: this.renderChild, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent }));
|
|
303
324
|
}
|
|
304
325
|
else if (Object.keys(schema).length === 0) {
|
|
305
326
|
return null;
|
|
@@ -340,7 +361,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
340
361
|
}
|
|
341
362
|
var renderer = this.renderer;
|
|
342
363
|
schema = factory.filterSchema(schema, renderer, rest);
|
|
343
|
-
var defaultData = schema.data, defaultValue = schema.value, defaultActiveKey = schema.activeKey, restSchema = tslib.__rest(schema, ["data", "value", "activeKey"]);
|
|
364
|
+
var defaultData = schema.data, defaultValue = schema.value, defaultActiveKey = schema.activeKey, propKey = schema.key, restSchema = tslib.__rest(schema, ["data", "value", "activeKey", "key"]);
|
|
344
365
|
var Component = renderer.component;
|
|
345
366
|
var animationShow = true;
|
|
346
367
|
// 原来表单项的 visible: false 和 hidden: true 表单项的值和验证是有效的
|
|
@@ -369,6 +390,8 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
369
390
|
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), {
|
|
370
391
|
// value: defaultValue, // 备注: 此处并没有将value传递给渲染器
|
|
371
392
|
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 });
|
|
393
|
+
// 用于全局变量刷新
|
|
394
|
+
props.data = this.tmpData || props.data;
|
|
372
395
|
// style 支持公式
|
|
373
396
|
if (schema.style) {
|
|
374
397
|
props.style = style.buildStyle(schema.style, detectData);
|
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.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.11.0-beta.
|
|
2
|
+
* amis-core v6.11.0-beta.2
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -26,7 +26,7 @@ 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, _7;
|
|
28
28
|
return tslib.__awaiter(this, void 0, void 0, function () {
|
|
29
|
-
var key, dataMergeMode, path, beforeSetData, res, component, msg, result, _8, dispatchEvent_1, data, valid, _9, e_1, result, e_2;
|
|
29
|
+
var key, dataMergeMode, path, topStore, beforeSetData, res, component, msg, result, _8, dispatchEvent_1, data, valid, _9, e_1, result, e_2;
|
|
30
30
|
var _10, _11, _12, _13, _14, _15;
|
|
31
31
|
return tslib.__generator(this, function (_16) {
|
|
32
32
|
switch (_16.label) {
|
|
@@ -35,6 +35,10 @@ var CmptAction = /** @class */ (function () {
|
|
|
35
35
|
dataMergeMode = action.dataMergeMode || 'merge';
|
|
36
36
|
path = (_a = action.args) === null || _a === void 0 ? void 0 : _a.path;
|
|
37
37
|
if (!(action.actionType === 'setValue' && path && typeof path === 'string')) return [3 /*break*/, 2];
|
|
38
|
+
if (path.startsWith('global.')) {
|
|
39
|
+
topStore = renderer.props.topStore;
|
|
40
|
+
topStore === null || topStore === void 0 ? void 0 : topStore.updateGlobalVarValue(path.substring(7), action.args.value);
|
|
41
|
+
}
|
|
38
42
|
beforeSetData = (_c = (_b = event === null || event === void 0 ? void 0 : event.context) === null || _b === void 0 ? void 0 : _b.env) === null || _c === void 0 ? void 0 : _c.beforeSetData;
|
|
39
43
|
if (!(beforeSetData && typeof beforeSetData === 'function')) return [3 /*break*/, 2];
|
|
40
44
|
return [4 /*yield*/, beforeSetData(renderer, action, event)];
|