amis-core 6.9.0-rc.0 → 6.9.0-rc.10

package/esm/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * Copyright 2018-2024 fex
  */
 
@@ -92,6 +92,7 @@ var Form = /** @class */ (function (_super) {
         _this.blockRouting = _this.blockRouting.bind(_this);
         _this.beforePageUnload = _this.beforePageUnload.bind(_this);
         _this.formItemDispatchEvent = _this.formItemDispatchEvent.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);
         store.setPersistData(persistData);
@@ -177,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;
@@ -373,7 +376,7 @@ var Form = /** @class */ (function (_super) {
                     case 3:
                         // 派发初始化接口请求完成事件
                         this.dispatchInited(result);
-                        return [2 /*return*/];
+                        return [2 /*return*/, store.data];
                 }
             });
         });
@@ -384,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;
@@ -444,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; }
@@ -554,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);
         }
@@ -598,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',
@@ -618,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);
@@ -670,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();
                         }
@@ -870,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));
@@ -1229,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,

package/esm/renderers/Item.d.ts

@@ -4,7 +4,7 @@ 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 {
@@ -362,6 +362,7 @@ export interface FormItemBasicConfig extends Partial<RendererConfig> {
     renderDescription?: boolean;
     test?: RegExp | TestFunc;
     storeType?: string;
+    formItemStoreType?: string;
     validations?: string;
     strictMode?: boolean;
     /**
@@ -403,7 +404,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;
@@ -460,7 +461,7 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
      * @param ctx 上下文对象，类型为任意类型
      * @param skipIfExits 是否跳过已存在的属性，默认为 false
      */
-    applyMapping(mapping: any, ctx: any, skipIfExits?: boolean, ignoreSelf?: boolean): void;
+    applyMapping(mapping: any, ctx: any, skipIfExits?: boolean): void;
     buildAutoFillSchema(): {
         popOverContainer: any;
         popOverClassName: any;
@@ -643,9 +644,7 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
         storeType: string;
     } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
         readonly fetcher: any;
-        readonly notify: any; /**
-         * 显示一个小图标, 鼠标放上去的时候显示提示内容
-         */
+        readonly notify: any;
         readonly isCancel: (value: any) => boolean;
         readonly __: import("..").TranslateFn<any>;
         getStoreById(id: string): {
@@ -727,7 +726,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;
@@ -804,14 +806,14 @@ 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 notify: any;
         readonly isCancel: (value: any) => boolean;
         readonly __: import("..").TranslateFn<any>;
         getStoreById(id: string): {
@@ -893,7 +895,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;
@@ -970,7 +975,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, {}> & {

package/esm/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0-rc.0
+ * amis-core v6.9.0-rc.10
  * Copyright 2018-2024 fex
  */
 
@@ -20,7 +20,7 @@ import '../utils/browser.js';
 import '../utils/ColorScale.js';
 import 'lodash/chunk';
 import { getVariable } from '../utils/getVariable.js';
-import { createObject, setVariable, createObjectFromChain, deleteVariable } from '../utils/object.js';
+import { createObject, setVariable, createObjectFromChain } from '../utils/object.js';
 import { dataMapping } from '../utils/dataMapping.js';
 import '../utils/DataSchema.js';
 import '../utils/DataScope.js';
@@ -118,7 +118,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                             if (!result) {
                                 return [2 /*return*/];
                             }
-                            this.applyMapping((_d = autoFill === null || autoFill === void 0 ? void 0 : autoFill.fillMapping) !== null && _d !== void 0 ? _d : { '&': '$$' }, result, false, true);
+                            this.applyMapping((_d = autoFill === null || autoFill === void 0 ? void 0 : autoFill.fillMapping) !== null && _d !== void 0 ? _d : { '&': '$$' }, result, false);
                             _e.label = 3;
                         case 3: return [3 /*break*/, 5];
                         case 4:
@@ -275,10 +275,9 @@ var FormItemWrap = /** @class */ (function (_super) {
      * @param ctx 上下文对象，类型为任意类型
      * @param skipIfExits 是否跳过已存在的属性，默认为 false
      */
-    FormItemWrap.prototype.applyMapping = function (mapping, ctx, skipIfExits, ignoreSelf) {
+    FormItemWrap.prototype.applyMapping = function (mapping, ctx, skipIfExits) {
         if (skipIfExits === void 0) { skipIfExits = false; }
-        if (ignoreSelf === void 0) { ignoreSelf = false; }
-        var _a = this.props, onBulkChange = _a.onBulkChange, data = _a.data, formItem = _a.formItem;
+        var _a = this.props, onBulkChange = _a.onBulkChange, data = _a.data; _a.formItem;
         var toSync = dataMapping(mapping, ctx);
         var tmpData = __assign({}, data);
         var result = __assign({}, toSync);
@@ -305,9 +304,9 @@ var FormItemWrap = /** @class */ (function (_super) {
             }
         });
         // 是否忽略自己的设置
-        if (ignoreSelf && (formItem === null || formItem === void 0 ? void 0 : formItem.name)) {
-            deleteVariable(result, formItem.name);
-        }
+        // if (ignoreSelf && formItem?.name) {
+        //   deleteVariable(result, formItem.name);
+        // }
         onBulkChange(result);
     };
     FormItemWrap.prototype.buildAutoFillSchema = function () {
@@ -1020,7 +1019,7 @@ function asFormItem(config) {
             })(observer(Control));
             delete config.storeType;
         }
-        return wrapControl(hoistNonReactStatic((_a = /** @class */ (function (_super) {
+        return wrapControl(config, hoistNonReactStatic((_a = /** @class */ (function (_super) {
                 __extends(class_1, _super);
                 function class_1(props) {
                     var _this = _super.call(this, props) || this;

package/esm/renderers/Options.d.ts

@@ -2,7 +2,7 @@
  * @file 所有列表选择类控件的父级，比如 Select、Radios、Checkboxes、
  * List、ButtonGroup 等等
  */
-import { Api, PlainObject, OptionProps, BaseApiObject } from '../types';
+import { Api, PlainObject, ActionObject, OptionProps, BaseApiObject } from '../types';
 import { FormControlProps, FormItemBasicConfig, FormBaseControl } from './Item';
 export type OptionsControlComponent = React.ComponentType<FormControlProps>;
 import React from 'react';
@@ -156,5 +156,50 @@ export interface OptionsProps extends FormControlProps, Omit<OptionProps, 'class
     optionLabel?: string;
 }
 export declare const detectProps: string[];
+export declare class OptionsControlBase<T extends OptionsProps = OptionsProps, S = any> extends React.Component<T, S> {
+    readonly config: OptionsConfig;
+    toDispose: Array<() => void>;
+    input: any;
+    mounted: boolean;
+    constructor(props: T, config: OptionsConfig);
+    componentDidMount(): void;
+    shouldComponentUpdate(nextProps: OptionsProps): boolean;
+    componentDidUpdate(prevProps: OptionsProps): void;
+    componentWillUnmount(): void;
+    oldDispatchOptionEvent(eventName: string, eventData?: any): Promise<boolean>;
+    dispatchOptionEvent(eventName: string, eventData?: any): Promise<boolean>;
+    doAction(action: ActionObject, data: object, throwErrors: boolean): void;
+    normalizeValue(): void;
+    getWrappedInstance(): any;
+    inputRef(ref: any): void;
+    handleToggle(option: Option, submitOnChange?: boolean, changeImmediately?: boolean): Promise<void>;
+    /**
+     * 初始化时处理默认全选逻辑
+     */
+    defaultCheckAll(): void;
+    /**
+     * 选中的值经过joinValues和delimiter等规则处理输出规定格式的值
+     * @param valueArray 选中值的数组
+     * @returns 通过joinValues和delimiter等规则输出规定格式的值
+     */
+    formatValueArray(valueArray: Array<Option>): string | Option | Option[];
+    handleToggleAll(): Promise<void>;
+    toggleValue(option: Option, originValue?: any): string | Option | Option[];
+    reload(): Promise<import("../types").Payload | null> | undefined;
+    reloadOptions(setError?: boolean, isInit?: boolean, data?: T["data"]): Promise<import("../types").Payload | null> | undefined;
+    deferLoad(option: Option): Promise<void>;
+    leftDeferLoad(option: Option, leftOptions: Option): void;
+    expandTreeOptions(nodePathArr: any[]): void;
+    initOptions(data: any): Promise<void>;
+    focus(): void;
+    changeOptionValue(value: any): void;
+    setOptions(options: Array<any>, skipNormalize?: boolean): void;
+    syncOptions(): void;
+    setLoading(value: boolean): void;
+    handleOptionAdd(idx?: number | Array<number>, value?: any, skipForm?: boolean, callback?: (value: any) => any): Promise<void>;
+    handleOptionEdit(value: any, origin?: any, skipForm?: boolean, callback?: (value: any) => any): Promise<void>;
+    handleOptionDelete(value: any, callback?: (value: any) => any): Promise<void>;
+    render(): React.ReactNode;
+}
 export declare function registerOptionsControl(config: OptionsConfig): import("..").RendererConfig;
 export declare function OptionsControl(config: OptionsBasicConfig): <T extends React.ComponentType<OptionsControlProps>>(component: T) => T;