amis-core 2.0.0 → 2.1.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 +7 -7
- package/esm/SchemaRenderer.js +12 -12
- package/esm/Scoped.js +1 -1
- package/esm/WithRootStore.d.ts +0 -18
- package/esm/WithRootStore.js +1 -1
- package/esm/WithStore.js +1 -1
- package/esm/_virtual/index.js +1 -1
- package/esm/_virtual/index2.js +1 -1
- package/esm/_virtual/react-is.development.js +1 -1
- package/esm/_virtual/react-is.production.min.js +1 -1
- package/esm/actions/Action.js +1 -1
- package/esm/actions/AjaxAction.js +39 -38
- package/esm/actions/BreakAction.js +1 -1
- package/esm/actions/BroadcastAction.js +1 -1
- package/esm/actions/CmptAction.js +3 -3
- package/esm/actions/ContinueAction.js +1 -1
- package/esm/actions/CopyAction.js +1 -1
- package/esm/actions/CustomAction.js +1 -1
- package/esm/actions/Decorators.js +1 -1
- package/esm/actions/DialogAction.js +2 -2
- package/esm/actions/DrawerAction.js +1 -1
- package/esm/actions/EmailAction.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/SwitchAction.js +1 -1
- package/esm/actions/ToastAction.js +1 -1
- package/esm/components/LazyComponent.js +1 -1
- package/esm/components/Overlay.d.ts +2 -0
- package/esm/components/Overlay.js +19 -2
- 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 -1
- package/esm/factory.js +1 -1
- package/esm/index.js +4 -4
- package/esm/index2.js +3 -4
- package/esm/locale.js +1 -1
- package/esm/node_modules/@restart/hooks/esm/useCommittedRef.js +1 -1
- package/esm/node_modules/@restart/hooks/esm/useEventCallback.js +1 -1
- package/esm/node_modules/dom-helpers/esm/addEventListener.js +1 -1
- package/esm/node_modules/dom-helpers/esm/canUseDOM.js +1 -1
- package/esm/node_modules/dom-helpers/esm/contains.js +1 -1
- package/esm/node_modules/dom-helpers/esm/listen.js +1 -1
- package/esm/node_modules/dom-helpers/esm/ownerDocument.js +1 -1
- package/esm/node_modules/dom-helpers/esm/removeEventListener.js +1 -1
- package/esm/node_modules/object-assign/index.js +1 -1
- package/esm/node_modules/prop-types/checkPropTypes.js +1 -1
- package/esm/node_modules/prop-types/factoryWithThrowingShims.js +1 -1
- package/esm/node_modules/prop-types/factoryWithTypeCheckers.js +1 -1
- package/esm/node_modules/prop-types/index.js +1 -1
- package/esm/node_modules/prop-types/lib/ReactPropTypesSecret.js +1 -1
- package/esm/node_modules/prop-types/lib/has.js +1 -1
- package/esm/node_modules/prop-types/node_modules/react-is/cjs/react-is.development.js +1 -1
- package/esm/node_modules/prop-types/node_modules/react-is/cjs/react-is.production.min.js +1 -1
- package/esm/node_modules/prop-types/node_modules/react-is/index.js +1 -1
- package/esm/node_modules/react-overlays/esm/Portal.js +1 -1
- package/esm/node_modules/react-overlays/esm/ownerDocument.js +1 -1
- package/esm/node_modules/react-overlays/esm/safeFindDOMNode.js +1 -1
- package/esm/node_modules/react-overlays/esm/useRootClose.js +1 -1
- package/esm/node_modules/react-overlays/esm/useWaitForDOMRef.js +1 -1
- package/esm/node_modules/warning/warning.js +1 -1
- package/esm/renderers/Form.d.ts +2 -1
- package/esm/renderers/Form.js +12 -6
- package/esm/renderers/Item.d.ts +4 -18
- package/esm/renderers/Item.js +21 -11
- package/esm/renderers/Options.js +14 -6
- package/esm/renderers/Placeholder.js +1 -1
- package/esm/renderers/builtin.js +1 -1
- package/esm/renderers/wrapControl.d.ts +0 -9
- package/esm/renderers/wrapControl.js +2 -3
- package/esm/store/app.d.ts +4 -1
- package/esm/store/app.js +5 -2
- package/esm/store/combo.js +1 -1
- package/esm/store/crud.js +1 -1
- package/esm/store/form.js +1 -1
- package/esm/store/formItem.js +4 -2
- package/esm/store/iRenderer.js +1 -1
- package/esm/store/index.d.ts +0 -5
- package/esm/store/index.js +1 -16
- 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.d.ts +4 -0
- package/esm/store/root.js +14 -2
- package/esm/store/service.js +1 -1
- package/esm/store/table-v2.js +1 -1
- package/esm/store/table.d.ts +2 -2
- package/esm/store/table.js +4 -9
- package/esm/theme.js +1 -1
- package/esm/types.d.ts +2 -2
- package/esm/utils/Animation.js +1 -1
- package/esm/utils/ColorScale.js +1 -1
- package/esm/utils/DataSchema.js +2 -6
- 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 +7 -0
- package/esm/utils/api.js +47 -6
- package/esm/utils/attachmentAdpator.js +1 -1
- package/esm/utils/autobind.js +1 -1
- package/esm/utils/columnsSplit.js +1 -1
- package/esm/utils/dataMapping.d.ts +6 -0
- package/esm/utils/dataMapping.js +16 -2
- package/esm/utils/date.js +1 -1
- package/esm/utils/debug.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 +27 -1
- package/esm/utils/helper.js +23 -6
- 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/makeSorter.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.d.ts +1 -1
- package/esm/utils/position.js +9 -1
- package/esm/utils/prettyBytes.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/resolveVariable.js +1 -1
- package/esm/utils/resolveVariableAndFilter.js +1 -1
- package/esm/utils/scrollPosition.d.ts +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.js +1 -1
- package/esm/utils/tokenize.js +1 -1
- package/esm/utils/tpl-builtin.d.ts +2 -2
- 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/validations.js +1 -1
- package/lib/Root.js +1 -1
- package/lib/RootRenderer.js +7 -7
- package/lib/SchemaRenderer.js +12 -12
- package/lib/Scoped.js +1 -1
- package/lib/WithRootStore.d.ts +0 -18
- package/lib/WithRootStore.js +1 -1
- package/lib/WithStore.js +1 -1
- package/lib/_virtual/index.js +1 -1
- package/lib/_virtual/index2.js +1 -1
- package/lib/_virtual/react-is.development.js +1 -1
- package/lib/_virtual/react-is.production.min.js +1 -1
- package/lib/actions/Action.js +1 -1
- package/lib/actions/AjaxAction.js +38 -37
- package/lib/actions/BreakAction.js +1 -1
- package/lib/actions/BroadcastAction.js +1 -1
- package/lib/actions/CmptAction.js +3 -3
- package/lib/actions/ContinueAction.js +1 -1
- package/lib/actions/CopyAction.js +1 -1
- package/lib/actions/CustomAction.js +1 -1
- package/lib/actions/Decorators.js +1 -1
- package/lib/actions/DialogAction.js +2 -2
- package/lib/actions/DrawerAction.js +1 -1
- package/lib/actions/EmailAction.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/SwitchAction.js +1 -1
- package/lib/actions/ToastAction.js +1 -1
- package/lib/components/LazyComponent.js +1 -1
- package/lib/components/Overlay.d.ts +2 -0
- package/lib/components/Overlay.js +19 -2
- 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 -1
- package/lib/factory.js +1 -1
- package/lib/index.js +5 -1
- package/lib/index2.js +4 -2
- package/lib/locale.js +1 -1
- package/lib/node_modules/@restart/hooks/esm/useCommittedRef.js +1 -1
- package/lib/node_modules/@restart/hooks/esm/useEventCallback.js +1 -1
- package/lib/node_modules/dom-helpers/esm/addEventListener.js +1 -1
- package/lib/node_modules/dom-helpers/esm/canUseDOM.js +1 -1
- package/lib/node_modules/dom-helpers/esm/contains.js +1 -1
- package/lib/node_modules/dom-helpers/esm/listen.js +1 -1
- package/lib/node_modules/dom-helpers/esm/ownerDocument.js +1 -1
- package/lib/node_modules/dom-helpers/esm/removeEventListener.js +1 -1
- package/lib/node_modules/object-assign/index.js +1 -1
- package/lib/node_modules/prop-types/checkPropTypes.js +1 -1
- package/lib/node_modules/prop-types/factoryWithThrowingShims.js +1 -1
- package/lib/node_modules/prop-types/factoryWithTypeCheckers.js +1 -1
- package/lib/node_modules/prop-types/index.js +1 -1
- package/lib/node_modules/prop-types/lib/ReactPropTypesSecret.js +1 -1
- package/lib/node_modules/prop-types/lib/has.js +1 -1
- package/lib/node_modules/prop-types/node_modules/react-is/cjs/react-is.development.js +1 -1
- package/lib/node_modules/prop-types/node_modules/react-is/cjs/react-is.production.min.js +1 -1
- package/lib/node_modules/prop-types/node_modules/react-is/index.js +1 -1
- package/lib/node_modules/react-overlays/esm/Portal.js +1 -1
- package/lib/node_modules/react-overlays/esm/ownerDocument.js +1 -1
- package/lib/node_modules/react-overlays/esm/safeFindDOMNode.js +1 -1
- package/lib/node_modules/react-overlays/esm/useRootClose.js +1 -1
- package/lib/node_modules/react-overlays/esm/useWaitForDOMRef.js +1 -1
- package/lib/node_modules/warning/warning.js +1 -1
- package/lib/renderers/Form.d.ts +2 -1
- package/lib/renderers/Form.js +12 -6
- package/lib/renderers/Item.d.ts +4 -18
- package/lib/renderers/Item.js +20 -10
- package/lib/renderers/Options.js +14 -7
- package/lib/renderers/Placeholder.js +1 -1
- package/lib/renderers/builtin.js +1 -1
- package/lib/renderers/wrapControl.d.ts +0 -9
- package/lib/renderers/wrapControl.js +2 -3
- package/lib/store/app.d.ts +4 -1
- package/lib/store/app.js +5 -2
- package/lib/store/combo.js +1 -1
- package/lib/store/crud.js +1 -1
- package/lib/store/form.js +1 -1
- package/lib/store/formItem.js +4 -2
- package/lib/store/iRenderer.js +1 -1
- package/lib/store/index.d.ts +0 -5
- package/lib/store/index.js +1 -16
- 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.d.ts +4 -0
- package/lib/store/root.js +14 -2
- package/lib/store/service.js +1 -1
- package/lib/store/table-v2.js +1 -1
- package/lib/store/table.d.ts +2 -2
- package/lib/store/table.js +4 -9
- package/lib/theme.js +1 -1
- package/lib/types.d.ts +2 -2
- package/lib/utils/Animation.js +1 -1
- package/lib/utils/ColorScale.js +1 -1
- package/lib/utils/DataSchema.js +2 -6
- 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 +7 -0
- package/lib/utils/api.js +48 -5
- package/lib/utils/attachmentAdpator.js +1 -1
- package/lib/utils/autobind.js +1 -1
- package/lib/utils/columnsSplit.js +1 -1
- package/lib/utils/dataMapping.d.ts +6 -0
- package/lib/utils/dataMapping.js +16 -1
- package/lib/utils/date.js +1 -1
- package/lib/utils/debug.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 +27 -1
- package/lib/utils/helper.js +23 -5
- 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/makeSorter.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.d.ts +1 -1
- package/lib/utils/position.js +9 -1
- package/lib/utils/prettyBytes.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/resolveVariable.js +1 -1
- package/lib/utils/resolveVariableAndFilter.js +1 -1
- package/lib/utils/scrollPosition.d.ts +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.js +1 -1
- package/lib/utils/tokenize.js +1 -1
- package/lib/utils/tpl-builtin.d.ts +2 -2
- 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/validations.js +1 -1
- package/package.json +6 -6
package/esm/Root.js
CHANGED
package/esm/RootRenderer.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v2.
|
|
2
|
+
* amis-core v2.1.0
|
|
3
3
|
* Copyright 2018-2022 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -246,25 +246,25 @@ var RootRenderer = /** @class */ (function (_super) {
|
|
|
246
246
|
return render('error', {
|
|
247
247
|
type: 'alert',
|
|
248
248
|
level: 'danger'
|
|
249
|
-
}, __assign(__assign({}, rest), { body: (React.createElement(React.Fragment, null,
|
|
249
|
+
}, __assign(__assign({}, rest), { topStore: this.store, body: (React.createElement(React.Fragment, null,
|
|
250
250
|
React.createElement("h3", null, (_a = this.store.runtimeError) === null || _a === void 0 ? void 0 : _a.toString()),
|
|
251
251
|
React.createElement("pre", null,
|
|
252
252
|
React.createElement("code", null, this.store.runtimeErrorStack.componentStack)))) }));
|
|
253
253
|
}
|
|
254
254
|
return (React.createElement(React.Fragment, null,
|
|
255
|
-
render(pathPrefix, schema, __assign(__assign({}, rest), { data: this.store.downStream, onAction: this.handleAction })),
|
|
255
|
+
render(pathPrefix, schema, __assign(__assign({}, rest), { topStore: this.store, data: this.store.downStream, onAction: this.handleAction })),
|
|
256
256
|
render('spinner', {
|
|
257
257
|
type: 'spinner'
|
|
258
|
-
}, __assign(__assign({}, rest), { show: store.loading })),
|
|
258
|
+
}, __assign(__assign({}, rest), { topStore: this.store, show: store.loading })),
|
|
259
259
|
store.error
|
|
260
260
|
? render('error', {
|
|
261
261
|
type: 'alert'
|
|
262
|
-
}, __assign(__assign({}, rest), { body: store.msg, showCloseButton: true, onClose: store.clearMessage }))
|
|
262
|
+
}, __assign(__assign({}, rest), { topStore: this.store, body: store.msg, showCloseButton: true, onClose: store.clearMessage }))
|
|
263
263
|
: null,
|
|
264
264
|
render('dialog', __assign(__assign({}, (store.action &&
|
|
265
|
-
store.action.dialog)), { type: 'dialog' }), __assign(__assign({}, rest), { key: 'dialog', data: store.dialogData, onConfirm: this.handleDialogConfirm, onClose: this.handleDialogClose, show: store.dialogOpen, onAction: this.handleAction })),
|
|
265
|
+
store.action.dialog)), { type: 'dialog' }), __assign(__assign({}, rest), { key: 'dialog', topStore: this.store, data: store.dialogData, onConfirm: this.handleDialogConfirm, onClose: this.handleDialogClose, show: store.dialogOpen, onAction: this.handleAction })),
|
|
266
266
|
render('drawer', __assign(__assign({}, (store.action &&
|
|
267
|
-
store.action.drawer)), { type: 'drawer' }), __assign(__assign({}, rest), { key: 'drawer', data: store.drawerData, onConfirm: this.handleDrawerConfirm, onClose: this.handleDrawerClose, show: store.drawerOpen, onAction: this.handleAction }))));
|
|
267
|
+
store.action.drawer)), { type: 'drawer' }), __assign(__assign({}, rest), { key: 'drawer', topStore: this.store, data: store.drawerData, onConfirm: this.handleDrawerConfirm, onClose: this.handleDrawerClose, show: store.drawerOpen, onAction: this.handleAction }))));
|
|
268
268
|
};
|
|
269
269
|
RootRenderer.contextType = ScopedContext;
|
|
270
270
|
RootRenderer = __decorate([
|
package/esm/SchemaRenderer.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v2.
|
|
2
|
+
* amis-core v2.1.0
|
|
3
3
|
* Copyright 2018-2022 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -60,9 +60,9 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
60
60
|
_this.reRender = _this.reRender.bind(_this);
|
|
61
61
|
_this.resolveRenderer(_this.props);
|
|
62
62
|
_this.dispatchEvent = _this.dispatchEvent.bind(_this);
|
|
63
|
-
// 监听
|
|
63
|
+
// 监听topStore更新
|
|
64
64
|
_this.reaction = reaction(function () {
|
|
65
|
-
return "".concat(props.
|
|
65
|
+
return "".concat(props.topStore.visibleState[props.schema.id || props.$path]).concat(props.topStore.disableState[props.schema.id || props.$path]);
|
|
66
66
|
}, function () { return _this.forceUpdate(); });
|
|
67
67
|
return _this;
|
|
68
68
|
}
|
|
@@ -178,7 +178,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
178
178
|
SchemaRenderer.prototype.render = function () {
|
|
179
179
|
var _this = this;
|
|
180
180
|
var _a, _b, _c;
|
|
181
|
-
var _d = this.props; _d.$path; var __ = _d.schema, rootStore = _d.rootStore, render = _d.render, rest = __rest(_d, ["$path", "schema", "rootStore", "render"]);
|
|
181
|
+
var _d = this.props; _d.$path; var __ = _d.schema, rootStore = _d.rootStore, topStore = _d.topStore, render = _d.render, rest = __rest(_d, ["$path", "schema", "rootStore", "topStore", "render"]);
|
|
182
182
|
if (__ == null) {
|
|
183
183
|
return null;
|
|
184
184
|
}
|
|
@@ -193,11 +193,11 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
193
193
|
? getExprProperties(schema, detectData, undefined, rest)
|
|
194
194
|
: {};
|
|
195
195
|
// 控制显隐
|
|
196
|
-
var visible = isAlive(
|
|
197
|
-
?
|
|
196
|
+
var visible = isAlive(topStore)
|
|
197
|
+
? topStore.visibleState[schema.id || $path]
|
|
198
198
|
: undefined;
|
|
199
|
-
var disable = isAlive(
|
|
200
|
-
?
|
|
199
|
+
var disable = isAlive(topStore)
|
|
200
|
+
? topStore.disableState[schema.id || $path]
|
|
201
201
|
: undefined;
|
|
202
202
|
if (visible === false ||
|
|
203
203
|
(visible !== true &&
|
|
@@ -215,7 +215,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
215
215
|
? null
|
|
216
216
|
: React.isValidElement(schema.children)
|
|
217
217
|
? schema.children
|
|
218
|
-
: schema.children(__assign(__assign(__assign({}, rest), exprProps), { $path: $path, $schema: schema, render: this.renderChild, forwardedRef: this.refFn, rootStore: rootStore, dispatchEvent: this.dispatchEvent }));
|
|
218
|
+
: schema.children(__assign(__assign(__assign({}, rest), exprProps), { $path: $path, $schema: schema, render: this.renderChild, forwardedRef: this.refFn, rootStore: rootStore, topStore: topStore, dispatchEvent: this.dispatchEvent }));
|
|
219
219
|
}
|
|
220
220
|
else if (typeof schema.component === 'function') {
|
|
221
221
|
var isSFC = !(schema.component.prototype instanceof React.Component);
|
|
@@ -225,7 +225,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
225
225
|
? null
|
|
226
226
|
: React.createElement(schema.component, __assign(__assign(__assign(__assign({}, rest), restSchema_1), exprProps), {
|
|
227
227
|
// value: defaultValue, // 备注: 此处并没有将value传递给渲染器
|
|
228
|
-
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, dispatchEvent: this.dispatchEvent }));
|
|
228
|
+
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, topStore: topStore, dispatchEvent: this.dispatchEvent }));
|
|
229
229
|
}
|
|
230
230
|
else if (Object.keys(schema).length === 0) {
|
|
231
231
|
return null;
|
|
@@ -248,7 +248,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
248
248
|
return [2 /*return*/, function () { return loadRenderer(schema, $path); }];
|
|
249
249
|
}
|
|
250
250
|
});
|
|
251
|
-
}); }, "$path": $path, "$schema": schema, retry: this.reRender, rootStore: rootStore, dispatchEvent: this.dispatchEvent })));
|
|
251
|
+
}); }, "$path": $path, "$schema": schema, retry: this.reRender, rootStore: rootStore, topStore: topStore, dispatchEvent: this.dispatchEvent })));
|
|
252
252
|
}
|
|
253
253
|
var renderer = this.renderer;
|
|
254
254
|
schema = filterSchema(schema, renderer, rest);
|
|
@@ -269,7 +269,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
269
269
|
var $schema = __assign(__assign({}, schema), exprProps);
|
|
270
270
|
var props = __assign(__assign(__assign(__assign(__assign({}, theme.getRendererConfig(renderer.name)), restSchema), chainEvents(rest, restSchema)), exprProps), {
|
|
271
271
|
// value: defaultValue, // 备注: 此处并没有将value传递给渲染器
|
|
272
|
-
defaultData: (_b = restSchema.defaultData) !== null && _b !== void 0 ? _b : defaultData, defaultValue: (_c = restSchema.defaultValue) !== null && _c !== void 0 ? _c : defaultValue, defaultActiveKey: defaultActiveKey, propKey: propKey, $path: $path, $schema: $schema, ref: this.refFn, render: this.renderChild, rootStore: rootStore, dispatchEvent: this.dispatchEvent });
|
|
272
|
+
defaultData: (_b = restSchema.defaultData) !== null && _b !== void 0 ? _b : defaultData, defaultValue: (_c = restSchema.defaultValue) !== null && _c !== void 0 ? _c : defaultValue, defaultActiveKey: defaultActiveKey, propKey: propKey, $path: $path, $schema: $schema, ref: this.refFn, render: this.renderChild, rootStore: rootStore, topStore: topStore, dispatchEvent: this.dispatchEvent });
|
|
273
273
|
if (disable !== undefined) {
|
|
274
274
|
props.disabled = disable;
|
|
275
275
|
}
|
package/esm/Scoped.js
CHANGED
package/esm/WithRootStore.d.ts
CHANGED
|
@@ -3,8 +3,6 @@ import { IRendererStore } from './store';
|
|
|
3
3
|
import hoistNonReactStatic from 'hoist-non-react-statics';
|
|
4
4
|
export declare const RootStoreContext: React.Context<{
|
|
5
5
|
storeType: string;
|
|
6
|
-
visibleState: any;
|
|
7
|
-
disableState: any;
|
|
8
6
|
} & import("mobx-state-tree/dist/internal").NonEmptyObject & {
|
|
9
7
|
readonly fetcher: any;
|
|
10
8
|
readonly notify: any;
|
|
@@ -167,13 +165,8 @@ export declare const RootStoreContext: React.Context<{
|
|
|
167
165
|
addChildId: (id: string) => void;
|
|
168
166
|
removeChildId: (id: string) => void;
|
|
169
167
|
}, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
|
|
170
|
-
setVisible(id: string, value: boolean): void;
|
|
171
|
-
setDisable(id: string, value: boolean): void;
|
|
172
168
|
} & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
|
|
173
169
|
storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
|
|
174
|
-
} & {
|
|
175
|
-
visibleState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
|
|
176
|
-
disableState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
|
|
177
170
|
}, {
|
|
178
171
|
readonly fetcher: any;
|
|
179
172
|
readonly notify: any;
|
|
@@ -336,8 +329,6 @@ export declare const RootStoreContext: React.Context<{
|
|
|
336
329
|
addChildId: (id: string) => void;
|
|
337
330
|
removeChildId: (id: string) => void;
|
|
338
331
|
}, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
|
|
339
|
-
setVisible(id: string, value: boolean): void;
|
|
340
|
-
setDisable(id: string, value: boolean): void;
|
|
341
332
|
}, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>>;
|
|
342
333
|
export declare function withRootStore<T extends React.ComponentType<React.ComponentProps<T> & {
|
|
343
334
|
rootStore: IRendererStore;
|
|
@@ -395,8 +386,6 @@ export declare function withRootStore<T extends React.ComponentType<React.Compon
|
|
|
395
386
|
displayName: string;
|
|
396
387
|
contextType: React.Context<{
|
|
397
388
|
storeType: string;
|
|
398
|
-
visibleState: any;
|
|
399
|
-
disableState: any;
|
|
400
389
|
} & import("mobx-state-tree/dist/internal").NonEmptyObject & {
|
|
401
390
|
readonly fetcher: any;
|
|
402
391
|
readonly notify: any;
|
|
@@ -559,13 +548,8 @@ export declare function withRootStore<T extends React.ComponentType<React.Compon
|
|
|
559
548
|
addChildId: (id: string) => void;
|
|
560
549
|
removeChildId: (id: string) => void;
|
|
561
550
|
}, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
|
|
562
|
-
setVisible(id: string, value: boolean): void;
|
|
563
|
-
setDisable(id: string, value: boolean): void;
|
|
564
551
|
} & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
|
|
565
552
|
storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
|
|
566
|
-
} & {
|
|
567
|
-
visibleState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
|
|
568
|
-
disableState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
|
|
569
553
|
}, {
|
|
570
554
|
readonly fetcher: any;
|
|
571
555
|
readonly notify: any;
|
|
@@ -728,8 +712,6 @@ export declare function withRootStore<T extends React.ComponentType<React.Compon
|
|
|
728
712
|
addChildId: (id: string) => void;
|
|
729
713
|
removeChildId: (id: string) => void;
|
|
730
714
|
}, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
|
|
731
|
-
setVisible(id: string, value: boolean): void;
|
|
732
|
-
setDisable(id: string, value: boolean): void;
|
|
733
715
|
}, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>>;
|
|
734
716
|
ComposedComponent: React.ComponentType<T>;
|
|
735
717
|
} & hoistNonReactStatic.NonReactStatics<T, {}> & {
|
package/esm/WithRootStore.js
CHANGED
package/esm/WithStore.js
CHANGED
package/esm/_virtual/index.js
CHANGED
package/esm/_virtual/index2.js
CHANGED
package/esm/actions/Action.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v2.
|
|
2
|
+
* amis-core v2.1.0
|
|
3
3
|
* Copyright 2018-2022 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
|
-
import { __awaiter, __generator } from 'tslib';
|
|
6
|
+
import { __awaiter, __generator, __assign } from 'tslib';
|
|
7
7
|
import omit from 'lodash/omit';
|
|
8
8
|
import { normalizeApiResponseData } from '../utils/api.js';
|
|
9
9
|
import { ServerError } from '../utils/errors.js';
|
|
@@ -24,12 +24,12 @@ var AjaxAction = /** @class */ (function () {
|
|
|
24
24
|
this.fetcherType = fetcherType;
|
|
25
25
|
}
|
|
26
26
|
AjaxAction.prototype.run = function (action, renderer, event) {
|
|
27
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
|
|
27
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
|
|
28
28
|
return __awaiter(this, void 0, void 0, function () {
|
|
29
29
|
var env, result, responseData, msg, e_1, result;
|
|
30
|
-
var
|
|
31
|
-
return __generator(this, function (
|
|
32
|
-
switch (
|
|
30
|
+
var _s;
|
|
31
|
+
return __generator(this, function (_t) {
|
|
32
|
+
switch (_t.label) {
|
|
33
33
|
case 0:
|
|
34
34
|
if (!((_a = renderer.props.env) === null || _a === void 0 ? void 0 : _a.fetcher)) {
|
|
35
35
|
throw new Error('env.fetcher is required!');
|
|
@@ -40,47 +40,48 @@ var AjaxAction = /** @class */ (function () {
|
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
env = event.context.env;
|
|
43
|
-
|
|
43
|
+
_t.label = 1;
|
|
44
44
|
case 1:
|
|
45
|
-
|
|
45
|
+
_t.trys.push([1, 3, , 4]);
|
|
46
46
|
return [4 /*yield*/, env.fetcher((_c = action.args) === null || _c === void 0 ? void 0 : _c.api, omit((_d = action.args) !== null && _d !== void 0 ? _d : {}, ['api', 'options', 'messages']), (_f = (_e = action.args) === null || _e === void 0 ? void 0 : _e.options) !== null && _f !== void 0 ? _f : {})];
|
|
47
47
|
case 2:
|
|
48
|
-
result =
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
48
|
+
result = _t.sent();
|
|
49
|
+
responseData = !isEmpty(result.data) || result.ok
|
|
50
|
+
? normalizeApiResponseData(result.data)
|
|
51
|
+
: null;
|
|
52
|
+
// 记录请求返回的数据
|
|
53
|
+
event.setData(createObject(event.data, __assign(__assign({}, responseData), (_s = { responseData: responseData }, _s[action.outputVar || 'responseResult'] = __assign(__assign({}, responseData), { responseData: responseData, responseStatus: result.status, responseMsg: result.msg }), _s))));
|
|
54
|
+
if (!((_h = (_g = action.args) === null || _g === void 0 ? void 0 : _g.options) === null || _h === void 0 ? void 0 : _h.silent)) {
|
|
55
|
+
if (!result.ok) {
|
|
56
|
+
throw new ServerError((_l = (_k = (_j = action.args) === null || _j === void 0 ? void 0 : _j.messages) === null || _k === void 0 ? void 0 : _k.failed) !== null && _l !== void 0 ? _l : result.msg, result);
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
msg = (_p = (_o = (_m = action.args) === null || _m === void 0 ? void 0 : _m.messages) === null || _o === void 0 ? void 0 : _o.success) !== null && _p !== void 0 ? _p : result.msg;
|
|
60
|
+
msg &&
|
|
61
|
+
env.notify('success', msg, result.msgTimeout !== undefined
|
|
62
|
+
? {
|
|
63
|
+
closeButton: true,
|
|
64
|
+
timeout: result.msgTimeout
|
|
65
|
+
}
|
|
66
|
+
: undefined);
|
|
67
|
+
}
|
|
59
68
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
69
|
+
return [2 /*return*/, result.data];
|
|
70
|
+
case 3:
|
|
71
|
+
e_1 = _t.sent();
|
|
72
|
+
if (!((_r = (_q = action.args) === null || _q === void 0 ? void 0 : _q.options) === null || _r === void 0 ? void 0 : _r.silent)) {
|
|
73
|
+
if (e_1.type === 'ServerError') {
|
|
74
|
+
result = e_1.response;
|
|
75
|
+
env.notify('error', e_1.message, result.msgTimeout !== undefined
|
|
64
76
|
? {
|
|
65
77
|
closeButton: true,
|
|
66
78
|
timeout: result.msgTimeout
|
|
67
79
|
}
|
|
68
80
|
: undefined);
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
if (e_1.type === 'ServerError') {
|
|
74
|
-
result = e_1.response;
|
|
75
|
-
env.notify('error', e_1.message, result.msgTimeout !== undefined
|
|
76
|
-
? {
|
|
77
|
-
closeButton: true,
|
|
78
|
-
timeout: result.msgTimeout
|
|
79
|
-
}
|
|
80
|
-
: undefined);
|
|
81
|
-
}
|
|
82
|
-
else {
|
|
83
|
-
env.notify('error', e_1.message);
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
env.notify('error', e_1.message);
|
|
84
|
+
}
|
|
84
85
|
}
|
|
85
86
|
return [3 /*break*/, 4];
|
|
86
87
|
case 4: return [2 /*return*/];
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v2.
|
|
2
|
+
* amis-core v2.1.0
|
|
3
3
|
* Copyright 2018-2022 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -26,10 +26,10 @@ var CmptAction = /** @class */ (function () {
|
|
|
26
26
|
: renderer;
|
|
27
27
|
// 显隐&状态控制
|
|
28
28
|
if (['show', 'hidden'].includes(action.actionType)) {
|
|
29
|
-
return [2 /*return*/, renderer.props.
|
|
29
|
+
return [2 /*return*/, renderer.props.topStore.setVisible(action.componentId, action.actionType === 'show')];
|
|
30
30
|
}
|
|
31
31
|
else if (['enabled', 'disabled'].includes(action.actionType)) {
|
|
32
|
-
return [2 /*return*/, renderer.props.
|
|
32
|
+
return [2 /*return*/, renderer.props.topStore.setDisable(action.componentId, action.actionType === 'disabled')];
|
|
33
33
|
}
|
|
34
34
|
// 数据更新
|
|
35
35
|
if (action.actionType === 'setValue') {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v2.
|
|
2
|
+
* amis-core v2.1.0
|
|
3
3
|
* Copyright 2018-2022 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -20,7 +20,7 @@ var DialogAction = /** @class */ (function () {
|
|
|
20
20
|
var _a, _b;
|
|
21
21
|
return __awaiter(this, void 0, void 0, function () {
|
|
22
22
|
return __generator(this, function (_c) {
|
|
23
|
-
(_b = (_a = renderer.props).onAction) === null || _b === void 0 ? void 0 : _b.call(_a, event, action, action.args);
|
|
23
|
+
(_b = (_a = renderer.props).onAction) === null || _b === void 0 ? void 0 : _b.call(_a, event, __assign(__assign({}, action), { reload: 'none' }), action.args);
|
|
24
24
|
return [2 /*return*/];
|
|
25
25
|
});
|
|
26
26
|
});
|
|
@@ -13,6 +13,7 @@ interface OverlayProps {
|
|
|
13
13
|
rootClose?: boolean;
|
|
14
14
|
onHide?(props: any, ...args: any[]): any;
|
|
15
15
|
container?: React.ReactNode | Function;
|
|
16
|
+
containerSelector?: string;
|
|
16
17
|
target?: React.ReactNode | Function;
|
|
17
18
|
watchTargetSizeChange?: boolean;
|
|
18
19
|
offset?: [number, number];
|
|
@@ -36,6 +37,7 @@ export default class Overlay extends React.Component<OverlayProps, OverlayState>
|
|
|
36
37
|
updatePosition(): void;
|
|
37
38
|
componentDidUpdate(prevProps: OverlayProps): void;
|
|
38
39
|
onHiddenListener(node: HTMLElement): void;
|
|
40
|
+
getContainerSelector(): Element | null;
|
|
39
41
|
render(): JSX.Element | null;
|
|
40
42
|
}
|
|
41
43
|
export {};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v2.
|
|
2
|
+
* amis-core v2.1.0
|
|
3
3
|
* Copyright 2018-2022 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -176,8 +176,19 @@ var Overlay = /** @class */ (function (_super) {
|
|
|
176
176
|
this.props.onExited(node);
|
|
177
177
|
}
|
|
178
178
|
};
|
|
179
|
+
Overlay.prototype.getContainerSelector = function () {
|
|
180
|
+
var containerSelector = this.props.containerSelector;
|
|
181
|
+
var container = null;
|
|
182
|
+
if (typeof containerSelector === 'string') {
|
|
183
|
+
container = document.querySelector(containerSelector);
|
|
184
|
+
}
|
|
185
|
+
return container;
|
|
186
|
+
};
|
|
179
187
|
Overlay.prototype.render = function () {
|
|
180
|
-
var _a = this.props,
|
|
188
|
+
var _a = this.props, containerPadding = _a.containerPadding, target = _a.target, placement = _a.placement, shouldUpdatePosition = _a.shouldUpdatePosition, rootClose = _a.rootClose, children = _a.children; _a.watchTargetSizeChange; var Transition = _a.transition, offset = _a.offset, props = __rest(_a, ["containerPadding", "target", "placement", "shouldUpdatePosition", "rootClose", "children", "watchTargetSizeChange", "transition", "offset"]);
|
|
189
|
+
var container = this.getContainerSelector()
|
|
190
|
+
? this.getContainerSelector
|
|
191
|
+
: this.props.container;
|
|
181
192
|
var mountOverlay = props.show || (Transition && !this.state.exited);
|
|
182
193
|
if (!mountOverlay) {
|
|
183
194
|
// Don't bother showing anything if we don't have to.
|
|
@@ -228,6 +239,12 @@ var Overlay = /** @class */ (function (_super) {
|
|
|
228
239
|
__metadata("design:paramtypes", [HTMLElement]),
|
|
229
240
|
__metadata("design:returntype", void 0)
|
|
230
241
|
], Overlay.prototype, "onHiddenListener", null);
|
|
242
|
+
__decorate([
|
|
243
|
+
autobind,
|
|
244
|
+
__metadata("design:type", Function),
|
|
245
|
+
__metadata("design:paramtypes", []),
|
|
246
|
+
__metadata("design:returntype", void 0)
|
|
247
|
+
], Overlay.prototype, "getContainerSelector", null);
|
|
231
248
|
return Overlay;
|
|
232
249
|
}(React.Component));
|
|
233
250
|
|
package/esm/env.js
CHANGED
package/esm/envOverwrite.js
CHANGED
package/esm/factory.d.ts
CHANGED
|
@@ -56,7 +56,7 @@ export interface RenderOptions extends Partial<Omit<RendererEnv, 'fetcher' | 'th
|
|
|
56
56
|
}
|
|
57
57
|
export interface fetcherConfig {
|
|
58
58
|
url: string;
|
|
59
|
-
method?: 'get' | 'post' | 'put' | 'patch' | 'delete' | 'jsonp';
|
|
59
|
+
method?: 'get' | 'post' | 'put' | 'patch' | 'delete' | 'jsonp' | 'js';
|
|
60
60
|
data?: any;
|
|
61
61
|
config?: any;
|
|
62
62
|
}
|
package/esm/factory.js
CHANGED