amis-core 6.13.0-beta.2 → 6.13.0-beta.21

package/lib/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 
@@ -56,6 +56,12 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
             trailing: true,
             leading: false
         });
+        // 当有多次调用时，只需要跳一个
+        _this.lazyJumpToErrorComponent = debounce__default["default"](_this.jumpToErrorComponent.bind(_this), 250, {
+            trailing: false,
+            leading: true
+        });
+        _this.formRef = React__default["default"].createRef();
         // 如果开启了 lazyChange，需要一个 flush 方法把队列中值应用上。
         _this.flushing = false;
         _this.emittedData = null;
@@ -82,7 +88,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
         _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);
@@ -180,6 +186,11 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                 }
             })
                 .then(this.initInterval)
+                .then(function () {
+                return _this.props.dispatchEvent('initApiFinished', object.injectObjectChain(store.data, {
+                    __trigger: 'init'
+                }));
+            })
                 .then(this.onInit);
         }
         else {
@@ -209,6 +220,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
         clearTimeout(this.timer);
         // this.lazyHandleChange.flush();
         this.lazyEmitChange.cancel();
+        this.lazyJumpToErrorComponent.cancel();
         this.asyncCancel && this.asyncCancel();
         this.toDispose.forEach(function (fn) { return fn(); });
         this.toDispose = [];
@@ -263,6 +275,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
     Form.prototype.onInit = function () {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var _a, onInit, store, persistData, submitOnInit, dispatchEvent, data, initedAt, hooks, groupedHooks, dispatch;
+            var _this = this;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -273,6 +286,13 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                         data = object.cloneObject(store.data);
                         initedAt = store.initedAt;
                         store.setInited(true);
+                        // 等待 formInited 属性下发成功
+                        // 因为 hooks 里面可以能有读取 props 的操作
+                        return [4 /*yield*/, new Promise(function (resolve) { return _this.forceUpdate(resolve); })];
+                    case 1:
+                        // 等待 formInited 属性下发成功
+                        // 因为 hooks 里面可以能有读取 props 的操作
+                        _b.sent();
                         hooks = this.hooks['init'] || [];
                         groupedHooks = groupBy__default["default"](hooks, function (item) {
                             return item.__enforce === 'prev'
@@ -282,15 +302,15 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                                     : 'normal';
                         });
                         return [4 /*yield*/, Promise.all((groupedHooks.prev || []).map(function (hook) { return hook(data); }))];
-                    case 1:
+                    case 2:
                         _b.sent();
                         //  有可能在前面的步骤中删除了钩子，所以需要重新验证一下
                         return [4 /*yield*/, Promise.all((groupedHooks.normal || []).map(function (hook) { return hooks.includes(hook) && hook(data); }))];
-                    case 2:
+                    case 3:
                         //  有可能在前面的步骤中删除了钩子，所以需要重新验证一下
                         _b.sent();
                         return [4 /*yield*/, Promise.all((groupedHooks.post || []).map(function (hook) { return hooks.includes(hook) && hook(data); }))];
-                    case 3:
+                    case 4:
                         _b.sent();
                         if (!mobxStateTree.isAlive(store)) {
                             return [2 /*return*/];
@@ -308,7 +328,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                         }
                         onInit && onInit(data, this.props);
                         return [4 /*yield*/, this.dispatchInited({ data: data })];
-                    case 4:
+                    case 5:
                         dispatch = _b.sent();
                         if (dispatch === null || dispatch === void 0 ? void 0 : dispatch.prevented) {
                             return [2 /*return*/];
@@ -340,7 +360,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                                 _c[initFinishedField || 'finished'] = false,
                                 _c));
                         result = undefined;
-                        if (!api.isEffectiveApi(initApi, store.data)) return [3 /*break*/, 2];
+                        if (!api.isEffectiveApi(initApi, store.data)) return [3 /*break*/, 4];
                         return [4 /*yield*/, store.fetchInitData(initApi, store.data, {
                                 successMessage: fetchSuccess,
                                 errorMessage: fetchFailed,
@@ -356,15 +376,20 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                             })];
                     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', object.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];
@@ -566,9 +591,34 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
             store.setLocalPersistData(persistDataKeys);
         }
     };
-    Form.prototype.formItemDispatchEvent = function (type, data) {
-        var dispatchEvent = this.props.dispatchEvent;
-        return dispatchEvent(type, data);
+    Form.prototype.jumpToErrorComponent = function (renderer) {
+        var _a, _b;
+        // 当表单校验错误是，优先调用组件的 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(".".concat(this.props.classPrefix, "Form-feedback"))) === null || _b === void 0 ? void 0 : _b.scrollIntoView({
+                behavior: 'smooth',
+                block: 'center'
+            });
+        }
+    };
+    Form.prototype.dispatchEvent = function (e, data, renderer, // for didmount
+    scoped) {
+        // 把这两个事件转到 form 组件上，让 form 组件来处理
+        if ((e === 'formItemValidateSucc' || e === 'formItemValidateError') &&
+            (renderer === null || renderer === void 0 ? void 0 : renderer.props.type) !== 'form') {
+            if (e === 'formItemValidateError') {
+                this.lazyJumpToErrorComponent(renderer);
+            }
+            // 如果事件是 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; }
@@ -1245,7 +1295,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
             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
@@ -1268,7 +1318,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
         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, styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, this.props), { name: [
+        return (_J$X_(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, styleHelper.setThemeClassName(tslib.__assign(tslib.__assign({}, this.props), { name: [
                     'formControlClassName',
                     'itemClassName',
                     'staticClassName',
@@ -1289,16 +1339,14 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
             }),
             padDom,
             restError && restError.length ? (_J$X_("ul", { className: cx('Form-restError', 'Form-feedback') }, restError.map(function (item, idx) { return (_J$X_("li", { key: idx }, item)); }))) : null,
-            render('modal', tslib.__assign(tslib.__assign({}, (store.action &&
-                store.action.dialog)), { type: 'dialog' }), {
+            render('modal', tslib.__assign(tslib.__assign({}, store.dialogSchema), { type: 'dialog' }), {
                 key: 'dialog',
                 data: store.dialogData,
                 onConfirm: this.handleDialogConfirm,
                 onClose: this.handleDialogClose,
                 show: store.dialogOpen
             }),
-            render('modal', tslib.__assign(tslib.__assign({}, (store.action &&
-                store.action.drawer)), { type: 'drawer' }), {
+            render('modal', tslib.__assign(tslib.__assign({}, store.drawerSchema), { type: 'drawer' }), {
                 key: 'drawer',
                 data: store.drawerData,
                 onConfirm: this.handleDrawerConfirm,

package/lib/renderers/Item.js

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

package/lib/renderers/Options.js

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

package/lib/renderers/Placeholder.js

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

package/lib/renderers/builtin.js

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

package/lib/renderers/register.js

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

package/lib/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/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 
@@ -23,8 +23,10 @@ var hoistNonReactStatic = require('hoist-non-react-statics');
 var WithRootStore = require('../WithRootStore.js');
 var table = require('../store/table.js');
 var pick = require('lodash/pick');
+var mobx = require('mobx');
 require('../utils/index.js');
 var tokenize = require('../utils/tokenize.js');
+var object = require('../utils/object.js');
 var getVariable = require('../utils/getVariable.js');
 var api = require('../utils/api.js');
 
@@ -74,6 +76,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                 if (!name) {
                     return _this;
                 }
+                var valueIsExp = formula.isExpression(value);
                 var propValue = _this.props.value;
                 var model = rootStore.addStore({
                     id: helper.guid(),
@@ -90,8 +93,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                     ? tslib.__assign(tslib.__assign({}, validations$1), validations.str2rules(config.validations)) : validations$1;
                 // @issue 打算干掉这个
                 formItem$1 === null || formItem$1 === void 0 ? void 0 : formItem$1.addSubFormItem(model);
-                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) &&
-                        value.replace(/\s/g, '') !== "${".concat(name, "}"), rules: rules, messages: validationErrors, delimiter: delimiter, valueField: valueField, labelField: labelField, joinValues: joinValues, extractValue: extractValue, selectFirst: selectFirst, autoFill: autoFill, clearValueOnHidden: clearValueOnHidden, validateApi: validateApi, minLength: minLength, maxLength: maxLength, validateOnChange: validateOnChange, label: label, inputGroupControl: inputGroupControl, extraName: extraName, pagination: pagination }));
+                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: valueIsExp && value.replace(/\s/g, '') !== "${".concat(name, "}"), rules: rules, messages: validationErrors, delimiter: delimiter, valueField: valueField, labelField: labelField, joinValues: joinValues, extractValue: extractValue, selectFirst: selectFirst, autoFill: autoFill, clearValueOnHidden: clearValueOnHidden, validateApi: validateApi, minLength: minLength, maxLength: maxLength, validateOnChange: validateOnChange, label: label, inputGroupControl: inputGroupControl, extraName: extraName, pagination: pagination }));
                 // issue 这个逻辑应该在 combo 里面自己实现。
                 if (_this.model.unique &&
                     ((_b = form === null || form === void 0 ? void 0 : form.parentStore) === null || _b === void 0 ? void 0 : _b.storeType) === combo.ComboStore.name) {
@@ -108,7 +110,13 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                 }
                 if (onChange &&
                     value !== undefined &&
-                    model.tmpValue !== undefined) {
+                    model.tmpValue !== undefined &&
+                    // 要么是默认值起作用了
+                    // 要么是表达式起作用了
+                    // 只有这两种情况才会触发 onChange
+                    // 比如以下 case 就不应该触发
+                    // 关联到上下文数据了，同时设置了默认值，因为是上下文数据优先，这个时候就不应该触发 onChange，因为没变化
+                    (value === model.tmpValue || valueIsExp)) {
                     // 组件默认值支持表达式需要: 避免初始化时上下文中丢失组件默认值
                     if (model.extraName) {
                         var values = model.splitExtraValue(model.tmpValue);
@@ -136,6 +144,17 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                         onChange(model.tmpValue, model.name, false, true);
                     }
                 }
+                _this.reaction = mobx.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', object.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 () {
@@ -390,15 +409,14 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                 }
             };
             class_1.prototype.validate = function () {
-                var _a, _b;
                 return tslib.__awaiter(this, void 0, void 0, function () {
-                    var _c, form, data, formItemDispatchEvent, result, combo$1, group, validPromises, valid;
-                    return tslib.__generator(this, function (_d) {
-                        switch (_d.label) {
+                    var _a, form, data, dispatchEvent, result, combo$1, group, validPromises, valid;
+                    return tslib.__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 === combo.ComboStore.name)) return [3 /*break*/, 2];
@@ -409,16 +427,14 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                                 });
                                 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/lib/store/app.d.ts

@@ -17,8 +17,10 @@ export declare const AppStore: import("mobx-state-tree").IModelType<{
     pristineRaw: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
     upStreamData: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
     action: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
+    dialogSchema: import("mobx-state-tree").IType<any, any, any>;
     dialogOpen: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     dialogData: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
+    drawerSchema: import("mobx-state-tree").IType<any, any, any>;
     drawerOpen: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     drawerData: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
 } & {

package/lib/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.2
+ * amis-core v6.13.0-beta.21
  * Copyright 2018-2025 fex
  */
 
@@ -11,27 +11,27 @@ var tslib = require('tslib');
 var mobxStateTree = require('mobx-state-tree');
 var helper = require('../utils/helper.js');
 var service = require('./service.js');
+require('amis-formula');
+require('moment');
+var object = require('../utils/object.js');
+require('../utils/memoryParse.js');
+require('@rc-component/mini-decimal');
+require('lodash/isPlainObject');
+require('../utils/filter.js');
 require('../utils/api.js');
 require('file-saver');
 require('../utils/browser.js');
 require('../utils/ColorScale.js');
 require('../utils/columnsSplit.js');
-var object = require('../utils/object.js');
-require('../utils/memoryParse.js');
-require('amis-formula');
-require('lodash/isPlainObject');
 require('../utils/DataSchema.js');
 require('../utils/DataScope.js');
-require('moment');
 require('../utils/debug.js');
 require('../utils/dom.js');
 require('../utils/errors.js');
 var tpl = require('../utils/tpl.js');
-require('../utils/filter.js');
 require('lodash/isObject');
 require('lodash/isString');
 require('lodash/isBoolean');
-require('@rc-component/mini-decimal');
 require('../utils/highlight.js');
 require('../utils/icon.js');
 require('../utils/image.js');