amis-core 3.2.0 → 3.3.0

package/esm/actions/DialogAction.js

@@ -1,12 +1,11 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
 import { __awaiter, __generator, __assign } from 'tslib';
-import { registerAction } from './Action.js';
-import '../index.js';
 import { filter } from '../utils/tpl.js';
+import { registerAction } from './Action.js';
 
 /**
  * 打开弹窗动作
@@ -19,16 +18,16 @@ var DialogAction = /** @class */ (function () {
     function DialogAction() {
     }
     DialogAction.prototype.run = function (action, renderer, event) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_e) {
+            return __generator(this, function (_c) {
                 // 防止editor preview模式下执行
                 if (action.$$id !== undefined) {
                     return [2 /*return*/];
                 }
                 (_b = (_a = renderer.props).onAction) === null || _b === void 0 ? void 0 : _b.call(_a, event, {
                     actionType: 'dialog',
-                    dialog: (_c = action.dialog) !== null && _c !== void 0 ? _c : (_d = action.args) === null || _d === void 0 ? void 0 : _d.dialog,
+                    dialog: action.dialog,
                     reload: 'none'
                 }, action.data);
                 return [2 /*return*/];

package/esm/actions/DrawerAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -17,12 +17,12 @@ var DrawerAction = /** @class */ (function () {
     function DrawerAction() {
     }
     DrawerAction.prototype.run = function (action, renderer, event) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_e) {
+            return __generator(this, function (_c) {
                 (_b = (_a = renderer.props).onAction) === null || _b === void 0 ? void 0 : _b.call(_a, event, {
                     actionType: 'drawer',
-                    drawer: (_c = action.drawer) !== null && _c !== void 0 ? _c : (_d = action.args) === null || _d === void 0 ? void 0 : _d.drawer,
+                    drawer: action.drawer,
                     reload: 'none'
                 }, action.data);
                 return [2 /*return*/];

package/esm/actions/EmailAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/LinkAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/LoopAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/PageAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/ParallelAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/StatusAction.d.ts

@@ -0,0 +1,15 @@
+import { RendererEvent } from '../utils/renderer-event';
+import { RendererAction, ListenerAction, ListenerContext } from './Action';
+export interface IStatusAction extends ListenerAction {
+    actionType: 'static' | 'nonstatic' | 'show' | 'visibility' | 'hidden' | 'enabled' | 'disabled' | 'usability';
+}
+/**
+ * 状态更新动作
+ *
+ * @export
+ * @class StatusAction
+ * @implements {Action}
+ */
+export declare class StatusAction implements RendererAction {
+    run(action: IStatusAction, renderer: ListenerContext, event: RendererEvent<any>): Promise<void>;
+}

package/esm/actions/StatusAction.js

@@ -0,0 +1,49 @@
+/**
+ * amis-core v3.3.0
+ * Copyright 2018-2023 fex
+ */
+
+import { __awaiter, __generator } from 'tslib';
+import { registerAction } from './Action.js';
+
+/**
+ * 状态更新动作
+ *
+ * @export
+ * @class StatusAction
+ * @implements {Action}
+ */
+var StatusAction = /** @class */ (function () {
+    function StatusAction() {
+    }
+    StatusAction.prototype.run = function (action, renderer, event) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function () {
+            var key, visibility, usability;
+            return __generator(this, function (_c) {
+                key = action.componentId || action.componentName;
+                // 显隐&状态控制
+                if (['show', 'hidden', 'visibility'].includes(action.actionType)) {
+                    visibility = action.actionType === 'visibility'
+                        ? (_a = action.args) === null || _a === void 0 ? void 0 : _a.value
+                        : action.actionType === 'show';
+                    return [2 /*return*/, renderer.props.statusStore.setVisible(key, visibility)];
+                }
+                else if (['static', 'nonstatic'].includes(action.actionType)) {
+                    return [2 /*return*/, renderer.props.statusStore.setStatic(key, action.actionType === 'static')];
+                }
+                else if (['enabled', 'disabled', 'usability'].includes(action.actionType)) {
+                    usability = action.actionType === 'usability'
+                        ? !((_b = action.args) === null || _b === void 0 ? void 0 : _b.value)
+                        : action.actionType === 'disabled';
+                    return [2 /*return*/, renderer.props.statusStore.setDisable(key, usability)];
+                }
+                return [2 /*return*/];
+            });
+        });
+    };
+    return StatusAction;
+}());
+registerAction('status', new StatusAction());
+
+export { StatusAction };

package/esm/actions/SwitchAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/ToastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/index.d.ts

@@ -9,6 +9,7 @@ import './ParallelAction';
 import './CustomAction';
 import './BroadcastAction';
 import './CmptAction';
+import './StatusAction';
 import './AjaxAction';
 import './CopyAction';
 import './DialogAction';

package/esm/components/CustomStyle.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/LazyComponent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/Overlay.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -25,8 +25,8 @@ import '../utils/filter.js';
 import 'lodash/isObject';
 import 'lodash/isString';
 import 'lodash/isBoolean';
-import 'lodash';
 import '../utils/image.js';
+import 'lodash/isEqual';
 import '../actions/Action.js';
 import 'lodash/debounce';
 import 'lodash/cloneDeep';

package/esm/components/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -24,8 +24,8 @@ import '../utils/filter.js';
 import 'lodash/isObject';
 import 'lodash/isString';
 import 'lodash/isBoolean';
-import 'lodash';
 import '../utils/image.js';
+import 'lodash/isEqual';
 import '../actions/Action.js';
 import 'lodash/debounce';
 import 'lodash/cloneDeep';

package/esm/env.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/envOverwrite.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -65,7 +65,7 @@ function registerRenderer(config) {
         })(observer(config.component));
     }
     if (config.isolateScope) {
-        config.component = HocScoped(config.component);
+        config.component = HocScoped(config.component, config.type);
     }
     var idx = findIndex(renderers, function (item) { return config.weight < item.weight; });
     ~idx ? renderers.splice(idx, 0, config) : renderers.push(config);

package/esm/index.d.ts

@@ -40,6 +40,7 @@ import Overlay from './components/Overlay';
 import PopOver from './components/PopOver';
 import { FormRenderer } from './renderers/Form';
 import type { FormHorizontal, FormSchemaBase } from './renderers/Form';
+import { enableDebug, disableDebug } from './utils/index';
 import type { OnEventProps } from './utils/index';
 import { valueMap as styleMap } from './utils/style-helper';
 import { RENDERER_TRANSMISSION_OMIT_PROPS } from './SchemaRenderer';
@@ -47,5 +48,5 @@ import type { IItem } from './store/list';
 import CustomStyle from './components/CustomStyle';
 import { StatusScoped } from './StatusScoped';
 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, StatusScoped, 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, filterTarget, CustomStyle };
+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, StatusScoped, 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, filterTarget, CustomStyle, enableDebug, disableDebug };
 export declare function render(schema: Schema, props?: RootRenderProps, options?: RenderOptions, pathPrefix?: string): JSX.Element;

package/esm/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -19,22 +19,22 @@ export { dataMapping, resolveMapping, resolveMappingObject } from './utils/dataM
 export { DataSchema } from './utils/DataSchema.js';
 export { DATASCHEMA_TYPE_MAP, DataScope } from './utils/DataScope.js';
 export { filterDate, normalizeDate, parseDuration, relativeValueRe } from './utils/date.js';
-import { enableDebug } from './utils/debug.js';
-export { DebugWrapper, debug, enableDebug, warning } from './utils/debug.js';
+import { enableDebug, disableDebug } from './utils/debug.js';
+export { DebugWrapper, JsonView, debug, disableDebug, enableDebug, warning } from './utils/debug.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, isNowFormula, registerFormulaExec, replaceExpression } from './utils/formula.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';
 import { promisify } from './utils/helper.js';
 import * as helper from './utils/helper.js';
 export { helper as utils };
-export { JSONTraverse, JSONValueMap, 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 { JSONTraverse, JSONValueMap, SkipOperation, ValidateError, __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';
@@ -44,7 +44,7 @@ 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, createObjectFromChain, deleteVariable, extendObject, extractObjectChain, isObject, pickValues, setVariable } from './utils/object.js';
+export { cloneObject, createObject, createObjectFromChain, deleteVariable, extendObject, extractObjectChain, injectObjectChain, 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';
@@ -72,6 +72,7 @@ export { decodeEntity } from './utils/decodeEntity.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 { arraySlice } from './utils/arraySlice.js';
+export { numberFormatter, safeAdd, safeSub } from './utils/math.js';
 export { default as animation } from './utils/Animation.js';
 import { RendererStore } from './store/index.js';
 export { RegisterStore, RendererStore } from './store/index.js';
@@ -89,6 +90,7 @@ import './actions/ParallelAction.js';
 import './actions/CustomAction.js';
 import './actions/BroadcastAction.js';
 import './actions/CmptAction.js';
+import './actions/StatusAction.js';
 import './actions/AjaxAction.js';
 import './actions/CopyAction.js';
 import './actions/DialogAction.js';
@@ -138,7 +140,7 @@ export { StoreNode } from './store/node.js';
  */
 var classPrefix = getClassPrefix();
 // @ts-ignore
-var version = '3.2.0';
+var version = '3.3.0';
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }
@@ -165,12 +167,6 @@ function AMISRenderer(_a) {
             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;
         }
@@ -190,6 +186,10 @@ function AMISRenderer(_a) {
         theme = 'cxd';
     }
     env.theme = getTheme(theme);
+    React.useEffect(function () {
+        env.enableAMISDebug ? enableDebug() : disableDebug();
+        return function () { return env.enableAMISDebug || disableDebug(); };
+    }, [env.enableAMISDebug]);
     if (props.locale !== undefined) {
         env.translate = translate;
         env.locale = locale;

package/esm/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/polyfills.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/esm/renderers/Form.d.ts

@@ -330,19 +330,19 @@ export default class Form extends React.Component<FormProps, object> {
     blockRouting(): any;
     beforePageUnload(e: any): any;
     onInit(): Promise<void>;
-    reload(subPath?: string, query?: any, ctx?: any, silent?: boolean): void;
-    receive(values: object, name?: string, replace?: boolean): void;
+    reload(subPath?: string, query?: any, ctx?: any, silent?: boolean): Promise<any>;
+    receive(values: object, name?: string, replace?: boolean): Promise<any>;
     silentReload(target?: string, query?: any): void;
     initInterval(value: any): any;
     isValidated(): boolean;
-    validate(forceValidate?: boolean): Promise<boolean>;
+    validate(forceValidate?: boolean, throwErrors?: boolean): Promise<boolean>;
     setErrors(errors: {
         [propName: string]: string;
     }, tag?: string): void;
     clearErrors(): void;
     getValues(): any;
     setValues(value: any, replace?: boolean): void;
-    submit(fn?: (values: object) => Promise<any>): Promise<any>;
+    submit(fn?: (values: object) => Promise<any>, throwErrors?: boolean): Promise<any>;
     flush(): void;
     reset(): void;
     addHook(fn: () => any, type?: 'validate' | 'init' | 'flush'): () => void;
@@ -383,8 +383,8 @@ export declare class FormRenderer extends Form {
     submitToTarget(target: string, values: object): void;
     reloadTarget(target: string, data: any): void;
     closeTarget(target: string): void;
-    reload(target?: string, query?: any, ctx?: any, silent?: boolean, replace?: boolean): void;
-    receive(values: object, name?: string, replace?: boolean): void;
+    reload(target?: string, query?: any, ctx?: any, silent?: boolean, replace?: boolean): Promise<any>;
+    receive(values: object, name?: string, replace?: boolean): Promise<any>;
     setData(values: object, replace?: boolean): void;
     getData(): any;
 }