amis-core 6.0.0 → 6.1.0

package/lib/index.d.ts

@@ -19,7 +19,7 @@ import { RegisterStore } from './store';
 import type { IColumn, IColumn2, IRow, IRow2 } from './store';
 import { setDefaultLocale, getDefaultLocale, makeTranslator, register as registerLocale, extendLocale, removeLocaleData, localeable } from './locale';
 import type { LocaleProps, TranslateFn } from './locale';
-import Scoped, { ScopedContext, filterTarget } from './Scoped';
+import Scoped, { ScopedContext, filterTarget, splitTarget } from './Scoped';
 import type { ScopedComponentType, IScopedContext } from './Scoped';
 import { classnames, getClassPrefix, setDefaultTheme, theme, getTheme, themeable, makeClassnames } from './theme';
 import type { ClassNamesFn, ThemeProps } from './theme';
@@ -50,5 +50,5 @@ import type { IItem } from './store/list';
 import CustomStyle from './components/CustomStyle';
 import { StatusScoped } from './StatusScoped';
 export declare const version = "__buildVersion";
-export { clearStoresCache, updateEnv, Renderer, RendererProps, RenderOptions, RendererEnv, EnvContext, RegisterStore, FormItem, FormItemWrap, FormItemProps, OptionsControl, FormRenderer, FormHorizontal, utils, getRendererByName, registerRenderer, unRegisterRenderer, getRenderers, registerFormItem, getFormItemByName, registerOptionsControl, resolveRenderer, filterSchema, Scoped, ScopedContext, IScopedContext, StatusScoped, setDefaultTheme, theme, themeable, ThemeProps, getTheme, classPrefix, getClassPrefix, classnames, makeClassnames, getDefaultLocale, setDefaultLocale, registerLocale, makeTranslator, extendLocale, removeLocaleData, localeable, LocaleProps, TranslateFn, ClassNamesFn, parse, lexer, Evaluator, AsyncEvaluator, FilterContext, filters, getFilters, registerFilter, extendsFilters, registerFunction, evaluate, evaluateForAsync, LazyComponent, Overlay, PopOver, ErrorBoundary, addSchemaFilter, OptionsControlProps, FormOptionsControl, FormControlProps, FormBaseControl, extendDefaultEnv, addRootWrapper, RendererConfig, styleMap, RENDERER_TRANSMISSION_OMIT_PROPS, ScopedComponentType, IItem, IColumn, IRow, IColumn2, IRow2, OnEventProps, FormSchemaBase, filterTarget, CustomStyle, enableDebug, disableDebug };
+export { clearStoresCache, updateEnv, Renderer, RendererProps, RenderOptions, RendererEnv, EnvContext, RegisterStore, FormItem, FormItemWrap, FormItemProps, OptionsControl, FormRenderer, FormHorizontal, utils, getRendererByName, registerRenderer, unRegisterRenderer, getRenderers, registerFormItem, getFormItemByName, registerOptionsControl, resolveRenderer, filterSchema, Scoped, ScopedContext, IScopedContext, StatusScoped, setDefaultTheme, theme, themeable, ThemeProps, getTheme, classPrefix, getClassPrefix, classnames, makeClassnames, getDefaultLocale, setDefaultLocale, registerLocale, makeTranslator, extendLocale, removeLocaleData, localeable, LocaleProps, TranslateFn, ClassNamesFn, parse, lexer, Evaluator, AsyncEvaluator, FilterContext, filters, getFilters, registerFilter, extendsFilters, registerFunction, evaluate, evaluateForAsync, LazyComponent, Overlay, PopOver, ErrorBoundary, addSchemaFilter, OptionsControlProps, FormOptionsControl, FormControlProps, FormBaseControl, extendDefaultEnv, addRootWrapper, RendererConfig, styleMap, RENDERER_TRANSMISSION_OMIT_PROPS, ScopedComponentType, IItem, IColumn, IRow, IColumn2, IRow2, OnEventProps, FormSchemaBase, filterTarget, splitTarget, CustomStyle, enableDebug, disableDebug };
 export declare function render(schema: Schema, props?: RootRenderProps, options?: RenderOptions, pathPrefix?: string): JSX.Element;

package/lib/index.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';
@@ -41,6 +41,7 @@ var image = require('./utils/image.js');
 var isPureVariable = require('./utils/isPureVariable.js');
 var jsonSchema2AmisSchema = require('./utils/json-schema-2-amis-schema.js');
 var keyToPath = require('./utils/keyToPath.js');
+var labelToString = require('./utils/labelToString.js');
 var makeSorter = require('./utils/makeSorter.js');
 var normalizeLink = require('./utils/normalizeLink.js');
 var normalizeOptions = require('./utils/normalizeOptions.js');
@@ -135,7 +136,7 @@ var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
 (__react_jsx__["default"] || __react_jsx__).Fragment;
 var classPrefix = theme.getClassPrefix();
 // @ts-ignore
-var version = '6.0.0';
+var version = '6.1.0';
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }
@@ -194,8 +195,12 @@ function AMISRenderer(_a) {
         props.mobileUI = env$1.isMobile();
     }
     // 根据环境覆盖 schema，这个要在最前面做，不然就无法覆盖 validations
-    schema = envOverwrite.envOverwrite(schema, locale$1);
-    schema = replaceText.replaceText(schema, options.replaceText, env$1.replaceTextIgnoreKeys);
+    schema = React__default["default"].useMemo(function () {
+        schema = envOverwrite.envOverwrite(schema, locale$1);
+        // todo 和 envOverwrite 一起处理，减少循环次数
+        schema = replaceText.replaceText(schema, options.replaceText, env$1.replaceTextIgnoreKeys);
+        return schema;
+    }, [schema, locale$1]);
     return (_J$X_(env.EnvContext.Provider, { value: env$1 },
         _J$X_(Root["default"], tslib.__assign({}, props, { schema: schema, pathPrefix: pathPrefix, rootStore: store, env: env$1, theme: theme$1, locale: locale$1, translate: translate }))));
 }
@@ -277,10 +282,12 @@ exports.handleAction = handleAction.handleAction;
 exports.JSONTraverse = helper.JSONTraverse;
 exports.JSONValueMap = helper.JSONValueMap;
 exports.SkipOperation = helper.SkipOperation;
+exports.TEST_ID_KEY = helper.TEST_ID_KEY;
 exports.ValidateError = helper.ValidateError;
 exports.__uri = helper.__uri;
 exports.anyChanged = helper.anyChanged;
 exports.autobind = helper.autobind;
+exports.buildTestId = helper.buildTestId;
 exports.buildTrackExpression = helper.buildTrackExpression;
 exports.bulkBindFunctions = helper.bulkBindFunctions;
 exports.camel = helper.camel;
@@ -308,6 +315,7 @@ exports.getPropValue = helper.getPropValue;
 exports.getRange = helper.getRange;
 exports.getScrollParent = helper.getScrollParent;
 exports.getScrollbarWidth = helper.getScrollbarWidth;
+exports.getTestId = helper.getTestId;
 exports.getTree = helper.getTree;
 exports.getTreeAncestors = helper.getTreeAncestors;
 exports.getTreeDepth = helper.getTreeDepth;
@@ -374,6 +382,7 @@ exports.toDataURL = image.toDataURL;
 exports.isPureVariable = isPureVariable.isPureVariable;
 exports.JSONSchme2AMisSchema = jsonSchema2AmisSchema.JSONSchme2AMisSchema;
 exports.keyToPath = keyToPath.keyToPath;
+exports.labelToString = labelToString.labelToString;
 exports.makeSorter = makeSorter.makeSorter;
 exports.normalizeLink = normalizeLink.normalizeLink;
 exports.normalizeOptions = normalizeOptions.normalizeOptions;
@@ -412,6 +421,7 @@ exports.scrollPosition = scrollPosition.scrollPosition;
 exports.SimpleMap = SimpleMap.SimpleMap;
 exports.string2regExp = string2regExp.string2regExp;
 exports.buildStyle = style.buildStyle;
+exports.memoParse = tokenize.memoParse;
 exports.tokenize = tokenize.tokenize;
 exports.register = tplBuiltin.register;
 exports.asyncFilter = tpl.asyncFilter;
@@ -466,6 +476,7 @@ exports.setDefaultLocale = locale.setDefaultLocale;
 exports.Scoped = Scoped.HocScoped;
 exports.ScopedContext = Scoped.ScopedContext;
 exports.filterTarget = Scoped.filterTarget;
+exports.splitTarget = Scoped.splitTarget;
 exports.classnames = theme.classnames;
 exports.getClassPrefix = theme.getClassPrefix;
 exports.getTheme = theme.getTheme;

package/lib/locale.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/polyfills.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/renderers/Form.d.ts

@@ -341,15 +341,16 @@ export default class Form extends React.Component<FormProps, object> {
     silentReload(target?: string, query?: any): void;
     initInterval(value: any): any;
     isValidated(): boolean;
-    validate(forceValidate?: boolean, throwErrors?: boolean, toastErrors?: boolean): Promise<boolean>;
+    validate(forceValidate?: boolean, throwErrors?: boolean, toastErrors?: boolean, skipFlush?: boolean): Promise<boolean>;
     setErrors(errors: {
         [propName: string]: string;
     }, tag?: string): void;
     clearErrors(): void;
     getValues(): any;
     setValues(value: any, replace?: boolean): void;
-    submit(fn?: (values: object) => Promise<any>, throwErrors?: boolean): Promise<any>;
-    flush(): void;
+    submit(fn?: (values: object) => Promise<any>, throwErrors?: boolean, skipFlush?: boolean): Promise<any>;
+    flushing: boolean;
+    flush(): Promise<void>;
     reset(): void;
     addHook(fn: () => any, type?: 'validate' | 'init' | 'flush'): () => void;
     removeHook(fn: () => any, type?: string): void;

package/lib/renderers/Form.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';
@@ -43,13 +43,13 @@ require('../utils/image.js');
 require('lodash/isPlainObject');
 require('lodash/isEqual');
 require('../actions/Action.js');
-require('lodash/cloneDeep');
 require('../utils/resize-sensor.js');
 require('react-overlays/useRootClose');
 require('react-dom');
 require('../utils/SimpleMap.js');
 require('lodash/mapValues');
 require('lodash/camelCase');
+require('lodash/cloneDeep');
 require('lodash/map');
 require('lodash/isEmpty');
 require('lodash/kebabCase');
@@ -81,6 +81,8 @@ var Form = /** @class */ (function (_super) {
             trailing: true,
             leading: false
         });
+        // 如果开启了 lazyChange，需要一个 flush 方法把队列中值应用上。
+        _this.flushing = false;
         _this.onInit = _this.onInit.bind(_this);
         _this.handleAction = _this.handleAction.bind(_this);
         _this.handleQuery = _this.handleQuery.bind(_this);
@@ -393,22 +395,27 @@ var Form = /** @class */ (function (_super) {
     Form.prototype.isValidated = function () {
         return this.props.store.validated;
     };
-    Form.prototype.validate = function (forceValidate, throwErrors, toastErrors) {
+    Form.prototype.validate = function (forceValidate, throwErrors, toastErrors, skipFlush) {
         if (throwErrors === void 0) { throwErrors = false; }
         if (toastErrors === void 0) { toastErrors = true; }
+        if (skipFlush === void 0) { skipFlush = false; }
         return tslib.__awaiter(this, void 0, void 0, function () {
             var _a, store, dispatchEvent, data, messages, __, result;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         _a = this.props, store = _a.store, dispatchEvent = _a.dispatchEvent, data = _a.data, messages = _a.messages, __ = _a.translate;
-                        this.flush();
-                        return [4 /*yield*/, store.validate(this.hooks['validate'] || [], forceValidate, throwErrors, toastErrors === false
-                                ? ''
-                                : typeof (messages === null || messages === void 0 ? void 0 : messages.validateFailed) === 'string'
-                                    ? __(tpl.filter(messages.validateFailed, store.data))
-                                    : undefined)];
+                        if (!!skipFlush) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.flush()];
                     case 1:
+                        _b.sent();
+                        _b.label = 2;
+                    case 2: return [4 /*yield*/, store.validate(this.hooks['validate'] || [], forceValidate, throwErrors, toastErrors === false
+                            ? ''
+                            : typeof (messages === null || messages === void 0 ? void 0 : messages.validateFailed) === 'string'
+                                ? __(tpl.filter(messages.validateFailed, store.data))
+                                : undefined)];
+                    case 3:
                         result = _b.sent();
                         dispatchEvent(result ? 'validateSucc' : 'validateError', data);
                         return [2 /*return*/, result];
@@ -435,20 +442,55 @@ var Form = /** @class */ (function (_super) {
         this.flush();
         store.setValues(value, undefined, replace);
     };
-    Form.prototype.submit = function (fn, throwErrors) {
+    Form.prototype.submit = function (fn, throwErrors, skipFlush) {
         if (throwErrors === void 0) { throwErrors = false; }
-        var _a = this.props, store = _a.store, messages = _a.messages, __ = _a.translate, dispatchEvent = _a.dispatchEvent, data = _a.data;
-        this.flush();
-        var validateErrCb = function () { return dispatchEvent('validateError', data); };
-        return store.submit(fn, this.hooks['validate'] || [], typeof (messages === null || messages === void 0 ? void 0 : messages.validateFailed) === 'string'
-            ? __(tpl.filter(messages.validateFailed, store.data))
-            : undefined, validateErrCb, throwErrors);
+        if (skipFlush === void 0) { skipFlush = false; }
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, store, messages, __, dispatchEvent, data, validateErrCb;
+            return tslib.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, store = _a.store, messages = _a.messages, __ = _a.translate, dispatchEvent = _a.dispatchEvent, data = _a.data;
+                        if (!!skipFlush) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.flush()];
+                    case 1:
+                        _b.sent();
+                        _b.label = 2;
+                    case 2:
+                        validateErrCb = function () { return dispatchEvent('validateError', data); };
+                        return [2 /*return*/, store.submit(fn, this.hooks['validate'] || [], typeof (messages === null || messages === void 0 ? void 0 : messages.validateFailed) === 'string'
+                                ? __(tpl.filter(messages.validateFailed, store.data))
+                                : undefined, validateErrCb, throwErrors)];
+                }
+            });
+        });
     };
-    // 如果开启了 lazyChange，需要一个 flush 方法把队列中值应用上。
     Form.prototype.flush = function () {
-        var hooks = this.hooks['flush'] || [];
-        hooks.forEach(function (fn) { return fn(); });
-        this.lazyEmitChange.flush();
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var hooks;
+            return tslib.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, , 3, 4]);
+                        if (this.flushing) {
+                            return [2 /*return*/];
+                        }
+                        this.flushing = true;
+                        hooks = this.hooks['flush'] || [];
+                        return [4 /*yield*/, Promise.all(hooks.map(function (fn) { return fn(); }))];
+                    case 1:
+                        _a.sent();
+                        return [4 /*yield*/, this.lazyEmitChange.flush()];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        this.flushing = false;
+                        return [7 /*endfinally*/];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
     };
     Form.prototype.reset = function () {
         var _a = this.props, store = _a.store, onReset = _a.onReset;
@@ -520,11 +562,17 @@ var Form = /** @class */ (function (_super) {
                             onChange && onChange.apply(null, changeProps);
                         }
                         store.clearRestError();
-                        (submit || (submitOnChange && store.inited)) &&
-                            this.handleAction(undefined, {
-                                type: 'submit'
-                            }, store.data);
-                        return [2 /*return*/];
+                        if (!(submit || (submitOnChange && store.inited))) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.handleAction(undefined, {
+                                type: 'submit',
+                                // 如果这里不跳过，会相互依赖死循环，flush 会 让 emiteChange 立即执行
+                                // handleAction 里面又会调用 flush
+                                skipFormFlush: true
+                            }, store.data)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3: return [2 /*return*/];
                 }
             });
         });
@@ -575,8 +623,12 @@ var Form = /** @class */ (function (_super) {
                 switch (_f.label) {
                     case 0:
                         _c = this.props, store = _c.store, onSubmit = _c.onSubmit, api$1 = _c.api, asyncApi = _c.asyncApi, finishedField = _c.finishedField, checkInterval = _c.checkInterval, _d = _c.messages, saveSuccess = _d.saveSuccess, saveFailed = _d.saveFailed, resetAfterSubmit = _c.resetAfterSubmit, clearAfterSubmit = _c.clearAfterSubmit, onAction = _c.onAction, onSaved = _c.onSaved, onReset = _c.onReset, onFinished = _c.onFinished, onFailed = _c.onFailed, redirect = _c.redirect, reload = _c.reload, target = _c.target, env = _c.env, onChange = _c.onChange, clearPersistDataAfterSubmit = _c.clearPersistDataAfterSubmit, trimValues = _c.trimValues, dispatchEvent = _c.dispatchEvent, __ = _c.translate;
-                        // 做动作之前，先把数据同步一下。
-                        this.flush();
+                        if (!!action.skipFormFlush) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.flush()];
+                    case 1:
+                        _f.sent();
+                        _f.label = 2;
+                    case 2:
                         if (trimValues) {
                             store.trimValues();
                         }
@@ -584,7 +636,7 @@ var Form = /** @class */ (function (_super) {
                         if (data === this.props.data) {
                             data = store.data;
                         }
-                        if (!(Array.isArray(action.required) && action.required.length)) return [3 /*break*/, 4];
+                        if (!(Array.isArray(action.required) && action.required.length)) return [3 /*break*/, 6];
                         /** 如果是按钮指定了required，则校验前先清空一下遗留的校验报错 */
                         store.clearErrors();
                         fields = action.required.map(function (item) { return ({
@@ -592,31 +644,31 @@ var Form = /** @class */ (function (_super) {
                             rules: { isRequired: true }
                         }); });
                         return [4 /*yield*/, store.validateFields(fields)];
-                    case 1:
+                    case 3:
                         validationRes = _f.sent();
-                        if (!!validationRes) return [3 /*break*/, 3];
+                        if (!!validationRes) return [3 /*break*/, 5];
                         return [4 /*yield*/, dispatchEvent('validateError', this.props.data)];
-                    case 2:
+                    case 4:
                         dispatcher = _f.sent();
                         if (!(dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented)) {
                             env.notify('error', __('Form.validateFailed'));
                         }
                         /** 抛异常是为了在dialog中catch这个错误，避免弹窗直接关闭 */
                         return [2 /*return*/, Promise.reject(__('Form.validateFailed'))];
-                    case 3:
+                    case 5:
                         /** 重置validated状态，保证submit时触发表单中的校验项 */
                         store.clearErrors();
-                        _f.label = 4;
-                    case 4:
+                        _f.label = 6;
+                    case 6:
                         if (!(action.type === 'submit' ||
                             action.actionType === 'submit' ||
                             action.actionType === 'confirm' ||
                             action.actionType === 'reset-and-submit' ||
-                            action.actionType === 'clear-and-submit')) return [3 /*break*/, 6];
+                            action.actionType === 'clear-and-submit')) return [3 /*break*/, 8];
                         _e = this.props, dispatchEvent_1 = _e.dispatchEvent, onEvent = _e.onEvent;
                         submitEvent = (_b = (_a = onEvent === null || onEvent === void 0 ? void 0 : onEvent.submit) === null || _a === void 0 ? void 0 : _a.actions) === null || _b === void 0 ? void 0 : _b.length;
                         return [4 /*yield*/, dispatchEvent_1('submit', this.props.data)];
-                    case 5:
+                    case 7:
                         dispatcher = _f.sent();
                         if ((dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) || submitEvent) {
                             return [2 /*return*/];
@@ -753,7 +805,7 @@ var Form = /** @class */ (function (_super) {
                                             return [2 /*return*/, Promise.resolve(null)];
                                     }
                                 });
-                            }); }, throwErrors)
+                            }); }, throwErrors, true)
                                 .then(function (values) {
                                 // 有可能 onSubmit return false 了，那么后面的就不应该再执行了。
                                 if (values === false) {
@@ -781,7 +833,7 @@ var Form = /** @class */ (function (_super) {
                                     throw reason;
                                 }
                             })];
-                    case 6:
+                    case 8:
                         if (action.type === 'reset' || action.actionType === 'reset') {
                             store.setCurrentAction(action);
                             store.reset(onReset);
@@ -792,7 +844,7 @@ var Form = /** @class */ (function (_super) {
                         }
                         else if (action.actionType === 'validate') {
                             store.setCurrentAction(action);
-                            return [2 /*return*/, this.validate(true, throwErrors)];
+                            return [2 /*return*/, this.validate(true, throwErrors, true, true)];
                         }
                         else if (action.actionType === 'dialog') {
                             store.setCurrentAction(action);
@@ -868,8 +920,8 @@ var Form = /** @class */ (function (_super) {
                             // 不识别的丢给上层去处理。
                             return [2 /*return*/, onAction(e, action, data, throwErrors, delegate || this.context)];
                         }
-                        _f.label = 7;
-                    case 7: return [2 /*return*/];
+                        _f.label = 9;
+                    case 9: return [2 /*return*/];
                 }
             });
         });

package/lib/renderers/Item.d.ts

@@ -361,6 +361,7 @@ export interface FormItemProps extends RendererProps {
     };
     error?: string;
     showErrorMsg?: boolean;
+    testid?: string;
 }
 export type FormControlProps = RendererProps & {
     onOpenDialog: (schema: Schema, data: any) => Promise<any>;

package/lib/renderers/Item.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';
@@ -43,7 +43,6 @@ require('../utils/icon.js');
 require('../utils/image.js');
 require('lodash/isEqual');
 require('../actions/Action.js');
-require('lodash/cloneDeep');
 require('../utils/resize-sensor.js');
 require('react-overlays/useRootClose');
 require('../utils/SimpleMap.js');
@@ -73,7 +72,7 @@ var getItemLabelClassName = function (props) {
     var staticLabelClassName = props.staticLabelClassName, labelClassName = props.labelClassName, id = props.id, themeCss = props.themeCss;
     return props.static && staticLabelClassName
         ? staticLabelClassName
-        : cx__default["default"](labelClassName, styleHelper.setThemeClassName('labelClassName', id, themeCss, 'item'));
+        : cx__default["default"](labelClassName, styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, props), { name: 'labelClassName', id: id, themeCss: themeCss, extra: 'item' })));
 };
 var getItemInputClassName = function (props) {
     var staticInputClassName = props.staticInputClassName, inputClassName = props.inputClassName;
@@ -365,7 +364,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                         typeof controlSize === 'string' &&
                         !!controlSize &&
                         controlSize !== 'full',
-                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, styleHelper.setThemeClassName('wrapperCustomStyle', rest.id, rest.wrapperCustomStyle, 'item'), getItemInputClassName(this.props)) }));
+                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, this.props), { name: 'wrapperCustomStyle', id: rest.id, themeCss: rest.wrapperCustomStyle, extra: 'item' })), getItemInputClassName(this.props)) }));
         }
         return null;
     };
@@ -388,7 +387,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                     formStore: undefined
                 })
                 : null,
-            _J$X_(CustomStyle["default"], { config: {
+            _J$X_(CustomStyle["default"], tslib.__assign({}, this.props, { config: {
                     themeCss: themeCss || css,
                     classNames: [
                         {
@@ -400,7 +399,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                     ],
                     wrapperCustomStyle: wrapperCustomStyle,
                     id: id && id + '-item'
-                }, env: env })));
+                }, env: env }))));
     };
     /**
      * 布局扩充点，可以自己扩充表单项的布局方式
@@ -424,7 +423,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                     },
                     _a["is-error"] = model && !model.valid,
                     _a["is-required"] = required,
-                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, styleHelper.setThemeClassName('wrapperCustomStyle', id, wrapperCustomStyle, 'item')), style: style },
+                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, props), { name: 'wrapperCustomStyle', id: id, themeCss: wrapperCustomStyle, extra: 'item' }))), style: style },
                 label !== false ? (_J$X_("label", { className: cx("Form-label", (_b = {},
                         _b["Form-itemColumn--".concat(typeof horizontal.leftFixed === 'string'
                             ? horizontal.leftFixed
@@ -477,7 +476,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                         Array.isArray(model.errors) ? (_J$X_("ul", { className: cx("Form-feedback") }, model.errors.map(function (msg, key) { return (_J$X_("li", { key: key }, msg)); }))) : null,
                     renderDescription !== false && description
                         ? render('description', description, {
-                            className: cx("Form-description", descriptionClassName, styleHelper.setThemeClassName('descriptionClassName', id, themeCss, 'item'))
+                            className: cx("Form-description", descriptionClassName, styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, props), { name: 'descriptionClassName', id: id, themeCss: themeCss, extra: 'item' })))
                         })
                         : null)));
         },
@@ -489,7 +488,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                         'is-error': model && !model.valid
                     },
                     _a["is-required"] = required,
-                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, styleHelper.setThemeClassName('wrapperCustomStyle', id, wrapperCustomStyle, 'item')), style: style },
+                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, props), { name: 'wrapperCustomStyle', id: id, themeCss: wrapperCustomStyle, extra: 'item' }))), style: style },
                 label && renderLabel !== false ? (_J$X_("label", { className: cx("Form-label", getItemLabelClassName(props)) },
                     _J$X_("span", null,
                         label ? render('label', label) : null,
@@ -532,7 +531,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                         Array.isArray(model.errors) ? (_J$X_("ul", { className: cx("Form-feedback") }, model.errors.map(function (msg, key) { return (_J$X_("li", { key: key }, msg)); }))) : null,
                     renderDescription !== false && description
                         ? render('description', description, {
-                            className: cx("Form-description", descriptionClassName, styleHelper.setThemeClassName('descriptionClassName', id, themeCss, 'item'))
+                            className: cx("Form-description", descriptionClassName, styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, props), { name: 'descriptionClassName', id: id, themeCss: themeCss, extra: 'item' })))
                         })
                         : null)) : (_J$X_(React__default["default"].Fragment, null,
                     renderControl(),
@@ -562,7 +561,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                         Array.isArray(model.errors) ? (_J$X_("ul", { className: cx("Form-feedback") }, model.errors.map(function (msg, key) { return (_J$X_("li", { key: key }, msg)); }))) : null,
                     renderDescription !== false && description
                         ? render('description', description, {
-                            className: cx("Form-description", descriptionClassName, styleHelper.setThemeClassName('descriptionClassName', id, themeCss, 'item'))
+                            className: cx("Form-description", descriptionClassName, styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, props), { name: 'descriptionClassName', id: id, themeCss: themeCss, extra: 'item' })))
                         })
                         : null))));
         },
@@ -575,7 +574,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                         'is-error': model && !model.valid
                     },
                     _a["is-required"] = required,
-                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, styleHelper.setThemeClassName('wrapperCustomStyle', id, wrapperCustomStyle, 'item')), style: style },
+                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, props), { name: 'wrapperCustomStyle', id: id, themeCss: wrapperCustomStyle, extra: 'item' }))), style: style },
                 label && renderLabel !== false ? (_J$X_("label", { className: cx("Form-label", getItemLabelClassName(props)), style: labelWidth != null ? { width: labelWidth } : undefined },
                     _J$X_("span", null,
                         label ? render('label', label) : label,
@@ -618,7 +617,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                         Array.isArray(model.errors) ? (_J$X_("ul", { className: cx("Form-feedback") }, model.errors.map(function (msg, key) { return (_J$X_("li", { key: key }, msg)); }))) : null,
                     renderDescription !== false && description
                         ? render('description', description, {
-                            className: cx("Form-description", descriptionClassName, styleHelper.setThemeClassName('descriptionClassName', id, themeCss, 'item'))
+                            className: cx("Form-description", descriptionClassName, styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, props), { name: 'descriptionClassName', id: id, themeCss: themeCss, extra: 'item' })))
                         })
                         : null)));
         },
@@ -631,7 +630,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                         'is-error': model && !model.valid
                     },
                     _a["is-required"] = required,
-                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, styleHelper.setThemeClassName('wrapperCustomStyle', id, wrapperCustomStyle, 'item')), style: style },
+                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, props), { name: 'wrapperCustomStyle', id: id, themeCss: wrapperCustomStyle, extra: 'item' }))), style: style },
                 _J$X_("div", { className: cx('Form-rowInner') },
                     label && renderLabel !== false ? (_J$X_("label", { className: cx("Form-label", getItemLabelClassName(props)), style: labelWidth != null ? { width: labelWidth } : undefined },
                         _J$X_("span", null,
@@ -673,7 +672,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                     Array.isArray(model.errors) ? (_J$X_("ul", { className: cx('Form-feedback') }, model.errors.map(function (msg, key) { return (_J$X_("li", { key: key }, msg)); }))) : null,
                 description && renderDescription !== false
                     ? render('description', description, {
-                        className: cx("Form-description", descriptionClassName, styleHelper.setThemeClassName('descriptionClassName', id, themeCss, 'item'))
+                        className: cx("Form-description", descriptionClassName, styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, props), { name: 'descriptionClassName', id: id, themeCss: themeCss, extra: 'item' })))
                     })
                     : null));
         }

package/lib/renderers/Options.d.ts

@@ -126,6 +126,11 @@ export interface FormOptionsControl extends FormBaseControl {
     autoFill?: {
         [propName: string]: string;
     };
+    /**
+     * @default fillIfNotSet
+     * 初始化时是否把其他字段同步到表单内部。
+     */
+    initAutoFill?: boolean | 'fillIfNotSet';
 }
 export interface OptionsBasicConfig extends FormItemBasicConfig {
     autoLoadOptionsFromSource?: boolean;