amis-core 2.0.2 → 2.2.0

package/esm/index.js

@@ -1,49 +1,55 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 
-export { classPrefix, render } from './index2.js';
-export { FormItem, FormItemWrap, registerFormItem } from './renderers/Item.js';
-export { buildApi, clearApiCache, getApiCache, isApiOutdated, isEffectiveApi, isSameApi, isValidApi, jsonpFetcher, normalizeApi, normalizeApiResponseData, responseAdaptor, setApiCache, str2AsyncFunction, str2function, wrapAdaptor, wrapFetcher } from './utils/api.js';
+import { __assign } from 'tslib';
+import { stores, defaultOptions } from './factory.js';
+export { Renderer, addSchemaFilter, clearStoresCache, extendDefaultEnv, filterSchema, getRendererByName, getRenderers, registerRenderer, resolveRenderer, unRegisterRenderer, updateEnv } from './factory.js';
+import './renderers/builtin.js';
+import { wrapFetcher } from './utils/api.js';
+export { buildApi, clearApiCache, getApiCache, isApiOutdated, isApiOutdatedWithData, isEffectiveApi, isSameApi, isValidApi, jsFetcher, jsonpFetcher, normalizeApi, normalizeApiResponseData, responseAdaptor, setApiCache, str2AsyncFunction, str2function, wrapAdaptor, wrapFetcher } from './utils/api.js';
 export { attachmentAdpator } from './utils/attachmentAdpator.js';
 export { autobindMethod, bind } from './utils/autobind.js';
 export { ColorScale } from './utils/ColorScale.js';
 export { columnsSplit } from './utils/columnsSplit.js';
-export { dataMapping, resolveMapping } from './utils/dataMapping.js';
+export { dataMapping, resolveMapping, resolveMappingObject } from './utils/dataMapping.js';
 export { DataSchema } from './utils/DataSchema.js';
 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 { 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 { getVariable } from './utils/getVariable.js';
 export { collectVariables } from './utils/grammar.js';
 export { handleAction } from './utils/handleAction.js';
-export { cloneObject, createObject, deleteVariable, extendObject, isObject, pickValues, setVariable } from './utils/object.js';
-export { string2regExp } from './utils/string2regExp.js';
-export { keyToPath } from './utils/keyToPath.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, 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, 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, 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, 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';
 export { isPureVariable } from './utils/isPureVariable.js';
 export { JSONSchme2AMisSchema } from './utils/json-schema-2-amis-schema.js';
+export { keyToPath } from './utils/keyToPath.js';
 export { makeSorter } from './utils/makeSorter.js';
 export { normalizeLink } from './utils/normalizeLink.js';
 export { normalizeOptions } from './utils/normalizeOptions.js';
+export { cloneObject, createObject, deleteVariable, extendObject, isObject, pickValues, setVariable } from './utils/object.js';
 export { offset } from './utils/offset.js';
 export { offsetParent } from './utils/offsetParent.js';
 export { matchOptionValue, optionValueCompare } from './utils/optionValueCompare.js';
 export { position } from './utils/position.js';
 export { prettyBytes } from './utils/prettyBytes.js';
 export { bindEvent, createRendererEvent, dispatchEvent, getRendererEventListeners } from './utils/renderer-event.js';
+import { replaceText } from './utils/replaceText.js';
 export { replaceText } from './utils/replaceText.js';
 export { getComputedStyle, resizeSensor } from './utils/resize-sensor.js';
 export { resolveVariable } from './utils/resolveVariable.js';
@@ -51,39 +57,115 @@ export { resolveVariableAndFilter } from './utils/resolveVariableAndFilter.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 { Evaluator, evaluate, extendsFilters, filters, getFilters, lexer, parse, registerFilter } from 'amis-formula';
-export { stripNumber } from './utils/stripNumber.js';
 export { register } from './utils/tpl-builtin.js';
 export { evalExpression, 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 { default as animation } from './utils/Animation.js';
+import { RendererStore } from './store/index.js';
 export { RegisterStore, RendererStore } from './store/index.js';
+import { getEnv } from 'mobx-state-tree';
+import { getDefaultLocale, makeTranslator } from './locale.js';
+export { extendLocale, getDefaultLocale, localeable, makeTranslator, register as registerLocale, setDefaultLocale } from './locale.js';
+export { HocScoped as Scoped, ScopedContext } from './Scoped.js';
+import { getClassPrefix, getTheme } from './theme.js';
+export { classnames, getClassPrefix, getTheme, makeClassnames, setDefaultTheme, theme, themeable } from './theme.js';
+import './actions/LoopAction.js';
+import './actions/BreakAction.js';
+import './actions/ContinueAction.js';
+import './actions/SwitchAction.js';
+import './actions/ParallelAction.js';
+import './actions/CustomAction.js';
+import './actions/BroadcastAction.js';
+import './actions/CmptAction.js';
+import './actions/AjaxAction.js';
+import './actions/CopyAction.js';
+import './actions/DialogAction.js';
+import './actions/DrawerAction.js';
+import './actions/EmailAction.js';
+import './actions/LinkAction.js';
+import './actions/ToastAction.js';
+import './actions/PageAction.js';
+export { bindRendererEvent, rendererEventDispatcher } from './actions/Decorators.js';
+export { LoopStatus, getActionByType, registerAction, runAction, runActions } from './actions/Action.js';
+export { FormItem, FormItemWrap, getFormItemByName, registerFormItem } from './renderers/Item.js';
+export { OptionsControl, registerOptionsControl } from './renderers/Options.js';
+import ScopedRootRenderer from './Root.js';
+export { addRootWrapper } from './Root.js';
+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 } 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 { stripNumber } from './utils/stripNumber.js';
 export { iRendererStore } from './store/iRenderer.js';
 export { ServiceStore } from './store/service.js';
 export { FormStore } from './store/form.js';
 export { ComboStore } from './store/combo.js';
 export { CRUDStore } from './store/crud.js';
 export { TableStore } from './store/table.js';
-export { TableStoreV2 } from './store/table-v2.js';
+export { TableStore2 } from './store/table2.js';
 export { ListStore } from './store/list.js';
 export { ModalStore } from './store/modal.js';
 export { FormItemStore } from './store/formItem.js';
 export { PaginationStore } from './store/pagination.js';
 export { AppStore } from './store/app.js';
 export { StoreNode } from './store/node.js';
-export { bindRendererEvent, rendererEventDispatcher } from './actions/Decorators.js';
-export { LoopStatus, getActionByType, registerAction, runAction, runActions } from './actions/Action.js';
-export { Renderer, addSchemaFilter, clearStoresCache, extendDefaultEnv, filterSchema, getRendererByName, getRenderers, registerRenderer, resolveRenderer, unRegisterRenderer, updateEnv } from './factory.js';
-export { EnvContext } from './env.js';
-export { OptionsControl, registerOptionsControl } from './renderers/Options.js';
-export { FormRenderer } from './renderers/Form.js';
-export { HocScoped as Scoped, ScopedContext } from './Scoped.js';
-export { classnames, getClassPrefix, getTheme, makeClassnames, setDefaultTheme, theme, themeable } from './theme.js';
-export { extendLocale, getDefaultLocale, localeable, makeTranslator, register as registerLocale, setDefaultLocale } from './locale.js';
-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 { addRootWrapper } from './Root.js';
+
+var classPrefix = getClassPrefix();
+function render(schema, props, options, pathPrefix) {
+    if (props === void 0) { props = {}; }
+    if (options === void 0) { options = {}; }
+    if (pathPrefix === void 0) { pathPrefix = ''; }
+    var locale = props.locale || getDefaultLocale();
+    // 兼容 locale 的不同写法
+    locale = locale.replace('_', '-');
+    locale = locale === 'en' ? 'en-US' : locale;
+    locale = locale === 'zh' ? 'zh-CN' : locale;
+    locale = locale === 'cn' ? 'zh-CN' : locale;
+    var translate = props.translate || makeTranslator(locale);
+    var store = stores[options.session || 'global'];
+    // 根据环境覆盖 schema，这个要在最前面做，不然就无法覆盖 validations
+    envOverwrite(schema, locale);
+    if (!store) {
+        options = __assign(__assign(__assign({}, defaultOptions), options), { fetcher: options.fetcher
+                ? wrapFetcher(options.fetcher, options.tracker)
+                : defaultOptions.fetcher, confirm: promisify(options.confirm || defaultOptions.confirm || window.confirm), locale: locale, translate: translate });
+        if (options.enableAMISDebug) {
+            // 因为里面还有 render
+            setTimeout(function () {
+                enableDebug();
+            }, 10);
+        }
+        store = RendererStore.create({}, options);
+        stores[options.session || 'global'] = store;
+    }
+    window.amisStore = store; // 为了方便 debug.
+    var env = getEnv(store);
+    var theme = props.theme || options.theme || 'cxd';
+    if (theme === 'default') {
+        theme = 'cxd';
+    }
+    env.theme = getTheme(theme);
+    if (props.locale !== undefined) {
+        env.translate = translate;
+        env.locale = locale;
+    }
+    // 默认将开启移动端原生 UI
+    if (typeof options.useMobileUI) {
+        props.useMobileUI = true;
+    }
+    replaceText(schema, env.replaceText, env.replaceTextIgnoreKeys);
+    return (React.createElement(EnvContext.Provider, { value: env },
+        React.createElement(ScopedRootRenderer, __assign({}, props, { schema: schema, pathPrefix: pathPrefix, rootStore: store, env: env, theme: theme, locale: locale, translate: translate }))));
+}
+
+export { classPrefix, render };

package/esm/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 
@@ -15,7 +15,8 @@ import './utils/filter.js';
 var defaultLocale = 'zh-CN';
 var locales = {};
 function register(name, config) {
-    locales[name] = config;
+    // 修改为扩展，防止已注册的语料被覆盖
+    extendLocale(name, config);
 }
 function extendLocale(name, config) {
     locales[name] = __assign(__assign({}, (locales[name] || {})), config);

package/esm/node_modules/@restart/hooks/esm/useCommittedRef.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/@restart/hooks/esm/useEventCallback.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/dom-helpers/esm/addEventListener.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/dom-helpers/esm/canUseDOM.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/dom-helpers/esm/contains.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/dom-helpers/esm/listen.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/dom-helpers/esm/ownerDocument.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/dom-helpers/esm/removeEventListener.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/object-assign/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/prop-types/checkPropTypes.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/prop-types/factoryWithThrowingShims.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/prop-types/factoryWithTypeCheckers.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/prop-types/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/prop-types/lib/ReactPropTypesSecret.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/prop-types/lib/has.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/prop-types/node_modules/react-is/cjs/react-is.development.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/prop-types/node_modules/react-is/cjs/react-is.production.min.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/prop-types/node_modules/react-is/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/react-overlays/esm/Portal.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/react-overlays/esm/ownerDocument.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/react-overlays/esm/safeFindDOMNode.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/react-overlays/esm/useRootClose.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/react-overlays/esm/useWaitForDOMRef.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/node_modules/warning/warning.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/renderers/Form.d.ts

@@ -40,6 +40,35 @@ export interface FormSchemaBase {
      * 是否开启调试，开启后会在顶部实时显示表单项数据。
      */
     debug?: boolean;
+    /**
+     * Debug面板配置
+     */
+    debugConfig?: {
+        /**
+         * 默认展开的级别
+         */
+        levelExpand?: number;
+        /**
+         * 是否可复制
+         */
+        enableClipboard?: boolean;
+        /**
+         * 图标风格
+         */
+        iconStyle?: 'square' | 'circle' | 'triangle';
+        /**
+         * 是否显示键的引号
+         */
+        quotesOnKeys?: boolean;
+        /**
+         * 是否为键排序
+         */
+        sortKeys?: boolean;
+        /**
+         * 设置字符串的最大展示长度，超出长度阈值的字符串将被截断，点击value可切换字符串展示方式，默认为120
+         */
+        ellipsisThreshold?: number | false;
+    };
     /**
      * 用来初始化表单数据
      */
@@ -220,7 +249,7 @@ export interface FormProps extends RendererProps, Omit<FormSchemaBase, 'mode' |
     lazyLoad?: boolean;
     simpleMode?: boolean;
     onInit?: (values: object, props: any) => any;
-    onReset?: (values: object) => void;
+    onReset?: (values: object, action?: any) => void;
     onSubmit?: (values: object, action: any) => any;
     onChange?: (values: object, diff: object, props: any) => any;
     onFailed?: (reason: string, errors: any) => any;
@@ -304,7 +333,8 @@ export default class Form extends React.Component<FormProps, object> {
     formItemDispatchEvent(dispatchEvent: any): (type: string, data: any) => void;
     emitChange(submit: boolean): Promise<void>;
     handleBulkChange(values: Object, submit: boolean): void;
-    handleFormSubmit(e: React.UIEvent<any>): false | Promise<any>;
+    handleFormSubmit(e: React.UIEvent<any>): any;
+    handleReset(action: any): (data: any) => void;
     handleAction(e: React.UIEvent<any> | void, action: ActionObject, data: object, throwErrors?: boolean, delegate?: IScopedContext): Promise<any>;
     handleQuery(query: any): void;
     handleDialogConfirm(values: object[], action: ActionObject, ctx: any, targets: Array<any>): void;

package/esm/renderers/Form.js

@@ -1,10 +1,11 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 
 import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
+import extend from 'lodash/extend';
 import { Renderer } from '../factory.js';
 import { FormStore } from '../store/form.js';
 import { evalExpression, filter } from '../utils/tpl.js';
@@ -414,14 +415,23 @@ var Form = /** @class */ (function (_super) {
         (formLazyChange === false ? this.emitChange : this.lazyEmitChange)(submit);
     };
     Form.prototype.handleFormSubmit = function (e) {
-        var preventEnterSubmit = this.props.preventEnterSubmit;
+        var _a = this.props, preventEnterSubmit = _a.preventEnterSubmit, onActionSensor = _a.onActionSensor;
         e.preventDefault();
         if (preventEnterSubmit) {
             return false;
         }
-        return this.handleAction(e, {
+        var sensor = this.handleAction(e, {
             type: 'submit'
         }, this.props.store.data);
+        // 让外层可以监控这个动作执行结果
+        onActionSensor === null || onActionSensor === void 0 ? void 0 : onActionSensor(sensor);
+        return sensor;
+    };
+    Form.prototype.handleReset = function (action) {
+        var onReset = this.props.onReset;
+        return function (data) {
+            onReset && onReset(data, action);
+        };
     };
     Form.prototype.handleAction = function (e, action, data, throwErrors, delegate) {
         if (throwErrors === void 0) { throwErrors = false; }
@@ -472,10 +482,10 @@ var Form = /** @class */ (function (_super) {
                             action.actionType === 'clear-and-submit') {
                             store.setCurrentAction(action);
                             if (action.actionType === 'reset-and-submit') {
-                                store.reset(onReset);
+                                store.reset(this.handleReset(action));
                             }
                             else if (action.actionType === 'clear-and-submit') {
-                                store.clear(onReset);
+                                store.clear(this.handleReset(action));
                             }
                             return [2 /*return*/, this.submit(function (values) {
                                     var _a;
@@ -582,8 +592,8 @@ var Form = /** @class */ (function (_super) {
                                     if (onFinished && onFinished(values, action) === false) {
                                         return values;
                                     }
-                                    resetAfterSubmit && store.reset(onReset);
-                                    clearAfterSubmit && store.clear(onReset);
+                                    resetAfterSubmit && store.reset(_this.handleReset(action));
+                                    clearAfterSubmit && store.clear(_this.handleReset(action));
                                     clearPersistDataAfterSubmit && store.clearLocalPersistData();
                                     if (action.redirect || redirect) {
                                         var finalRedirect = filter(action.redirect || redirect, store.data);
@@ -880,7 +890,7 @@ var Form = /** @class */ (function (_super) {
         return render("".concat(region ? "".concat(region, "/") : '').concat(key), subSchema, subProps);
     };
     Form.prototype.renderBody = function () {
-        var _a = this.props, body = _a.body, mode = _a.mode, className = _a.className, cx = _a.classnames, debug = _a.debug, $path = _a.$path, store = _a.store, columnCount = _a.columnCount, render = _a.render;
+        var _a = this.props, body = _a.body, mode = _a.mode, className = _a.className, cx = _a.classnames, debug = _a.debug, debugConfig = _a.debugConfig, $path = _a.$path, store = _a.store, columnCount = _a.columnCount, render = _a.render;
         var restError = store.restError;
         var WrapperComponent = this.props.wrapperComponent ||
             (/(?:\/|^)form\//.test($path) ? 'div' : 'form');
@@ -889,8 +899,16 @@ var Form = /** @class */ (function (_super) {
             : 0, function (index) { return (React.createElement("div", { className: cx("Form-item Form-item--".concat(mode, " is-placeholder")), key: index })); });
         return (React.createElement(WrapperComponent, { className: cx("Form", "Form--".concat(mode || 'normal'), columnCount ? "Form--column Form--column-".concat(columnCount) : null, className), onSubmit: this.handleFormSubmit, noValidate: true },
             React.createElement("input", { type: "submit", style: { display: 'none' } }),
-            debug ? (React.createElement("pre", null,
-                React.createElement("code", { className: cx('Form--debug') }, JSON.stringify(store.data, null, 2)))) : null,
+            debug
+                ? render('form-debug-json', extend({
+                    type: 'json',
+                    value: store.data,
+                    ellipsisThreshold: 120,
+                    className: cx('Form--debug')
+                }, 
+                /** 定制debug输出格式 */
+                isObject(debugConfig) ? debugConfig : {}))
+                : null,
             render('spinner', { type: 'spinner' }, {
                 overlay: true,
                 show: store.loading