amis-core 3.6.2 → 3.6.4
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 +2 -2
- package/esm/RootRenderer.js +2 -2
- package/esm/SchemaRenderer.js +2 -2
- package/esm/Scoped.js +2 -2
- package/esm/StatusScoped.js +2 -2
- package/esm/WithRootStore.js +2 -2
- package/esm/WithStore.js +2 -2
- package/esm/actions/Action.js +2 -2
- package/esm/actions/AjaxAction.js +2 -2
- package/esm/actions/BreakAction.js +2 -2
- package/esm/actions/BroadcastAction.js +2 -2
- package/esm/actions/CmptAction.js +2 -2
- package/esm/actions/ContinueAction.js +2 -2
- package/esm/actions/CopyAction.js +2 -2
- package/esm/actions/CustomAction.js +2 -2
- package/esm/actions/DialogAction.js +2 -2
- package/esm/actions/DrawerAction.js +2 -2
- package/esm/actions/EmailAction.js +2 -2
- package/esm/actions/LinkAction.js +2 -2
- package/esm/actions/LoopAction.js +2 -2
- package/esm/actions/PageAction.js +2 -2
- package/esm/actions/ParallelAction.js +2 -2
- package/esm/actions/StatusAction.js +2 -2
- package/esm/actions/SwitchAction.js +2 -2
- package/esm/actions/ToastAction.js +2 -2
- package/esm/components/CustomStyle.js +2 -2
- package/esm/components/ErrorBoundary.js +2 -2
- package/esm/components/LazyComponent.js +2 -2
- package/esm/components/Overlay.d.ts +2 -1
- package/esm/components/Overlay.js +20 -6
- package/esm/components/PopOver.js +5 -3
- package/esm/env.js +2 -2
- package/esm/envOverwrite.js +2 -2
- package/esm/factory.js +2 -2
- package/esm/index.js +3 -3
- package/esm/locale.js +2 -2
- package/esm/polyfills.js +2 -2
- package/esm/renderers/Form.js +2 -2
- package/esm/renderers/Item.js +2 -2
- package/esm/renderers/Options.js +2 -2
- package/esm/renderers/Placeholder.js +2 -2
- package/esm/renderers/builtin.js +2 -2
- package/esm/renderers/register.js +2 -2
- package/esm/renderers/wrapControl.js +2 -2
- package/esm/store/app.js +2 -2
- package/esm/store/combo.d.ts +24 -24
- package/esm/store/combo.js +2 -2
- package/esm/store/crud.js +2 -2
- package/esm/store/form.d.ts +10 -10
- package/esm/store/form.js +2 -2
- package/esm/store/formItem.js +2 -2
- package/esm/store/iRenderer.js +2 -2
- package/esm/store/index.js +2 -2
- package/esm/store/list.js +2 -2
- package/esm/store/manager.js +2 -2
- package/esm/store/modal.js +2 -2
- package/esm/store/node.js +2 -2
- package/esm/store/pagination.js +2 -2
- package/esm/store/root.js +2 -2
- package/esm/store/service.js +2 -2
- package/esm/store/status.js +2 -2
- package/esm/store/table.d.ts +20 -20
- package/esm/store/table.js +2 -2
- package/esm/store/table2.js +2 -2
- package/esm/theme.js +2 -2
- package/esm/utils/Animation.js +2 -2
- package/esm/utils/ColorScale.js +2 -2
- package/esm/utils/DataSchema.js +2 -2
- package/esm/utils/DataScope.js +2 -2
- package/esm/utils/RootClose.js +2 -2
- package/esm/utils/SimpleMap.js +2 -2
- package/esm/utils/api.js +2 -2
- package/esm/utils/arraySlice.js +2 -2
- package/esm/utils/attachmentAdpator.js +2 -2
- package/esm/utils/autobind.js +2 -2
- package/esm/utils/columnsSplit.js +2 -2
- package/esm/utils/dataMapping.js +2 -2
- package/esm/utils/date.js +2 -2
- package/esm/utils/debug.js +2 -2
- package/esm/utils/decodeEntity.js +2 -2
- package/esm/utils/dom.js +2 -2
- package/esm/utils/errors.js +2 -2
- package/esm/utils/escapeHtml.js +2 -2
- package/esm/utils/filter-schema.js +2 -2
- package/esm/utils/filter.js +2 -2
- package/esm/utils/formatDuration.js +2 -2
- package/esm/utils/formula.js +2 -2
- package/esm/utils/getVariable.js +2 -2
- package/esm/utils/grammar.js +2 -2
- package/esm/utils/handleAction.js +2 -2
- package/esm/utils/helper.js +2 -2
- package/esm/utils/highlight.js +2 -2
- package/esm/utils/icon.js +2 -2
- package/esm/utils/image.js +2 -2
- package/esm/utils/isPureVariable.js +2 -2
- package/esm/utils/json-schema-2-amis-schema.js +2 -2
- package/esm/utils/keyToPath.js +2 -2
- package/esm/utils/makeSorter.js +2 -2
- package/esm/utils/math.js +2 -2
- package/esm/utils/memoryParse.js +2 -2
- package/esm/utils/normalizeLink.js +2 -2
- package/esm/utils/normalizeOptions.js +2 -2
- package/esm/utils/object.js +2 -2
- package/esm/utils/offset.js +2 -2
- package/esm/utils/offsetParent.js +2 -2
- package/esm/utils/optionValueCompare.js +2 -2
- package/esm/utils/position.js +2 -2
- package/esm/utils/prettyBytes.js +2 -2
- package/esm/utils/renderer-event.js +2 -2
- package/esm/utils/replaceText.js +2 -2
- package/esm/utils/resize-sensor.js +2 -2
- package/esm/utils/resolveCondition.js +2 -2
- package/esm/utils/resolveVariable.js +2 -2
- package/esm/utils/resolveVariableAndFilter.js +2 -2
- package/esm/utils/resolveVariableAndFilterForAsync.js +2 -2
- package/esm/utils/scrollPosition.js +2 -2
- package/esm/utils/string2regExp.js +2 -2
- package/esm/utils/stripNumber.js +2 -2
- package/esm/utils/style-helper.js +2 -2
- package/esm/utils/style.js +2 -2
- package/esm/utils/toNumber.js +2 -2
- package/esm/utils/tokenize.js +2 -2
- package/esm/utils/tpl-builtin.js +2 -2
- package/esm/utils/tpl-lodash.js +2 -2
- package/esm/utils/tpl.js +2 -2
- package/esm/utils/uncontrollable.js +2 -2
- package/esm/utils/validations.js +2 -2
- package/lib/Root.js +2 -2
- package/lib/RootRenderer.d.ts +1 -1
- package/lib/RootRenderer.js +2 -2
- package/lib/SchemaRenderer.js +2 -2
- package/lib/Scoped.js +2 -2
- package/lib/StatusScoped.js +2 -2
- package/lib/WithRootStore.js +2 -2
- package/lib/WithStore.js +2 -2
- package/lib/actions/Action.js +2 -2
- package/lib/actions/AjaxAction.js +2 -2
- package/lib/actions/BreakAction.js +2 -2
- package/lib/actions/BroadcastAction.js +2 -2
- package/lib/actions/CmptAction.js +2 -2
- package/lib/actions/ContinueAction.js +2 -2
- package/lib/actions/CopyAction.js +2 -2
- package/lib/actions/CustomAction.js +2 -2
- package/lib/actions/DialogAction.js +2 -2
- package/lib/actions/DrawerAction.js +2 -2
- package/lib/actions/EmailAction.js +2 -2
- package/lib/actions/LinkAction.js +2 -2
- package/lib/actions/LoopAction.js +2 -2
- package/lib/actions/PageAction.js +2 -2
- package/lib/actions/ParallelAction.js +2 -2
- package/lib/actions/StatusAction.js +2 -2
- package/lib/actions/SwitchAction.js +2 -2
- package/lib/actions/ToastAction.js +2 -2
- package/lib/components/CustomStyle.js +2 -2
- package/lib/components/ErrorBoundary.js +2 -2
- package/lib/components/LazyComponent.js +2 -2
- package/lib/components/Overlay.d.ts +2 -1
- package/lib/components/Overlay.js +20 -5
- package/lib/components/PopOver.js +5 -3
- package/lib/env.js +2 -2
- package/lib/envOverwrite.js +2 -2
- package/lib/factory.js +2 -2
- package/lib/index.js +3 -3
- package/lib/locale.js +2 -2
- package/lib/polyfills.js +2 -2
- package/lib/renderers/Form.js +2 -2
- package/lib/renderers/Item.js +2 -2
- package/lib/renderers/Options.js +2 -2
- package/lib/renderers/Placeholder.js +2 -2
- package/lib/renderers/builtin.js +2 -2
- package/lib/renderers/register.js +2 -2
- package/lib/renderers/wrapControl.js +2 -2
- package/lib/store/app.js +2 -2
- package/lib/store/combo.d.ts +24 -25
- package/lib/store/combo.js +2 -2
- package/lib/store/crud.js +2 -2
- package/lib/store/form.d.ts +10 -11
- package/lib/store/form.js +2 -2
- package/lib/store/formItem.js +2 -2
- package/lib/store/iRenderer.js +2 -2
- package/lib/store/index.js +2 -2
- package/lib/store/list.js +2 -2
- package/lib/store/manager.js +2 -2
- package/lib/store/modal.js +2 -2
- package/lib/store/node.js +2 -2
- package/lib/store/pagination.js +2 -2
- package/lib/store/root.js +2 -2
- package/lib/store/service.js +2 -2
- package/lib/store/status.js +2 -2
- package/lib/store/table.d.ts +20 -21
- package/lib/store/table.js +2 -2
- package/lib/store/table2.js +2 -2
- package/lib/theme.js +2 -2
- package/lib/utils/Animation.js +2 -2
- package/lib/utils/ColorScale.js +2 -2
- package/lib/utils/DataSchema.js +2 -2
- package/lib/utils/DataScope.js +2 -2
- package/lib/utils/RootClose.js +2 -2
- package/lib/utils/SimpleMap.js +2 -2
- package/lib/utils/api.js +2 -2
- package/lib/utils/arraySlice.js +2 -2
- package/lib/utils/attachmentAdpator.js +2 -2
- package/lib/utils/autobind.js +2 -2
- package/lib/utils/columnsSplit.js +2 -2
- package/lib/utils/dataMapping.js +2 -2
- package/lib/utils/date.js +2 -2
- package/lib/utils/debug.js +2 -2
- package/lib/utils/decodeEntity.js +2 -2
- package/lib/utils/dom.js +2 -2
- package/lib/utils/errors.js +2 -2
- package/lib/utils/escapeHtml.js +2 -2
- package/lib/utils/filter-schema.js +2 -2
- package/lib/utils/filter.js +2 -2
- package/lib/utils/formatDuration.js +2 -2
- package/lib/utils/formula.js +2 -2
- package/lib/utils/getVariable.js +2 -2
- package/lib/utils/grammar.js +2 -2
- package/lib/utils/handleAction.js +2 -2
- package/lib/utils/helper.js +2 -2
- package/lib/utils/highlight.js +2 -2
- package/lib/utils/icon.js +2 -2
- package/lib/utils/image.js +2 -2
- package/lib/utils/isPureVariable.js +2 -2
- package/lib/utils/json-schema-2-amis-schema.js +2 -2
- package/lib/utils/keyToPath.js +2 -2
- package/lib/utils/makeSorter.js +2 -2
- package/lib/utils/math.js +2 -2
- package/lib/utils/memoryParse.js +2 -2
- package/lib/utils/normalizeLink.js +2 -2
- package/lib/utils/normalizeOptions.js +2 -2
- package/lib/utils/object.js +2 -2
- package/lib/utils/offset.js +2 -2
- package/lib/utils/offsetParent.js +2 -2
- package/lib/utils/optionValueCompare.js +2 -2
- package/lib/utils/position.js +2 -2
- package/lib/utils/prettyBytes.js +2 -2
- package/lib/utils/renderer-event.js +2 -2
- package/lib/utils/replaceText.js +2 -2
- package/lib/utils/resize-sensor.js +2 -2
- package/lib/utils/resolveCondition.js +2 -2
- package/lib/utils/resolveVariable.js +2 -2
- package/lib/utils/resolveVariableAndFilter.js +2 -2
- package/lib/utils/resolveVariableAndFilterForAsync.js +2 -2
- package/lib/utils/scrollPosition.js +2 -2
- package/lib/utils/string2regExp.js +2 -2
- package/lib/utils/stripNumber.js +2 -2
- package/lib/utils/style-helper.js +2 -2
- package/lib/utils/style.js +2 -2
- package/lib/utils/toNumber.js +2 -2
- package/lib/utils/tokenize.js +2 -2
- package/lib/utils/tpl-builtin.js +2 -2
- package/lib/utils/tpl-lodash.js +2 -2
- package/lib/utils/tpl.js +2 -2
- package/lib/utils/uncontrollable.js +2 -2
- package/lib/utils/validations.js +2 -2
- package/package.json +3 -3
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/validations.js
CHANGED
package/lib/Root.js
CHANGED
package/lib/RootRenderer.d.ts
CHANGED
|
@@ -30,5 +30,5 @@ export declare class RootRenderer extends React.Component<RootRendererProps> {
|
|
|
30
30
|
renderError(): React.ReactNode;
|
|
31
31
|
renderDialog(): React.ReactNode;
|
|
32
32
|
renderDrawer(): React.ReactNode;
|
|
33
|
-
render(): string | number | boolean | React.
|
|
33
|
+
render(): string | number | boolean | Iterable<React.ReactNode> | React.JSX.Element | null | undefined;
|
|
34
34
|
}
|
package/lib/RootRenderer.js
CHANGED
package/lib/SchemaRenderer.js
CHANGED
package/lib/Scoped.js
CHANGED
package/lib/StatusScoped.js
CHANGED
package/lib/WithRootStore.js
CHANGED
package/lib/WithStore.js
CHANGED
package/lib/actions/Action.js
CHANGED
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* @author fex
|
|
5
5
|
*/
|
|
6
6
|
import React from 'react';
|
|
7
|
+
export declare const SubPopoverDisplayedID = "data-sub-popover-displayed";
|
|
7
8
|
interface OverlayProps {
|
|
8
9
|
placement?: string;
|
|
9
10
|
show?: boolean;
|
|
@@ -36,7 +37,7 @@ export default class Overlay extends React.Component<OverlayProps, OverlayState>
|
|
|
36
37
|
position: any;
|
|
37
38
|
positionRef: (position: any) => void;
|
|
38
39
|
updatePosition(): void;
|
|
39
|
-
componentDidUpdate(prevProps: OverlayProps): void;
|
|
40
|
+
componentDidUpdate(prevProps: OverlayProps, prevState: OverlayState): void;
|
|
40
41
|
onHiddenListener(node: HTMLElement): void;
|
|
41
42
|
getContainerSelector(): Element | null;
|
|
42
43
|
render(): React.JSX.Element | null;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v3.6.
|
|
3
|
-
* Copyright 2018-
|
|
2
|
+
* amis-core v3.6.4
|
|
3
|
+
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
'use strict';
|
|
@@ -61,6 +61,7 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
|
|
|
61
61
|
var __react_jsx__ = require('react');
|
|
62
62
|
var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
|
|
63
63
|
(__react_jsx__["default"] || __react_jsx__).Fragment;
|
|
64
|
+
var SubPopoverDisplayedID = 'data-sub-popover-displayed';
|
|
64
65
|
function onScroll(elem, callback) {
|
|
65
66
|
var handler = function () {
|
|
66
67
|
requestAnimationFrame(callback);
|
|
@@ -99,8 +100,16 @@ var Position = /** @class */ (function (_super) {
|
|
|
99
100
|
}
|
|
100
101
|
Position.prototype.updatePosition = function (target) {
|
|
101
102
|
var _this = this;
|
|
102
|
-
var _a;
|
|
103
|
+
var _a, _b;
|
|
103
104
|
this._lastTarget = target;
|
|
105
|
+
/** 标记宿主元素的PopOver祖先，用于后续判断PopOver 是否可以 root close */
|
|
106
|
+
if (target) {
|
|
107
|
+
var parentPopover = (_a = target === null || target === void 0 ? void 0 : target.closest) === null || _a === void 0 ? void 0 : _a.call(target, '[role=popover]');
|
|
108
|
+
if (!this.parentPopover && parentPopover) {
|
|
109
|
+
this.parentPopover = parentPopover;
|
|
110
|
+
this.parentPopover.setAttribute(SubPopoverDisplayedID, true);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
104
113
|
if (!target) {
|
|
105
114
|
return this.setState({
|
|
106
115
|
positionLeft: 0,
|
|
@@ -114,7 +123,7 @@ var Position = /** @class */ (function (_super) {
|
|
|
114
123
|
var container = dom.getContainer(this.props.container, dom.ownerDocument(this).body);
|
|
115
124
|
if ((!this.watchedTarget || this.watchedTarget !== target) &&
|
|
116
125
|
resizeSensor.getComputedStyle(target, 'position') !== 'static') {
|
|
117
|
-
(
|
|
126
|
+
(_b = this.resizeDispose) === null || _b === void 0 ? void 0 : _b.forEach(function (fn) { return fn(); });
|
|
118
127
|
this.watchedTarget = target;
|
|
119
128
|
this.resizeDispose = [
|
|
120
129
|
watchTargetSizeChange !== false
|
|
@@ -139,6 +148,11 @@ var Position = /** @class */ (function (_super) {
|
|
|
139
148
|
};
|
|
140
149
|
Position.prototype.componentWillUnmount = function () {
|
|
141
150
|
var _a;
|
|
151
|
+
if (this.parentPopover &&
|
|
152
|
+
this.parentPopover.getAttribute(SubPopoverDisplayedID)) {
|
|
153
|
+
this.parentPopover.removeAttribute(SubPopoverDisplayedID);
|
|
154
|
+
this.parentPopover = null;
|
|
155
|
+
}
|
|
142
156
|
(_a = this.resizeDispose) === null || _a === void 0 ? void 0 : _a.forEach(function (fn) { return fn(); });
|
|
143
157
|
};
|
|
144
158
|
Position.prototype.render = function () {
|
|
@@ -180,7 +194,7 @@ var Overlay = /** @class */ (function (_super) {
|
|
|
180
194
|
var _a;
|
|
181
195
|
(_a = this.position) === null || _a === void 0 ? void 0 : _a.maybeUpdatePosition(true);
|
|
182
196
|
};
|
|
183
|
-
Overlay.prototype.componentDidUpdate = function (prevProps) {
|
|
197
|
+
Overlay.prototype.componentDidUpdate = function (prevProps, prevState) {
|
|
184
198
|
var props = this.props;
|
|
185
199
|
if (prevProps.show !== props.show && props.show) {
|
|
186
200
|
this.setState({ exited: false });
|
|
@@ -268,4 +282,5 @@ var Overlay = /** @class */ (function (_super) {
|
|
|
268
282
|
return Overlay;
|
|
269
283
|
}(React__default["default"].Component));
|
|
270
284
|
|
|
285
|
+
exports.SubPopoverDisplayedID = SubPopoverDisplayedID;
|
|
271
286
|
exports["default"] = Overlay;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v3.6.
|
|
3
|
-
* Copyright 2018-
|
|
2
|
+
* amis-core v3.6.4
|
|
3
|
+
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
'use strict';
|
|
@@ -49,6 +49,7 @@ require('../utils/validations.js');
|
|
|
49
49
|
require('../utils/resolveCondition.js');
|
|
50
50
|
require('mobx');
|
|
51
51
|
require('../utils/Animation.js');
|
|
52
|
+
var Overlay = require('./Overlay.js');
|
|
52
53
|
|
|
53
54
|
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
54
55
|
|
|
@@ -110,6 +111,7 @@ var PopOver = /** @class */ (function (_super) {
|
|
|
110
111
|
closeOnOutside &&
|
|
111
112
|
target &&
|
|
112
113
|
this.wrapperRef.current &&
|
|
114
|
+
!this.wrapperRef.current.getAttribute(Overlay.SubPopoverDisplayedID) &&
|
|
113
115
|
((!this.wrapperRef.current.contains(target) &&
|
|
114
116
|
!target.closest('[role=dialog]')) ||
|
|
115
117
|
(target.matches(".".concat(ns, "Modal")) && target === this.wrapperRef.current))); // 干脆过滤掉来自弹框里面的点击
|
|
@@ -159,7 +161,7 @@ var PopOver = /** @class */ (function (_super) {
|
|
|
159
161
|
var _b = this.state, xOffset = _b.xOffset, yOffset = _b.yOffset;
|
|
160
162
|
var outerStyle = tslib.__assign(tslib.__assign({ display: 'block' }, style), { top: positionTop + yOffset, left: positionLeft + xOffset });
|
|
161
163
|
var placements = typeof activePlacement === 'string' ? activePlacement.split('-') : [];
|
|
162
|
-
return (_J$X_("div", tslib.__assign({ ref: this.wrapperRef, className: cx("PopOver", className, "PopOver--".concat(helper.camel(activePlacement)), placements[3] ? "PopOver--v-".concat(placements[3]) : ''), style: outerStyle }, rest),
|
|
164
|
+
return (_J$X_("div", tslib.__assign({ ref: this.wrapperRef, role: "popover", className: cx("PopOver", className, "PopOver--".concat(helper.camel(activePlacement)), placements[3] ? "PopOver--v-".concat(placements[3]) : ''), style: outerStyle }, rest),
|
|
163
165
|
overlay ? (_J$X_("div", { className: "".concat(ns, "PopOver-overlay"), onClick: onHide })) : null,
|
|
164
166
|
children));
|
|
165
167
|
};
|
package/lib/env.js
CHANGED
package/lib/envOverwrite.js
CHANGED