amis-core 2.8.0 → 2.9.0

package/esm/env.d.ts

@@ -47,7 +47,7 @@ export interface RendererEnv {
     affixOffsetTop: number;
     affixOffsetBottom: number;
     richTextToken: string;
-    loadRenderer: (schema: Schema, path: string, reRender: Function) => Promise<React.ReactType> | React.ReactType | JSX.Element | void;
+    loadRenderer: (schema: Schema, path: string, reRender: Function) => Promise<React.ElementType> | React.ElementType | JSX.Element | void;
     loadChartExtends?: () => void | Promise<void>;
     useMobileUI?: boolean;
     /**
@@ -87,15 +87,13 @@ export declare function withRendererEnv<T extends React.ComponentType<React.Comp
         env?: RendererEnv | undefined;
     }>): {
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "env">> & {
             env?: RendererEnv | undefined;
         }>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "env">> & {
             env?: RendererEnv | undefined;
-        }> & Readonly<{
-            children?: React.ReactNode;
         }>;
         state: Readonly<{}>;
         refs: {
@@ -132,15 +130,13 @@ export declare function withRendererEnv<T extends React.ComponentType<React.Comp
         env?: RendererEnv | undefined;
     }, context: any): {
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "env">> & {
             env?: RendererEnv | undefined;
         }>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "env">> & {
             env?: RendererEnv | undefined;
-        }> & Readonly<{
-            children?: React.ReactNode;
         }>;
         state: Readonly<{}>;
         refs: {

package/esm/env.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 

package/esm/envOverwrite.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 

package/esm/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 
@@ -74,6 +74,8 @@ function registerRenderer(config) {
 }
 function unRegisterRenderer(config) {
     var name = (typeof config === 'string' ? config : config.name);
+    var idx = renderers.findIndex(function (item) { return item.name === name; });
+    ~idx && renderers.splice(idx, 1);
     delete renderersMap[name];
     // 清空渲染器定位缓存
     cache = {};

package/esm/index.d.ts

@@ -5,7 +5,6 @@
  * This source code is licensed under the Apache license found in the
  * LICENSE file in the root directory of this source tree.
  */
-/// <reference types="react" />
 import { Renderer, getRendererByName, getRenderers, registerRenderer, unRegisterRenderer, resolveRenderer, filterSchema, clearStoresCache, updateEnv, addSchemaFilter, extendDefaultEnv } from './factory';
 import type { RenderOptions, RendererConfig, RendererProps } from './factory';
 import './renderers/builtin';
@@ -32,7 +31,7 @@ import { Schema } from './types';
 import { addRootWrapper, RootRenderProps } from './Root';
 import { EnvContext } from './env';
 import type { RendererEnv } from './env';
-import { evaluate, Evaluator, extendsFilters, filters, getFilters, lexer, parse, registerFilter, registerFunction } from 'amis-formula';
+import { evaluate, evaluateForAsync, Evaluator, AsyncEvaluator, extendsFilters, filters, getFilters, lexer, parse, registerFilter, registerFunction } from 'amis-formula';
 import type { FilterContext } from 'amis-formula';
 import LazyComponent from './components/LazyComponent';
 import Overlay from './components/Overlay';
@@ -40,5 +39,5 @@ import PopOver from './components/PopOver';
 import { FormRenderer } from './renderers/Form';
 import type { FormHorizontal } from './renderers/Form';
 export declare const version = "__buildVersion";
-export { clearStoresCache, updateEnv, Renderer, RendererProps, RenderOptions, RendererEnv, EnvContext, RegisterStore, FormItem, FormItemWrap, FormItemProps, OptionsControl, FormRenderer, FormHorizontal, utils, getRendererByName, registerRenderer, unRegisterRenderer, getRenderers, registerFormItem, getFormItemByName, registerOptionsControl, resolveRenderer, filterSchema, Scoped, ScopedContext, IScopedContext, setDefaultTheme, theme, themeable, ThemeProps, getTheme, classPrefix, getClassPrefix, classnames, makeClassnames, getDefaultLocale, setDefaultLocale, registerLocale, makeTranslator, extendLocale, removeLocaleData, localeable, LocaleProps, TranslateFn, ClassNamesFn, parse, lexer, Evaluator, FilterContext, filters, getFilters, registerFilter, extendsFilters, registerFunction, evaluate, LazyComponent, Overlay, PopOver, addSchemaFilter, OptionsControlProps, FormOptionsControl, FormControlProps, FormBaseControl, extendDefaultEnv, addRootWrapper, RendererConfig };
+export { clearStoresCache, updateEnv, Renderer, RendererProps, RenderOptions, RendererEnv, EnvContext, RegisterStore, FormItem, FormItemWrap, FormItemProps, OptionsControl, FormRenderer, FormHorizontal, utils, getRendererByName, registerRenderer, unRegisterRenderer, getRenderers, registerFormItem, getFormItemByName, registerOptionsControl, resolveRenderer, filterSchema, Scoped, ScopedContext, IScopedContext, setDefaultTheme, theme, themeable, ThemeProps, getTheme, classPrefix, getClassPrefix, classnames, makeClassnames, getDefaultLocale, setDefaultLocale, registerLocale, makeTranslator, extendLocale, removeLocaleData, localeable, LocaleProps, TranslateFn, ClassNamesFn, parse, lexer, Evaluator, AsyncEvaluator, FilterContext, filters, getFilters, registerFilter, extendsFilters, registerFunction, evaluate, evaluateForAsync, LazyComponent, Overlay, PopOver, addSchemaFilter, OptionsControlProps, FormOptionsControl, FormControlProps, FormBaseControl, extendDefaultEnv, addRootWrapper, RendererConfig };
 export declare function render(schema: Schema, props?: RootRenderProps, options?: RenderOptions, pathPrefix?: string): JSX.Element;

package/esm/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 
@@ -26,7 +26,7 @@ export { escapeHtml } from './utils/escapeHtml.js';
 export { getExprProperties } from './utils/filter-schema.js';
 import './utils/filter.js';
 export { formatDuration } from './utils/formatDuration.js';
-export { FormulaExec, formulaExec, isExpression, isNeedFormula, registerFormulaExec, replaceExpression } from './utils/formula.js';
+export { FormulaExec, formulaExec, isExpression, isNeedFormula, isNowFormula, registerFormulaExec, replaceExpression } from './utils/formula.js';
 export { getVariable } from './utils/getVariable.js';
 export { collectVariables } from './utils/grammar.js';
 export { handleAction } from './utils/handleAction.js';
@@ -55,6 +55,7 @@ export { replaceText } from './utils/replaceText.js';
 export { getComputedStyle, resizeSensor } from './utils/resize-sensor.js';
 export { resolveVariable } from './utils/resolveVariable.js';
 export { resolveVariableAndFilter } from './utils/resolveVariableAndFilter.js';
+export { resolveVariableAndFilterForAsync } from './utils/resolveVariableAndFilterForAsync.js';
 export { RootClose } from './utils/RootClose.js';
 export { scrollPosition } from './utils/scrollPosition.js';
 export { SimpleMap } from './utils/SimpleMap.js';
@@ -62,12 +63,13 @@ export { string2regExp } from './utils/string2regExp.js';
 export { buildStyle } from './utils/style.js';
 export { tokenize } from './utils/tokenize.js';
 export { register } from './utils/tpl-builtin.js';
-export { evalExpression, evalJS, filter, registerTplEnginer, setCustomEvalExpression, setCustomEvalJs } from './utils/tpl.js';
+export { evalExpression, evalExpressionWithConditionBuilder, evalJS, filter, registerTplEnginer, setCustomEvalExpression, setCustomEvalJs } from './utils/tpl.js';
 export { uncontrollable } from './utils/uncontrollable.js';
 export { addRule, str2rules, validate, validateMessages, validateObject, validations } from './utils/validations.js';
 export { toNumber } from './utils/toNumber.js';
 export { decodeEntity } from './utils/decodeEntity.js';
 export { addStyle, findOrCreactStyle, formatStyle, insertCustomStyle, insertStyle, valueMap } from './utils/style-helper.js';
+export { getConditionComputers, registerConditionComputer, resolveCondition } from './utils/resolveCondition.js';
 export { default as animation } from './utils/Animation.js';
 import { RendererStore } from './store/index.js';
 export { RegisterStore, RendererStore } from './store/index.js';
@@ -102,7 +104,7 @@ import { envOverwrite } from './envOverwrite.js';
 import { EnvContext } from './env.js';
 export { EnvContext } from './env.js';
 import React from 'react';
-export { Evaluator, evaluate, extendsFilters, filters, getFilters, lexer, parse, registerFilter, registerFunction } from 'amis-formula';
+export { AsyncEvaluator, Evaluator, evaluate, evaluateForAsync, extendsFilters, filters, getFilters, lexer, parse, registerFilter, registerFunction } from 'amis-formula';
 export { default as LazyComponent } from './components/LazyComponent.js';
 export { default as Overlay } from './components/Overlay.js';
 export { default as PopOver } from './components/PopOver.js';
@@ -131,7 +133,7 @@ export { StoreNode } from './store/node.js';
  */
 var classPrefix = getClassPrefix();
 // @ts-ignore
-var version = '2.8.0';
+var version = '2.9.0';
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }

package/esm/locale.d.ts

@@ -25,7 +25,7 @@ export declare function localeable<T extends React.ComponentType<React.Component
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof LocaleProps>> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
@@ -34,8 +34,6 @@ export declare function localeable<T extends React.ComponentType<React.Component
         readonly props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof LocaleProps>> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
-        }> & Readonly<{
-            children?: React.ReactNode;
         }>;
         state: Readonly<{}>;
         refs: {

package/esm/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 

package/esm/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 
@@ -10,7 +10,7 @@ import { Renderer } from '../factory.js';
 import { FormStore } from '../store/form.js';
 import { evalExpression, filter } from '../utils/tpl.js';
 import { getExprProperties } from '../utils/filter-schema.js';
-import { promisify, isEmpty, until, noop, isVisible, SkipOperation, difference, repeatCount, qsparse, isObjectShallowModified } from '../utils/helper.js';
+import { promisify, isEmpty, until, noop, difference, isVisible, repeatCount, qsparse, isObjectShallowModified, SkipOperation } from '../utils/helper.js';
 import debounce from 'lodash/debounce';
 import flatten from 'lodash/flatten';
 import find from 'lodash/find';
@@ -379,7 +379,7 @@ var Form = /** @class */ (function (_super) {
     };
     Form.prototype.emitChange = function (submit) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, onChange, store, submitOnChange, dispatchEvent, data, dispatcher;
+            var _a, onChange, store, submitOnChange, dispatchEvent, data, changeProps, dispatcher;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -387,12 +387,16 @@ var Form = /** @class */ (function (_super) {
                         if (!isAlive(store)) {
                             return [2 /*return*/];
                         }
+                        changeProps = [
+                            store.data,
+                            difference(store.data, store.pristine),
+                            this.props
+                        ];
                         return [4 /*yield*/, dispatchEvent('change', createObject(data, store.data))];
                     case 1:
                         dispatcher = _b.sent();
                         if (!(dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented)) {
-                            onChange &&
-                                onChange(store.data, difference(store.data, store.pristine), this.props);
+                            onChange && onChange.apply(null, changeProps);
                         }
                         store.clearRestError();
                         (submit || (submitOnChange && store.inited)) &&
@@ -500,11 +504,12 @@ var Form = /** @class */ (function (_super) {
                                     // 走到这里代表校验成功了
                                     dispatchEvent('validateSucc', _this.props.data);
                                     if (target) {
-                                        _this.submitToTarget(target, values);
+                                        _this.submitToTarget(filter(target, values), values);
                                         dispatchEvent('submitSucc', createObject(_this.props.data, values));
                                     }
                                     else if (action.actionType === 'reload') {
-                                        action.target && _this.reloadTarget(action.target, values);
+                                        action.target &&
+                                            _this.reloadTarget(filter(action.target, values), values);
                                     }
                                     else if (action.actionType === 'dialog') {
                                         store.openDialog(data);
@@ -605,15 +610,12 @@ var Form = /** @class */ (function (_super) {
                                         finalRedirect && env.jumpTo(finalRedirect, action);
                                     }
                                     else if (action.reload || reload) {
-                                        _this.reloadTarget(action.reload || reload, store.data);
+                                        _this.reloadTarget(filter(action.reload || reload, store.data), store.data);
                                     }
                                     action.close && _this.closeTarget(action.close);
                                     return values;
                                 })
                                     .catch(function (reason) {
-                                    if (reason instanceof SkipOperation) {
-                                        return;
-                                    }
                                     onFailed && onFailed(reason, store.errors);
                                     if (throwErrors) {
                                         throw reason;
@@ -672,7 +674,8 @@ var Form = /** @class */ (function (_super) {
                                             case 4:
                                                 redirect = action.redirect && filter(action.redirect, store.data);
                                                 redirect && env.jumpTo(redirect, action);
-                                                action.reload && this.reloadTarget(action.reload, store.data);
+                                                action.reload &&
+                                                    this.reloadTarget(filter(action.reload, store.data), store.data);
                                                 action.close && this.closeTarget(action.close);
                                                 return [2 /*return*/];
                                         }
@@ -688,7 +691,7 @@ var Form = /** @class */ (function (_super) {
                         else if (action.actionType === 'reload') {
                             store.setCurrentAction(action);
                             if (action.target) {
-                                this.reloadTarget(action.target, data);
+                                this.reloadTarget(filter(action.target, data), data);
                             }
                             else {
                                 this.receive(data);
@@ -868,8 +871,7 @@ var Form = /** @class */ (function (_super) {
              */
             disabled: disabled ||
                 control.disabled ||
-                (form.loading ? true : undefined) }, control.static || isStatic
-            ? { static: true } : {}), { btnDisabled: disabled || form.loading || form.validating, onAction: this.handleAction, onQuery: this.handleQuery, onChange: this.handleChange, onBulkChange: this.handleBulkChange, addHook: this.addHook, removeHook: this.removeHook, renderFormItems: this.renderFormItems, formItemDispatchEvent: this.formItemDispatchEvent(dispatchEvent), formPristine: form.pristine });
+                (form.loading ? true : undefined) }, (control.static || isStatic ? { static: true } : {})), { btnDisabled: disabled || form.loading || form.validating, onAction: this.handleAction, onQuery: this.handleQuery, onChange: this.handleChange, onBulkChange: this.handleBulkChange, addHook: this.addHook, removeHook: this.removeHook, renderFormItems: this.renderFormItems, formItemDispatchEvent: this.formItemDispatchEvent(dispatchEvent), formPristine: form.pristine });
         var subSchema = __assign({}, control);
         if (subSchema.$ref) {
             subSchema = __assign(__assign({}, resolveDefinitions(subSchema.$ref)), subSchema);

package/esm/renderers/Item.d.ts

@@ -461,15 +461,11 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
 export declare const detectProps: string[];
 export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (Control: FormControlComponent) => {
     new (props: Omit<any, "rootStore"> | Readonly<Omit<any, "rootStore">>): {
-        render(): JSX.Element; /**
-         * 描述标题
-         */
-        context: any;
+        render(): JSX.Element;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<any, "rootStore">>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<any, "rootStore">> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<Omit<any, "rootStore">>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
@@ -488,15 +484,11 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
         UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<any, "rootStore">>, nextState: Readonly<{}>, nextContext: any): void;
     };
     new (props: Omit<any, "rootStore">, context: any): {
-        render(): JSX.Element; /**
-         * 描述标题
-         */
-        context: any;
+        render(): JSX.Element;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<any, "rootStore">>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<any, "rootStore">> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<Omit<any, "rootStore">>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
@@ -862,7 +854,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>>;
     ComposedComponent: React.ComponentType<any>;
 } & hoistNonReactStatic.NonReactStatics<any, {}> & {
-    ComposedComponent: any;
+    ComposedComponent: any; /**
+     * 配置 label className
+     */
 } & {
     ComposedComponent: any;
 };

package/esm/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 
@@ -45,6 +45,7 @@ import 'lodash/camelCase';
 import { insertCustomStyle } from '../utils/style-helper.js';
 import 'uncontrollable';
 import '../utils/validations.js';
+import '../utils/resolveCondition.js';
 import '../utils/Animation.js';
 import Overlay from '../components/Overlay.js';
 import PopOver from '../components/PopOver.js';

package/esm/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 
@@ -47,6 +47,7 @@ import 'lodash/camelCase';
 import 'uncontrollable';
 import 'hoist-non-react-statics';
 import '../utils/validations.js';
+import '../utils/resolveCondition.js';
 import '../utils/Animation.js';
 
 var detectProps = detectProps$1.concat([

package/esm/renderers/Placeholder.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 

package/esm/renderers/builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 

package/esm/renderers/register.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 

package/esm/renderers/wrapControl.d.ts

@@ -51,12 +51,10 @@ export interface ControlProps {
 export declare function wrapControl<T extends React.ComponentType<React.ComponentProps<T> & ControlProps>>(ComposedComponent: T): {
     new (props: Omit<any, "rootStore"> | Readonly<Omit<any, "rootStore">>): {
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<any, "rootStore">>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<any, "rootStore">> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<Omit<any, "rootStore">>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
@@ -76,12 +74,10 @@ export declare function wrapControl<T extends React.ComponentType<React.Componen
     };
     new (props: Omit<any, "rootStore">, context: any): {
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<any, "rootStore">>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<any, "rootStore">> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<Omit<any, "rootStore">>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;

package/esm/renderers/wrapControl.js

@@ -1,15 +1,15 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 
-import { __extends, __awaiter, __generator, __assign } from 'tslib';
+import { __extends, __assign, __awaiter, __generator } from 'tslib';
 import React from 'react';
 import debounce from 'lodash/debounce';
 import isEqual from 'lodash/isEqual';
 import { ComboStore } from '../store/combo.js';
 import { guid, promisify, anyChanged } from '../utils/helper.js';
-import { isExpression, FormulaExec, replaceExpression, isNeedFormula } from '../utils/formula.js';
+import { isExpression, FormulaExec, replaceExpression, isNowFormula, isNeedFormula } from '../utils/formula.js';
 import { ScopedContext } from '../Scoped.js';
 import { FormItemStore } from '../store/formItem.js';
 import { isAlive } from 'mobx-state-tree';
@@ -17,6 +17,7 @@ import { observer } from 'mobx-react';
 import hoistNonReactStatic from 'hoist-non-react-statics';
 import { withRootStore } from '../WithRootStore.js';
 import { TableStore } from '../store/table.js';
+import pick from 'lodash/pick';
 import { getVariable } from '../utils/getVariable.js';
 
 function wrapControl(ComposedComponent) {
@@ -32,7 +33,7 @@ function wrapControl(ComposedComponent) {
                     trailing: true,
                     leading: false
                 });
-                var _c = _this.props, form = _c.formStore, formItem = _c.formItem, rootStore = _c.rootStore, store = _c.store, onChange = _c.onChange, data = _c.data, inputGroupControl = _c.inputGroupControl, _d = _c.$schema, name = _d.name, id = _d.id, type = _d.type, required = _d.required, validations = _d.validations, validationErrors = _d.validationErrors, unique = _d.unique, value = _d.value, multiple = _d.multiple, delimiter = _d.delimiter, valueField = _d.valueField, labelField = _d.labelField, joinValues = _d.joinValues, extractValue = _d.extractValue, selectFirst = _d.selectFirst, autoFill = _d.autoFill, clearValueOnHidden = _d.clearValueOnHidden, validateApi = _d.validateApi, minLength = _d.minLength, maxLength = _d.maxLength, validateOnChange = _d.validateOnChange, label = _d.label;
+                var _c = _this.props, form = _c.formStore, formItem = _c.formItem, rootStore = _c.rootStore, store = _c.store, onChange = _c.onChange, data = _c.data, inputGroupControl = _c.inputGroupControl, _d = _c.$schema, name = _d.name, id = _d.id, type = _d.type, required = _d.required, validations = _d.validations, validationErrors = _d.validationErrors, unique = _d.unique, value = _d.value; _d.multiple; var delimiter = _d.delimiter, valueField = _d.valueField, labelField = _d.labelField, joinValues = _d.joinValues, extractValue = _d.extractValue, selectFirst = _d.selectFirst, autoFill = _d.autoFill, clearValueOnHidden = _d.clearValueOnHidden, validateApi = _d.validateApi, minLength = _d.minLength, maxLength = _d.maxLength, validateOnChange = _d.validateOnChange, label = _d.label;
                 _this.getValue = _this.getValue.bind(_this);
                 _this.setValue = _this.setValue.bind(_this);
                 _this.handleChange = _this.handleChange.bind(_this);
@@ -63,31 +64,7 @@ function wrapControl(ComposedComponent) {
                 _this.model = model;
                 // @issue 打算干掉这个
                 formItem === null || formItem === void 0 ? void 0 : formItem.addSubFormItem(model);
-                model.config({
-                    id: id,
-                    type: type,
-                    required: required,
-                    unique: unique,
-                    value: value,
-                    isValueSchemaExp: isExpression(value),
-                    rules: validations,
-                    messages: validationErrors,
-                    multiple: multiple,
-                    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
-                });
+                model.config(__assign(__assign({}, pick(__assign(__assign({}, ComposedComponent.defaultProps), _this.props.$schema), ['multiple'])), { id: id, type: type, required: required, unique: unique, value: value, isValueSchemaExp: isExpression(value), rules: validations, 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 }));
                 // issue 这个逻辑应该在 combo 里面自己实现。
                 if (_this.model.unique &&
                     ((_a = form === null || form === void 0 ? void 0 : form.parentStore) === null || _a === void 0 ? void 0 : _a.storeType) === ComboStore.name) {
@@ -209,10 +186,12 @@ function wrapControl(ComposedComponent) {
                 else if (model &&
                     typeof props.defaultValue !== 'undefined' &&
                     isExpression(props.defaultValue)) {
+                    var nowFormulaChecked = isNowFormula(props.defaultValue);
                     // 渲染器中的 defaultValue 优先（备注: SchemaRenderer中会将 value 改成 defaultValue）
                     if (!isEqual(props.defaultValue, prevProps.defaultValue) ||
                         (props.data !== prevProps.data &&
-                            isNeedFormula(props.defaultValue, props.data, prevProps.data))) {
+                            (isNeedFormula(props.defaultValue, props.data, prevProps.data) ||
+                                nowFormulaChecked))) {
                         var curResult = FormulaExec['formula'](props.defaultValue, props.data);
                         var prevResult = FormulaExec['formula'](prevProps.defaultValue, prevProps.data);
                         if (!isEqual(curResult, prevResult) &&
@@ -223,6 +202,14 @@ function wrapControl(ComposedComponent) {
                                 props.onChange(curResult, model.name, false);
                             }
                         }
+                        else if (nowFormulaChecked) {
+                            var nowData = props.data[model.name];
+                            // now 表达式，计算后的值永远相同
+                            model.changeTmpValue(nowData);
+                            if (props.onChange) {
+                                props.onChange(nowData, model.name, false);
+                            }
+                        }
                     }
                 }
                 else if (model) {
@@ -420,6 +407,10 @@ function wrapControl(ComposedComponent) {
                 if ((onFormItemChange === null || onFormItemChange === void 0 ? void 0 : onFormItemChange(value, oldValue, this.model, form)) === false) {
                     return;
                 }
+                // onFormItemChange 可能会触发组件销毁，再次读取 this.model 为 undefined
+                if (!this.model) {
+                    return;
+                }
                 var validated = this.model.validated;
                 onChange === null || onChange === void 0 ? void 0 : onChange(value, name, submitOnChange === true);
                 if (

package/esm/store/app.d.ts

@@ -54,10 +54,12 @@ export declare const AppStore: import("mobx-state-tree").IModelType<{
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
     setCurrentAction(action: object): void;
-    openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+    openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
     closeDialog(result?: any): void;
-    openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+    openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
     closeDrawer(result?: any): void;
+    getDialogScoped(): import("..").IScopedContext | null;
+    getDrawerScoped(): import("..").IScopedContext | null;
 } & {
     readonly loading: boolean;
 } & {

package/esm/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */
 

package/esm/store/combo.d.ts

@@ -1775,10 +1775,12 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
     updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
     changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
     setCurrentAction(action: object): void;
-    openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+    openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
     closeDialog(result?: any): void;
-    openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+    openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
     closeDrawer(result?: any): void;
+    getDialogScoped(): import("..").IScopedContext | null;
+    getDrawerScoped(): import("..").IScopedContext | null;
 } & {
     readonly forms: ({
         id: string;
@@ -1834,10 +1836,12 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
         changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
         setCurrentAction(action: object): void;
-        openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+        openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
         closeDialog(result?: any): void;
-        openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+        openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
         closeDrawer(result?: any): void;
+        getDialogScoped(): import("..").IScopedContext | null;
+        getDrawerScoped(): import("..").IScopedContext | null;
     } & {
         readonly loading: boolean;
     } & {
@@ -7091,10 +7095,12 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): void;
         changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
         setCurrentAction(action: object): void;
-        openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+        openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
         closeDialog(result?: any): void;
-        openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined): void;
+        openDrawer(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
         closeDrawer(result?: any): void;
+        getDialogScoped(): import("..").IScopedContext | null;
+        getDrawerScoped(): import("..").IScopedContext | null;
     } & {
         readonly loading: boolean;
     } & {

package/esm/store/combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v2.9.0
  * Copyright 2018-2023 fex
  */