amis-core 6.13.0-beta.16 → 6.13.0-beta.17

package/esm/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.16
+ * amis-core v6.13.0-beta.17
  * Copyright 2018-2025 fex
  */
 
@@ -23,7 +23,7 @@ import { reaction } from 'mobx';
 import groupBy from 'lodash/groupBy';
 import isEqual from 'lodash/isEqual';
 import CustomStyle from '../components/CustomStyle.js';
-import { isObject, createObject, cloneObject, injectObjectChain } from '../utils/object.js';
+import { isObject, injectObjectChain, createObject, cloneObject } from '../utils/object.js';
 import { setThemeClassName } from '../utils/style-helper.js';
 import { dataMapping } from '../utils/dataMapping.js';
 
@@ -38,6 +38,7 @@ var Form = /** @class */ (function (_super) {
             trailing: true,
             leading: false
         });
+        _this.formRef = React.createRef();
         // 如果开启了 lazyChange，需要一个 flush 方法把队列中值应用上。
         _this.flushing = false;
         _this.emittedData = null;
@@ -64,7 +65,7 @@ var Form = /** @class */ (function (_super) {
         _this.dispatchInited = _this.dispatchInited.bind(_this);
         _this.blockRouting = _this.blockRouting.bind(_this);
         _this.beforePageUnload = _this.beforePageUnload.bind(_this);
-        _this.formItemDispatchEvent = _this.formItemDispatchEvent.bind(_this);
+        _this.dispatchEvent = _this.dispatchEvent.bind(_this);
         _this.flush = _this.flush.bind(_this);
         var store = props.store, canAccessSuperData = props.canAccessSuperData, persistData = props.persistData, simpleMode = props.simpleMode, formLazyChange = props.formLazyChange;
         store.setCanAccessSuperData(canAccessSuperData !== false);
@@ -162,6 +163,11 @@ var Form = /** @class */ (function (_super) {
                 }
             })
                 .then(this.initInterval)
+                .then(function () {
+                return _this.props.dispatchEvent('initApiFinished', injectObjectChain(store.data, {
+                    __trigger: 'init'
+                }));
+            })
                 .then(this.onInit);
         }
         else {
@@ -330,7 +336,7 @@ var Form = /** @class */ (function (_super) {
                                 _c[initFinishedField || 'finished'] = false,
                                 _c));
                         result = undefined;
-                        if (!isEffectiveApi(initApi, store.data)) return [3 /*break*/, 2];
+                        if (!isEffectiveApi(initApi, store.data)) return [3 /*break*/, 4];
                         return [4 /*yield*/, store.fetchInitData(initApi, store.data, {
                                 successMessage: fetchSuccess,
                                 errorMessage: fetchFailed,
@@ -346,15 +352,20 @@ var Form = /** @class */ (function (_super) {
                             })];
                     case 1:
                         result = _d.sent();
-                        if (result === null || result === void 0 ? void 0 : result.ok) {
-                            this.initInterval(result);
-                            store.reset(undefined, false);
-                        }
-                        return [3 /*break*/, 3];
-                    case 2:
+                        if (!(result === null || result === void 0 ? void 0 : result.ok)) return [3 /*break*/, 3];
+                        this.initInterval(result);
                         store.reset(undefined, false);
+                        return [4 /*yield*/, this.props.dispatchEvent('initApiFinished', injectObjectChain(store.data, {
+                                __trigger: 'reload'
+                            }))];
+                    case 2:
+                        _d.sent();
                         _d.label = 3;
-                    case 3:
+                    case 3: return [3 /*break*/, 5];
+                    case 4:
+                        store.reset(undefined, false);
+                        _d.label = 5;
+                    case 5:
                         // 派发初始化接口请求完成事件
                         this.dispatchInited(result);
                         return [2 /*return*/, store.data];
@@ -556,9 +567,31 @@ var Form = /** @class */ (function (_super) {
             store.setLocalPersistData(persistDataKeys);
         }
     };
-    Form.prototype.formItemDispatchEvent = function (type, data) {
-        var dispatchEvent = this.props.dispatchEvent;
-        return dispatchEvent(type, data);
+    Form.prototype.dispatchEvent = function (e, data, renderer, // for didmount
+    scoped) {
+        var _a, _b;
+        // 把这两个事件转到 form 组件上，让 form 组件来处理
+        if ((e === 'formItemValidateSucc' || e === 'formItemValidateError') &&
+            (renderer === null || renderer === void 0 ? void 0 : renderer.props.type) !== 'form') {
+            if (e === 'formItemValidateError') {
+                // 当表单校验错误是，优先调用组件的 focus
+                // 如果没有 focus 方法，则滚动到错误信息的位置
+                if (typeof (renderer === null || renderer === void 0 ? void 0 : renderer.focus) === 'function') {
+                    renderer.focus();
+                }
+                else {
+                    (_b = (_a = this.formRef.current) === null || _a === void 0 ? void 0 : _a.querySelector('.cxd-Form-feedback')) === null || _b === void 0 ? void 0 : _b.scrollIntoView({
+                        behavior: 'smooth',
+                        block: 'center'
+                    });
+                }
+            }
+            // 如果事件是 formItemValidateSucc 或者 formItemValidateError 转成当前组件触发的，
+            // 所以 onEvent 是配置在 form 层的而不是表单项层
+            renderer = undefined;
+            scoped = undefined;
+        }
+        return this.props.dispatchEvent(e, data, renderer, scoped);
     };
     Form.prototype.emitChange = function (submit, emitedFromWatch) {
         if (emitedFromWatch === void 0) { emitedFromWatch = false; }
@@ -1235,7 +1268,7 @@ var Form = /** @class */ (function (_super) {
             addHook: this.addHook,
             removeHook: this.removeHook,
             renderFormItems: this.renderFormItems,
-            formItemDispatchEvent: this.formItemDispatchEvent,
+            dispatchEvent: this.dispatchEvent,
             formPristine: form.pristine,
             onFlushForm: this.flush
             // value: (control as any)?.name
@@ -1258,7 +1291,7 @@ var Form = /** @class */ (function (_super) {
         var padDom = repeatCount(columnCount && Array.isArray(body)
             ? (columnCount - (body.length % columnCount)) % columnCount
             : 0, function (index) { return (React.createElement("div", { className: cx("Form-item Form-item--".concat(mode, " is-placeholder")), key: index })); });
-        return (React.createElement(WrapperComponent, { className: cx("Form", "Form--".concat(mode || 'normal'), columnCount ? "Form--column Form--column-".concat(columnCount) : null, staticClassName && isStatic ? staticClassName : className, isStatic ? 'Form--isStatic' : null, setThemeClassName(__assign(__assign({}, this.props), { name: [
+        return (React.createElement(WrapperComponent, { ref: this.formRef, className: cx("Form", "Form--".concat(mode || 'normal'), columnCount ? "Form--column Form--column-".concat(columnCount) : null, staticClassName && isStatic ? staticClassName : className, isStatic ? 'Form--isStatic' : null, setThemeClassName(__assign(__assign({}, this.props), { name: [
                     'formControlClassName',
                     'itemClassName',
                     'staticClassName',

package/esm/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.16
+ * amis-core v6.13.0-beta.17
  * Copyright 2018-2025 fex
  */
 

package/esm/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.16
+ * amis-core v6.13.0-beta.17
  * Copyright 2018-2025 fex
  */
 

package/esm/renderers/Placeholder.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.16
+ * amis-core v6.13.0-beta.17
  * Copyright 2018-2025 fex
  */
 

package/esm/renderers/builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.16
+ * amis-core v6.13.0-beta.17
  * Copyright 2018-2025 fex
  */
 

package/esm/renderers/register.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.16
+ * amis-core v6.13.0-beta.17
  * Copyright 2018-2025 fex
  */
 

package/esm/renderers/wrapControl.d.ts

@@ -42,7 +42,6 @@ export interface ControlOutterProps extends RendererProps {
     };
     store?: IIRendererStore;
     onChange?: (value: any, name: string, submit?: boolean, changePristine?: boolean, changeReason?: DataChangeReason) => void;
-    formItemDispatchEvent: (type: string, data: any) => void;
     formItemRef?: (control: any) => void;
 }
 export interface ControlProps {

package/esm/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.16
+ * amis-core v6.13.0-beta.17
  * Copyright 2018-2025 fex
  */
 
@@ -19,8 +19,10 @@ import hoistNonReactStatic from 'hoist-non-react-statics';
 import { withRootStore } from '../WithRootStore.js';
 import { TableStore } from '../store/table.js';
 import pick from 'lodash/pick';
+import { reaction } from 'mobx';
 import '../utils/index.js';
 import { tokenize } from '../utils/tokenize.js';
+import { injectObjectChain } from '../utils/object.js';
 import { getVariable } from '../utils/getVariable.js';
 import { callStrFunction } from '../utils/api.js';
 
@@ -125,6 +127,17 @@ function wrapControl(config, ComposedComponent) {
                         onChange(model.tmpValue, model.name, false, true);
                     }
                 }
+                _this.reaction = reaction(function () { return model.validatedAt; }, function (validatedAt) {
+                    var _a, _b, _c, _d;
+                    (_b = (_a = _this.props).dispatchEvent) === null || _b === void 0 ? void 0 : _b.call(_a, model.valid
+                        ? 'formItemValidateSucc'
+                        : 'formItemValidateError', injectObjectChain((_d = (_c = _this.props.formStore) === null || _c === void 0 ? void 0 : _c.data) !== null && _d !== void 0 ? _d : _this.props.data, {
+                        __errors: model.errors,
+                        __formName: model.name,
+                        __formValue: model.tmpValue,
+                        __formControl: _this.control
+                    }));
+                });
                 return _this;
             }
             class_1.prototype.componentDidMount = function () {
@@ -379,15 +392,14 @@ function wrapControl(config, ComposedComponent) {
                 }
             };
             class_1.prototype.validate = function () {
-                var _a, _b;
                 return __awaiter(this, void 0, void 0, function () {
-                    var _c, form, data, formItemDispatchEvent, result, combo, group, validPromises, valid;
-                    return __generator(this, function (_d) {
-                        switch (_d.label) {
+                    var _a, form, data, dispatchEvent, result, combo, group, validPromises, valid;
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
                             case 0:
                                 if (!this.model)
                                     return [2 /*return*/];
-                                _c = this.props, form = _c.formStore, data = _c.data, formItemDispatchEvent = _c.formItemDispatchEvent;
+                                _a = this.props, form = _a.formStore, data = _a.data, dispatchEvent = _a.dispatchEvent;
                                 if (!(this.model.unique &&
                                     (form === null || form === void 0 ? void 0 : form.parentStore) &&
                                     form.parentStore.storeType === ComboStore.name)) return [3 /*break*/, 2];
@@ -398,16 +410,14 @@ function wrapControl(config, ComposedComponent) {
                                 });
                                 return [4 /*yield*/, Promise.all(validPromises)];
                             case 1:
-                                result = _d.sent();
+                                result = _b.sent();
                                 return [3 /*break*/, 4];
                             case 2: return [4 /*yield*/, this.model.validate(data)];
                             case 3:
-                                result = [_d.sent()];
-                                _d.label = 4;
+                                result = [_b.sent()];
+                                _b.label = 4;
                             case 4:
                                 valid = !result.some(function (item) { return item === false; });
-                                (_a = (formItemDispatchEvent !== null && formItemDispatchEvent !== void 0 ? formItemDispatchEvent : this.props.dispatchEvent)) === null || _a === void 0 ? void 0 : _a(valid ? 'formItemValidateSucc' : 'formItemValidateError', (_b = form === null || form === void 0 ? void 0 : form.data) !== null && _b !== void 0 ? _b : this.props.data // form里的一定是最新的数据
-                                );
                                 return [2 /*return*/, valid];
                         }
                     });

package/esm/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.16
+ * amis-core v6.13.0-beta.17
  * Copyright 2018-2025 fex
  */