amis-core 3.6.2 → 3.6.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm/Root.js +1 -1
- package/esm/RootRenderer.js +1 -1
- package/esm/SchemaRenderer.js +1 -1
- package/esm/Scoped.js +1 -1
- package/esm/StatusScoped.js +1 -1
- package/esm/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 +1 -1
- 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/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/StatusAction.js +1 -1
- package/esm/actions/SwitchAction.js +1 -1
- package/esm/actions/ToastAction.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.d.ts +2 -1
- package/esm/components/Overlay.js +19 -5
- package/esm/components/PopOver.js +4 -2
- package/esm/env.js +1 -1
- package/esm/envOverwrite.js +1 -1
- package/esm/factory.js +1 -1
- package/esm/index.js +2 -2
- package/esm/locale.js +1 -1
- package/esm/polyfills.js +1 -1
- package/esm/renderers/Form.js +1 -1
- package/esm/renderers/Item.js +1 -1
- package/esm/renderers/Options.js +1 -1
- package/esm/renderers/Placeholder.js +1 -1
- package/esm/renderers/builtin.js +1 -1
- package/esm/renderers/register.js +1 -1
- package/esm/renderers/wrapControl.js +1 -1
- package/esm/store/app.js +1 -1
- package/esm/store/combo.js +1 -1
- package/esm/store/crud.js +1 -1
- package/esm/store/form.js +1 -1
- package/esm/store/formItem.js +1 -1
- package/esm/store/iRenderer.js +1 -1
- package/esm/store/index.js +1 -1
- package/esm/store/list.js +1 -1
- package/esm/store/manager.js +1 -1
- package/esm/store/modal.js +1 -1
- package/esm/store/node.js +1 -1
- package/esm/store/pagination.js +1 -1
- package/esm/store/root.js +1 -1
- package/esm/store/service.js +1 -1
- package/esm/store/status.js +1 -1
- package/esm/store/table.js +1 -1
- package/esm/store/table2.js +1 -1
- package/esm/theme.js +1 -1
- package/esm/utils/Animation.js +1 -1
- package/esm/utils/ColorScale.js +1 -1
- package/esm/utils/DataSchema.js +1 -1
- package/esm/utils/DataScope.js +1 -1
- package/esm/utils/RootClose.js +1 -1
- package/esm/utils/SimpleMap.js +1 -1
- package/esm/utils/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/columnsSplit.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.js +1 -1
- package/esm/utils/highlight.js +1 -1
- package/esm/utils/icon.js +1 -1
- package/esm/utils/image.js +1 -1
- package/esm/utils/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/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/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/validations.js +1 -1
- package/lib/Root.js +1 -1
- package/lib/RootRenderer.d.ts +1 -1
- package/lib/RootRenderer.js +1 -1
- package/lib/SchemaRenderer.js +1 -1
- package/lib/Scoped.js +1 -1
- package/lib/StatusScoped.js +1 -1
- package/lib/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 +1 -1
- 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/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/StatusAction.js +1 -1
- package/lib/actions/SwitchAction.js +1 -1
- package/lib/actions/ToastAction.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.d.ts +2 -1
- package/lib/components/Overlay.js +19 -4
- package/lib/components/PopOver.js +4 -2
- package/lib/env.js +1 -1
- package/lib/envOverwrite.js +1 -1
- package/lib/factory.js +1 -1
- package/lib/index.js +2 -2
- package/lib/locale.js +1 -1
- package/lib/polyfills.js +1 -1
- package/lib/renderers/Form.js +1 -1
- package/lib/renderers/Item.js +1 -1
- package/lib/renderers/Options.js +1 -1
- package/lib/renderers/Placeholder.js +1 -1
- package/lib/renderers/builtin.js +1 -1
- package/lib/renderers/register.js +1 -1
- package/lib/renderers/wrapControl.js +1 -1
- package/lib/store/app.js +1 -1
- package/lib/store/combo.d.ts +24 -24
- package/lib/store/combo.js +1 -1
- package/lib/store/crud.js +1 -1
- package/lib/store/form.d.ts +10 -10
- package/lib/store/form.js +1 -1
- package/lib/store/formItem.js +1 -1
- package/lib/store/iRenderer.js +1 -1
- package/lib/store/index.js +1 -1
- package/lib/store/list.js +1 -1
- package/lib/store/manager.js +1 -1
- package/lib/store/modal.js +1 -1
- package/lib/store/node.js +1 -1
- package/lib/store/pagination.js +1 -1
- package/lib/store/root.js +1 -1
- package/lib/store/service.js +1 -1
- package/lib/store/status.js +1 -1
- package/lib/store/table.d.ts +20 -20
- package/lib/store/table.js +1 -1
- package/lib/store/table2.js +1 -1
- package/lib/theme.js +1 -1
- package/lib/utils/Animation.js +1 -1
- package/lib/utils/ColorScale.js +1 -1
- package/lib/utils/DataSchema.js +1 -1
- package/lib/utils/DataScope.js +1 -1
- package/lib/utils/RootClose.js +1 -1
- package/lib/utils/SimpleMap.js +1 -1
- package/lib/utils/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/columnsSplit.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.js +1 -1
- package/lib/utils/highlight.js +1 -1
- package/lib/utils/icon.js +1 -1
- package/lib/utils/image.js +1 -1
- package/lib/utils/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/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/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/validations.js +1 -1
- package/package.json +3 -3
package/esm/Root.js
CHANGED
package/esm/RootRenderer.js
CHANGED
package/esm/SchemaRenderer.js
CHANGED
package/esm/Scoped.js
CHANGED
package/esm/StatusScoped.js
CHANGED
package/esm/WithRootStore.js
CHANGED
package/esm/WithStore.js
CHANGED
package/esm/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,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v3.6.
|
|
2
|
+
* amis-core v3.6.3
|
|
3
3
|
* Copyright 2018-2023 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -50,6 +50,7 @@ import '../utils/Animation.js';
|
|
|
50
50
|
* @description
|
|
51
51
|
* @author fex
|
|
52
52
|
*/
|
|
53
|
+
var SubPopoverDisplayedID = 'data-sub-popover-displayed';
|
|
53
54
|
function onScroll(elem, callback) {
|
|
54
55
|
var handler = function () {
|
|
55
56
|
requestAnimationFrame(callback);
|
|
@@ -88,8 +89,16 @@ var Position = /** @class */ (function (_super) {
|
|
|
88
89
|
}
|
|
89
90
|
Position.prototype.updatePosition = function (target) {
|
|
90
91
|
var _this = this;
|
|
91
|
-
var _a;
|
|
92
|
+
var _a, _b;
|
|
92
93
|
this._lastTarget = target;
|
|
94
|
+
/** 标记宿主元素的PopOver祖先,用于后续判断PopOver 是否可以 root close */
|
|
95
|
+
if (target) {
|
|
96
|
+
var parentPopover = (_a = target === null || target === void 0 ? void 0 : target.closest) === null || _a === void 0 ? void 0 : _a.call(target, '[role=popover]');
|
|
97
|
+
if (!this.parentPopover && parentPopover) {
|
|
98
|
+
this.parentPopover = parentPopover;
|
|
99
|
+
this.parentPopover.setAttribute(SubPopoverDisplayedID, true);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
93
102
|
if (!target) {
|
|
94
103
|
return this.setState({
|
|
95
104
|
positionLeft: 0,
|
|
@@ -103,7 +112,7 @@ var Position = /** @class */ (function (_super) {
|
|
|
103
112
|
var container = getContainer(this.props.container, ownerDocument(this).body);
|
|
104
113
|
if ((!this.watchedTarget || this.watchedTarget !== target) &&
|
|
105
114
|
getComputedStyle(target, 'position') !== 'static') {
|
|
106
|
-
(
|
|
115
|
+
(_b = this.resizeDispose) === null || _b === void 0 ? void 0 : _b.forEach(function (fn) { return fn(); });
|
|
107
116
|
this.watchedTarget = target;
|
|
108
117
|
this.resizeDispose = [
|
|
109
118
|
watchTargetSizeChange !== false
|
|
@@ -128,6 +137,11 @@ var Position = /** @class */ (function (_super) {
|
|
|
128
137
|
};
|
|
129
138
|
Position.prototype.componentWillUnmount = function () {
|
|
130
139
|
var _a;
|
|
140
|
+
if (this.parentPopover &&
|
|
141
|
+
this.parentPopover.getAttribute(SubPopoverDisplayedID)) {
|
|
142
|
+
this.parentPopover.removeAttribute(SubPopoverDisplayedID);
|
|
143
|
+
this.parentPopover = null;
|
|
144
|
+
}
|
|
131
145
|
(_a = this.resizeDispose) === null || _a === void 0 ? void 0 : _a.forEach(function (fn) { return fn(); });
|
|
132
146
|
};
|
|
133
147
|
Position.prototype.render = function () {
|
|
@@ -169,7 +183,7 @@ var Overlay = /** @class */ (function (_super) {
|
|
|
169
183
|
var _a;
|
|
170
184
|
(_a = this.position) === null || _a === void 0 ? void 0 : _a.maybeUpdatePosition(true);
|
|
171
185
|
};
|
|
172
|
-
Overlay.prototype.componentDidUpdate = function (prevProps) {
|
|
186
|
+
Overlay.prototype.componentDidUpdate = function (prevProps, prevState) {
|
|
173
187
|
var props = this.props;
|
|
174
188
|
if (prevProps.show !== props.show && props.show) {
|
|
175
189
|
this.setState({ exited: false });
|
|
@@ -257,4 +271,4 @@ var Overlay = /** @class */ (function (_super) {
|
|
|
257
271
|
return Overlay;
|
|
258
272
|
}(React.Component));
|
|
259
273
|
|
|
260
|
-
export { Overlay as default };
|
|
274
|
+
export { SubPopoverDisplayedID, Overlay as default };
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v3.6.
|
|
2
|
+
* amis-core v3.6.3
|
|
3
3
|
* Copyright 2018-2023 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -42,6 +42,7 @@ import '../utils/validations.js';
|
|
|
42
42
|
import '../utils/resolveCondition.js';
|
|
43
43
|
import 'mobx';
|
|
44
44
|
import '../utils/Animation.js';
|
|
45
|
+
import { SubPopoverDisplayedID } from './Overlay.js';
|
|
45
46
|
|
|
46
47
|
/**
|
|
47
48
|
* @file PopOver
|
|
@@ -101,6 +102,7 @@ var PopOver = /** @class */ (function (_super) {
|
|
|
101
102
|
closeOnOutside &&
|
|
102
103
|
target &&
|
|
103
104
|
this.wrapperRef.current &&
|
|
105
|
+
!this.wrapperRef.current.getAttribute(SubPopoverDisplayedID) &&
|
|
104
106
|
((!this.wrapperRef.current.contains(target) &&
|
|
105
107
|
!target.closest('[role=dialog]')) ||
|
|
106
108
|
(target.matches(".".concat(ns, "Modal")) && target === this.wrapperRef.current))); // 干脆过滤掉来自弹框里面的点击
|
|
@@ -150,7 +152,7 @@ var PopOver = /** @class */ (function (_super) {
|
|
|
150
152
|
var _b = this.state, xOffset = _b.xOffset, yOffset = _b.yOffset;
|
|
151
153
|
var outerStyle = __assign(__assign({ display: 'block' }, style), { top: positionTop + yOffset, left: positionLeft + xOffset });
|
|
152
154
|
var placements = typeof activePlacement === 'string' ? activePlacement.split('-') : [];
|
|
153
|
-
return (React.createElement("div", __assign({ ref: this.wrapperRef, className: cx("PopOver", className, "PopOver--".concat(camel(activePlacement)), placements[3] ? "PopOver--v-".concat(placements[3]) : ''), style: outerStyle }, rest),
|
|
155
|
+
return (React.createElement("div", __assign({ ref: this.wrapperRef, role: "popover", className: cx("PopOver", className, "PopOver--".concat(camel(activePlacement)), placements[3] ? "PopOver--v-".concat(placements[3]) : ''), style: outerStyle }, rest),
|
|
154
156
|
overlay ? (React.createElement("div", { className: "".concat(ns, "PopOver-overlay"), onClick: onHide })) : null,
|
|
155
157
|
children));
|
|
156
158
|
};
|
package/esm/env.js
CHANGED
package/esm/envOverwrite.js
CHANGED
package/esm/factory.js
CHANGED
package/esm/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v3.6.
|
|
2
|
+
* amis-core v3.6.3
|
|
3
3
|
* Copyright 2018-2023 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -141,7 +141,7 @@ export { StoreNode } from './store/node.js';
|
|
|
141
141
|
*/
|
|
142
142
|
var classPrefix = getClassPrefix();
|
|
143
143
|
// @ts-ignore
|
|
144
|
-
var version = '3.6.
|
|
144
|
+
var version = '3.6.3';
|
|
145
145
|
function render(schema, props, options, pathPrefix) {
|
|
146
146
|
if (props === void 0) { props = {}; }
|
|
147
147
|
if (options === void 0) { options = {}; }
|
package/esm/locale.js
CHANGED
package/esm/polyfills.js
CHANGED
package/esm/renderers/Form.js
CHANGED
package/esm/renderers/Item.js
CHANGED
package/esm/renderers/Options.js
CHANGED
package/esm/renderers/builtin.js
CHANGED
package/esm/store/app.js
CHANGED
package/esm/store/combo.js
CHANGED
package/esm/store/crud.js
CHANGED
package/esm/store/form.js
CHANGED
package/esm/store/formItem.js
CHANGED
package/esm/store/iRenderer.js
CHANGED
package/esm/store/index.js
CHANGED
package/esm/store/list.js
CHANGED
package/esm/store/manager.js
CHANGED
package/esm/store/modal.js
CHANGED
package/esm/store/node.js
CHANGED
package/esm/store/pagination.js
CHANGED
package/esm/store/root.js
CHANGED
package/esm/store/service.js
CHANGED
package/esm/store/status.js
CHANGED
package/esm/store/table.js
CHANGED
package/esm/store/table2.js
CHANGED
package/esm/theme.js
CHANGED
package/esm/utils/Animation.js
CHANGED
package/esm/utils/ColorScale.js
CHANGED
package/esm/utils/DataSchema.js
CHANGED
package/esm/utils/DataScope.js
CHANGED
package/esm/utils/RootClose.js
CHANGED