amis-core 6.7.0 → 6.9.0-beta.0

package/esm/renderers/Form.js

@@ -1,9 +1,9 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-beta.0
  * Copyright 2018-2024 fex
  */
 
-import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';
+import { __extends, __awaiter, __generator, __assign, __values, __decorate, __metadata } from 'tslib';
 import React from 'react';
 import { Renderer } from '../factory.js';
 import { FormStore } from '../store/form.js';
@@ -17,11 +17,12 @@ import { filterTarget, ScopedContext } from '../Scoped.js';
 import 'amis-formula';
 import 'moment';
 import { isObject, createObject, cloneObject, injectObjectChain } from '../utils/object.js';
+import '../utils/memoryParse.js';
 import '@rc-component/mini-decimal';
 import { dataMapping } from '../utils/dataMapping.js';
 import '../utils/filter.js';
 import { isEffectiveApi, isApiOutdated } from '../utils/api.js';
-import LazyComponent from '../components/LazyComponent.js';
+import themedLazyComponent from '../components/LazyComponent.js';
 import { isAlive } from 'mobx-state-tree';
 import '../utils/browser.js';
 import '../utils/ColorScale.js';
@@ -91,7 +92,8 @@ var Form = /** @class */ (function (_super) {
         _this.blockRouting = _this.blockRouting.bind(_this);
         _this.beforePageUnload = _this.beforePageUnload.bind(_this);
         _this.formItemDispatchEvent = _this.formItemDispatchEvent.bind(_this);
-        var store = props.store, canAccessSuperData = props.canAccessSuperData, persistData = props.persistData, simpleMode = props.simpleMode;
+        _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);
         store.setPersistData(persistData);
         if (simpleMode) {
@@ -111,7 +113,7 @@ var Form = /** @class */ (function (_super) {
         // https://github.com/baidu/amis/issues/8773
         _this.toDispose.push(reaction(function () { return store.initedAt; }, function () {
             store.inited &&
-                _this.lazyEmitChange(!!_this.props.submitOnChange, true);
+                (formLazyChange === false ? _this.emitChange : _this.lazyEmitChange)(!!_this.props.submitOnChange, true);
         }));
         return _this;
     }
@@ -176,7 +178,9 @@ var Form = /** @class */ (function (_super) {
                 successMessage: fetchSuccess,
                 errorMessage: fetchFailed,
                 onSuccess: function (json, data) {
-                    store.setValues(data);
+                    store.setValues(data, undefined, undefined, undefined, {
+                        type: 'api'
+                    });
                     if (!isEffectiveApi(initAsyncApi, store.data) ||
                         store.data[initFinishedField || 'finished']) {
                         return;
@@ -372,7 +376,7 @@ var Form = /** @class */ (function (_super) {
                     case 3:
                         // 派发初始化接口请求完成事件
                         this.dispatchInited(result);
-                        return [2 /*return*/];
+                        return [2 /*return*/, store.data];
                 }
             });
         });
@@ -383,7 +387,7 @@ var Form = /** @class */ (function (_super) {
         return this.reload();
     };
     Form.prototype.silentReload = function (target, query) {
-        this.reload(target, query, undefined, true);
+        return this.reload(target, query, undefined, true);
     };
     Form.prototype.initInterval = function (value) {
         var _a = this.props, interval = _a.interval, silentPolling = _a.silentPolling, stopAutoRefreshWhen = _a.stopAutoRefreshWhen, data = _a.data;
@@ -443,7 +447,9 @@ var Form = /** @class */ (function (_super) {
     Form.prototype.setValues = function (value, replace) {
         var store = this.props.store;
         this.flush();
-        store.setValues(value, undefined, replace);
+        store.setValues(value, undefined, replace, undefined, {
+            type: 'action'
+        });
     };
     Form.prototype.submit = function (fn, throwErrors, skipFlush) {
         if (throwErrors === void 0) { throwErrors = false; }
@@ -470,29 +476,54 @@ var Form = /** @class */ (function (_super) {
     };
     Form.prototype.flush = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var hooks;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var hooks, hooks_1, hooks_1_1, hook, e_1_1;
+            var e_1, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        _a.trys.push([0, , 4, 5]);
+                        _b.trys.push([0, , 11, 12]);
                         if (this.flushing) {
                             return [2 /*return*/];
                         }
                         this.flushing = true;
                         hooks = this.hooks['flush'] || [];
-                        return [4 /*yield*/, Promise.all(hooks.map(function (fn) { return fn(); }))];
+                        _b.label = 1;
                     case 1:
-                        _a.sent();
-                        if (!!this.emitting) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.lazyEmitChange.flush()];
+                        _b.trys.push([1, 6, 7, 8]);
+                        hooks_1 = __values(hooks), hooks_1_1 = hooks_1.next();
+                        _b.label = 2;
                     case 2:
-                        _a.sent();
-                        _a.label = 3;
-                    case 3: return [3 /*break*/, 5];
+                        if (!!hooks_1_1.done) return [3 /*break*/, 5];
+                        hook = hooks_1_1.value;
+                        return [4 /*yield*/, hook()];
+                    case 3:
+                        _b.sent();
+                        _b.label = 4;
                     case 4:
+                        hooks_1_1 = hooks_1.next();
+                        return [3 /*break*/, 2];
+                    case 5: return [3 /*break*/, 8];
+                    case 6:
+                        e_1_1 = _b.sent();
+                        e_1 = { error: e_1_1 };
+                        return [3 /*break*/, 8];
+                    case 7:
+                        try {
+                            if (hooks_1_1 && !hooks_1_1.done && (_a = hooks_1.return)) _a.call(hooks_1);
+                        }
+                        finally { if (e_1) throw e_1.error; }
+                        return [7 /*endfinally*/];
+                    case 8:
+                        if (!!this.emitting) return [3 /*break*/, 10];
+                        return [4 /*yield*/, this.lazyEmitChange.flush()];
+                    case 9:
+                        _b.sent();
+                        _b.label = 10;
+                    case 10: return [3 /*break*/, 12];
+                    case 11:
                         this.flushing = false;
                         return [7 /*endfinally*/];
-                    case 5: return [2 /*return*/];
+                    case 12: return [2 /*return*/];
                 }
             });
         });
@@ -528,13 +559,15 @@ var Form = /** @class */ (function (_super) {
             }
         }
     };
-    Form.prototype.handleChange = function (value, name, submit, changePristine) {
+    Form.prototype.handleChange = function (value, name, submit, changePristine, changeReason) {
         if (changePristine === void 0) { changePristine = false; }
         var _a = this.props, store = _a.store, formLazyChange = _a.formLazyChange, persistDataKeys = _a.persistDataKeys;
         if (typeof name !== 'string') {
             return;
         }
-        store.changeValue(name, value, changePristine);
+        store.changeValue(name, value, changePristine, undefined, undefined, changeReason || {
+            type: 'input'
+        });
         if (!changePristine || typeof value !== 'undefined') {
             (formLazyChange === false ? this.emitChange : this.lazyEmitChange)(submit);
         }
@@ -572,7 +605,7 @@ var Form = /** @class */ (function (_super) {
                         if (!(dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented)) {
                             onChange && onChange.apply(null, changeProps);
                         }
-                        store.clearRestError();
+                        isAlive(store) && store.clearRestError();
                         if (!(!emitedFromWatch && (submit || (submitOnChange && store.inited)))) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.handleAction(undefined, {
                                 type: 'submit',
@@ -592,9 +625,11 @@ var Form = /** @class */ (function (_super) {
             });
         });
     };
-    Form.prototype.handleBulkChange = function (values, submit) {
+    Form.prototype.handleBulkChange = function (values, submit, changeReason) {
         var _a = this.props; _a.onChange; var store = _a.store, formLazyChange = _a.formLazyChange;
-        store.setValues(values);
+        store.setValues(values, undefined, undefined, undefined, changeReason || {
+            type: 'input'
+        });
         // store.updateData(values);
         // store.items.forEach(formItem => {
         //   const updatedValue = getVariable(values, formItem.name, false);
@@ -644,6 +679,9 @@ var Form = /** @class */ (function (_super) {
                         _f.sent();
                         _f.label = 2;
                     case 2:
+                        if (!isAlive(store)) {
+                            return [2 /*return*/];
+                        }
                         if (trimValues) {
                             store.trimValues();
                         }
@@ -844,7 +882,7 @@ var Form = /** @class */ (function (_super) {
                                 if (values === false) {
                                     return store.data;
                                 }
-                                if (onFinished && onFinished(values, action) === false) {
+                                if (onFinished && onFinished(values, action, store) === false) {
                                     return values;
                                 }
                                 resetAfterSubmit && store.reset(_this.handleReset(action));
@@ -1203,7 +1241,8 @@ var Form = /** @class */ (function (_super) {
             removeHook: this.removeHook,
             renderFormItems: this.renderFormItems,
             formItemDispatchEvent: this.formItemDispatchEvent,
-            formPristine: form.pristine
+            formPristine: form.pristine,
+            onFlushForm: this.flush
             // value: (control as any)?.name
             //   ? getVariable(form.data, (control as any)?.name, canAccessSuperData)
             //   : (control as any)?.value,
@@ -1357,7 +1396,7 @@ var Form = /** @class */ (function (_super) {
             });
         }
         if (lazyLoad) {
-            body = React.createElement(LazyComponent, null, body);
+            body = React.createElement(themedLazyComponent, null, body);
         }
         return body;
     };

package/esm/renderers/Item.d.ts

@@ -4,7 +4,8 @@ import hoistNonReactStatic from 'hoist-non-react-statics';
 import { IFormItemStore, IFormStore } from '../store/form';
 import { RendererProps, TestFunc, RendererConfig } from '../factory';
 import { FormHorizontal, FormSchemaBase } from './Form';
-import { ActionObject, BaseApiObject, BaseSchemaWithoutType, ClassName, Schema } from '../types';
+import { ActionObject, BaseApiObject, BaseSchemaWithoutType, ClassName, DataChangeReason, Schema } from '../types';
+import { IScopedContext } from '../Scoped';
 export type LabelAlign = 'right' | 'left' | 'top' | 'inherit';
 export interface FormBaseControl extends BaseSchemaWithoutType {
     /**
@@ -303,6 +304,10 @@ export interface FormBaseControl extends BaseSchemaWithoutType {
          * 是否为参照录入模式，参照录入会展示候选值供用户选择，而不是直接填充。
          */
         showSuggestion?: boolean;
+        /**
+         * 参照录入时，默认选中的值
+         */
+        defaultSelection?: any;
         /**
          * 自动填充 api
          */
@@ -321,7 +326,7 @@ export interface FormBaseControl extends BaseSchemaWithoutType {
         /**
          * 触发条件，默认为 change
          */
-        trigger?: 'change' | 'foucs';
+        trigger?: 'change' | 'focus' | 'blur';
         /**
          * 弹窗方式，当为参照录入时用可以配置
          */
@@ -359,6 +364,10 @@ export interface FormItemBasicConfig extends Partial<RendererConfig> {
     storeType?: string;
     validations?: string;
     strictMode?: boolean;
+    /**
+     * 是否是瘦子
+     */
+    thin?: boolean;
     /**
      * schema变化使视图更新的属性白名单
      */
@@ -394,7 +403,7 @@ export interface FormItemProps extends RendererProps {
     onChange: (value: any, submitOnChange?: boolean, changeImmediately?: boolean) => void;
     onBulkChange?: (values: {
         [propName: string]: any;
-    }, submitOnChange?: boolean) => void;
+    }, submitOnChange?: boolean, changeReason?: DataChangeReason) => void;
     addHook: (fn: Function, mode?: 'validate' | 'init' | 'flush', enforce?: 'prev' | 'post') => () => void;
     removeHook: (fn: Function, mode?: 'validate' | 'init' | 'flush') => void;
     renderFormItems: (schema: Partial<FormSchemaBase>, region: string, props: any) => JSX.Element;
@@ -444,7 +453,76 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
     updateAutoFillData(context: any): void;
     syncApiAutoFill: import("lodash").DebouncedFunc<(term: any, forceLoad?: boolean, skipIfExits?: any) => Promise<void>>;
     syncOptionAutoFill(selectedOptions: Array<any>, skipIfExits?: boolean): void;
-    buildAutoFillSchema(): React.JSX.Element | {
+    /**
+     * 应用映射函数，根据给定的映射关系，更新数据对象
+     *
+     * @param mapping 映射关系，类型为任意类型
+     * @param ctx 上下文对象，类型为任意类型
+     * @param skipIfExits 是否跳过已存在的属性，默认为 false
+     */
+    applyMapping(mapping: any, ctx: any, skipIfExits?: boolean): void;
+    buildAutoFillSchema(): {
+        popOverContainer: any;
+        popOverClassName: any;
+        placement: any;
+        offset: any;
+        body: {
+            type: string;
+            title: string;
+            className: string;
+            body: {
+                type: string;
+                embed: boolean;
+                joinValues: boolean;
+                strictMode: boolean;
+                label: boolean;
+                labelField: any;
+                valueField: any;
+                multiple: any;
+                name: string;
+                value: any;
+                options: never[];
+                required: boolean;
+                source: any;
+                pickerSchema: {
+                    type: string;
+                    bodyClassName: string;
+                    affixHeader: boolean;
+                    alwaysShowPagination: boolean;
+                    keepItemSelectionOnPageChange: boolean;
+                    headerToolbar: never[];
+                    footerToolbar: ({
+                        type: string;
+                        align: string;
+                        className?: undefined;
+                    } | {
+                        type: string;
+                        align: string;
+                        className: string;
+                    })[];
+                    multiple: any;
+                    filter: any;
+                    columns: any;
+                };
+            }[];
+            actions: ({
+                type: string;
+                actionType: string;
+                label: any;
+                level?: undefined;
+            } | {
+                type: string;
+                actionType: string;
+                level: string;
+                label: any;
+            })[];
+        };
+        type?: undefined;
+        className?: undefined;
+        title?: undefined;
+        size?: undefined;
+        actions?: undefined;
+    } | {
         type: any;
         className: string;
         title: any;
@@ -458,16 +536,19 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
                 type: string;
                 embed: boolean;
                 joinValues: boolean;
+                strictMode: boolean;
                 label: boolean;
                 labelField: any;
                 valueField: any;
                 multiple: any;
                 name: string;
+                value: any;
                 options: never[];
                 required: boolean;
                 source: any;
                 pickerSchema: {
                     type: string;
+                    bodyClassName: string;
                     affixHeader: boolean;
                     alwaysShowPagination: boolean;
                     keepItemSelectionOnPageChange: boolean;
@@ -485,7 +566,7 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
                     filter: any;
                     columns: any;
                 };
-            };
+            }[];
             actions: ({
                 type: string;
                 actionType: string;
@@ -509,10 +590,14 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
             level: string;
             label: any;
         })[];
+        popOverContainer?: undefined;
+        popOverClassName?: undefined;
+        placement?: undefined;
+        offset?: undefined;
     } | undefined;
-    handleSubmit(values: any): void;
-    handleAction(e: React.UIEvent<any>, action: ActionObject, data: object): void;
-    handleClose(): void;
+    handlePopOverConfirm(values: any): void;
+    handlePopOverAction(e: React.UIEvent<any>, action: ActionObject, data: object, throwErrors?: boolean, delegate?: IScopedContext): any;
+    closePopOver(): void;
     handleOpenDialog(schema: Schema, data: any): Promise<unknown>;
     handleDialogConfirm([values]: Array<any>): void;
     handleDialogClose(confirmed?: boolean): void;
@@ -559,9 +644,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
     } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
         readonly fetcher: any;
         readonly notify: any;
-        readonly isCancel: (value: any) => boolean; /**
-         * 当修改完的时候是否提交表单。
-         */
+        readonly isCancel: (value: any) => boolean;
         readonly __: import("..").TranslateFn<any>;
         getStoreById(id: string): {
             id: string;
@@ -642,7 +725,10 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
     } & {
         addStore(store: {
             [propName: string]: any;
-            storeType: string;
+            storeType: string; /**
+             * 不设置时，当表单提交过后表单项每次修改都会触发重新验证，
+             * 如果设置了，则由此配置项来决定要不要每次修改都触发验证。
+             */
             id: string;
             path: string;
             parentId?: string | undefined;
@@ -719,15 +805,15 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
-        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
+        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void; /**
+         * 配置 input className
+         */
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
         storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
     }, {
         readonly fetcher: any;
         readonly notify: any;
-        readonly isCancel: (value: any) => boolean; /**
-         * 当修改完的时候是否提交表单。
-         */
+        readonly isCancel: (value: any) => boolean;
         readonly __: import("..").TranslateFn<any>;
         getStoreById(id: string): {
             id: string;
@@ -808,7 +894,10 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
     } & {
         addStore(store: {
             [propName: string]: any;
-            storeType: string;
+            storeType: string; /**
+             * 不设置时，当表单提交过后表单项每次修改都会触发重新验证，
+             * 如果设置了，则由此配置项来决定要不要每次修改都触发验证。
+             */
             id: string;
             path: string;
             parentId?: string | undefined;
@@ -885,7 +974,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
             dispose: (callback?: (() => void) | undefined) => void;
             addChildId: (id: string) => void;
             removeChildId: (id: string) => void;
-        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void;
+        }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>): void; /**
+         * 配置 input className
+         */
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>>;
     ComposedComponent: React.ComponentType<any>;
 } & hoistNonReactStatic.NonReactStatics<any, {}> & {