amis-core 6.14.0-beta.9 → 7.0.0-next.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.d.ts +1 -1
- package/esm/RootRenderer.js +3 -3
- package/esm/SchemaRenderer.js +5 -1
- package/esm/Scoped.js +1 -1
- package/esm/StatusScoped.js +1 -1
- package/esm/StyleManager.js +1 -1
- package/esm/TaggerWrapper.d.ts +14 -0
- package/esm/TaggerWrapper.js +57 -0
- package/esm/WithRootStore.js +1 -1
- package/esm/WithStore.js +1 -1
- package/esm/actions/Action.js +2 -2
- 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 +2 -2
- package/esm/actions/DialogAction.js +2 -2
- package/esm/actions/DrawerAction.js +2 -2
- package/esm/actions/EmailAction.js +1 -1
- package/esm/actions/EventAction.js +2 -2
- 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 +2 -2
- 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 +5 -5
- package/esm/components/PopOver.js +4 -4
- package/esm/env.d.ts +2 -0
- package/esm/env.js +1 -1
- package/esm/envOverwrite.js +1 -1
- package/esm/factory.js +5 -2
- package/esm/globalVar.js +1 -1
- package/esm/globalVarClientHandler.js +1 -1
- package/esm/globalVarDefaultValueHandler.js +1 -1
- package/esm/hooks/useEnvContext.js +1 -1
- package/esm/hooks/useRenderOptionsContext.js +1 -1
- package/esm/index.js +9 -4
- package/esm/locale.js +1 -1
- package/esm/polyfills.js +1 -1
- package/esm/renderers/Form.js +8 -2
- package/esm/renderers/Item.js +3 -3
- 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/schema.d.ts +25 -0
- 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 +7 -2
- package/esm/store/iRenderer.js +1 -1
- package/esm/store/index.js +1 -1
- package/esm/store/list.js +1 -1
- package/esm/store/manager.js +1 -1
- package/esm/store/modal.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 +3 -3
- package/esm/utils/SimpleMap.js +1 -1
- package/esm/utils/animations.js +1 -1
- package/esm/utils/api.js +1 -1
- package/esm/utils/arraySlice.js +1 -1
- package/esm/utils/attachmentAdpator.js +1 -1
- package/esm/utils/autobind.js +1 -1
- package/esm/utils/browser.js +1 -1
- package/esm/utils/columnsSplit.js +1 -1
- package/esm/utils/concatData.js +1 -1
- package/esm/utils/dataMapping.js +1 -1
- package/esm/utils/date.js +1 -1
- package/esm/utils/debug.js +4 -3
- package/esm/utils/decodeEntity.js +1 -1
- package/esm/utils/dom.js +4 -5
- package/esm/utils/errors.js +1 -1
- package/esm/utils/escapeHtml.js +3 -4
- package/esm/utils/filter-schema.js +1 -1
- package/esm/utils/filter.js +1 -1
- package/esm/utils/findDomCompat.d.ts +16 -0
- package/esm/utils/findDomCompat.js +253 -0
- package/esm/utils/formatDuration.js +1 -1
- package/esm/utils/formula.js +1 -1
- package/esm/utils/getPageId.js +1 -1
- package/esm/utils/getVariable.js +1 -1
- package/esm/utils/grammar.js +1 -1
- package/esm/utils/handleAction.js +1 -1
- package/esm/utils/helper.js +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/index.d.ts +1 -0
- package/esm/utils/index.js +2 -2
- 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 +5 -1
- package/esm/utils/visitedCache.js +1 -1
- package/lib/Root.js +1 -1
- package/lib/RootRenderer.d.ts +1 -1
- package/lib/RootRenderer.js +3 -3
- package/lib/SchemaRenderer.js +5 -1
- package/lib/Scoped.js +1 -1
- package/lib/StatusScoped.js +1 -1
- package/lib/StyleManager.js +1 -1
- package/lib/TaggerWrapper.d.ts +14 -0
- package/lib/TaggerWrapper.js +66 -0
- 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/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 +5 -6
- package/lib/components/PopOver.js +4 -4
- package/lib/env.d.ts +2 -0
- package/lib/env.js +1 -1
- package/lib/envOverwrite.js +1 -1
- package/lib/factory.js +5 -2
- package/lib/globalVar.js +1 -1
- package/lib/globalVarClientHandler.js +1 -1
- package/lib/globalVarDefaultValueHandler.js +1 -1
- package/lib/hooks/useEnvContext.js +1 -1
- package/lib/hooks/useRenderOptionsContext.js +1 -1
- package/lib/index.js +11 -4
- package/lib/locale.js +1 -1
- package/lib/polyfills.js +1 -1
- package/lib/renderers/Form.js +8 -2
- package/lib/renderers/Item.js +3 -3
- 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/schema.d.ts +25 -0
- package/lib/store/app.js +1 -1
- 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 +7 -2
- package/lib/store/iRenderer.js +1 -1
- package/lib/store/index.js +1 -1
- package/lib/store/list.js +1 -1
- package/lib/store/manager.js +1 -1
- package/lib/store/modal.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.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 +3 -3
- package/lib/utils/SimpleMap.js +1 -1
- package/lib/utils/animations.js +1 -1
- package/lib/utils/api.js +1 -1
- package/lib/utils/arraySlice.js +1 -1
- package/lib/utils/attachmentAdpator.js +1 -1
- package/lib/utils/autobind.js +1 -1
- package/lib/utils/browser.js +1 -1
- package/lib/utils/columnsSplit.js +1 -1
- package/lib/utils/concatData.js +1 -1
- package/lib/utils/dataMapping.js +1 -1
- package/lib/utils/date.js +1 -1
- package/lib/utils/debug.js +6 -5
- package/lib/utils/decodeEntity.js +1 -1
- package/lib/utils/dom.js +4 -9
- package/lib/utils/errors.js +1 -1
- package/lib/utils/escapeHtml.js +3 -4
- package/lib/utils/filter-schema.js +1 -1
- package/lib/utils/filter.js +1 -1
- package/lib/utils/findDomCompat.d.ts +16 -0
- package/lib/utils/findDomCompat.js +262 -0
- package/lib/utils/formatDuration.js +1 -1
- package/lib/utils/formula.js +1 -1
- package/lib/utils/getPageId.js +1 -1
- package/lib/utils/getVariable.js +1 -1
- package/lib/utils/grammar.js +1 -1
- package/lib/utils/handleAction.js +1 -1
- package/lib/utils/helper.js +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/index.d.ts +1 -0
- package/lib/utils/index.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 +5 -1
- package/lib/utils/visitedCache.js +1 -1
- package/package.json +2 -2
package/esm/utils/validations.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core
|
|
2
|
+
* amis-core v7.0.0-next.0
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -235,6 +235,9 @@ var validations = {
|
|
|
235
235
|
notEmptyString: function (values, value) {
|
|
236
236
|
return !isExisty(value) || !(String(value) && String(value).trim() === '');
|
|
237
237
|
},
|
|
238
|
+
notEmpty: function (values, value) {
|
|
239
|
+
return !isExisty(value) || !(String(value) && String(value).trim() === '');
|
|
240
|
+
},
|
|
238
241
|
matchRegexp1: function (values, value, regexp) {
|
|
239
242
|
return validations.matchRegexp(values, value, regexp);
|
|
240
243
|
},
|
|
@@ -339,6 +342,7 @@ var validateMessages = {
|
|
|
339
342
|
isJson: 'validate.isJson',
|
|
340
343
|
isLength: 'validate.isLength',
|
|
341
344
|
notEmptyString: 'validate.notEmptyString',
|
|
345
|
+
notEmpty: 'validate.notEmptyString',
|
|
342
346
|
equalsField: 'validate.equalsField',
|
|
343
347
|
equals: 'validate.equals',
|
|
344
348
|
isPhoneNumber: 'validate.isPhoneNumber',
|
package/lib/Root.js
CHANGED
package/lib/RootRenderer.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ import type { RootProps } from './Root';
|
|
|
3
3
|
import { IScopedContext } from './Scoped';
|
|
4
4
|
import { IRootStore } from './store/root';
|
|
5
5
|
import { ActionObject } from './types';
|
|
6
|
-
import { GlobalVariableItem } from '
|
|
6
|
+
import { GlobalVariableItem } from './globalVar';
|
|
7
7
|
export interface RootRendererProps extends RootProps {
|
|
8
8
|
/**
|
|
9
9
|
* 当前页面的路径信息,用于路由识别
|
package/lib/RootRenderer.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core
|
|
2
|
+
* amis-core v7.0.0-next.0
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -19,7 +19,7 @@ var pick = require('lodash/pick');
|
|
|
19
19
|
var mapValues = require('lodash/mapValues');
|
|
20
20
|
var fileSaver = require('file-saver');
|
|
21
21
|
var api = require('./utils/api.js');
|
|
22
|
-
var
|
|
22
|
+
var findDomCompat = require('./utils/findDomCompat.js');
|
|
23
23
|
var LazyComponent = require('./components/LazyComponent.js');
|
|
24
24
|
var factory = require('./factory.js');
|
|
25
25
|
var rendererEvent = require('./utils/renderer-event.js');
|
|
@@ -99,7 +99,7 @@ var RootRenderer = /** @class */ (function (_super) {
|
|
|
99
99
|
if (typeof this.props.env.affixOffsetTop !== 'undefined' ||
|
|
100
100
|
typeof this.props.env.affixOffsetBottom !== 'undefined') {
|
|
101
101
|
// top: var(--affix-offset-top);
|
|
102
|
-
var dom =
|
|
102
|
+
var dom = findDomCompat.findDomCompat(this);
|
|
103
103
|
if (dom === null || dom === void 0 ? void 0 : dom.parentElement) {
|
|
104
104
|
dom.parentElement.style.cssText += "--affix-offset-top: ".concat(this.props.env.affixOffsetTop || 0, "px; --affix-offset-bottom: ").concat(this.props.env.affixOffsetBottom || 0, "px;");
|
|
105
105
|
}
|
package/lib/SchemaRenderer.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core
|
|
2
|
+
* amis-core v7.0.0-next.0
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -64,6 +64,7 @@ require('lodash/kebabCase');
|
|
|
64
64
|
require('lodash/some');
|
|
65
65
|
require('./utils/resolveCondition.js');
|
|
66
66
|
require('./utils/Animation.js');
|
|
67
|
+
var TaggerWrapper = require('./TaggerWrapper.js');
|
|
67
68
|
|
|
68
69
|
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
69
70
|
|
|
@@ -485,6 +486,9 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
485
486
|
if (schema.animations) {
|
|
486
487
|
component = (_J$X_(Animations["default"], { schema: schema, component: component, show: animationShow }));
|
|
487
488
|
}
|
|
489
|
+
if (schema.$$tagger) {
|
|
490
|
+
component = (_J$X_(TaggerWrapper.TaggerWrapper, { tagger: schema.$$tagger }, component));
|
|
491
|
+
}
|
|
488
492
|
return this.props.env.enableAMISDebug ? (_J$X_(debug.DebugWrapper, { renderer: renderer }, component)) : (component);
|
|
489
493
|
};
|
|
490
494
|
SchemaRenderer.displayName = 'Renderer';
|
package/lib/Scoped.js
CHANGED
package/lib/StatusScoped.js
CHANGED
package/lib/StyleManager.js
CHANGED
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
interface TaggerWrapperProps {
|
|
3
|
+
children: React.ReactElement;
|
|
4
|
+
tagger: {
|
|
5
|
+
[propName: string]: string | number;
|
|
6
|
+
};
|
|
7
|
+
}
|
|
8
|
+
/**
|
|
9
|
+
* 自动给组件对应 dom 打标记,开发态时才会进来
|
|
10
|
+
* @param param0
|
|
11
|
+
* @returns
|
|
12
|
+
*/
|
|
13
|
+
export declare const TaggerWrapper: React.FC<TaggerWrapperProps>;
|
|
14
|
+
export default TaggerWrapper;
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* amis-core v7.0.0-next.0
|
|
3
|
+
* Copyright 2018-2025 fex
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
'use strict';
|
|
7
|
+
|
|
8
|
+
Object.defineProperty(exports, '__esModule', { value: true });
|
|
9
|
+
|
|
10
|
+
var React = require('react');
|
|
11
|
+
var findDomCompat = require('./utils/findDomCompat.js');
|
|
12
|
+
|
|
13
|
+
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
14
|
+
|
|
15
|
+
var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* 自动给组件对应 dom 打标记,开发态时才会进来
|
|
19
|
+
* @param param0
|
|
20
|
+
* @returns
|
|
21
|
+
*/
|
|
22
|
+
var TaggerWrapper = function (_a) {
|
|
23
|
+
var children = _a.children, tagger = _a.tagger;
|
|
24
|
+
var ref = React__default["default"].useRef(null);
|
|
25
|
+
React__default["default"].useLayoutEffect(function () {
|
|
26
|
+
if (!ref.current || !tagger) {
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
var dom = findDomCompat.findDomCompat(ref.current);
|
|
30
|
+
var attrs = {};
|
|
31
|
+
Object.keys(tagger).forEach(function (key) {
|
|
32
|
+
if (typeof tagger[key] === 'string' || typeof tagger[key] === 'number') {
|
|
33
|
+
attrs["data-amis-tagger-".concat(key)] = String(tagger[key]);
|
|
34
|
+
}
|
|
35
|
+
});
|
|
36
|
+
Object.keys(attrs).forEach(function (key) {
|
|
37
|
+
dom === null || dom === void 0 ? void 0 : dom.setAttribute(key, attrs[key]);
|
|
38
|
+
});
|
|
39
|
+
return function () {
|
|
40
|
+
Object.keys(attrs).forEach(function (key) {
|
|
41
|
+
dom === null || dom === void 0 ? void 0 : dom.removeAttribute(key);
|
|
42
|
+
});
|
|
43
|
+
};
|
|
44
|
+
}, [tagger, ref.current]);
|
|
45
|
+
// 合并 ref:保持原有 ref,同时添加我们的 ref
|
|
46
|
+
var mergedRef = React__default["default"].useCallback(function (node) {
|
|
47
|
+
ref.current = node;
|
|
48
|
+
// 如果原有 children 有 ref,也调用它
|
|
49
|
+
var childRef = children.ref;
|
|
50
|
+
if (childRef) {
|
|
51
|
+
if (typeof childRef === 'function') {
|
|
52
|
+
childRef(node);
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
// ref 对象
|
|
56
|
+
childRef.current = node;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
}, [children]);
|
|
60
|
+
return React__default["default"].cloneElement(children, {
|
|
61
|
+
ref: mergedRef
|
|
62
|
+
});
|
|
63
|
+
};
|
|
64
|
+
|
|
65
|
+
exports.TaggerWrapper = TaggerWrapper;
|
|
66
|
+
exports["default"] = TaggerWrapper;
|
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
|
|
2
|
+
* amis-core v7.0.0-next.0
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -10,8 +10,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
|
10
10
|
var tslib = require('tslib');
|
|
11
11
|
var Portal = require('react-overlays/Portal');
|
|
12
12
|
var cx = require('classnames');
|
|
13
|
-
var ReactDOM = require('react-dom');
|
|
14
|
-
var React = require('react');
|
|
15
13
|
require('amis-formula');
|
|
16
14
|
require('moment');
|
|
17
15
|
require('lodash/isPlainObject');
|
|
@@ -55,14 +53,15 @@ require('hoist-non-react-statics');
|
|
|
55
53
|
require('../utils/validations.js');
|
|
56
54
|
require('../utils/resolveCondition.js');
|
|
57
55
|
require('mobx');
|
|
56
|
+
var findDomCompat = require('../utils/findDomCompat.js');
|
|
58
57
|
require('../utils/Animation.js');
|
|
58
|
+
var React = require('react');
|
|
59
59
|
var env = require('../env.js');
|
|
60
60
|
|
|
61
61
|
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
62
62
|
|
|
63
63
|
var Portal__default = /*#__PURE__*/_interopDefaultLegacy(Portal);
|
|
64
64
|
var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
|
|
65
|
-
var ReactDOM__default = /*#__PURE__*/_interopDefaultLegacy(ReactDOM);
|
|
66
65
|
var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
|
|
67
66
|
|
|
68
67
|
var __react_jsx__ = require('react');
|
|
@@ -85,7 +84,7 @@ var Position = /** @class */ (function (_super) {
|
|
|
85
84
|
_this.getTarget = function () {
|
|
86
85
|
var target = _this.props.target;
|
|
87
86
|
var targetElement = typeof target === 'function' ? target() : target;
|
|
88
|
-
return (targetElement &&
|
|
87
|
+
return (targetElement && findDomCompat.findDomCompat(targetElement)) || null;
|
|
89
88
|
};
|
|
90
89
|
_this.maybeUpdatePosition = function (placementChanged) {
|
|
91
90
|
var target = _this.getTarget();
|
|
@@ -145,7 +144,7 @@ var Position = /** @class */ (function (_super) {
|
|
|
145
144
|
this.setState(tslib.__assign(tslib.__assign({}, dom.calculatePosition(this.props.placement, overlay, target, container, this.props.containerPadding, this.props.offset)), { ready: true }));
|
|
146
145
|
};
|
|
147
146
|
Position.prototype.componentDidMount = function () {
|
|
148
|
-
this.overlay =
|
|
147
|
+
this.overlay = findDomCompat.findDomCompat(this);
|
|
149
148
|
this.updatePosition(this.getTarget());
|
|
150
149
|
};
|
|
151
150
|
Position.prototype.componentDidUpdate = function (prevProps) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core
|
|
2
|
+
* amis-core v7.0.0-next.0
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -9,7 +9,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
|
9
9
|
|
|
10
10
|
var tslib = require('tslib');
|
|
11
11
|
var React = require('react');
|
|
12
|
-
var
|
|
12
|
+
var findDomCompat = require('../utils/findDomCompat.js');
|
|
13
13
|
var theme = require('../theme.js');
|
|
14
14
|
require('amis-formula');
|
|
15
15
|
require('moment');
|
|
@@ -77,7 +77,7 @@ var PopOver = /** @class */ (function (_super) {
|
|
|
77
77
|
}
|
|
78
78
|
PopOver.prototype.componentDidMount = function () {
|
|
79
79
|
this.mayUpdateOffset();
|
|
80
|
-
var dom =
|
|
80
|
+
var dom = findDomCompat.findDomCompat(this);
|
|
81
81
|
this.parent = dom.parentNode;
|
|
82
82
|
this.parent.classList.add('has-popover');
|
|
83
83
|
if (this.wrapperRef && this.wrapperRef.current) {
|
|
@@ -151,7 +151,7 @@ var PopOver = /** @class */ (function (_super) {
|
|
|
151
151
|
var getOffset = this.props.offset;
|
|
152
152
|
if (getOffset && typeof getOffset === 'function') {
|
|
153
153
|
var _a = this.props, placement = _a.placement, y = _a.positionTop, x = _a.positionLeft;
|
|
154
|
-
offset = getOffset(
|
|
154
|
+
offset = getOffset(findDomCompat.findDomCompat(this).getBoundingClientRect(), {
|
|
155
155
|
x: x,
|
|
156
156
|
y: y,
|
|
157
157
|
placement: placement
|
package/lib/env.d.ts
CHANGED
|
@@ -10,6 +10,7 @@ import type { IScopedContext } from './Scoped';
|
|
|
10
10
|
import type { RendererEvent } from './utils/renderer-event';
|
|
11
11
|
import type { ListenerContext } from './actions/Action';
|
|
12
12
|
import type { ICmptAction } from './actions/CmptAction';
|
|
13
|
+
import { AMISPageMeta } from './schema';
|
|
13
14
|
export interface WsObject {
|
|
14
15
|
url: string;
|
|
15
16
|
responseKey?: string;
|
|
@@ -110,6 +111,7 @@ export interface RendererEnv {
|
|
|
110
111
|
* 渲染器包裹组件可以外部指定
|
|
111
112
|
*/
|
|
112
113
|
SchemaRenderer?: React.ComponentType<any>;
|
|
114
|
+
pageMetaEffect?: (meta: AMISPageMeta) => void;
|
|
113
115
|
/**
|
|
114
116
|
* 获取当前页面标识
|
|
115
117
|
*/
|
package/lib/env.js
CHANGED
package/lib/envOverwrite.js
CHANGED
package/lib/factory.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core
|
|
2
|
+
* amis-core v7.0.0-next.0
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -396,7 +396,10 @@ var defaultOptions = {
|
|
|
396
396
|
*/
|
|
397
397
|
filterHtml: function (input) { return input; },
|
|
398
398
|
isMobile: helper.isMobile,
|
|
399
|
-
getPageId: getPageId.getPageId
|
|
399
|
+
getPageId: getPageId.getPageId,
|
|
400
|
+
pageMetaEffect: function (meta) {
|
|
401
|
+
// console.log(meta)
|
|
402
|
+
}
|
|
400
403
|
};
|
|
401
404
|
var RenderOptionsContext = React__default["default"].createContext(defaultOptions);
|
|
402
405
|
var stores = {};
|
package/lib/globalVar.js
CHANGED