amis-core 6.9.0-rc.2 → 6.9.0-rc.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm/Root.js +1 -1
- package/esm/RootRenderer.js +1 -1
- package/esm/SchemaRenderer.js +1 -1
- package/esm/Scoped.js +1 -1
- package/esm/StatusScoped.js +1 -1
- package/esm/WithRootStore.js +1 -1
- package/esm/WithStore.js +1 -1
- package/esm/actions/Action.js +1 -1
- package/esm/actions/AjaxAction.js +1 -1
- package/esm/actions/BreakAction.js +1 -1
- package/esm/actions/BroadcastAction.js +1 -1
- package/esm/actions/CmptAction.js +1 -1
- package/esm/actions/ContinueAction.js +1 -1
- package/esm/actions/CopyAction.js +1 -1
- package/esm/actions/CustomAction.js +1 -1
- package/esm/actions/DialogAction.js +1 -1
- package/esm/actions/DrawerAction.js +1 -1
- package/esm/actions/EmailAction.js +1 -1
- package/esm/actions/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/CustomStyle.js +1 -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.d.ts +1 -1
- package/esm/factory.js +22 -2
- package/esm/index.js +4 -4
- package/esm/locale.d.ts +1 -1
- package/esm/locale.js +13 -2
- package/esm/polyfills.js +1 -1
- package/esm/renderers/Form.js +1 -1
- package/esm/renderers/Item.d.ts +1 -1
- package/esm/renderers/Item.js +8 -9
- 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 +6 -5
- package/esm/store/app.js +1 -1
- package/esm/store/combo.js +1 -1
- package/esm/store/crud.js +1 -1
- package/esm/store/form.js +1 -1
- package/esm/store/formItem.js +1 -1
- package/esm/store/iRenderer.js +1 -1
- package/esm/store/index.js +1 -1
- package/esm/store/list.js +1 -1
- package/esm/store/manager.js +1 -1
- package/esm/store/modal.js +1 -1
- package/esm/store/node.js +1 -1
- package/esm/store/pagination.js +1 -1
- package/esm/store/root.js +1 -1
- package/esm/store/service.js +1 -1
- package/esm/store/status.js +1 -1
- package/esm/store/table.js +1 -1
- package/esm/store/table2.js +1 -1
- package/esm/theme.d.ts +1 -1
- package/esm/theme.js +13 -2
- package/esm/utils/Animation.js +1 -1
- package/esm/utils/ColorScale.js +1 -1
- package/esm/utils/DataSchema.js +1 -1
- package/esm/utils/DataScope.js +1 -1
- package/esm/utils/RootClose.js +1 -1
- package/esm/utils/SimpleMap.js +1 -1
- package/esm/utils/api.js +1 -1
- package/esm/utils/arraySlice.js +1 -1
- package/esm/utils/attachmentAdpator.js +1 -1
- package/esm/utils/autobind.js +1 -1
- package/esm/utils/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 +1 -1
- package/esm/utils/errors.js +1 -1
- package/esm/utils/escapeHtml.js +1 -1
- package/esm/utils/filter-schema.js +1 -1
- package/esm/utils/filter.js +1 -1
- package/esm/utils/formatDuration.js +1 -1
- package/esm/utils/formula.js +1 -1
- package/esm/utils/getVariable.js +1 -1
- package/esm/utils/grammar.js +1 -1
- package/esm/utils/handleAction.js +1 -1
- package/esm/utils/helper.js +1 -1
- package/esm/utils/highlight.js +1 -1
- package/esm/utils/icon.js +1 -1
- package/esm/utils/image.js +1 -1
- package/esm/utils/isPureVariable.js +1 -1
- package/esm/utils/json-schema-2-amis-schema.js +1 -1
- package/esm/utils/keyToPath.js +1 -1
- package/esm/utils/labelToString.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 +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 +1 -1
- package/lib/Scoped.js +1 -1
- package/lib/StatusScoped.js +1 -1
- package/lib/WithRootStore.js +1 -1
- package/lib/WithStore.js +1 -1
- package/lib/actions/Action.js +1 -1
- package/lib/actions/AjaxAction.js +1 -1
- package/lib/actions/BreakAction.js +1 -1
- package/lib/actions/BroadcastAction.js +1 -1
- package/lib/actions/CmptAction.js +1 -1
- package/lib/actions/ContinueAction.js +1 -1
- package/lib/actions/CopyAction.js +1 -1
- package/lib/actions/CustomAction.js +1 -1
- package/lib/actions/DialogAction.js +1 -1
- package/lib/actions/DrawerAction.js +1 -1
- package/lib/actions/EmailAction.js +1 -1
- package/lib/actions/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/CustomStyle.js +1 -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.d.ts +1 -1
- package/lib/factory.js +22 -2
- package/lib/index.js +4 -4
- package/lib/locale.d.ts +1 -1
- package/lib/locale.js +13 -2
- package/lib/polyfills.js +1 -1
- package/lib/renderers/Form.js +1 -1
- package/lib/renderers/Item.d.ts +1 -1
- package/lib/renderers/Item.js +7 -8
- 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 +6 -5
- 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 +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.js +1 -1
- package/lib/store/table2.js +1 -1
- package/lib/theme.d.ts +1 -1
- package/lib/theme.js +13 -2
- package/lib/utils/Animation.js +1 -1
- package/lib/utils/ColorScale.js +1 -1
- package/lib/utils/DataSchema.js +1 -1
- package/lib/utils/DataScope.js +1 -1
- package/lib/utils/RootClose.js +1 -1
- package/lib/utils/SimpleMap.js +1 -1
- package/lib/utils/api.js +1 -1
- package/lib/utils/arraySlice.js +1 -1
- package/lib/utils/attachmentAdpator.js +1 -1
- package/lib/utils/autobind.js +1 -1
- package/lib/utils/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 +1 -1
- package/lib/utils/errors.js +1 -1
- package/lib/utils/escapeHtml.js +1 -1
- package/lib/utils/filter-schema.js +1 -1
- package/lib/utils/filter.js +1 -1
- package/lib/utils/formatDuration.js +1 -1
- package/lib/utils/formula.js +1 -1
- package/lib/utils/getVariable.js +1 -1
- package/lib/utils/grammar.js +1 -1
- package/lib/utils/handleAction.js +1 -1
- package/lib/utils/helper.js +1 -1
- package/lib/utils/highlight.js +1 -1
- package/lib/utils/icon.js +1 -1
- package/lib/utils/image.js +1 -1
- package/lib/utils/isPureVariable.js +1 -1
- package/lib/utils/json-schema-2-amis-schema.js +1 -1
- package/lib/utils/keyToPath.js +1 -1
- package/lib/utils/labelToString.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 +1 -1
- package/lib/utils/visitedCache.js +1 -1
- package/package.json +2 -2
package/esm/utils/validations.js
CHANGED
package/lib/Root.js
CHANGED
package/lib/RootRenderer.js
CHANGED
package/lib/SchemaRenderer.js
CHANGED
package/lib/Scoped.js
CHANGED
package/lib/StatusScoped.js
CHANGED
package/lib/WithRootStore.js
CHANGED
package/lib/WithStore.js
CHANGED
package/lib/actions/Action.js
CHANGED
package/lib/env.js
CHANGED
package/lib/envOverwrite.js
CHANGED
package/lib/factory.d.ts
CHANGED
|
@@ -24,6 +24,7 @@ export interface RendererBasicConfig {
|
|
|
24
24
|
isolateScope?: boolean;
|
|
25
25
|
isFormItem?: boolean;
|
|
26
26
|
autoVar?: boolean;
|
|
27
|
+
override?: boolean;
|
|
27
28
|
}
|
|
28
29
|
export interface RendererProps extends ThemeProps, LocaleProps, OnEventProps, StatusScopedProps {
|
|
29
30
|
render: (region: string, node: SchemaNode, props?: PlainObject) => JSX.Element;
|
|
@@ -54,7 +55,6 @@ export interface RendererConfig extends RendererBasicConfig {
|
|
|
54
55
|
getComponent?: () => Promise<{
|
|
55
56
|
default: RendererComponent;
|
|
56
57
|
} | any>;
|
|
57
|
-
override?: boolean;
|
|
58
58
|
Renderer?: RendererComponent;
|
|
59
59
|
}
|
|
60
60
|
export interface RenderSchemaFilter {
|
package/lib/factory.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.9.0-rc.
|
|
2
|
+
* amis-core v6.9.0-rc.4
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -47,6 +47,26 @@ function Renderer(config) {
|
|
|
47
47
|
return renderer.component;
|
|
48
48
|
};
|
|
49
49
|
}
|
|
50
|
+
// mobx-react 的 observer 会修改原型链的 render 方法
|
|
51
|
+
// 如果想继承覆盖组件的 render 方法，需要把原型链 render 还原回来
|
|
52
|
+
// 否则无法调用 super.render 方法
|
|
53
|
+
function fixMobxInjectRender(klass) {
|
|
54
|
+
var _a;
|
|
55
|
+
var target = klass.prototype;
|
|
56
|
+
// mobx-react 篡改之前先记录原始 render
|
|
57
|
+
if (target === null || target === void 0 ? void 0 : target.render) {
|
|
58
|
+
target.__originRender = target.render;
|
|
59
|
+
}
|
|
60
|
+
// 将父级类上面被 mobx 篡改的 render 方法还原回来
|
|
61
|
+
// 而且当前类的 render 也是会被篡改的，所以父级上的其实不需要篡改
|
|
62
|
+
if ((_a = target === null || target === void 0 ? void 0 : target.__proto__) === null || _a === void 0 ? void 0 : _a.hasOwnProperty('__originRender')) {
|
|
63
|
+
var originProto = target.__proto__;
|
|
64
|
+
target.__proto__ = Object.create(originProto.__proto__ || Object);
|
|
65
|
+
Object.assign(target.__proto__, originProto);
|
|
66
|
+
target.__proto__.render = originProto.__originRender;
|
|
67
|
+
}
|
|
68
|
+
return klass;
|
|
69
|
+
}
|
|
50
70
|
// 将 renderer 转成组件
|
|
51
71
|
function rendererToComponent(component, config) {
|
|
52
72
|
if (config.storeType && config.component) {
|
|
@@ -54,7 +74,7 @@ function rendererToComponent(component, config) {
|
|
|
54
74
|
storeType: config.storeType,
|
|
55
75
|
extendsData: config.storeExtendsData,
|
|
56
76
|
shouldSyncSuperStore: config.shouldSyncSuperStore
|
|
57
|
-
})(mobxReact.observer(component));
|
|
77
|
+
})(mobxReact.observer(fixMobxInjectRender(component)));
|
|
58
78
|
}
|
|
59
79
|
if (config.isolateScope) {
|
|
60
80
|
component = Scoped.HocScoped(component, config.type);
|
package/lib/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.9.0-rc.
|
|
2
|
+
* amis-core v6.9.0-rc.4
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -139,10 +139,10 @@ var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
|
|
|
139
139
|
(__react_jsx__["default"] || __react_jsx__).Fragment;
|
|
140
140
|
var classPrefix = theme.getClassPrefix();
|
|
141
141
|
// @ts-ignore
|
|
142
|
-
var version = '6.9.0-rc.
|
|
142
|
+
var version = '6.9.0-rc.4';
|
|
143
143
|
window.amisVersionInfo = {
|
|
144
|
-
version: '6.9.0-rc.
|
|
145
|
-
buildTime: '2024-
|
|
144
|
+
version: '6.9.0-rc.4',
|
|
145
|
+
buildTime: '2024-10-15T12:37:25.247Z'
|
|
146
146
|
};
|
|
147
147
|
function render(schema, props, options, pathPrefix) {
|
|
148
148
|
if (props === void 0) { props = {}; }
|
package/lib/locale.d.ts
CHANGED
|
@@ -16,7 +16,7 @@ export interface LocaleProps {
|
|
|
16
16
|
translate: TranslateFn;
|
|
17
17
|
}
|
|
18
18
|
export declare const LocaleContext: React.Context<string>;
|
|
19
|
-
export declare function localeable<T extends React.ComponentType<React.ComponentProps<T> & LocaleProps>>(ComposedComponent: T): {
|
|
19
|
+
export declare function localeable<T extends React.ComponentType<React.ComponentProps<T> & LocaleProps>>(ComposedComponent: T, methods?: Array<string>): {
|
|
20
20
|
new (props: JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof LocaleProps>> & {
|
|
21
21
|
locale?: string | undefined;
|
|
22
22
|
translate?: ((str: string, ...args: any[]) => string) | undefined;
|
package/lib/locale.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.9.0-rc.
|
|
2
|
+
* amis-core v6.9.0-rc.4
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -99,7 +99,7 @@ function setDefaultLocale(locale) {
|
|
|
99
99
|
defaultLocale = locale;
|
|
100
100
|
}
|
|
101
101
|
var LocaleContext = React__default["default"].createContext('');
|
|
102
|
-
function localeable(ComposedComponent) {
|
|
102
|
+
function localeable(ComposedComponent, methods) {
|
|
103
103
|
var _a;
|
|
104
104
|
var result = hoistNonReactStatic__default["default"]((_a = /** @class */ (function (_super) {
|
|
105
105
|
tslib.__extends(class_1, _super);
|
|
@@ -141,6 +141,17 @@ function localeable(ComposedComponent) {
|
|
|
141
141
|
_a.contextType = LocaleContext,
|
|
142
142
|
_a.ComposedComponent = ComposedComponent,
|
|
143
143
|
_a), ComposedComponent);
|
|
144
|
+
if (Array.isArray(methods)) {
|
|
145
|
+
methods.forEach(function (method) {
|
|
146
|
+
if (ComposedComponent.prototype[method]) {
|
|
147
|
+
result.prototype[method] = function () {
|
|
148
|
+
var _a;
|
|
149
|
+
var fn = (_a = this.ref) === null || _a === void 0 ? void 0 : _a[method];
|
|
150
|
+
return fn ? fn.apply(this.ref, arguments) : undefined;
|
|
151
|
+
};
|
|
152
|
+
}
|
|
153
|
+
});
|
|
154
|
+
}
|
|
144
155
|
return result;
|
|
145
156
|
}
|
|
146
157
|
|
package/lib/polyfills.js
CHANGED
package/lib/renderers/Form.js
CHANGED
package/lib/renderers/Item.d.ts
CHANGED
|
@@ -460,7 +460,7 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
|
|
|
460
460
|
* @param ctx 上下文对象，类型为任意类型
|
|
461
461
|
* @param skipIfExits 是否跳过已存在的属性，默认为 false
|
|
462
462
|
*/
|
|
463
|
-
applyMapping(mapping: any, ctx: any, skipIfExits?: boolean
|
|
463
|
+
applyMapping(mapping: any, ctx: any, skipIfExits?: boolean): void;
|
|
464
464
|
buildAutoFillSchema(): {
|
|
465
465
|
popOverContainer: any;
|
|
466
466
|
popOverClassName: any;
|
package/lib/renderers/Item.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.9.0-rc.
|
|
2
|
+
* amis-core v6.9.0-rc.4
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -136,7 +136,7 @@ var FormItemWrap = /** @class */ (function (_super) {
|
|
|
136
136
|
if (!result) {
|
|
137
137
|
return [2 /*return*/];
|
|
138
138
|
}
|
|
139
|
-
this.applyMapping((_d = autoFill === null || autoFill === void 0 ? void 0 : autoFill.fillMapping) !== null && _d !== void 0 ? _d : { '&': '$$' }, result, false
|
|
139
|
+
this.applyMapping((_d = autoFill === null || autoFill === void 0 ? void 0 : autoFill.fillMapping) !== null && _d !== void 0 ? _d : { '&': '$$' }, result, false);
|
|
140
140
|
_e.label = 3;
|
|
141
141
|
case 3: return [3 /*break*/, 5];
|
|
142
142
|
case 4:
|
|
@@ -293,10 +293,9 @@ var FormItemWrap = /** @class */ (function (_super) {
|
|
|
293
293
|
* @param ctx 上下文对象，类型为任意类型
|
|
294
294
|
* @param skipIfExits 是否跳过已存在的属性，默认为 false
|
|
295
295
|
*/
|
|
296
|
-
FormItemWrap.prototype.applyMapping = function (mapping, ctx, skipIfExits
|
|
296
|
+
FormItemWrap.prototype.applyMapping = function (mapping, ctx, skipIfExits) {
|
|
297
297
|
if (skipIfExits === void 0) { skipIfExits = false; }
|
|
298
|
-
|
|
299
|
-
var _a = this.props, onBulkChange = _a.onBulkChange, data = _a.data, formItem = _a.formItem;
|
|
298
|
+
var _a = this.props, onBulkChange = _a.onBulkChange, data = _a.data; _a.formItem;
|
|
300
299
|
var toSync = dataMapping.dataMapping(mapping, ctx);
|
|
301
300
|
var tmpData = tslib.__assign({}, data);
|
|
302
301
|
var result = tslib.__assign({}, toSync);
|
|
@@ -323,9 +322,9 @@ var FormItemWrap = /** @class */ (function (_super) {
|
|
|
323
322
|
}
|
|
324
323
|
});
|
|
325
324
|
// 是否忽略自己的设置
|
|
326
|
-
if (ignoreSelf &&
|
|
327
|
-
|
|
328
|
-
}
|
|
325
|
+
// if (ignoreSelf && formItem?.name) {
|
|
326
|
+
// deleteVariable(result, formItem.name);
|
|
327
|
+
// }
|
|
329
328
|
onBulkChange(result);
|
|
330
329
|
};
|
|
331
330
|
FormItemWrap.prototype.buildAutoFillSchema = function () {
|
package/lib/renderers/Options.js
CHANGED
package/lib/renderers/builtin.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.9.0-rc.
|
|
2
|
+
* amis-core v6.9.0-rc.4
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -78,14 +78,14 @@ function wrapControl(ComposedComponent) {
|
|
|
78
78
|
tslib.__extends(class_1, _super);
|
|
79
79
|
function class_1(props) {
|
|
80
80
|
var _this = this;
|
|
81
|
-
var _a;
|
|
81
|
+
var _a, _b;
|
|
82
82
|
_this = _super.call(this, props) || this;
|
|
83
83
|
_this.value = undefined;
|
|
84
84
|
_this.lazyEmitChange = debounce__default["default"](_this.emitChange.bind(_this), 250, {
|
|
85
85
|
trailing: true,
|
|
86
86
|
leading: false
|
|
87
87
|
});
|
|
88
|
-
var
|
|
88
|
+
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; _d.multiple; var 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;
|
|
89
89
|
_this.getValue = _this.getValue.bind(_this);
|
|
90
90
|
_this.setValue = _this.setValue.bind(_this);
|
|
91
91
|
_this.handleChange = _this.handleChange.bind(_this);
|
|
@@ -95,7 +95,8 @@ function wrapControl(ComposedComponent) {
|
|
|
95
95
|
_this.validate = _this.validate.bind(_this);
|
|
96
96
|
_this.flushChange = _this.flushChange.bind(_this);
|
|
97
97
|
_this.renderChild = _this.renderChild.bind(_this);
|
|
98
|
-
var name = _this.props.$schema.name
|
|
98
|
+
var name = _this.props.$schema.name ||
|
|
99
|
+
((_a = ComposedComponent.defaultProps) === null || _a === void 0 ? void 0 : _a.name);
|
|
99
100
|
// 如果 name 是表达式
|
|
100
101
|
// 扩充 each 用法
|
|
101
102
|
if (formula.isExpression(name)) {
|
|
@@ -120,7 +121,7 @@ function wrapControl(ComposedComponent) {
|
|
|
120
121
|
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), rules: validations, 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 }));
|
|
121
122
|
// issue 这个逻辑应该在 combo 里面自己实现。
|
|
122
123
|
if (_this.model.unique &&
|
|
123
|
-
((
|
|
124
|
+
((_b = form === null || form === void 0 ? void 0 : form.parentStore) === null || _b === void 0 ? void 0 : _b.storeType) === combo.ComboStore.name) {
|
|
124
125
|
var combo$1 = form.parentStore;
|
|
125
126
|
combo$1.bindUniuqueItem(model);
|
|
126
127
|
}
|
package/lib/store/app.js
CHANGED
package/lib/store/combo.js
CHANGED
package/lib/store/crud.js
CHANGED
package/lib/store/form.js
CHANGED
package/lib/store/formItem.js
CHANGED
package/lib/store/iRenderer.js
CHANGED
package/lib/store/index.js
CHANGED
package/lib/store/list.js
CHANGED