amis-core 6.5.0 → 6.7.0

package/lib/actions/ParallelAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/PrintAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/StatusAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/SwitchAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/ToastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/WaitAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/components/CustomStyle.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 
@@ -13,7 +13,8 @@ var styleHelper = require('../utils/style-helper.js');
 var styleIdCount = new Map();
 function CustomStyle (props) {
     var config = props.config, env = props.env, data = props.data;
-    var themeCss = config.themeCss, classNames = config.classNames, id = config.id, defaultData = config.defaultData, wrapperCustomStyle = config.wrapperCustomStyle;
+    var themeCss = config.themeCss, classNames = config.classNames, defaultData = config.defaultData, wrapperCustomStyle = config.wrapperCustomStyle;
+    var id = config.id ? "".concat(config.id) : config.id;
     React.useEffect(function () {
         if (styleIdCount.has(id)) {
             styleIdCount.set(id, styleIdCount.get(id) + 1);

package/lib/components/ErrorBoundary.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/components/LazyComponent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/components/Overlay.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/components/PopOver.d.ts

@@ -6,6 +6,7 @@
 /// <reference types="hoist-non-react-statics" />
 import React from 'react';
 import { ClassNamesFn } from '../theme';
+import type { TestIdBuilder } from 'amis-core';
 export interface Offset {
     x: number;
     y: number;
@@ -24,6 +25,7 @@ export interface PopOverProps {
     onClick?: (e: React.MouseEvent<any>) => void;
     classPrefix: string;
     classnames: ClassNamesFn;
+    testIdBuilder?: TestIdBuilder;
     [propName: string]: any;
 }
 interface PopOverState {

package/lib/components/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 
@@ -161,12 +161,12 @@ var PopOver = /** @class */ (function (_super) {
         });
     };
     PopOver.prototype.render = function () {
-        var _a = this.props; _a.placement; var activePlacement = _a.activePlacement, positionTop = _a.positionTop, positionLeft = _a.positionLeft; _a.arrowOffsetLeft; _a.arrowOffsetTop; var style = _a.style, children = _a.children; _a.offset; var overlay = _a.overlay, onHide = _a.onHide, ns = _a.classPrefix, cx = _a.classnames, className = _a.className; _a.componentId; var rest = tslib.__rest(_a, ["placement", "activePlacement", "positionTop", "positionLeft", "arrowOffsetLeft", "arrowOffsetTop", "style", "children", "offset", "overlay", "onHide", "classPrefix", "classnames", "className", "componentId"]);
+        var _a = this.props; _a.placement; var activePlacement = _a.activePlacement, positionTop = _a.positionTop, positionLeft = _a.positionLeft; _a.arrowOffsetLeft; _a.arrowOffsetTop; var style = _a.style, children = _a.children; _a.offset; var overlay = _a.overlay, onHide = _a.onHide, ns = _a.classPrefix, cx = _a.classnames, className = _a.className; _a.componentId; var testIdBuilder = _a.testIdBuilder, rest = tslib.__rest(_a, ["placement", "activePlacement", "positionTop", "positionLeft", "arrowOffsetLeft", "arrowOffsetTop", "style", "children", "offset", "overlay", "onHide", "classPrefix", "classnames", "className", "componentId", "testIdBuilder"]);
         var _b = this.state, xOffset = _b.xOffset, yOffset = _b.yOffset;
         var outerStyle = tslib.__assign(tslib.__assign({ display: 'block' }, style), { top: positionTop + yOffset, left: positionLeft + xOffset });
         var placements = typeof activePlacement === 'string' ? activePlacement.split('-') : [];
-        return (_J$X_("div", tslib.__assign({ ref: this.wrapperRef, role: "popover", className: cx("PopOver", className, "PopOver--".concat(helper.camel(activePlacement)), placements[3] ? "PopOver--v-".concat(placements[3]) : ''), style: outerStyle }, rest),
-            overlay ? (_J$X_("div", { className: "".concat(ns, "PopOver-overlay"), onClick: onHide })) : null,
+        return (_J$X_("div", tslib.__assign({ ref: this.wrapperRef, role: "popover", className: cx("PopOver", className, "PopOver--".concat(helper.camel(activePlacement)), placements[3] ? "PopOver--v-".concat(placements[3]) : ''), style: outerStyle }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getTestId(), rest),
+            overlay ? (_J$X_("div", tslib.__assign({ className: "".concat(ns, "PopOver-overlay"), onClick: onHide }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('overlay').getTestId()))) : null,
             children));
     };
     PopOver.defaultProps = {

package/lib/env.d.ts

@@ -90,6 +90,10 @@ export interface RendererEnv {
      * 是否开启 testid 定位
      */
     enableTestid?: boolean;
+    /**
+     * pdfjs worker 地址，用于渲染 pdf
+     */
+    pdfjsWorkerSrc?: string;
     /**
      * 替换文本，用于实现 URL 替换、语言替换等
      */

package/lib/env.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/envOverwrite.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 
@@ -139,7 +139,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.5.0';
+var version = '6.7.0';
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }
@@ -371,6 +371,7 @@ exports.rmUndefined = helper.rmUndefined;
 exports.someTree = helper.someTree;
 exports.sortArray = helper.sortArray;
 exports.spliceTree = helper.spliceTree;
+exports.supportsMjs = helper.supportsMjs;
 exports.syncDataFromSuper = helper.syncDataFromSuper;
 exports.ucFirst = helper.ucFirst;
 exports.until = helper.until;

package/lib/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/polyfills.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 
@@ -50,10 +50,7 @@ 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');
+var styleHelper = require('../utils/style-helper.js');
 require('uncontrollable');
 require('hoist-non-react-statics');
 require('../utils/validations.js');
@@ -61,6 +58,7 @@ require('../utils/resolveCondition.js');
 var mobx = require('mobx');
 require('../utils/Animation.js');
 var groupBy = require('lodash/groupBy');
+var CustomStyle = require('../components/CustomStyle.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -570,17 +568,17 @@ var Form = /** @class */ (function (_super) {
     Form.prototype.emitChange = function (submit, emitedFromWatch) {
         if (emitedFromWatch === void 0) { emitedFromWatch = false; }
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, onChange, store, submitOnChange, dispatchEvent_1, data, diff, changeProps, dispatcher;
+            var _a, onChange, store, submitOnChange, dispatchEvent_1, data, originData, diff, changeProps, dispatcher;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         _b.trys.push([0, , 4, 5]);
                         this.emitting = true;
-                        _a = this.props, onChange = _a.onChange, store = _a.store, submitOnChange = _a.submitOnChange, dispatchEvent_1 = _a.dispatchEvent, data = _a.data;
+                        _a = this.props, onChange = _a.onChange, store = _a.store, submitOnChange = _a.submitOnChange, dispatchEvent_1 = _a.dispatchEvent, data = _a.data, originData = _a.originData;
                         if (!mobxStateTree.isAlive(store)) {
                             return [2 /*return*/];
                         }
-                        diff = helper.difference(store.data, store.pristine);
+                        diff = helper.difference(store.data, originData !== null && originData !== void 0 ? originData : store.upStreamData);
                         if (emitedFromWatch &&
                             (!Object.keys(diff).length || isEqual__default["default"](store.data, this.emittedData))) {
                             return [2 /*return*/];
@@ -1238,14 +1236,20 @@ var Form = /** @class */ (function (_super) {
         return render("".concat(region ? "".concat(region, "/") : '').concat(key), subSchema, subProps);
     };
     Form.prototype.renderBody = function () {
-        var _a = this.props, body = _a.body, mode = _a.mode, className = _a.className, cx = _a.classnames, debug = _a.debug, debugConfig = _a.debugConfig, $path = _a.$path, store = _a.store, columnCount = _a.columnCount, render = _a.render, staticClassName = _a.staticClassName, _b = _a.static, isStatic = _b === void 0 ? false : _b, loadingConfig = _a.loadingConfig; _a.testid;
+        var _a = this.props, body = _a.body, mode = _a.mode, className = _a.className, cx = _a.classnames, debug = _a.debug, debugConfig = _a.debugConfig, $path = _a.$path, store = _a.store, columnCount = _a.columnCount, render = _a.render, staticClassName = _a.staticClassName, _b = _a.static, isStatic = _b === void 0 ? false : _b, loadingConfig = _a.loadingConfig, themeCss = _a.themeCss, id = _a.id, wrapperCustomStyle = _a.wrapperCustomStyle, env = _a.env, wrapWithPanel = _a.wrapWithPanel; _a.testid;
         var restError = store.restError;
         var WrapperComponent = this.props.wrapperComponent ||
             (/(?:\/|^)form\//.test($path) ? 'div' : 'form');
         var padDom = helper.repeatCount(columnCount && Array.isArray(body)
             ? (columnCount - (body.length % columnCount)) % columnCount
             : 0, function (index) { return (_J$X_("div", { className: cx("Form-item Form-item--".concat(mode, " is-placeholder")), key: index })); });
-        return (_J$X_(WrapperComponent, { className: cx("Form", "Form--".concat(mode || 'normal'), columnCount ? "Form--column Form--column-".concat(columnCount) : null, staticClassName && isStatic ? staticClassName : className, isStatic ? 'Form--isStatic' : null), onSubmit: this.handleFormSubmit, noValidate: true },
+        return (_J$X_(WrapperComponent, { className: cx("Form", "Form--".concat(mode || 'normal'), columnCount ? "Form--column Form--column-".concat(columnCount) : null, staticClassName && isStatic ? staticClassName : className, isStatic ? 'Form--isStatic' : null, styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, this.props), { name: [
+                    'formControlClassName',
+                    'itemClassName',
+                    'staticClassName',
+                    'itemLabelClassName'
+                ], id: id, themeCss: themeCss })), !wrapWithPanel &&
+                styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, this.props), { name: 'wrapperCustomStyle', id: id, themeCss: wrapperCustomStyle }))), onSubmit: this.handleFormSubmit, noValidate: true },
             _J$X_("input", { type: "submit", style: { display: 'none' } }),
             debug
                 ? render('form-debug-json', tslib.__assign({ type: 'json', value: store.data, ellipsisThreshold: 120, className: cx('Form--debug') }, debugConfig))
@@ -1275,17 +1279,81 @@ var Form = /** @class */ (function (_super) {
                 onConfirm: this.handleDrawerConfirm,
                 onClose: this.handleDrawerClose,
                 show: store.drawerOpen
-            })));
+            }),
+            _J$X_(CustomStyle["default"], tslib.__assign({}, this.props, { config: {
+                    themeCss: themeCss,
+                    classNames: [
+                        wrapWithPanel && {
+                            key: 'panelClassName'
+                        },
+                        !wrapWithPanel && {
+                            key: 'formControlClassName'
+                        },
+                        {
+                            key: 'headerControlClassName',
+                            weights: {
+                                default: {
+                                    parent: ".".concat(cx('Panel'))
+                                }
+                            }
+                        },
+                        wrapWithPanel && {
+                            key: 'headerTitleControlClassName',
+                            weights: {
+                                default: {
+                                    important: true
+                                }
+                            }
+                        },
+                        wrapWithPanel && {
+                            key: 'bodyControlClassName'
+                        },
+                        wrapWithPanel && {
+                            key: 'actionsControlClassName',
+                            weights: {
+                                default: {
+                                    parent: ".".concat(cx('Panel--form'))
+                                }
+                            }
+                        },
+                        {
+                            key: 'itemClassName',
+                            weights: {
+                                default: {
+                                    inner: ".".concat(cx('Form-item'))
+                                }
+                            }
+                        },
+                        {
+                            key: 'staticClassName',
+                            weights: {
+                                default: {
+                                    inner: ".".concat(cx('Form-static'))
+                                }
+                            }
+                        },
+                        {
+                            key: 'itemLabelClassName',
+                            weights: {
+                                default: {
+                                    inner: ".".concat(cx('Form-label'))
+                                }
+                            }
+                        }
+                    ].filter(function (n) { return n; }),
+                    wrapperCustomStyle: wrapperCustomStyle,
+                    id: id
+                }, env: env }))));
     };
     Form.prototype.render = function () {
-        var _a = this.props; _a.$path; _a.$schema; var wrapWithPanel = _a.wrapWithPanel, render = _a.render, title = _a.title, store = _a.store, panelClassName = _a.panelClassName, headerClassName = _a.headerClassName, footerClassName = _a.footerClassName, footerWrapClassName = _a.footerWrapClassName, actionsClassName = _a.actionsClassName, bodyClassName = _a.bodyClassName, cx = _a.classnames, style = _a.style, affixFooter = _a.affixFooter, lazyLoad = _a.lazyLoad, __ = _a.translate, footer = _a.footer;
+        var _a = this.props; _a.$path; _a.$schema; var wrapWithPanel = _a.wrapWithPanel, render = _a.render, title = _a.title, store = _a.store, panelClassName = _a.panelClassName, headerClassName = _a.headerClassName, footerClassName = _a.footerClassName, footerWrapClassName = _a.footerWrapClassName, actionsClassName = _a.actionsClassName, bodyClassName = _a.bodyClassName, cx = _a.classnames, style = _a.style, affixFooter = _a.affixFooter, lazyLoad = _a.lazyLoad, __ = _a.translate, footer = _a.footer, id = _a.id, wrapperCustomStyle = _a.wrapperCustomStyle, themeCss = _a.themeCss;
         var body = this.renderBody();
         if (wrapWithPanel) {
             body = render('body', {
                 type: 'panel',
                 title: __(title)
             }, {
-                className: cx(panelClassName, 'Panel--form'),
+                className: cx(panelClassName, 'Panel--form', styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, this.props), { name: 'wrapperCustomStyle', id: id, themeCss: wrapperCustomStyle })), styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, this.props), { name: 'panelClassName', id: id, themeCss: themeCss }))),
                 style: style,
                 formStore: this.props.store,
                 children: body,
@@ -1295,11 +1363,15 @@ var Form = /** @class */ (function (_super) {
                 disabled: store.loading,
                 btnDisabled: store.loading || store.validating,
                 headerClassName: headerClassName,
+                headerControlClassName: styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, this.props), { name: 'headerControlClassName', id: id, themeCss: themeCss })),
+                headerTitleControlClassName: styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, this.props), { name: 'headerTitleControlClassName', id: id, themeCss: themeCss })),
                 footer: footer,
                 footerClassName: footerClassName,
                 footerWrapClassName: footerWrapClassName,
                 actionsClassName: actionsClassName,
+                actionsControlClassName: styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, this.props), { name: 'actionsControlClassName', id: id, themeCss: themeCss })),
                 bodyClassName: bodyClassName,
+                bodyControlClassName: styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, this.props), { name: 'bodyControlClassName', id: id, themeCss: themeCss })),
                 affixFooter: affixFooter
             });
         }

package/lib/renderers/Item.d.ts

@@ -523,7 +523,7 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
     static layoutRenderers: {
         [propsName: string]: (props: FormItemProps, renderControl: () => JSX.Element | null) => JSX.Element;
     };
-    render(): React.JSX.Element | null;
+    render(): JSX.Element | null;
 }
 export declare const detectProps: string[];
 export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (Control: FormControlComponent) => {

package/lib/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 
@@ -470,7 +470,7 @@ var FormItemWrap = /** @class */ (function (_super) {
         return null;
     };
     FormItemWrap.prototype.render = function () {
-        var _a = this.props, formMode = _a.formMode, inputOnly = _a.inputOnly, wrap = _a.wrap, render = _a.render, model = _a.formItem, css = _a.css, themeCss = _a.themeCss, id = _a.id, wrapperCustomStyle = _a.wrapperCustomStyle, env = _a.env;
+        var _a = this.props, formMode = _a.formMode, inputOnly = _a.inputOnly, wrap = _a.wrap, render = _a.render, model = _a.formItem, css = _a.css, themeCss = _a.themeCss, id = _a.id, wrapperCustomStyle = _a.wrapperCustomStyle, env = _a.env, cx = _a.classnames;
         var mode = this.props.mode || formMode;
         if (wrap === false || inputOnly) {
             return this.renderControl();
@@ -492,7 +492,13 @@ var FormItemWrap = /** @class */ (function (_super) {
                     themeCss: themeCss || css,
                     classNames: [
                         {
-                            key: 'labelClassName'
+                            key: 'labelClassName',
+                            weights: {
+                                default: {
+                                    suf: ".".concat(cx('Form-label')),
+                                    parent: ".".concat(cx('Form-item'))
+                                }
+                            }
                         },
                         {
                             key: 'descriptionClassName'
@@ -517,7 +523,8 @@ var FormItemWrap = /** @class */ (function (_super) {
             var horizontal = props.horizontal || props.formHorizontal || {};
             var left = helper.getWidthRate(horizontal.left);
             var right = helper.getWidthRate(horizontal.right);
-            var labelAlign = props.labelAlign || props.formLabelAlign;
+            var labelAlign = (props.labelAlign !== 'inherit' && props.labelAlign) ||
+                props.formLabelAlign;
             var labelWidth = props.labelWidth || props.formLabelWidth;
             return (_J$X_("div", { "data-role": "form-item", className: cx("Form-item Form-item--horizontal", isStatic && staticClassName ? staticClassName : className, (_a = {
                         'Form-item--horizontal-justify': horizontal.justify
@@ -806,35 +813,36 @@ var FormItemWrap = /** @class */ (function (_super) {
                                     container: props.popOverContainer || env.getModalContainer
                                 })
                                 : null))) : null,
-                    renderControl(),
-                    caption
-                        ? render('caption', caption, {
-                            className: cx("Form-caption", captionClassName)
-                        })
-                        : null,
-                    remark
-                        ? render('remark', {
-                            type: 'remark',
-                            icon: remark.icon || 'warning-mark',
-                            className: cx("Form-remark"),
-                            tooltip: remark,
-                            container: props.popOverContainer || env.getModalContainer
-                        })
-                        : null),
-                hint && model && model.isFocused
-                    ? render('hint', hint, {
-                        className: cx("Form-hint")
-                    })
-                    : null,
-                model &&
-                    !model.valid &&
-                    showErrorMsg !== false &&
-                    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(tslib.__assign(tslib.__assign({}, props), { name: 'descriptionClassName', id: id, themeCss: themeCss, extra: 'item' })))
-                    })
-                    : null));
+                    _J$X_("div", { className: cx("Form-value") },
+                        renderControl(),
+                        caption
+                            ? render('caption', caption, {
+                                className: cx("Form-caption", captionClassName)
+                            })
+                            : null,
+                        remark
+                            ? render('remark', {
+                                type: 'remark',
+                                icon: remark.icon || 'warning-mark',
+                                className: cx("Form-remark"),
+                                tooltip: remark,
+                                container: props.popOverContainer || env.getModalContainer
+                            })
+                            : null,
+                        hint && model && model.isFocused
+                            ? render('hint', hint, {
+                                className: cx("Form-hint")
+                            })
+                            : null,
+                        model &&
+                            !model.valid &&
+                            showErrorMsg !== false &&
+                            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(tslib.__assign(tslib.__assign({}, props), { name: 'descriptionClassName', id: id, themeCss: themeCss, extra: 'item' })))
+                            })
+                            : null))));
         }
     };
     tslib.__decorate([
@@ -994,6 +1002,7 @@ function asFormItem(config) {
                 function class_1(props) {
                     var _this = _super.call(this, props) || this;
                     _this.refFn = _this.refFn.bind(_this);
+                    _this.getData = _this.getData.bind(_this);
                     var validations = props.validations, model = props.formItem;
                     // 组件注册的时候可能默认指定验证器类型
                     if (model && !validations && config.validations) {
@@ -1022,18 +1031,25 @@ function asFormItem(config) {
                 class_1.prototype.refFn = function (ref) {
                     this.ref = ref;
                 };
+                class_1.prototype.getData = function () {
+                    return this.props.data;
+                };
                 class_1.prototype.renderControl = function () {
                     var _a;
                     var _b = this.props; 
                     // 这里解构，不可轻易删除，避免被rest传到子组件
                     _b.inputClassName; var model = _b.formItem, cx = _b.classnames; _b.children; var type = _b.type, size = _b.size, defaultSize = _b.defaultSize, mobileUI = _b.mobileUI, rest = tslib.__rest(_b, ["inputClassName", "formItem", "classnames", "children", "type", "size", "defaultSize", "mobileUI"]);
-                    var controlSize = size && ['xs', 'sm', 'md', 'lg', 'full'].includes(size)
-                        ? size
-                        : defaultSize;
+                    var isRuleSize = size && ['xs', 'sm', 'md', 'lg', 'full'].includes(size);
+                    var controlSize = isRuleSize ? size : defaultSize;
                     //@ts-ignore
                     var isOpened = this.state.isOpened;
                     return (_J$X_(React__default["default"].Fragment, null,
-                        _J$X_(Control, tslib.__assign({}, rest, { mobileUI: mobileUI, onOpenDialog: this.handleOpenDialog, size: config.sizeMutable !== false ? undefined : size, onFocus: this.handleFocus, onBlur: this.handleBlur, type: type, classnames: cx, ref: supportRef ? this.refFn : undefined, forwardedRef: supportRef ? undefined : this.refFn, formItem: model, className: cx("Form-control", (_a = {
+                        _J$X_(Control, tslib.__assign({}, rest, { 
+                            // 因为 formItem 内部可能不会更新到最新的 data，所以暴露个方法可以获取到最新的
+                            // 获取不到最新的因为做了限制，只有表单项目 name 关联的数值变化才更新
+                            getData: this.getData, mobileUI: mobileUI, onOpenDialog: this.handleOpenDialog, size: config.sizeMutable !== false ? undefined : size, onFocus: this.handleFocus, onBlur: this.handleBlur, type: type, classnames: cx, ref: supportRef ? this.refFn : undefined, forwardedRef: supportRef ? undefined : this.refFn, formItem: model, style: {
+                                width: !isRuleSize && size ? size : undefined
+                            }, className: cx("Form-control", (_a = {
                                     'is-inline': !!rest.inline && !mobileUI,
                                     'is-error': model && !model.valid,
                                     'is-full': size === 'full'

package/lib/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 
@@ -107,21 +107,47 @@ function registerOptionsControl(config) {
                 _this.defaultCheckAll();
             }
             var loadOptions = initFetch !== false;
+            var setInitValue = null;
             if (joinValues === false && defaultValue) {
-                var selectedOptions = extractValue
-                    ? formItem
-                        .getSelectedOptions(value)
-                        .map(function (selectedOption) {
-                        return selectedOption[valueField || 'value'];
-                    })
-                    : formItem.getSelectedOptions(value);
-                setPrinstineValue(multiple ? selectedOptions.concat() : selectedOptions[0]);
+                setInitValue = function () {
+                    var selectedOptions = extractValue
+                        ? formItem
+                            .getSelectedOptions(value)
+                            .map(function (selectedOption) {
+                            return selectedOption[valueField || 'value'];
+                        })
+                        : formItem.getSelectedOptions(value);
+                    setPrinstineValue(multiple ? selectedOptions.concat() : selectedOptions[0]);
+                };
             }
-            loadOptions &&
-                config.autoLoadOptionsFromSource !== false &&
+            if (loadOptions && config.autoLoadOptionsFromSource !== false) {
                 _this.toDispose.push(formInited || !addHook
-                    ? formItem.addInitHook(_this.reload)
-                    : addHook(_this.initOptions, 'init'));
+                    ? formItem.addInitHook(function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+                        return tslib.__generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, this.reload()];
+                                case 1:
+                                    _a.sent();
+                                    setInitValue === null || setInitValue === void 0 ? void 0 : setInitValue();
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); })
+                    : addHook(function (data) { return tslib.__awaiter(_this, void 0, void 0, function () {
+                        return tslib.__generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, this.initOptions(data)];
+                                case 1:
+                                    _a.sent();
+                                    setInitValue === null || setInitValue === void 0 ? void 0 : setInitValue();
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); }, 'init'));
+            }
+            else {
+                setInitValue === null || setInitValue === void 0 ? void 0 : setInitValue();
+            }
             return _this;
         }
         FormOptionsItem.prototype.componentDidMount = function () {

package/lib/renderers/Placeholder.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/renderers/builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/renderers/register.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */