amis-core 6.12.0-beta.4 → 6.12.0-beta.6
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/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 +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/EventAction.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/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 +1 -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 +1 -1
- package/esm/components/PopOver.js +1 -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 +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 +1 -1
- package/esm/store/combo.js +1 -1
- package/esm/store/crud.d.ts +2 -0
- package/esm/store/crud.js +116 -100
- 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/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.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.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.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/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 +1 -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 +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 +2 -1
- package/lib/components/ErrorBoundary.js +1 -1
- package/lib/components/LazyComponent.js +1 -1
- package/lib/components/Overlay.js +1 -1
- package/lib/components/PopOver.js +1 -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 +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 +1 -1
- package/lib/store/combo.d.ts +25 -24
- package/lib/store/combo.js +1 -1
- package/lib/store/crud.d.ts +2 -0
- package/lib/store/crud.js +116 -100
- 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/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.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.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.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 +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
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/StyleManager.js
CHANGED
package/esm/WithRootStore.js
CHANGED
package/esm/WithStore.js
CHANGED
package/esm/actions/Action.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.12.0-beta.
|
|
2
|
+
* amis-core v6.12.0-beta.6
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -53,6 +53,7 @@ function CustomStyle (props) {
|
|
|
53
53
|
insertEditCustomStyle({
|
|
54
54
|
customStyle: wrapperCustomStyle,
|
|
55
55
|
id: id,
|
|
56
|
+
customStyleClassPrefix: env === null || env === void 0 ? void 0 : env.customStyleClassPrefix,
|
|
56
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,
|
|
57
58
|
data: data
|
|
58
59
|
});
|
package/esm/env.js
CHANGED
package/esm/envOverwrite.js
CHANGED
package/esm/factory.js
CHANGED
package/esm/globalVar.js
CHANGED
package/esm/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.12.0-beta.
|
|
2
|
+
* amis-core v6.12.0-beta.6
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -23,7 +23,7 @@ export { DATASCHEMA_TYPE_MAP, DataScope } from './utils/DataScope.js';
|
|
|
23
23
|
export { filterDate, normalizeDate, parseDuration, relativeValueRe } from './utils/date.js';
|
|
24
24
|
import { enableDebug, disableDebug } from './utils/debug.js';
|
|
25
25
|
export { DebugWrapper, JsonView, debug, disableDebug, enableDebug, traceProps, warning } from './utils/debug.js';
|
|
26
|
-
export { calculatePosition, getContainer, getStyleNumber, ownerDocument, renderTextByKeyword } from './utils/dom.js';
|
|
26
|
+
export { calculateHeight, calculatePosition, getContainer, getStyleNumber, ownerDocument, renderTextByKeyword } from './utils/dom.js';
|
|
27
27
|
export { ServerError } from './utils/errors.js';
|
|
28
28
|
export { escapeHtml } from './utils/escapeHtml.js';
|
|
29
29
|
export { filterClassNameObject, getExprProperties, hasExprPropertiesChanged } from './utils/filter-schema.js';
|
|
@@ -154,10 +154,10 @@ export { StoreNode } from './store/node.js';
|
|
|
154
154
|
*/
|
|
155
155
|
var classPrefix = getClassPrefix();
|
|
156
156
|
// @ts-ignore
|
|
157
|
-
var version = '6.12.0-beta.
|
|
157
|
+
var version = '6.12.0-beta.6';
|
|
158
158
|
window.amisVersionInfo = {
|
|
159
|
-
version: '6.12.0-beta.
|
|
160
|
-
buildTime: '2025-
|
|
159
|
+
version: '6.12.0-beta.6',
|
|
160
|
+
buildTime: '2025-03-06T02:23:44.335Z'
|
|
161
161
|
};
|
|
162
162
|
function render(schema, _a, options, pathPrefix) {
|
|
163
163
|
if (_a === void 0) { _a = {}; }
|
package/esm/locale.js
CHANGED
package/esm/polyfills.js
CHANGED
package/esm/renderers/Form.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.12.0-beta.
|
|
2
|
+
* amis-core v6.12.0-beta.6
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -1065,8 +1065,9 @@ var Form = /** @class */ (function (_super) {
|
|
|
1065
1065
|
});
|
|
1066
1066
|
};
|
|
1067
1067
|
Form.prototype.buildActions = function () {
|
|
1068
|
-
var _a = this.props, actions = _a.actions, submitText = _a.submitText, body = _a.body, __ = _a.translate, loadingConfig = _a.loadingConfig;
|
|
1069
|
-
if (
|
|
1068
|
+
var _a = this.props, actions = _a.actions, submitText = _a.submitText, body = _a.body, __ = _a.translate, loadingConfig = _a.loadingConfig, wrapWithPanel = _a.wrapWithPanel;
|
|
1069
|
+
if (wrapWithPanel === false ||
|
|
1070
|
+
typeof actions !== 'undefined' ||
|
|
1070
1071
|
!submitText ||
|
|
1071
1072
|
(Array.isArray(body) &&
|
|
1072
1073
|
body.some(function (item) {
|
package/esm/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/esm/renderers/Options.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.12.0-beta.
|
|
2
|
+
* amis-core v6.12.0-beta.6
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -16,10 +16,10 @@ import findIndex from 'lodash/findIndex';
|
|
|
16
16
|
import { normalizeOptions } from '../utils/normalizeOptions.js';
|
|
17
17
|
import { optionValueCompare } from '../utils/optionValueCompare.js';
|
|
18
18
|
import '../utils/index.js';
|
|
19
|
+
import { extendObject, createObject, setVariable } from '../utils/object.js';
|
|
19
20
|
import { isPureVariable } from '../utils/isPureVariable.js';
|
|
20
21
|
import { resolveVariableAndFilter } from '../utils/resolveVariableAndFilter.js';
|
|
21
22
|
import { resolveEventData } from '../utils/renderer-event.js';
|
|
22
|
-
import { createObject, setVariable } from '../utils/object.js';
|
|
23
23
|
|
|
24
24
|
var detectProps = detectProps$1.concat([
|
|
25
25
|
'value',
|
|
@@ -373,8 +373,14 @@ var OptionsControlBase = /** @class */ (function (_super) {
|
|
|
373
373
|
return newValue;
|
|
374
374
|
};
|
|
375
375
|
// 当有 action 触发，如果指定了 reload 目标组件，有可能会来到这里面来
|
|
376
|
-
OptionsControlBase.prototype.reload = function () {
|
|
377
|
-
|
|
376
|
+
OptionsControlBase.prototype.reload = function (subpath, query) {
|
|
377
|
+
var _a, _b;
|
|
378
|
+
var data = this.props.data;
|
|
379
|
+
if (query) {
|
|
380
|
+
(_b = (_a = this.props).onBulkChange) === null || _b === void 0 ? void 0 : _b.call(_a, query);
|
|
381
|
+
data = extendObject(data, query);
|
|
382
|
+
}
|
|
383
|
+
return this.reloadOptions(false, false, data);
|
|
378
384
|
};
|
|
379
385
|
OptionsControlBase.prototype.reloadOptions = function (setError, isInit, data) {
|
|
380
386
|
if (isInit === void 0) { isInit = false; }
|
|
@@ -911,7 +917,7 @@ var OptionsControlBase = /** @class */ (function (_super) {
|
|
|
911
917
|
__decorate([
|
|
912
918
|
autobind,
|
|
913
919
|
__metadata("design:type", Function),
|
|
914
|
-
__metadata("design:paramtypes", []),
|
|
920
|
+
__metadata("design:paramtypes", [String, Object]),
|
|
915
921
|
__metadata("design:returntype", void 0)
|
|
916
922
|
], OptionsControlBase.prototype, "reload", null);
|
|
917
923
|
__decorate([
|
package/esm/renderers/builtin.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.12.0-beta.
|
|
2
|
+
* amis-core v6.12.0-beta.6
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -9,6 +9,7 @@ import debounce from 'lodash/debounce';
|
|
|
9
9
|
import isEqual from 'lodash/isEqual';
|
|
10
10
|
import { ComboStore } from '../store/combo.js';
|
|
11
11
|
import { guid, promisify, changedEffect } from '../utils/helper.js';
|
|
12
|
+
import { str2rules } from '../utils/validations.js';
|
|
12
13
|
import { isExpression, isNeedFormula, FormulaExec, replaceExpression } from '../utils/formula.js';
|
|
13
14
|
import { ScopedContext } from '../Scoped.js';
|
|
14
15
|
import { FormItemStore } from '../store/formItem.js';
|
|
@@ -67,9 +68,13 @@ function wrapControl(config, ComposedComponent) {
|
|
|
67
68
|
rowIndex: rowIndex !== undefined ? rowIndex : undefined
|
|
68
69
|
});
|
|
69
70
|
_this.model = model;
|
|
71
|
+
// 如果组件有默认验证器类型，则合并
|
|
72
|
+
var rules = validations && model && config.validations
|
|
73
|
+
? __assign(__assign({}, validations), str2rules(config.validations)) : validations;
|
|
70
74
|
// @issue 打算干掉这个
|
|
71
75
|
formItem === null || formItem === void 0 ? void 0 : formItem.addSubFormItem(model);
|
|
72
|
-
model.config(__assign(__assign({}, pick(__assign(__assign({}, ComposedComponent.defaultProps), _this.props.$schema), ['multiple'])), { id: id, type: type, required: props.required || required, unique: unique, value: value, isValueSchemaExp: isExpression(value)
|
|
76
|
+
model.config(__assign(__assign({}, pick(__assign(__assign({}, ComposedComponent.defaultProps), _this.props.$schema), ['multiple'])), { id: id, type: type, required: props.required || required, unique: unique, value: value, isValueSchemaExp: isExpression(value) &&
|
|
77
|
+
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 }));
|
|
73
78
|
// issue 这个逻辑应该在 combo 里面自己实现。
|
|
74
79
|
if (_this.model.unique &&
|
|
75
80
|
((_b = form === null || form === void 0 ? void 0 : form.parentStore) === null || _b === void 0 ? void 0 : _b.storeType) === ComboStore.name) {
|
|
@@ -172,7 +177,9 @@ function wrapControl(config, ComposedComponent) {
|
|
|
172
177
|
], prevProps.$schema, props.$schema, function (changes) {
|
|
173
178
|
model.config(__assign(__assign({}, changes), {
|
|
174
179
|
// todo 优化后面两个
|
|
175
|
-
isValueSchemaExp: isExpression(props.$schema.value)
|
|
180
|
+
isValueSchemaExp: isExpression(props.$schema.value) &&
|
|
181
|
+
props.$schema.value.replace(/\s/g, '') !==
|
|
182
|
+
"${".concat(props.$schema.name, "}"), inputGroupControl: props === null || props === void 0 ? void 0 : props.inputGroupControl }));
|
|
176
183
|
if (changes.hasOwnProperty('name')) {
|
|
177
184
|
_this.setInitialValue(_this.props.$schema.value);
|
|
178
185
|
}
|
|
@@ -193,6 +200,8 @@ function wrapControl(config, ComposedComponent) {
|
|
|
193
200
|
}
|
|
194
201
|
else if (typeof props.defaultValue !== 'undefined' &&
|
|
195
202
|
isExpression(props.defaultValue) &&
|
|
203
|
+
props.defaultValue.replace(/\s/g, '') !==
|
|
204
|
+
"${".concat(props.name, "}") &&
|
|
196
205
|
(!isEqual(props.defaultValue, prevProps.defaultValue) ||
|
|
197
206
|
(props.data !== prevProps.data &&
|
|
198
207
|
isNeedFormula(props.defaultValue, props.data, prevProps.data)))) {
|
|
@@ -253,8 +262,13 @@ function wrapControl(config, ComposedComponent) {
|
|
|
253
262
|
};
|
|
254
263
|
class_1.prototype.setInitialValue = function (value) {
|
|
255
264
|
var model = this.model;
|
|
256
|
-
var _a = this.props, form = _a.formStore, data = _a.data, canAccessSuperData = _a.canAccessSuperData;
|
|
265
|
+
var _a = this.props, form = _a.formStore, data = _a.data, canAccessSuperData = _a.canAccessSuperData, name = _a.name;
|
|
257
266
|
var isExp = isExpression(value);
|
|
267
|
+
if (isExp && value.replace(/\s/g, '') === "${".concat(name, "}")) {
|
|
268
|
+
console.warn('value 不要使用表达式关联自己');
|
|
269
|
+
isExp = false;
|
|
270
|
+
value = undefined;
|
|
271
|
+
}
|
|
258
272
|
var initialValue = model.extraName
|
|
259
273
|
? [
|
|
260
274
|
getVariable(data, model.name, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData),
|
package/esm/store/app.js
CHANGED
package/esm/store/combo.js
CHANGED
package/esm/store/crud.d.ts
CHANGED
|
@@ -137,6 +137,8 @@ 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';
|
|
140
142
|
}) => Promise<any>;
|
|
141
143
|
changePage: (page: number | string, perPage?: number | string) => void;
|
|
142
144
|
changePerPage: (perPage: number | string) => void;
|