amis-core 3.1.1 → 3.3.0

package/lib/components/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -13,13 +13,14 @@ var ReactDOM = require('react-dom');
 var theme = require('../theme.js');
 require('../utils/api.js');
 require('../utils/ColorScale.js');
-require('lodash/chunk');
+require('../utils/columnsSplit.js');
 require('amis-formula');
 require('lodash/isPlainObject');
 require('../utils/DataSchema.js');
 require('../utils/DataScope.js');
 require('moment');
 require('../utils/debug.js');
+require('../utils/dom.js');
 require('../utils/errors.js');
 require('../utils/tpl.js');
 var helper = require('../utils/helper.js');
@@ -28,8 +29,10 @@ require('../utils/filter.js');
 require('lodash/isObject');
 require('lodash/isString');
 require('lodash/isBoolean');
-require('lodash');
+require('../utils/highlight.js');
+require('../utils/icon.js');
 require('../utils/image.js');
+require('lodash/isEqual');
 require('../actions/Action.js');
 require('lodash/debounce');
 require('lodash/cloneDeep');
@@ -42,17 +45,16 @@ require('uncontrollable');
 require('hoist-non-react-statics');
 require('../utils/validations.js');
 require('../utils/resolveCondition.js');
+require('mobx');
 require('../utils/Animation.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-/**
- * @file PopOver
- * @description
- * @author fex
- */
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 var PopOver = /** @class */ (function (_super) {
     tslib.__extends(PopOver, _super);
     function PopOver() {
@@ -109,8 +111,8 @@ var PopOver = /** @class */ (function (_super) {
         var _a = this.props; _a.placement; var activePlacement = _a.activePlacement, positionTop = _a.positionTop, positionLeft = _a.positionLeft; _a.arrowOffsetLeft; _a.arrowOffsetTop; var style = _a.style, children = _a.children; _a.offset; var overlay = _a.overlay, onHide = _a.onHide, ns = _a.classPrefix, cx = _a.classnames, className = _a.className, rest = tslib.__rest(_a, ["placement", "activePlacement", "positionTop", "positionLeft", "arrowOffsetLeft", "arrowOffsetTop", "style", "children", "offset", "overlay", "onHide", "classPrefix", "classnames", "className"]);
         var _b = this.state, xOffset = _b.xOffset, yOffset = _b.yOffset;
         var outerStyle = tslib.__assign(tslib.__assign({ display: 'block' }, style), { top: positionTop + yOffset, left: positionLeft + xOffset });
-        return (React__default["default"].createElement("div", tslib.__assign({ ref: this.wrapperRef, className: cx("".concat(ns, "PopOver"), className, "".concat(ns, "PopOver--").concat(helper.camel(activePlacement))), style: outerStyle }, rest),
-            overlay ? (React__default["default"].createElement("div", { className: "".concat(ns, "PopOver-overlay"), onClick: onHide })) : null,
+        return (_J$X_("div", tslib.__assign({ ref: this.wrapperRef, className: cx("".concat(ns, "PopOver"), className, "".concat(ns, "PopOver--").concat(helper.camel(activePlacement))), style: outerStyle }, rest),
+            overlay ? (_J$X_("div", { className: "".concat(ns, "PopOver-overlay"), onClick: onHide })) : null,
             children));
     };
     PopOver.defaultProps = {

package/lib/env.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -15,6 +15,9 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
+var __react_jsx__ = require('react');
+(__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 var EnvContext = React__default["default"].createContext(undefined);
 
 exports.EnvContext = EnvContext;

package/lib/envOverwrite.js

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

package/lib/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -8,7 +8,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
-var React = require('react');
+require('react');
 var index = require('./store/index.js');
 var mobxStateTree = require('mobx-state-tree');
 var api = require('./utils/api.js');
@@ -23,9 +23,11 @@ var string2regExp = require('./utils/string2regExp.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
 
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 var _a, _b;
 var renderers = [];
 var renderersMap = {};
@@ -74,7 +76,7 @@ function registerRenderer(config) {
         })(mobxReact.observer(config.component));
     }
     if (config.isolateScope) {
-        config.component = Scoped.HocScoped(config.component);
+        config.component = Scoped.HocScoped(config.component, config.type);
     }
     var idx = helper.findIndex(renderers, function (item) { return config.weight < item.weight; });
     ~idx ? renderers.splice(idx, 0, config) : renderers.push(config);
@@ -90,13 +92,13 @@ function unRegisterRenderer(config) {
     cache = {};
 }
 function loadRenderer(schema, path) {
-    return (React__default["default"].createElement("div", { className: "RuntimeError" },
-        React__default["default"].createElement("p", null, "Error: \u627E\u4E0D\u5230\u5BF9\u5E94\u7684\u6E32\u67D3\u5668"),
-        React__default["default"].createElement("p", null,
+    return (_J$X_("div", { className: "RuntimeError" },
+        _J$X_("p", null, "Error: \u627E\u4E0D\u5230\u5BF9\u5E94\u7684\u6E32\u67D3\u5668"),
+        _J$X_("p", null,
             "Path: ",
             path),
-        React__default["default"].createElement("pre", null,
-            React__default["default"].createElement("code", null, JSON.stringify(schema, null, 2)))));
+        _J$X_("pre", null,
+            _J$X_("code", null, JSON.stringify(schema, null, 2)))));
 }
 var defaultOptions = {
     session: 'global',

package/lib/index.d.ts

@@ -7,6 +7,7 @@
  */
 import { Renderer, getRendererByName, getRenderers, registerRenderer, unRegisterRenderer, resolveRenderer, filterSchema, clearStoresCache, updateEnv, addSchemaFilter, extendDefaultEnv } from './factory';
 import type { RenderOptions, RendererConfig, RendererProps } from './factory';
+import './polyfills';
 import './renderers/builtin';
 import './renderers/register';
 export * from './utils/index';
@@ -39,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';
@@ -46,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/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -9,6 +9,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var factory = require('./factory.js');
+require('./polyfills.js');
 require('./renderers/builtin.js');
 require('./renderers/register.js');
 var api = require('./utils/api.js');
@@ -67,6 +68,8 @@ var toNumber = require('./utils/toNumber.js');
 var decodeEntity = require('./utils/decodeEntity.js');
 var styleHelper = require('./utils/style-helper.js');
 var resolveCondition = require('./utils/resolveCondition.js');
+var arraySlice = require('./utils/arraySlice.js');
+var math = require('./utils/math.js');
 var Animation = require('./utils/Animation.js');
 var index = require('./store/index.js');
 var mobxStateTree = require('mobx-state-tree');
@@ -81,6 +84,7 @@ require('./actions/ParallelAction.js');
 require('./actions/CustomAction.js');
 require('./actions/BroadcastAction.js');
 require('./actions/CmptAction.js');
+require('./actions/StatusAction.js');
 require('./actions/AjaxAction.js');
 require('./actions/CopyAction.js');
 require('./actions/DialogAction.js');
@@ -123,21 +127,17 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-/** @license amis v@version
- *
- * Copyright Baidu
- *
- * This source code is licensed under the Apache license found in the
- * LICENSE file in the root directory of this source tree.
- */
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 var classPrefix = theme.getClassPrefix();
 // @ts-ignore
-var version = '3.1.1';
+var version = '3.3.0';
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }
     if (pathPrefix === void 0) { pathPrefix = ''; }
-    return (React__default["default"].createElement(AMISRenderer, tslib.__assign({}, props, { schema: schema, pathPrefix: pathPrefix, options: options })));
+    return (_J$X_(AMISRenderer, tslib.__assign({}, props, { schema: schema, pathPrefix: pathPrefix, options: options })));
 }
 function AMISRenderer(_a) {
     var schema = _a.schema, options = _a.options, pathPrefix = _a.pathPrefix, props = tslib.__rest(_a, ["schema", "options", "pathPrefix"]);
@@ -159,12 +159,6 @@ function AMISRenderer(_a) {
             options = tslib.__assign(tslib.__assign(tslib.__assign({}, factory.defaultOptions), options), { fetcher: options.fetcher
                     ? api.wrapFetcher(options.fetcher, options.tracker)
                     : factory.defaultOptions.fetcher, confirm: helper.promisify(options.confirm || factory.defaultOptions.confirm || window.confirm), locale: locale$1, translate: translate });
-            if (options.enableAMISDebug) {
-                // 因为里面还有 render
-                setTimeout(function () {
-                    debug.enableDebug();
-                }, 10);
-            }
             store = index.RendererStore.create({}, options);
             factory.stores[options.session || 'global'] = store;
         }
@@ -184,6 +178,10 @@ function AMISRenderer(_a) {
         theme$1 = 'cxd';
     }
     env$1.theme = theme.getTheme(theme$1);
+    React__default["default"].useEffect(function () {
+        env$1.enableAMISDebug ? debug.enableDebug() : debug.disableDebug();
+        return function () { return env$1.enableAMISDebug || debug.disableDebug(); };
+    }, [env$1.enableAMISDebug]);
     if (props.locale !== undefined) {
         env$1.translate = translate;
         env$1.locale = locale$1;
@@ -195,8 +193,8 @@ function AMISRenderer(_a) {
     // 根据环境覆盖 schema，这个要在最前面做，不然就无法覆盖 validations
     envOverwrite.envOverwrite(schema, locale$1);
     schema = replaceText.replaceText(schema, options.replaceText, env$1.replaceTextIgnoreKeys);
-    return (React__default["default"].createElement(env.EnvContext.Provider, { value: env$1 },
-        React__default["default"].createElement(Root["default"], tslib.__assign({}, props, { schema: schema, pathPrefix: pathPrefix, rootStore: store, env: env$1, theme: theme$1, locale: locale$1, translate: translate }))));
+    return (_J$X_(env.EnvContext.Provider, { value: env$1 },
+        _J$X_(Root["default"], tslib.__assign({}, props, { schema: schema, pathPrefix: pathPrefix, rootStore: store, env: env$1, theme: theme$1, locale: locale$1, translate: translate }))));
 }
 
 exports.Renderer = factory.Renderer;
@@ -237,13 +235,16 @@ exports.dataMapping = dataMapping.dataMapping;
 exports.resolveMapping = dataMapping.resolveMapping;
 exports.resolveMappingObject = dataMapping.resolveMappingObject;
 exports.DataSchema = DataSchema.DataSchema;
+exports.DATASCHEMA_TYPE_MAP = DataScope.DATASCHEMA_TYPE_MAP;
 exports.DataScope = DataScope.DataScope;
 exports.filterDate = date.filterDate;
 exports.normalizeDate = date.normalizeDate;
 exports.parseDuration = date.parseDuration;
 exports.relativeValueRe = date.relativeValueRe;
 exports.DebugWrapper = debug.DebugWrapper;
+exports.JsonView = debug.JsonView;
 exports.debug = debug.debug;
+exports.disableDebug = debug.disableDebug;
 exports.enableDebug = debug.enableDebug;
 exports.warning = debug.warning;
 exports.calculatePosition = dom.calculatePosition;
@@ -259,14 +260,15 @@ exports.FormulaExec = formula.FormulaExec;
 exports.formulaExec = formula.formulaExec;
 exports.isExpression = formula.isExpression;
 exports.isNeedFormula = formula.isNeedFormula;
-exports.isNowFormula = formula.isNowFormula;
 exports.registerFormulaExec = formula.registerFormulaExec;
 exports.replaceExpression = formula.replaceExpression;
 exports.getVariable = getVariable.getVariable;
 exports.collectVariables = grammar.collectVariables;
 exports.handleAction = handleAction.handleAction;
 exports.JSONTraverse = helper.JSONTraverse;
+exports.JSONValueMap = helper.JSONValueMap;
 exports.SkipOperation = helper.SkipOperation;
+exports.ValidateError = helper.ValidateError;
 exports.__uri = helper.__uri;
 exports.anyChanged = helper.anyChanged;
 exports.autobind = helper.autobind;
@@ -364,6 +366,7 @@ exports.createObjectFromChain = object.createObjectFromChain;
 exports.deleteVariable = object.deleteVariable;
 exports.extendObject = object.extendObject;
 exports.extractObjectChain = object.extractObjectChain;
+exports.injectObjectChain = object.injectObjectChain;
 exports.isObject = object.isObject;
 exports.pickValues = object.pickValues;
 exports.setVariable = object.setVariable;
@@ -422,6 +425,10 @@ exports.getConditionComputers = resolveCondition.getConditionComputers;
 exports.registerConditionComputer = resolveCondition.registerConditionComputer;
 exports.resolveCondition = resolveCondition.resolveCondition;
 exports.setConditionComputeErrorHandler = resolveCondition.setConditionComputeErrorHandler;
+exports.arraySlice = arraySlice.arraySlice;
+exports.numberFormatter = math.numberFormatter;
+exports.safeAdd = math.safeAdd;
+exports.safeSub = math.safeSub;
 exports.animation = Animation["default"];
 exports.RegisterStore = index.RegisterStore;
 exports.RendererStore = index.RendererStore;

package/lib/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -21,6 +21,9 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var hoistNonReactStatic__default = /*#__PURE__*/_interopDefaultLegacy(hoistNonReactStatic);
 
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 var defaultLocale = 'zh-CN';
 var locales = {};
 function register(name, config) {
@@ -118,8 +121,8 @@ function localeable(ComposedComponent) {
                 var refConfig = ((_a = ComposedComponent.prototype) === null || _a === void 0 ? void 0 : _a.isReactComponent)
                     ? { ref: this.childRef }
                     : { forwardedRef: this.childRef };
-                var body = (React__default["default"].createElement(ComposedComponent, tslib.__assign({}, this.props, injectedProps, refConfig)));
-                return this.context ? (body) : (React__default["default"].createElement(LocaleContext.Provider, { value: locale }, body));
+                var body = (_J$X_(ComposedComponent, tslib.__assign({}, this.props, injectedProps, refConfig)));
+                return this.context ? (body) : (_J$X_(LocaleContext.Provider, { value: locale }, body));
             };
             return class_1;
         }(React__default["default"].Component)),

package/lib/polyfills.d.ts

@@ -0,0 +1,3 @@
+/**
+ * 用于放一些关键的 polyfill
+ */

package/lib/polyfills.js

@@ -0,0 +1,20 @@
+/**
+ * amis-core v3.3.0
+ * Copyright 2018-2023 fex
+ */
+
+'use strict';
+
+/**
+ * 用于放一些关键的 polyfill
+ */
+// ios 老版本没有这个会报错
+if (!('DragEvent' in window)) {
+    Object.defineProperty(window, 'DragEvent', {
+        value: /** @class */ (function () {
+            function DragEvent() {
+            }
+            return DragEvent;
+        }())
+    });
+}

package/lib/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;
@@ -354,7 +354,7 @@ export default class Form extends React.Component<FormProps, object> {
     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;
+    handleQuery(query: any): any;
     handleDialogConfirm(values: object[], action: ActionObject, ctx: any, targets: Array<any>): void;
     handleDialogClose(confirmed?: boolean): void;
     handleDrawerConfirm(values: object[], action: ActionObject, ctx: any, targets: Array<any>): 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;
 }