amis-core 2.8.0 → 3.0.0

package/esm/components/Overlay.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -38,6 +38,7 @@ import 'lodash/camelCase';
 import 'uncontrollable';
 import 'hoist-non-react-statics';
 import '../utils/validations.js';
+import '../utils/resolveCondition.js';
 import '../utils/Animation.js';
 
 /**

package/esm/components/PopOver.d.ts

@@ -58,12 +58,10 @@ declare const _default: {
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<PopOverPorps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<PopOverPorps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<Omit<PopOverPorps, keyof import("../theme").ThemeProps> & import("../theme").ThemeOutterProps>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;

package/esm/components/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -37,6 +37,7 @@ import 'lodash/camelCase';
 import 'uncontrollable';
 import 'hoist-non-react-statics';
 import '../utils/validations.js';
+import '../utils/resolveCondition.js';
 import '../utils/Animation.js';
 
 /**

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 v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/envOverwrite.js

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

package/esm/factory.d.ts

@@ -4,7 +4,7 @@ import { fetcherResult, SchemaNode, Schema, PlainObject } from './types';
 import { ThemeProps } from './theme';
 import { LocaleProps } from './locale';
 import type { RendererEnv } from './env';
-import { OnEventProps } from './utils/renderer-event';
+import { OnEventProps, RendererEvent } from './utils/renderer-event';
 export interface TestFunc {
     (path: string, schema?: Schema, resolveRenderer?: (path: string, schema?: Schema, props?: any) => null | RendererConfig): boolean;
 }
@@ -35,6 +35,7 @@ export interface RendererProps extends ThemeProps, LocaleProps, OnEventProps {
     style?: {
         [propName: string]: any;
     };
+    onBroadcast?: (type: string, rawEvent: RendererEvent<any>, ctx: any) => any;
     [propName: string]: any;
 }
 export type RendererComponent = React.ComponentType<RendererProps> & {

package/esm/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.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 = {};
@@ -136,11 +138,11 @@ var defaultOptions = {
         }
     },
     isCancel: function () {
-        console.error('Please implement isCancel. see https://baidu.gitee.io/amis/docs/start/getting-started#%E4%BD%BF%E7%94%A8%E6%8C%87%E5%8D%97');
+        console.error('Please implement isCancel. see https://aisuda.bce.baidu.com/amis/zh-CN/start/getting-started#%E4%BD%BF%E7%94%A8%E6%8C%87%E5%8D%97');
         return false;
     },
     updateLocation: function () {
-        console.error('Please implement updateLocation. see https://baidu.gitee.io/amis/docs/start/getting-started#%E4%BD%BF%E7%94%A8%E6%8C%87%E5%8D%97');
+        console.error('Please implement updateLocation. see https://aisuda.bce.baidu.com/amis/zh-CN/start/getting-started#%E4%BD%BF%E7%94%A8%E6%8C%87%E5%8D%97');
     },
     jumpTo: function (to, action) {
         if (to === 'goBack') {

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';
@@ -15,10 +14,11 @@ export * from './types';
 export * from './store';
 import * as utils from './utils/helper';
 import { RegisterStore } from './store';
+import type { IColumn, IColumn2, IRow, IRow2 } from './store';
 import { setDefaultLocale, getDefaultLocale, makeTranslator, register as registerLocale, extendLocale, removeLocaleData, localeable } from './locale';
 import type { LocaleProps, TranslateFn } from './locale';
 import Scoped, { ScopedContext } from './Scoped';
-import type { IScopedContext } from './Scoped';
+import type { ScopedComponentType, IScopedContext } from './Scoped';
 import { classnames, getClassPrefix, setDefaultTheme, theme, getTheme, themeable, makeClassnames } from './theme';
 import type { ClassNamesFn, ThemeProps } from './theme';
 declare const classPrefix: string | undefined;
@@ -32,13 +32,17 @@ 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';
 import PopOver from './components/PopOver';
 import { FormRenderer } from './renderers/Form';
-import type { FormHorizontal } from './renderers/Form';
+import type { FormHorizontal, FormSchemaBase } from './renderers/Form';
+import type { OnEventProps } from './utils/index';
+import { valueMap as styleMap } from './utils/style-helper';
+import { RENDERER_TRANSMISSION_OMIT_PROPS } from './SchemaRenderer';
+import type { IItem } from './store/list';
 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, styleMap, RENDERER_TRANSMISSION_OMIT_PROPS, ScopedComponentType, IItem, IColumn, IRow, IColumn2, IRow2, OnEventProps, FormSchemaBase };
 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 v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -20,20 +20,20 @@ export { DataScope } from './utils/DataScope.js';
 export { filterDate, parseDuration, relativeValueRe } from './utils/date.js';
 import { enableDebug } from './utils/debug.js';
 export { DebugWrapper, debug, enableDebug, warning } from './utils/debug.js';
-export { calculatePosition, getContainer, getStyleNumber, ownerDocument } from './utils/dom.js';
+export { calculatePosition, getContainer, getStyleNumber, ownerDocument, renderTextByKeyword } from './utils/dom.js';
 export { ServerError } from './utils/errors.js';
 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';
 import { promisify } from './utils/helper.js';
 import * as helper from './utils/helper.js';
 export { helper as utils };
-export { JSONTraverse, SkipOperation, __uri, anyChanged, autobind, bulkBindFunctions, camel, chainEvents, chainFunctions, convertArrayValueToMoment, detectPropValueChanged, difference, eachTree, everyTree, filterTree, findIndex, findObjectsWithKey, findTree, findTreeIndex, flattenTree, flattenTreeWithLeafNodes, getLevelFromClassName, getPropValue, getRange, getScrollParent, getScrollbarWidth, getTree, getTreeAncestors, getTreeDepth, getTreeParent, getWidthRate, guid, hasAbility, hasFile, hasOwnPropertyInPath, hasVisibleExpression, hashCode, immutableExtends, injectPropsToObject, isArrayChildrenModified, isBreakpoint, isClickOnInput, isDisabled, isEmpty, isMobile, isNumeric, isObjectShallowModified, isSuperDataModified, isUnfolded, isVisible, lcFirst, loadScript, makeColumnClassBuild, makeHorizontalDeeper, mapObject, mapTree, noop, normalizeNodePath, object2formData, omitControls, padArr, parseQuery, pickEventsProps, preventDefault, promisify, qsparse, qsstringify, range, removeHTMLTag, repeatCount, rmUndefined, someTree, sortArray, spliceTree, syncDataFromSuper, ucFirst, until, uuid, uuidv4, visibilityFilter } from './utils/helper.js';
+export { JSONTraverse, SkipOperation, __uri, anyChanged, autobind, bulkBindFunctions, camel, chainEvents, chainFunctions, convertArrayValueToMoment, detectPropValueChanged, difference, eachTree, everyTree, filterTree, findIndex, findObjectsWithKey, findTree, findTreeAll, findTreeIndex, flattenTree, flattenTreeWithLeafNodes, getLevelFromClassName, getPropValue, getRange, getScrollParent, getScrollbarWidth, getTree, getTreeAncestors, getTreeDepth, getTreeParent, getWidthRate, guid, hasAbility, hasFile, hasOwnPropertyInPath, hasVisibleExpression, hashCode, immutableExtends, injectPropsToObject, isArrayChildrenModified, isBreakpoint, isClickOnInput, isDisabled, isEmpty, isMobile, isNumeric, isObjectShallowModified, isSuperDataModified, isUnfolded, isVisible, lcFirst, loadScript, loadStyle, makeColumnClassBuild, makeHorizontalDeeper, mapObject, mapTree, noop, normalizeNodePath, object2formData, omitControls, padArr, parseQuery, pickEventsProps, preventDefault, promisify, qsparse, qsstringify, range, removeHTMLTag, repeatCount, rmUndefined, someTree, sortArray, spliceTree, syncDataFromSuper, ucFirst, until, uuid, uuidv4, visibilityFilter } from './utils/helper.js';
 export { highlight } from './utils/highlight.js';
 export { generateIcon } from './utils/icon.js';
 export { getImageDimensions, toDataURL } from './utils/image.js';
@@ -55,19 +55,21 @@ 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, setFormulaEvalErrorHandler } from './utils/resolveVariableAndFilterForAsync.js';
 export { RootClose } from './utils/RootClose.js';
 export { scrollPosition } from './utils/scrollPosition.js';
 export { SimpleMap } from './utils/SimpleMap.js';
 export { string2regExp } from './utils/string2regExp.js';
 export { buildStyle } from './utils/style.js';
-export { tokenize } from './utils/tokenize.js';
+export { asyncTokenize, tokenize } from './utils/tokenize.js';
 export { register } from './utils/tpl-builtin.js';
-export { evalExpression, evalJS, filter, registerTplEnginer, setCustomEvalExpression, setCustomEvalJs } from './utils/tpl.js';
+export { asyncFilter, 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 { addStyle, findOrCreactStyle, formatStyle, getValueByPath, inheritValueMap, insertCustomStyle, insertStyle, valueMap as styleMap, valueMap } from './utils/style-helper.js';
+export { getConditionComputers, registerConditionComputer, resolveCondition, setConditionComputeErrorHandler } 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,11 +104,12 @@ 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';
 export { FormRenderer } from './renderers/Form.js';
+export { RENDERER_TRANSMISSION_OMIT_PROPS } from './SchemaRenderer.js';
 export { stripNumber } from './utils/stripNumber.js';
 export { iRendererStore } from './store/iRenderer.js';
 export { ServiceStore } from './store/service.js';
@@ -131,7 +134,7 @@ export { StoreNode } from './store/node.js';
  */
 var classPrefix = getClassPrefix();
 // @ts-ignore
-var version = '2.8.0';
+var version = '3.0.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 v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/renderers/Form.d.ts

@@ -120,7 +120,7 @@ export interface FormSchemaBase {
     /**
      * Form 用来保存数据的 api。
      *
-     * 详情：https://baidu.gitee.io/amis/docs/components/form/index#%E8%A1%A8%E5%8D%95%E6%8F%90%E4%BA%A4
+     * 详情：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/index#%E8%A1%A8%E5%8D%95%E6%8F%90%E4%BA%A4
      */
     api?: string | BaseApiObject;
     /**

package/esm/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.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 v3.0.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';
@@ -333,7 +334,8 @@ var FormItemWrap = /** @class */ (function (_super) {
             var controlSize = size || defaultSize;
             return renderControl(__assign(__assign({}, rest), { onOpenDialog: this.handleOpenDialog, type: type, classnames: cx, formItem: model, className: cx("Form-control", (_a = {
                         'is-inline': !!rest.inline && !mobileUI,
-                        'is-error': model && !model.valid
+                        'is-error': model && !model.valid,
+                        'is-full': size === 'full'
                     },
                     _a["Form-control--withSize Form-control--size".concat(ucFirst(controlSize))] = sizeMutable !== false &&
                         typeof controlSize === 'string' &&
@@ -344,15 +346,15 @@ var FormItemWrap = /** @class */ (function (_super) {
         return null;
     };
     FormItemWrap.prototype.render = function () {
-        var _a = this.props, formMode = _a.formMode, inputOnly = _a.inputOnly, wrap = _a.wrap, render = _a.render, model = _a.formItem, css = _a.css, id = _a.id, labelClassName = _a.labelClassName, descriptionClassName = _a.descriptionClassName;
+        var _a = this.props, formMode = _a.formMode, inputOnly = _a.inputOnly, wrap = _a.wrap, render = _a.render, model = _a.formItem, css = _a.css, themeCss = _a.themeCss, id = _a.id, labelClassName = _a.labelClassName, descriptionClassName = _a.descriptionClassName;
         var mode = this.props.mode || formMode;
-        insertCustomStyle(css, [
+        insertCustomStyle(themeCss || css, [
             {
                 key: 'labelClassName',
                 value: labelClassName
             }
         ], id + '-label');
-        insertCustomStyle(css, [
+        insertCustomStyle(themeCss || css, [
             {
                 key: 'descriptionClassName',
                 value: descriptionClassName
@@ -766,7 +768,8 @@ var detectProps = [
     'embed',
     'displayMode',
     'revealPassword',
-    'loading'
+    'loading',
+    'themeCss'
 ];
 function asFormItem(config) {
     return function (Control) {
@@ -837,7 +840,8 @@ function asFormItem(config) {
                     return (React.createElement(React.Fragment, null,
                         React.createElement(Control, __assign({}, rest, { useMobileUI: useMobileUI, onOpenDialog: this.handleOpenDialog, size: config.sizeMutable !== false ? undefined : size, onFocus: this.handleFocus, onBlur: this.handleBlur, type: type, classnames: cx, ref: isSFC ? undefined : this.refFn, forwardedRef: isSFC ? this.refFn : undefined, formItem: model, className: cx("Form-control", (_a = {
                                     'is-inline': !!rest.inline && !mobileUI,
-                                    'is-error': model && !model.valid
+                                    'is-error': model && !model.valid,
+                                    'is-full': size === 'full'
                                 },
                                 _a["Form-control--withSize Form-control--size".concat(ucFirst(controlSize))] = config.sizeMutable !== false &&
                                     typeof controlSize === 'string' &&

package/esm/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.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([
@@ -182,8 +183,8 @@ function registerOptionsControl(config) {
                     switch (_b.label) {
                         case 0:
                             _a = this.props, dispatchEvent = _a.dispatchEvent, options = _a.options;
-                            return [4 /*yield*/, dispatchEvent(eventName, resolveEventData(this.props, { value: eventData, options: options, items: options }, // 为了保持名字统一
-                                'value'))];
+                            return [4 /*yield*/, dispatchEvent(eventName, resolveEventData(this.props, { value: eventData, options: options, items: options } // 为了保持名字统一
+                                ))];
                         case 1:
                             rendererEvent = _b.sent();
                             // 返回阻塞标识

package/esm/renderers/Placeholder.js

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

package/esm/renderers/builtin.js

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

package/esm/renderers/register.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.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;