amis-core 6.12.0-beta.1 → 6.12.0-beta.11
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 +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 +1 -1
- package/esm/actions/AjaxAction.js +2 -2
- 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 +2 -1
- 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.d.ts +1 -1
- package/esm/envOverwrite.js +4 -3
- 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 +7 -7
- package/esm/locale.js +1 -1
- package/esm/polyfills.js +1 -1
- package/esm/renderers/Form.js +4 -3
- package/esm/renderers/Item.js +1 -1
- package/esm/renderers/Options.d.ts +2 -2
- package/esm/renderers/Options.js +11 -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 +18 -4
- package/esm/store/app.js +2 -1
- package/esm/store/combo.d.ts +4 -2
- package/esm/store/combo.js +1 -1
- package/esm/store/crud.d.ts +4 -0
- package/esm/store/crud.js +131 -110
- package/esm/store/form.d.ts +3 -1
- package/esm/store/form.js +17 -11
- package/esm/store/formItem.js +1 -1
- package/esm/store/iRenderer.js +5 -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.d.ts +5 -2
- package/esm/store/table.js +28 -19
- 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/animations.d.ts +1 -0
- package/esm/utils/animations.js +17 -9
- package/esm/utils/api.js +1 -1
- package/esm/utils/arraySlice.js +1 -1
- package/esm/utils/attachmentAdpator.js +3 -29
- 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.d.ts +1 -0
- package/esm/utils/dom.js +39 -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/getVariable.js +1 -1
- package/esm/utils/grammar.js +1 -1
- package/esm/utils/handleAction.js +1 -1
- package/esm/utils/helper.d.ts +1 -0
- package/esm/utils/helper.js +9 -2
- 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 +3 -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.d.ts +1 -0
- package/esm/utils/style-helper.js +10 -7
- 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.d.ts +1 -1
- package/lib/RootRenderer.js +1 -1
- package/lib/SchemaRenderer.js +1 -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 +1 -1
- package/lib/actions/AjaxAction.js +2 -2
- 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 +2 -1
- 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.d.ts +1 -1
- package/lib/envOverwrite.js +4 -3
- 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 +7 -5
- package/lib/locale.js +1 -1
- package/lib/polyfills.js +1 -1
- package/lib/renderers/Form.js +4 -3
- package/lib/renderers/Item.js +1 -1
- package/lib/renderers/Options.d.ts +2 -2
- package/lib/renderers/Options.js +11 -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 +19 -5
- package/lib/store/app.js +2 -1
- package/lib/store/combo.d.ts +4 -2
- package/lib/store/combo.js +1 -1
- package/lib/store/crud.d.ts +4 -0
- package/lib/store/crud.js +131 -110
- package/lib/store/form.d.ts +4 -1
- package/lib/store/form.js +17 -11
- package/lib/store/formItem.js +1 -1
- package/lib/store/iRenderer.js +5 -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.d.ts +1 -0
- 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.d.ts +5 -2
- package/lib/store/table.js +27 -18
- 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/animations.d.ts +1 -0
- package/lib/utils/animations.js +17 -9
- package/lib/utils/api.js +1 -1
- package/lib/utils/arraySlice.js +1 -1
- package/lib/utils/attachmentAdpator.js +3 -29
- 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.d.ts +1 -0
- package/lib/utils/dom.js +39 -1
- package/lib/utils/errors.js +1 -1
- package/lib/utils/escapeHtml.js +1 -1
- package/lib/utils/filter-schema.js +1 -1
- package/lib/utils/filter.js +1 -1
- package/lib/utils/formatDuration.js +1 -1
- package/lib/utils/formula.js +1 -1
- package/lib/utils/getVariable.js +1 -1
- package/lib/utils/grammar.js +1 -1
- package/lib/utils/handleAction.js +1 -1
- package/lib/utils/helper.d.ts +1 -0
- package/lib/utils/helper.js +9 -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.js +4 -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 +1 -0
- package/lib/utils/style-helper.js +10 -7
- 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.12.0-beta.
|
|
2
|
+
* amis-core v6.12.0-beta.11
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -11,6 +11,7 @@ var tslib = require('tslib');
|
|
|
11
11
|
var React = require('react');
|
|
12
12
|
var reactTransitionGroup = require('react-transition-group');
|
|
13
13
|
require('../utils/api.js');
|
|
14
|
+
require('file-saver');
|
|
14
15
|
require('../utils/browser.js');
|
|
15
16
|
require('../utils/ColorScale.js');
|
|
16
17
|
require('../utils/columnsSplit.js');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.12.0-beta.
|
|
2
|
+
* amis-core v6.12.0-beta.11
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -57,6 +57,7 @@ function CustomStyle (props) {
|
|
|
57
57
|
styleHelper.insertEditCustomStyle({
|
|
58
58
|
customStyle: wrapperCustomStyle,
|
|
59
59
|
id: id,
|
|
60
|
+
customStyleClassPrefix: env === null || env === void 0 ? void 0 : env.customStyleClassPrefix,
|
|
60
61
|
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,
|
|
61
62
|
data: data
|
|
62
63
|
});
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.12.0-beta.
|
|
2
|
+
* amis-core v6.12.0-beta.11
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -13,6 +13,7 @@ var cx = require('classnames');
|
|
|
13
13
|
var ReactDOM = require('react-dom');
|
|
14
14
|
var React = require('react');
|
|
15
15
|
require('../utils/api.js');
|
|
16
|
+
require('file-saver');
|
|
16
17
|
require('../utils/browser.js');
|
|
17
18
|
require('../utils/ColorScale.js');
|
|
18
19
|
require('../utils/columnsSplit.js');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.12.0-beta.
|
|
2
|
+
* amis-core v6.12.0-beta.11
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -12,6 +12,7 @@ var React = require('react');
|
|
|
12
12
|
var ReactDOM = require('react-dom');
|
|
13
13
|
var theme = require('../theme.js');
|
|
14
14
|
require('../utils/api.js');
|
|
15
|
+
require('file-saver');
|
|
15
16
|
require('../utils/browser.js');
|
|
16
17
|
require('../utils/ColorScale.js');
|
|
17
18
|
require('../utils/columnsSplit.js');
|
package/lib/env.js
CHANGED
package/lib/envOverwrite.d.ts
CHANGED
package/lib/envOverwrite.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.12.0-beta.
|
|
2
|
+
* amis-core v6.12.0-beta.11
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -22,7 +22,8 @@ var isMobile = ((_b = (_a = window).matchMedia) === null || _b === void 0 ? void
|
|
|
22
22
|
? true
|
|
23
23
|
: false;
|
|
24
24
|
// 这里不能用 addSchemaFilter 是因为还需要更深层的替换,比如 select 里的 options
|
|
25
|
-
var envOverwrite = function (schema, locale) {
|
|
25
|
+
var envOverwrite = function (schema, locale, device) {
|
|
26
|
+
var isMobileDevice = device === 'mobile' || isMobile;
|
|
26
27
|
return helper.JSONValueMap(schema, function (value) {
|
|
27
28
|
if (!isPlainObject__default["default"](value)) {
|
|
28
29
|
return value;
|
|
@@ -32,7 +33,7 @@ var envOverwrite = function (schema, locale) {
|
|
|
32
33
|
delete newValue[locale];
|
|
33
34
|
return newValue;
|
|
34
35
|
}
|
|
35
|
-
else if (
|
|
36
|
+
else if (isMobileDevice && value.mobile) {
|
|
36
37
|
var newValue = Object.assign({}, value, value.mobile);
|
|
37
38
|
delete newValue.mobile;
|
|
38
39
|
return newValue;
|
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.12.0-beta.
|
|
2
|
+
* amis-core v6.12.0-beta.11
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -145,10 +145,10 @@ var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
|
|
|
145
145
|
(__react_jsx__["default"] || __react_jsx__).Fragment;
|
|
146
146
|
var classPrefix = theme.getClassPrefix();
|
|
147
147
|
// @ts-ignore
|
|
148
|
-
var version = '6.12.0-beta.
|
|
148
|
+
var version = '6.12.0-beta.11';
|
|
149
149
|
window.amisVersionInfo = {
|
|
150
|
-
version: '6.12.0-beta.
|
|
151
|
-
buildTime: '2025-
|
|
150
|
+
version: '6.12.0-beta.11',
|
|
151
|
+
buildTime: '2025-03-26T07:58:38.717Z'
|
|
152
152
|
};
|
|
153
153
|
function render(schema, _a, options, pathPrefix) {
|
|
154
154
|
if (_a === void 0) { _a = {}; }
|
|
@@ -210,7 +210,7 @@ function AMISRenderer(_a) {
|
|
|
210
210
|
}
|
|
211
211
|
// 根据环境覆盖 schema,这个要在最前面做,不然就无法覆盖 validations
|
|
212
212
|
schema = React__default["default"].useMemo(function () {
|
|
213
|
-
schema = envOverwrite.envOverwrite(schema, locale$1);
|
|
213
|
+
schema = envOverwrite.envOverwrite(schema, locale$1, env$1.isMobile() ? 'mobile' : 'pc');
|
|
214
214
|
// todo 和 envOverwrite 一起处理,减少循环次数
|
|
215
215
|
schema = replaceText.replaceText(schema, options.replaceText, env$1.replaceTextIgnoreKeys);
|
|
216
216
|
return schema;
|
|
@@ -285,6 +285,7 @@ exports.disableDebug = debug.disableDebug;
|
|
|
285
285
|
exports.enableDebug = debug.enableDebug;
|
|
286
286
|
exports.traceProps = debug.traceProps;
|
|
287
287
|
exports.warning = debug.warning;
|
|
288
|
+
exports.calculateHeight = dom.calculateHeight;
|
|
288
289
|
exports.calculatePosition = dom.calculatePosition;
|
|
289
290
|
exports.getContainer = dom.getContainer;
|
|
290
291
|
exports.getStyleNumber = dom.getStyleNumber;
|
|
@@ -364,6 +365,7 @@ exports.isClickOnInput = helper.isClickOnInput;
|
|
|
364
365
|
exports.isDisabled = helper.isDisabled;
|
|
365
366
|
exports.isEmpty = helper.isEmpty;
|
|
366
367
|
exports.isMobile = helper.isMobile;
|
|
368
|
+
exports.isMobileDevice = helper.isMobileDevice;
|
|
367
369
|
exports.isNumeric = helper.isNumeric;
|
|
368
370
|
exports.isObjectShallowModified = helper.isObjectShallowModified;
|
|
369
371
|
exports.isSuperDataModified = helper.isSuperDataModified;
|
package/lib/locale.js
CHANGED
package/lib/polyfills.js
CHANGED
package/lib/renderers/Form.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.12.0-beta.
|
|
2
|
+
* amis-core v6.12.0-beta.11
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -1083,8 +1083,9 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
|
|
|
1083
1083
|
});
|
|
1084
1084
|
};
|
|
1085
1085
|
Form.prototype.buildActions = function () {
|
|
1086
|
-
var _a = this.props, actions = _a.actions, submitText = _a.submitText, body = _a.body, __ = _a.translate, loadingConfig = _a.loadingConfig;
|
|
1087
|
-
if (
|
|
1086
|
+
var _a = this.props, actions = _a.actions, submitText = _a.submitText, body = _a.body, __ = _a.translate, loadingConfig = _a.loadingConfig, wrapWithPanel = _a.wrapWithPanel;
|
|
1087
|
+
if (wrapWithPanel === false ||
|
|
1088
|
+
typeof actions !== 'undefined' ||
|
|
1088
1089
|
!submitText ||
|
|
1089
1090
|
(Array.isArray(body) &&
|
|
1090
1091
|
body.some(function (item) {
|
package/lib/renderers/Item.js
CHANGED
|
@@ -134,7 +134,7 @@ export interface OptionsControlProps extends FormControlProps, Omit<FormOptionsC
|
|
|
134
134
|
selectedOptions: Array<Option>;
|
|
135
135
|
setOptions: (value: Array<any>, skipNormalize?: boolean) => void;
|
|
136
136
|
setLoading: (value: boolean) => void;
|
|
137
|
-
reloadOptions: (
|
|
137
|
+
reloadOptions: (subpath?: string, query?: any) => void;
|
|
138
138
|
deferLoad: (option: Option) => void;
|
|
139
139
|
leftDeferLoad: (option: Option, leftOptions: Option) => void;
|
|
140
140
|
expandTreeOptions: (nodePathArr: any[]) => void;
|
|
@@ -185,7 +185,7 @@ export declare class OptionsControlBase<T extends OptionsProps = OptionsProps, S
|
|
|
185
185
|
formatValueArray(valueArray: Array<Option>): string | Option | Option[];
|
|
186
186
|
handleToggleAll(): Promise<void>;
|
|
187
187
|
toggleValue(option: Option, originValue?: any): string | Option | Option[];
|
|
188
|
-
reload(): Promise<import("../types").Payload | null> | undefined;
|
|
188
|
+
reload(subpath?: string, query?: any): Promise<import("../types").Payload | null> | undefined;
|
|
189
189
|
reloadOptions(setError?: boolean, isInit?: boolean, data?: T["data"]): Promise<import("../types").Payload | null> | undefined;
|
|
190
190
|
deferLoad(option: Option): Promise<void>;
|
|
191
191
|
leftDeferLoad(option: Option, leftOptions: Option): void;
|
package/lib/renderers/Options.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.12.0-beta.
|
|
2
|
+
* amis-core v6.12.0-beta.11
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -20,10 +20,10 @@ var findIndex = require('lodash/findIndex');
|
|
|
20
20
|
var normalizeOptions = require('../utils/normalizeOptions.js');
|
|
21
21
|
var optionValueCompare = require('../utils/optionValueCompare.js');
|
|
22
22
|
require('../utils/index.js');
|
|
23
|
+
var object = require('../utils/object.js');
|
|
23
24
|
var isPureVariable = require('../utils/isPureVariable.js');
|
|
24
25
|
var resolveVariableAndFilter = require('../utils/resolveVariableAndFilter.js');
|
|
25
26
|
var rendererEvent = require('../utils/renderer-event.js');
|
|
26
|
-
var object = require('../utils/object.js');
|
|
27
27
|
|
|
28
28
|
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
29
29
|
|
|
@@ -387,8 +387,14 @@ var OptionsControlBase = /** @class */ (function (_super) {
|
|
|
387
387
|
return newValue;
|
|
388
388
|
};
|
|
389
389
|
// 当有 action 触发,如果指定了 reload 目标组件,有可能会来到这里面来
|
|
390
|
-
OptionsControlBase.prototype.reload = function () {
|
|
391
|
-
|
|
390
|
+
OptionsControlBase.prototype.reload = function (subpath, query) {
|
|
391
|
+
var _a, _b;
|
|
392
|
+
var data = this.props.data;
|
|
393
|
+
if (query) {
|
|
394
|
+
(_b = (_a = this.props).onBulkChange) === null || _b === void 0 ? void 0 : _b.call(_a, query);
|
|
395
|
+
data = object.extendObject(data, query);
|
|
396
|
+
}
|
|
397
|
+
return this.reloadOptions(false, false, data);
|
|
392
398
|
};
|
|
393
399
|
OptionsControlBase.prototype.reloadOptions = function (setError, isInit, data) {
|
|
394
400
|
if (isInit === void 0) { isInit = false; }
|
|
@@ -925,7 +931,7 @@ var OptionsControlBase = /** @class */ (function (_super) {
|
|
|
925
931
|
tslib.__decorate([
|
|
926
932
|
helper.autobind,
|
|
927
933
|
tslib.__metadata("design:type", Function),
|
|
928
|
-
tslib.__metadata("design:paramtypes", []),
|
|
934
|
+
tslib.__metadata("design:paramtypes", [String, Object]),
|
|
929
935
|
tslib.__metadata("design:returntype", void 0)
|
|
930
936
|
], OptionsControlBase.prototype, "reload", null);
|
|
931
937
|
tslib.__decorate([
|
package/lib/renderers/builtin.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.12.0-beta.
|
|
2
|
+
* amis-core v6.12.0-beta.11
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -13,6 +13,7 @@ var debounce = require('lodash/debounce');
|
|
|
13
13
|
var isEqual = require('lodash/isEqual');
|
|
14
14
|
var combo = require('../store/combo.js');
|
|
15
15
|
var helper = require('../utils/helper.js');
|
|
16
|
+
var validations = require('../utils/validations.js');
|
|
16
17
|
var formula = require('../utils/formula.js');
|
|
17
18
|
var Scoped = require('../Scoped.js');
|
|
18
19
|
var formItem = require('../store/formItem.js');
|
|
@@ -53,7 +54,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
|
|
|
53
54
|
trailing: true,
|
|
54
55
|
leading: false
|
|
55
56
|
});
|
|
56
|
-
var _c = _this.props, form = _c.formStore, formItem$1 = _c.formItem, rootStore = _c.rootStore, store = _c.store, onChange = _c.onChange, data = _c.data, inputGroupControl = _c.inputGroupControl, colIndex = _c.colIndex, rowIndex = _c.rowIndex, _d = _c.$schema, id = _d.id, type = _d.type, required = _d.required, validations = _d.validations, validationErrors = _d.validationErrors, unique = _d.unique, value = _d.value, extraName = _d.extraName, multiple = _d.multiple, delimiter = _d.delimiter, valueField = _d.valueField, labelField = _d.labelField, joinValues = _d.joinValues, extractValue = _d.extractValue, selectFirst = _d.selectFirst, autoFill = _d.autoFill, clearValueOnHidden = _d.clearValueOnHidden, validateApi = _d.validateApi, minLength = _d.minLength, maxLength = _d.maxLength, validateOnChange = _d.validateOnChange, label = _d.label, pagination = _d.pagination;
|
|
57
|
+
var _c = _this.props, form = _c.formStore, formItem$1 = _c.formItem, rootStore = _c.rootStore, store = _c.store, onChange = _c.onChange, data = _c.data, inputGroupControl = _c.inputGroupControl, colIndex = _c.colIndex, rowIndex = _c.rowIndex, _d = _c.$schema, id = _d.id, type = _d.type, required = _d.required, validations$1 = _d.validations, validationErrors = _d.validationErrors, unique = _d.unique, value = _d.value, extraName = _d.extraName, multiple = _d.multiple, delimiter = _d.delimiter, valueField = _d.valueField, labelField = _d.labelField, joinValues = _d.joinValues, extractValue = _d.extractValue, selectFirst = _d.selectFirst, autoFill = _d.autoFill, clearValueOnHidden = _d.clearValueOnHidden, validateApi = _d.validateApi, minLength = _d.minLength, maxLength = _d.maxLength, validateOnChange = _d.validateOnChange, label = _d.label, pagination = _d.pagination;
|
|
57
58
|
_this.getValue = _this.getValue.bind(_this);
|
|
58
59
|
_this.setValue = _this.setValue.bind(_this);
|
|
59
60
|
_this.handleChange = _this.handleChange.bind(_this);
|
|
@@ -84,9 +85,13 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
|
|
|
84
85
|
rowIndex: rowIndex !== undefined ? rowIndex : undefined
|
|
85
86
|
});
|
|
86
87
|
_this.model = model;
|
|
88
|
+
// 如果组件有默认验证器类型,则合并
|
|
89
|
+
var rules = validations$1 && model && config.validations
|
|
90
|
+
? tslib.__assign(tslib.__assign({}, validations$1), validations.str2rules(config.validations)) : validations$1;
|
|
87
91
|
// @issue 打算干掉这个
|
|
88
92
|
formItem$1 === null || formItem$1 === void 0 ? void 0 : formItem$1.addSubFormItem(model);
|
|
89
|
-
model.config(tslib.__assign(tslib.__assign({}, pick__default["default"](tslib.__assign(tslib.__assign({}, ComposedComponent.defaultProps), _this.props.$schema), ['multiple'])), { id: id, type: type, required: props.required || required, unique: unique, value: value, isValueSchemaExp: formula.isExpression(value)
|
|
93
|
+
model.config(tslib.__assign(tslib.__assign({}, pick__default["default"](tslib.__assign(tslib.__assign({}, ComposedComponent.defaultProps), _this.props.$schema), ['multiple'])), { id: id, type: type, required: props.required || required, unique: unique, value: value, isValueSchemaExp: formula.isExpression(value) &&
|
|
94
|
+
value.replace(/\s/g, '') !== "${".concat(name, "}"), rules: rules, messages: validationErrors, delimiter: delimiter, valueField: valueField, labelField: labelField, joinValues: joinValues, extractValue: extractValue, selectFirst: selectFirst, autoFill: autoFill, clearValueOnHidden: clearValueOnHidden, validateApi: validateApi, minLength: minLength, maxLength: maxLength, validateOnChange: validateOnChange, label: label, inputGroupControl: inputGroupControl, extraName: extraName, pagination: pagination }));
|
|
90
95
|
// issue 这个逻辑应该在 combo 里面自己实现。
|
|
91
96
|
if (_this.model.unique &&
|
|
92
97
|
((_b = form === null || form === void 0 ? void 0 : form.parentStore) === null || _b === void 0 ? void 0 : _b.storeType) === combo.ComboStore.name) {
|
|
@@ -189,7 +194,9 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
|
|
|
189
194
|
], prevProps.$schema, props.$schema, function (changes) {
|
|
190
195
|
model.config(tslib.__assign(tslib.__assign({}, changes), {
|
|
191
196
|
// todo 优化后面两个
|
|
192
|
-
isValueSchemaExp: formula.isExpression(props.$schema.value)
|
|
197
|
+
isValueSchemaExp: formula.isExpression(props.$schema.value) &&
|
|
198
|
+
props.$schema.value.replace(/\s/g, '') !==
|
|
199
|
+
"${".concat(props.$schema.name, "}"), inputGroupControl: props === null || props === void 0 ? void 0 : props.inputGroupControl }));
|
|
193
200
|
if (changes.hasOwnProperty('name')) {
|
|
194
201
|
_this.setInitialValue(_this.props.$schema.value);
|
|
195
202
|
}
|
|
@@ -210,6 +217,8 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
|
|
|
210
217
|
}
|
|
211
218
|
else if (typeof props.defaultValue !== 'undefined' &&
|
|
212
219
|
formula.isExpression(props.defaultValue) &&
|
|
220
|
+
props.defaultValue.replace(/\s/g, '') !==
|
|
221
|
+
"${".concat(props.name, "}") &&
|
|
213
222
|
(!isEqual__default["default"](props.defaultValue, prevProps.defaultValue) ||
|
|
214
223
|
(props.data !== prevProps.data &&
|
|
215
224
|
formula.isNeedFormula(props.defaultValue, props.data, prevProps.data)))) {
|
|
@@ -270,8 +279,13 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
|
|
|
270
279
|
};
|
|
271
280
|
class_1.prototype.setInitialValue = function (value) {
|
|
272
281
|
var model = this.model;
|
|
273
|
-
var _a = this.props, form = _a.formStore, data = _a.data, canAccessSuperData = _a.canAccessSuperData;
|
|
282
|
+
var _a = this.props, form = _a.formStore, data = _a.data, canAccessSuperData = _a.canAccessSuperData, name = _a.name;
|
|
274
283
|
var isExp = formula.isExpression(value);
|
|
284
|
+
if (isExp && value.replace(/\s/g, '') === "${".concat(name, "}")) {
|
|
285
|
+
console.warn('value 不要使用表达式关联自己');
|
|
286
|
+
isExp = false;
|
|
287
|
+
value = undefined;
|
|
288
|
+
}
|
|
275
289
|
var initialValue = model.extraName
|
|
276
290
|
? [
|
|
277
291
|
getVariable.getVariable(data, model.name, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData),
|
package/lib/store/app.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.12.0-beta.
|
|
2
|
+
* amis-core v6.12.0-beta.11
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -12,6 +12,7 @@ var mobxStateTree = require('mobx-state-tree');
|
|
|
12
12
|
var helper = require('../utils/helper.js');
|
|
13
13
|
var service = require('./service.js');
|
|
14
14
|
require('../utils/api.js');
|
|
15
|
+
require('file-saver');
|
|
15
16
|
require('../utils/browser.js');
|
|
16
17
|
require('../utils/ColorScale.js');
|
|
17
18
|
require('../utils/columnsSplit.js');
|
package/lib/store/combo.d.ts
CHANGED
|
@@ -2303,7 +2303,6 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
|
|
|
2303
2303
|
fetchSchema: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
|
|
2304
2304
|
checkRemote: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
|
|
2305
2305
|
} & {
|
|
2306
|
-
readonly loading: boolean;
|
|
2307
2306
|
readonly items: ({
|
|
2308
2307
|
id: string;
|
|
2309
2308
|
path: string;
|
|
@@ -3378,6 +3377,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
|
|
|
3378
3377
|
addInitHook(fn: (store: any) => any, weight?: number): () => void;
|
|
3379
3378
|
beforeDestroy: () => void;
|
|
3380
3379
|
}, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
|
|
3380
|
+
} & {
|
|
3381
|
+
readonly loading: boolean;
|
|
3381
3382
|
readonly inputGroupItems: Record<string, ({
|
|
3382
3383
|
id: string;
|
|
3383
3384
|
path: string;
|
|
@@ -7801,7 +7802,6 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
|
|
|
7801
7802
|
fetchSchema: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
|
|
7802
7803
|
checkRemote: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
|
|
7803
7804
|
} & {
|
|
7804
|
-
readonly loading: boolean;
|
|
7805
7805
|
readonly items: ({
|
|
7806
7806
|
id: string;
|
|
7807
7807
|
path: string;
|
|
@@ -8876,6 +8876,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
|
|
|
8876
8876
|
addInitHook(fn: (store: any) => any, weight?: number): () => void;
|
|
8877
8877
|
beforeDestroy: () => void;
|
|
8878
8878
|
}, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
|
|
8879
|
+
} & {
|
|
8880
|
+
readonly loading: boolean;
|
|
8879
8881
|
readonly inputGroupItems: Record<string, ({
|
|
8880
8882
|
id: string;
|
|
8881
8883
|
path: string;
|
package/lib/store/combo.js
CHANGED
package/lib/store/crud.d.ts
CHANGED
|
@@ -137,6 +137,9 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
|
|
|
137
137
|
matchFunc?: MatchFunc;
|
|
138
138
|
filterOnAllColumns?: boolean;
|
|
139
139
|
isTable2?: Boolean;
|
|
140
|
+
minLoadingTime?: number;
|
|
141
|
+
dataAppendTo?: 'top' | 'bottom';
|
|
142
|
+
totalField?: string;
|
|
140
143
|
}) => Promise<any>;
|
|
141
144
|
changePage: (page: number | string, perPage?: number | string) => void;
|
|
142
145
|
changePerPage: (perPage: number | string) => void;
|
|
@@ -150,6 +153,7 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
|
|
|
150
153
|
initFromScope: (scope: any, source: string, options: {
|
|
151
154
|
columns?: Array<any>;
|
|
152
155
|
matchFunc?: MatchFunc | null;
|
|
156
|
+
totalField?: string;
|
|
153
157
|
}) => void;
|
|
154
158
|
exportAsCSV: (options?: {
|
|
155
159
|
loadDataOnce?: boolean | undefined;
|