amis-core 6.14.0-beta.4 → 6.14.0-beta.5
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 +2 -1
- package/esm/Scoped.js +2 -1
- package/esm/StatusScoped.js +1 -1
- package/esm/StyleManager.js +1 -1
- package/esm/WithRootStore.js +1 -1
- package/esm/WithStore.js +1 -1
- package/esm/actions/Action.js +2 -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 +2 -1
- package/esm/actions/DialogAction.js +2 -1
- package/esm/actions/DrawerAction.js +2 -1
- package/esm/actions/EmailAction.js +1 -1
- package/esm/actions/EventAction.js +2 -1
- package/esm/actions/LinkAction.js +1 -1
- package/esm/actions/LoopAction.js +1 -1
- package/esm/actions/PageAction.js +1 -1
- package/esm/actions/ParallelAction.js +1 -1
- package/esm/actions/PrintAction.js +1 -1
- package/esm/actions/StatusAction.js +1 -1
- package/esm/actions/SwitchAction.js +1 -1
- package/esm/actions/ToastAction.js +1 -1
- package/esm/actions/WaitAction.js +1 -1
- package/esm/components/Animations.js +2 -1
- package/esm/components/CustomStyle.js +60 -33
- package/esm/components/ErrorBoundary.js +1 -1
- package/esm/components/LazyComponent.js +1 -1
- package/esm/components/Overlay.js +2 -1
- package/esm/components/PopOver.js +2 -1
- package/esm/env.js +1 -1
- package/esm/envOverwrite.js +1 -1
- package/esm/factory.js +1 -1
- package/esm/globalVar.js +1 -1
- package/esm/globalVarClientHandler.js +1 -1
- package/esm/globalVarDefaultValueHandler.js +1 -1
- package/esm/index.js +5 -5
- 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.d.ts +3 -2
- package/esm/renderers/Options.js +57 -5
- 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 +2 -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 +2 -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 +2 -1
- package/esm/store/service.js +2 -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 +13 -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 +1 -1
- package/esm/utils/decodeEntity.js +1 -1
- package/esm/utils/dom.js +2 -2
- 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/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.d.ts +2 -2
- package/esm/utils/helper.js +3 -3
- 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.js +2 -1
- package/esm/utils/isPureVariable.js +1 -1
- package/esm/utils/json-schema-2-amis-schema.js +1 -1
- package/esm/utils/keyToPath.js +1 -1
- package/esm/utils/labelToString.js +1 -1
- package/esm/utils/loopTooMuch.js +1 -1
- package/esm/utils/makeSorter.js +1 -1
- package/esm/utils/math.js +1 -1
- package/esm/utils/memoryParse.js +1 -1
- package/esm/utils/normalizeLink.js +1 -1
- package/esm/utils/normalizeOptions.js +1 -1
- package/esm/utils/object.js +1 -1
- package/esm/utils/offset.js +1 -1
- package/esm/utils/offsetParent.js +1 -1
- package/esm/utils/optionValueCompare.js +1 -1
- package/esm/utils/position.js +1 -1
- package/esm/utils/prettyBytes.js +1 -1
- package/esm/utils/printElement.js +1 -1
- package/esm/utils/renderer-event.js +1 -1
- package/esm/utils/replaceText.js +1 -1
- package/esm/utils/resize-sensor.js +1 -1
- package/esm/utils/resolveCondition.js +1 -1
- package/esm/utils/resolveVariable.js +1 -1
- package/esm/utils/resolveVariableAndFilter.js +1 -1
- package/esm/utils/resolveVariableAndFilterForAsync.js +1 -1
- package/esm/utils/scrollPosition.js +1 -1
- package/esm/utils/string2regExp.js +1 -1
- package/esm/utils/stripNumber.js +1 -1
- package/esm/utils/style-helper.d.ts +5 -1
- package/esm/utils/style-helper.js +30 -13
- package/esm/utils/style.js +1 -1
- package/esm/utils/toNumber.js +1 -1
- package/esm/utils/tokenize.js +1 -1
- package/esm/utils/tpl-builtin.js +1 -1
- package/esm/utils/tpl-lodash.js +1 -1
- package/esm/utils/tpl.js +1 -1
- package/esm/utils/uncontrollable.js +1 -1
- package/esm/utils/validateId.js +1 -1
- package/esm/utils/validations.js +1 -1
- package/esm/utils/visitedCache.js +1 -1
- package/lib/Root.js +1 -1
- package/lib/RootRenderer.js +1 -1
- package/lib/SchemaRenderer.js +2 -1
- package/lib/Scoped.js +2 -1
- package/lib/StatusScoped.js +1 -1
- package/lib/StyleManager.js +1 -1
- package/lib/WithRootStore.js +1 -1
- package/lib/WithStore.js +1 -1
- package/lib/actions/Action.js +2 -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 +2 -1
- package/lib/actions/DialogAction.js +2 -1
- package/lib/actions/DrawerAction.js +2 -1
- package/lib/actions/EmailAction.js +1 -1
- package/lib/actions/EventAction.js +2 -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 +2 -1
- package/lib/components/CustomStyle.js +62 -31
- package/lib/components/ErrorBoundary.js +1 -1
- package/lib/components/LazyComponent.js +1 -1
- package/lib/components/Overlay.js +2 -1
- package/lib/components/PopOver.js +2 -1
- package/lib/env.js +1 -1
- package/lib/envOverwrite.js +1 -1
- package/lib/factory.js +1 -1
- package/lib/globalVar.js +1 -1
- package/lib/globalVarClientHandler.js +1 -1
- package/lib/globalVarDefaultValueHandler.js +1 -1
- package/lib/index.js +5 -4
- 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.d.ts +3 -2
- package/lib/renderers/Options.js +57 -5
- 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 +2 -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 +1 -1
- package/lib/store/iRenderer.js +2 -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 +2 -1
- package/lib/store/service.js +2 -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 +13 -2
- 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 +1 -1
- package/lib/utils/decodeEntity.js +1 -1
- package/lib/utils/dom.js +2 -2
- 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/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.d.ts +2 -2
- package/lib/utils/helper.js +3 -3
- 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.js +2 -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.d.ts +5 -1
- package/lib/utils/style-helper.js +31 -12
- package/lib/utils/style.js +1 -1
- package/lib/utils/toNumber.js +1 -1
- package/lib/utils/tokenize.js +1 -1
- package/lib/utils/tpl-builtin.js +1 -1
- package/lib/utils/tpl-lodash.js +1 -1
- package/lib/utils/tpl.js +1 -1
- package/lib/utils/uncontrollable.js +1 -1
- package/lib/utils/validateId.js +1 -1
- package/lib/utils/validations.js +1 -1
- package/lib/utils/visitedCache.js +1 -1
- package/package.json +2 -2
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.14.0-beta.
|
|
2
|
+
* amis-core v6.14.0-beta.5
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -48,6 +48,7 @@ require('lodash/cloneDeep');
|
|
|
48
48
|
require('lodash/map');
|
|
49
49
|
require('lodash/isEmpty');
|
|
50
50
|
require('lodash/kebabCase');
|
|
51
|
+
require('lodash/some');
|
|
51
52
|
require('uncontrollable');
|
|
52
53
|
require('hoist-non-react-statics');
|
|
53
54
|
require('../utils/validations.js');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.14.0-beta.
|
|
2
|
+
* amis-core v6.14.0-beta.5
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -48,6 +48,7 @@ require('lodash/cloneDeep');
|
|
|
48
48
|
require('lodash/map');
|
|
49
49
|
require('lodash/isEmpty');
|
|
50
50
|
require('lodash/kebabCase');
|
|
51
|
+
require('lodash/some');
|
|
51
52
|
require('uncontrollable');
|
|
52
53
|
require('hoist-non-react-statics');
|
|
53
54
|
require('../utils/validations.js');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.14.0-beta.
|
|
2
|
+
* amis-core v6.14.0-beta.5
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -48,6 +48,7 @@ require('lodash/isObject');
|
|
|
48
48
|
require('lodash/map');
|
|
49
49
|
require('lodash/isEmpty');
|
|
50
50
|
require('lodash/kebabCase');
|
|
51
|
+
require('lodash/some');
|
|
51
52
|
require('uncontrollable');
|
|
52
53
|
require('hoist-non-react-statics');
|
|
53
54
|
require('../utils/validations.js');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.14.0-beta.
|
|
2
|
+
* amis-core v6.14.0-beta.5
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -48,6 +48,7 @@ require('lodash/cloneDeep');
|
|
|
48
48
|
require('lodash/map');
|
|
49
49
|
require('lodash/isEmpty');
|
|
50
50
|
require('lodash/kebabCase');
|
|
51
|
+
require('lodash/some');
|
|
51
52
|
require('uncontrollable');
|
|
52
53
|
require('hoist-non-react-statics');
|
|
53
54
|
require('../utils/validations.js');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.14.0-beta.
|
|
2
|
+
* amis-core v6.14.0-beta.5
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -9,66 +9,97 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
|
9
9
|
|
|
10
10
|
var React = require('react');
|
|
11
11
|
var styleHelper = require('../utils/style-helper.js');
|
|
12
|
+
var isEmpty = require('lodash/isEmpty');
|
|
13
|
+
|
|
14
|
+
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
15
|
+
|
|
16
|
+
var isEmpty__default = /*#__PURE__*/_interopDefaultLegacy(isEmpty);
|
|
12
17
|
|
|
13
18
|
var styleIdCount = new Map();
|
|
14
19
|
function CustomStyle (props) {
|
|
15
20
|
var config = props.config, env = props.env, data = props.data;
|
|
16
21
|
var themeCss = config.themeCss, classNames = config.classNames, defaultData = config.defaultData, wrapperCustomStyle = config.wrapperCustomStyle;
|
|
17
22
|
var id = config.id ? "".concat(config.id) : config.id;
|
|
23
|
+
var cssHasExpression = React.useMemo(function () {
|
|
24
|
+
return (styleHelper.hasExpression(themeCss || {}) || styleHelper.hasExpression(wrapperCustomStyle || {}));
|
|
25
|
+
}, [themeCss, wrapperCustomStyle]);
|
|
26
|
+
var styleId = id;
|
|
27
|
+
// 如果有变量 并且存在index变量则生成多个行
|
|
28
|
+
if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number' && cssHasExpression) {
|
|
29
|
+
styleId += "-".concat(data.index);
|
|
30
|
+
}
|
|
18
31
|
React.useEffect(function () {
|
|
19
|
-
if (styleIdCount.has(
|
|
20
|
-
styleIdCount.set(
|
|
32
|
+
if (styleIdCount.has(styleId)) {
|
|
33
|
+
styleIdCount.set(styleId, styleIdCount.get(styleId) + 1);
|
|
21
34
|
}
|
|
22
35
|
else if (id) {
|
|
23
|
-
styleIdCount.set(
|
|
36
|
+
styleIdCount.set(styleId, 1);
|
|
24
37
|
}
|
|
25
38
|
return function () {
|
|
26
|
-
if (styleIdCount.has(
|
|
27
|
-
styleIdCount.set(
|
|
28
|
-
if (styleIdCount.get(
|
|
29
|
-
styleIdCount.delete(
|
|
39
|
+
if (styleIdCount.has(styleId)) {
|
|
40
|
+
styleIdCount.set(styleId, styleIdCount.get(styleId) - 1);
|
|
41
|
+
if (styleIdCount.get(styleId) === 0) {
|
|
42
|
+
styleIdCount.delete(styleId);
|
|
30
43
|
}
|
|
31
44
|
}
|
|
32
45
|
};
|
|
33
|
-
}, [
|
|
46
|
+
}, [styleId]);
|
|
34
47
|
React.useEffect(function () {
|
|
35
48
|
var _a, _b;
|
|
36
49
|
if (themeCss && id) {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
50
|
+
if (!isEmpty__default["default"](themeCss)) {
|
|
51
|
+
styleHelper.insertCustomStyle({
|
|
52
|
+
themeCss: themeCss,
|
|
53
|
+
classNames: classNames,
|
|
54
|
+
id: id,
|
|
55
|
+
defaultData: defaultData,
|
|
56
|
+
customStyleClassPrefix: env === null || env === void 0 ? void 0 : env.customStyleClassPrefix,
|
|
57
|
+
doc: (_b = (_a = env === null || env === void 0 ? void 0 : env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument,
|
|
58
|
+
data: data,
|
|
59
|
+
cssHasExpression: cssHasExpression
|
|
60
|
+
});
|
|
61
|
+
}
|
|
46
62
|
}
|
|
47
63
|
return function () {
|
|
48
64
|
var _a, _b;
|
|
49
|
-
if (id && !styleIdCount.get(
|
|
50
|
-
styleHelper.removeCustomStyle('', id, (_b = (_a = env === null || env === void 0 ? void 0 : env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument, data);
|
|
65
|
+
if (id && !styleIdCount.get(styleId)) {
|
|
66
|
+
styleHelper.removeCustomStyle('', id, (_b = (_a = env === null || env === void 0 ? void 0 : env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument, data, cssHasExpression);
|
|
51
67
|
}
|
|
52
68
|
};
|
|
53
|
-
}, [
|
|
69
|
+
}, [
|
|
70
|
+
themeCss,
|
|
71
|
+
id,
|
|
72
|
+
styleId,
|
|
73
|
+
cssHasExpression,
|
|
74
|
+
cssHasExpression ? data : undefined
|
|
75
|
+
]);
|
|
54
76
|
React.useEffect(function () {
|
|
55
77
|
var _a, _b;
|
|
56
78
|
if (wrapperCustomStyle && id) {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
79
|
+
if (!isEmpty__default["default"](wrapperCustomStyle)) {
|
|
80
|
+
styleHelper.insertEditCustomStyle({
|
|
81
|
+
customStyle: wrapperCustomStyle,
|
|
82
|
+
id: id,
|
|
83
|
+
customStyleClassPrefix: env === null || env === void 0 ? void 0 : env.customStyleClassPrefix,
|
|
84
|
+
doc: (_b = (_a = env === null || env === void 0 ? void 0 : env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument,
|
|
85
|
+
data: data,
|
|
86
|
+
cssHasExpression: cssHasExpression
|
|
87
|
+
});
|
|
88
|
+
}
|
|
64
89
|
}
|
|
65
90
|
return function () {
|
|
66
91
|
var _a, _b;
|
|
67
|
-
if (id && !styleIdCount.get(
|
|
68
|
-
styleHelper.removeCustomStyle('wrapperCustomStyle', id, (_b = (_a = env === null || env === void 0 ? void 0 : env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument, data);
|
|
92
|
+
if (id && !styleIdCount.get(styleId)) {
|
|
93
|
+
styleHelper.removeCustomStyle('wrapperCustomStyle', id, (_b = (_a = env === null || env === void 0 ? void 0 : env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument, data, cssHasExpression);
|
|
69
94
|
}
|
|
70
95
|
};
|
|
71
|
-
}, [
|
|
96
|
+
}, [
|
|
97
|
+
wrapperCustomStyle,
|
|
98
|
+
id,
|
|
99
|
+
styleId,
|
|
100
|
+
cssHasExpression,
|
|
101
|
+
cssHasExpression ? data : undefined
|
|
102
|
+
]);
|
|
72
103
|
return null;
|
|
73
104
|
}
|
|
74
105
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.14.0-beta.
|
|
2
|
+
* amis-core v6.14.0-beta.5
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -49,6 +49,7 @@ require('lodash/cloneDeep');
|
|
|
49
49
|
require('lodash/map');
|
|
50
50
|
require('lodash/isEmpty');
|
|
51
51
|
require('lodash/kebabCase');
|
|
52
|
+
require('lodash/some');
|
|
52
53
|
require('uncontrollable');
|
|
53
54
|
require('hoist-non-react-statics');
|
|
54
55
|
require('../utils/validations.js');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.14.0-beta.
|
|
2
|
+
* amis-core v6.14.0-beta.5
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -47,6 +47,7 @@ require('lodash/cloneDeep');
|
|
|
47
47
|
require('lodash/map');
|
|
48
48
|
require('lodash/isEmpty');
|
|
49
49
|
require('lodash/kebabCase');
|
|
50
|
+
require('lodash/some');
|
|
50
51
|
require('uncontrollable');
|
|
51
52
|
require('hoist-non-react-statics');
|
|
52
53
|
require('../utils/validations.js');
|
package/lib/env.js
CHANGED
package/lib/envOverwrite.js
CHANGED
package/lib/factory.js
CHANGED
package/lib/globalVar.js
CHANGED
package/lib/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.14.0-beta.
|
|
2
|
+
* amis-core v6.14.0-beta.5
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -146,10 +146,10 @@ var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
|
|
|
146
146
|
(__react_jsx__["default"] || __react_jsx__).Fragment;
|
|
147
147
|
var classPrefix = theme.getClassPrefix();
|
|
148
148
|
// @ts-ignore
|
|
149
|
-
var version = '6.14.0-beta.
|
|
149
|
+
var version = '6.14.0-beta.5';
|
|
150
150
|
window.amisVersionInfo = {
|
|
151
|
-
version: '6.14.0-beta.
|
|
152
|
-
buildTime: '2025-09-
|
|
151
|
+
version: '6.14.0-beta.5',
|
|
152
|
+
buildTime: '2025-09-28T03:28:48.874Z'
|
|
153
153
|
};
|
|
154
154
|
function render(schema, _a, options, pathPrefix) {
|
|
155
155
|
if (_a === void 0) { _a = {}; }
|
|
@@ -494,6 +494,7 @@ exports.formatCustomStyle = styleHelper.formatCustomStyle;
|
|
|
494
494
|
exports.formatInputThemeCss = styleHelper.formatInputThemeCss;
|
|
495
495
|
exports.formatStyle = styleHelper.formatStyle;
|
|
496
496
|
exports.getValueByPath = styleHelper.getValueByPath;
|
|
497
|
+
exports.hasExpression = styleHelper.hasExpression;
|
|
497
498
|
exports.inheritValueMap = styleHelper.inheritValueMap;
|
|
498
499
|
exports.insertCustomStyle = styleHelper.insertCustomStyle;
|
|
499
500
|
exports.insertEditCustomStyle = styleHelper.insertEditCustomStyle;
|
package/lib/locale.js
CHANGED
package/lib/polyfills.js
CHANGED
package/lib/renderers/Form.js
CHANGED
package/lib/renderers/Item.js
CHANGED
|
@@ -174,6 +174,7 @@ export declare class OptionsControlBase<T extends OptionsProps = OptionsProps, S
|
|
|
174
174
|
constructor(props: T, config: OptionsConfig);
|
|
175
175
|
componentDidMount(): void;
|
|
176
176
|
shouldComponentUpdate(nextProps: OptionsProps): boolean;
|
|
177
|
+
onLoadOptionsFinished(): Promise<void>;
|
|
177
178
|
componentDidUpdate(prevProps: OptionsProps): void;
|
|
178
179
|
componentWillUnmount(): void;
|
|
179
180
|
oldDispatchOptionEvent(eventName: string, eventData?: any): Promise<boolean>;
|
|
@@ -195,8 +196,8 @@ export declare class OptionsControlBase<T extends OptionsProps = OptionsProps, S
|
|
|
195
196
|
formatValueArray(valueArray: Array<Option>): string | Option | Option[];
|
|
196
197
|
handleToggleAll(): Promise<void>;
|
|
197
198
|
toggleValue(option: Option, originValue?: any): string | Option | Option[];
|
|
198
|
-
reload(subpath?: string, query?: any): Promise<
|
|
199
|
-
reloadOptions(setError?: boolean, isInit?: boolean, data?: T["data"]): Promise<
|
|
199
|
+
reload(subpath?: string, query?: any): Promise<void> | undefined;
|
|
200
|
+
reloadOptions(setError?: boolean, isInit?: boolean, data?: T["data"]): Promise<void> | undefined;
|
|
200
201
|
deferLoad(option: Option): Promise<void>;
|
|
201
202
|
leftDeferLoad(option: Option, leftOptions: Option): void;
|
|
202
203
|
expandTreeOptions(nodePathArr: any[]): void;
|
package/lib/renderers/Options.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.14.0-beta.
|
|
2
|
+
* amis-core v6.14.0-beta.5
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -21,9 +21,9 @@ var normalizeOptions = require('../utils/normalizeOptions.js');
|
|
|
21
21
|
var optionValueCompare = require('../utils/optionValueCompare.js');
|
|
22
22
|
require('../utils/index.js');
|
|
23
23
|
var object = require('../utils/object.js');
|
|
24
|
+
var rendererEvent = require('../utils/renderer-event.js');
|
|
24
25
|
var isPureVariable = require('../utils/isPureVariable.js');
|
|
25
26
|
var resolveVariableAndFilter = require('../utils/resolveVariableAndFilter.js');
|
|
26
|
-
var rendererEvent = require('../utils/renderer-event.js');
|
|
27
27
|
|
|
28
28
|
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
29
29
|
|
|
@@ -139,6 +139,30 @@ var OptionsControlBase = /** @class */ (function (_super) {
|
|
|
139
139
|
}
|
|
140
140
|
return false;
|
|
141
141
|
};
|
|
142
|
+
OptionsControlBase.prototype.onLoadOptionsFinished = function () {
|
|
143
|
+
var _a, _b;
|
|
144
|
+
return tslib.__awaiter(this, void 0, void 0, function () {
|
|
145
|
+
var _c, options, _d, selectedOptions, multiple, tmpValue, dispatchEvent_1;
|
|
146
|
+
return tslib.__generator(this, function (_e) {
|
|
147
|
+
switch (_e.label) {
|
|
148
|
+
case 0:
|
|
149
|
+
if (!((_b = (_a = this.input) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.dispatchEvent)) return [3 /*break*/, 2];
|
|
150
|
+
_c = this.props.formItem || {}, options = _c.options, _d = _c.selectedOptions, selectedOptions = _d === void 0 ? [] : _d, multiple = _c.multiple, tmpValue = _c.tmpValue;
|
|
151
|
+
dispatchEvent_1 = this.input.props.dispatchEvent;
|
|
152
|
+
return [4 /*yield*/, dispatchEvent_1('loadOptionsFinished', rendererEvent.resolveEventData(this.props, {
|
|
153
|
+
options: options,
|
|
154
|
+
items: options,
|
|
155
|
+
value: tmpValue,
|
|
156
|
+
selectedItems: multiple ? selectedOptions : selectedOptions[0]
|
|
157
|
+
}))];
|
|
158
|
+
case 1:
|
|
159
|
+
_e.sent();
|
|
160
|
+
_e.label = 2;
|
|
161
|
+
case 2: return [2 /*return*/];
|
|
162
|
+
}
|
|
163
|
+
});
|
|
164
|
+
});
|
|
165
|
+
};
|
|
142
166
|
OptionsControlBase.prototype.componentDidUpdate = function (prevProps) {
|
|
143
167
|
var _this = this;
|
|
144
168
|
var props = this.props;
|
|
@@ -163,8 +187,18 @@ var OptionsControlBase = /** @class */ (function (_super) {
|
|
|
163
187
|
else if (api.isEffectiveApi(props.source, props.data) &&
|
|
164
188
|
api.isApiOutdated(prevProps.source, props.source, prevProps.data, props.data)) {
|
|
165
189
|
formItem
|
|
166
|
-
.loadOptions(props.source, props.data, undefined, true, this.changeOptionValue)
|
|
167
|
-
.then(function () { return _this.normalizeValue(); })
|
|
190
|
+
.loadOptions(props.source, props.data, undefined, true, this.changeOptionValue, undefined)
|
|
191
|
+
.then(function () { return _this.normalizeValue(); })
|
|
192
|
+
.then(function () { return tslib.__awaiter(_this, void 0, void 0, function () {
|
|
193
|
+
return tslib.__generator(this, function (_a) {
|
|
194
|
+
switch (_a.label) {
|
|
195
|
+
case 0: return [4 /*yield*/, this.onLoadOptionsFinished()];
|
|
196
|
+
case 1:
|
|
197
|
+
_a.sent();
|
|
198
|
+
return [2 /*return*/];
|
|
199
|
+
}
|
|
200
|
+
});
|
|
201
|
+
}); });
|
|
168
202
|
}
|
|
169
203
|
}
|
|
170
204
|
if (prevProps.value !== props.value || (formItem === null || formItem === void 0 ? void 0 : formItem.expressionsInOptions)) {
|
|
@@ -397,6 +431,7 @@ var OptionsControlBase = /** @class */ (function (_super) {
|
|
|
397
431
|
return this.reloadOptions(false, false, data);
|
|
398
432
|
};
|
|
399
433
|
OptionsControlBase.prototype.reloadOptions = function (setError, isInit, data) {
|
|
434
|
+
var _this = this;
|
|
400
435
|
if (isInit === void 0) { isInit = false; }
|
|
401
436
|
if (data === void 0) { data = this.props.data; }
|
|
402
437
|
var _a = this.props, source = _a.source, formItem = _a.formItem, onChange = _a.onChange, setPrinstineValue = _a.setPrinstineValue, valueField = _a.valueField;
|
|
@@ -409,7 +444,18 @@ var OptionsControlBase = /** @class */ (function (_super) {
|
|
|
409
444
|
return;
|
|
410
445
|
}
|
|
411
446
|
return mobxStateTree.isAlive(formItem)
|
|
412
|
-
? formItem
|
|
447
|
+
? formItem
|
|
448
|
+
.loadOptions(source, data, undefined, false, isInit ? setPrinstineValue : onChange, setError)
|
|
449
|
+
.then(function () { return tslib.__awaiter(_this, void 0, void 0, function () {
|
|
450
|
+
return tslib.__generator(this, function (_a) {
|
|
451
|
+
switch (_a.label) {
|
|
452
|
+
case 0: return [4 /*yield*/, this.onLoadOptionsFinished()];
|
|
453
|
+
case 1:
|
|
454
|
+
_a.sent();
|
|
455
|
+
return [2 /*return*/];
|
|
456
|
+
}
|
|
457
|
+
});
|
|
458
|
+
}); })
|
|
413
459
|
: undefined;
|
|
414
460
|
};
|
|
415
461
|
OptionsControlBase.prototype.deferLoad = function (option) {
|
|
@@ -910,6 +956,12 @@ var OptionsControlBase = /** @class */ (function (_super) {
|
|
|
910
956
|
? formItem.getSelectedOptions(value, enableNodePath ? nodeValueArray : undefined)
|
|
911
957
|
: [], nodePath: nodePathArray, loading: formItem ? formItem.loading : false, setLoading: this.setLoading, setOptions: this.setOptions, syncOptions: this.syncOptions, reloadOptions: this.reload, deferLoad: this.deferLoad, leftDeferLoad: this.leftDeferLoad, expandTreeOptions: this.expandTreeOptions, creatable: creatable !== false && api.isEffectiveApi(addApi) ? true : creatable, editable: editable || (editable !== false && api.isEffectiveApi(editApi)), removable: removable || (removable !== false && api.isEffectiveApi(deleteApi)), onAdd: this.handleOptionAdd, onEdit: this.handleOptionEdit, onDelete: this.handleOptionDelete })));
|
|
912
958
|
};
|
|
959
|
+
tslib.__decorate([
|
|
960
|
+
helper.autobind,
|
|
961
|
+
tslib.__metadata("design:type", Function),
|
|
962
|
+
tslib.__metadata("design:paramtypes", []),
|
|
963
|
+
tslib.__metadata("design:returntype", Promise)
|
|
964
|
+
], OptionsControlBase.prototype, "onLoadOptionsFinished", null);
|
|
913
965
|
tslib.__decorate([
|
|
914
966
|
helper.autobind,
|
|
915
967
|
tslib.__metadata("design:type", Function),
|
package/lib/renderers/builtin.js
CHANGED
package/lib/store/app.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.14.0-beta.
|
|
2
|
+
* amis-core v6.14.0-beta.5
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -50,6 +50,7 @@ require('lodash/cloneDeep');
|
|
|
50
50
|
require('lodash/map');
|
|
51
51
|
require('lodash/isEmpty');
|
|
52
52
|
require('lodash/kebabCase');
|
|
53
|
+
require('lodash/some');
|
|
53
54
|
require('uncontrollable');
|
|
54
55
|
require('hoist-non-react-statics');
|
|
55
56
|
require('../utils/validations.js');
|
package/lib/store/combo.js
CHANGED
package/lib/store/crud.js
CHANGED
package/lib/store/form.js
CHANGED
package/lib/store/formItem.js
CHANGED