amis-core 2.2.0 → 2.3.0

package/esm/Root.js

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

package/esm/RootRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.2.0
+ * amis-core v2.3.0
  * Copyright 2018-2022 fex
  */
 
@@ -171,7 +171,7 @@ var RootRenderer = /** @class */ (function (_super) {
             var api = normalizeApi(action.api);
             if (typeof api.url === 'string') {
                 var fileName = action.fileName || 'data.txt';
-                if (api.url.indexOf('.') !== -1) {
+                if (!action.fileName && api.url.indexOf('.') !== -1) {
                     fileName = api.url.split('/').pop();
                 }
                 saveAs(api.url, fileName);

package/esm/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.2.0
+ * amis-core v2.3.0
  * Copyright 2018-2022 fex
  */
 
@@ -265,9 +265,14 @@ var SchemaRenderer = /** @class */ (function (_super) {
                 (schema.visible !== false && !schema.hidden))) {
             return null;
         }
+        // withStore 里面会处理，而且会实时处理
+        // 这里处理反而导致了问题
+        if (renderer.storeType) {
+            exprProps = {};
+        }
         var isClassComponent = (_a = Component.prototype) === null || _a === void 0 ? void 0 : _a.isReactComponent;
         var $schema = __assign(__assign({}, schema), exprProps);
-        var props = __assign(__assign(__assign(__assign(__assign({}, theme.getRendererConfig(renderer.name)), restSchema), exprProps), chainEvents(rest, restSchema)), { 
+        var props = __assign(__assign(__assign(__assign(__assign({}, theme.getRendererConfig(renderer.name)), restSchema), chainEvents(rest, restSchema)), exprProps), { 
             // value: defaultValue, // 备注: 此处并没有将value传递给渲染器
             defaultData: (_b = restSchema.defaultData) !== null && _b !== void 0 ? _b : defaultData, defaultValue: (_c = restSchema.defaultValue) !== null && _c !== void 0 ? _c : defaultValue, defaultActiveKey: defaultActiveKey, propKey: propKey, $path: $path, $schema: $schema, ref: this.refFn, render: this.renderChild, rootStore: rootStore, topStore: topStore, dispatchEvent: this.dispatchEvent });
         if (disable !== undefined) {

package/esm/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.2.0
+ * amis-core v2.3.0
  * Copyright 2018-2022 fex
  */
 
@@ -12,7 +12,7 @@ import 'moment';
 import 'lodash/isPlainObject';
 import { dataMapping } from './utils/dataMapping.js';
 import './utils/filter.js';
-import { findTree, qsparse, qsstringify, autobind } from './utils/helper.js';
+import { findTree, qsparse, qsstringify, parseQuery, autobind } from './utils/helper.js';
 
 /**
  * @file 用来创建一个域，在这个域里面会把里面的运行时实例注册进来，方便组件之间的通信。
@@ -140,7 +140,7 @@ function createScopedTools(path, parent, env) {
                     component.receive(values, subPath);
                 }
                 else if (name === 'window' && env && env.updateLocation) {
-                    var query = __assign(__assign({}, (location.search ? qsparse(location.search.substring(1)) : {})), values);
+                    var query = __assign(__assign({}, parseQuery(location)), values);
                     var link = location.pathname + '?' + qsstringify(query);
                     env.updateLocation(link, true);
                 }

package/esm/WithRootStore.js

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

package/esm/WithStore.js

@@ -1,10 +1,11 @@
 /**
- * amis-core v2.2.0
+ * amis-core v2.3.0
  * Copyright 2018-2022 fex
  */
 
 import { __extends, __assign, __rest, __decorate, __metadata } from 'tslib';
 import hoistNonReactStatic from 'hoist-non-react-statics';
+import { reaction } from 'mobx';
 import { observer } from 'mobx-react';
 import { isAlive } from 'mobx-state-tree';
 import React from 'react';
@@ -53,6 +54,18 @@ function HocStoreFactory(renderer) {
                 else {
                     store.initData(__assign(__assign({}, _this.formatData(dataMapping(_this.props.defaultData, _this.props.data))), _this.formatData(_this.props.data)));
                 }
+                _this.state = {};
+                var detectField = props.detectField, rest = __rest(props, ["detectField"]);
+                var exprProps = {};
+                if (!detectField || detectField === 'data') {
+                    exprProps = getExprProperties(rest, store.data, undefined, rest);
+                    _this.state = __assign({}, exprProps);
+                    _this.unReaction = reaction(function () {
+                        return JSON.stringify(getExprProperties(rest, store.data, undefined, rest));
+                    }, function () {
+                        return _this.setState(__assign({}, getExprProperties(rest, store.data, undefined, rest)));
+                    });
+                }
                 return _this;
             }
             StoreFactory.prototype.getWrappedInstance = function () {
@@ -131,8 +144,10 @@ function HocStoreFactory(renderer) {
                 }
             };
             StoreFactory.prototype.componentWillUnmount = function () {
+                var _a;
                 var rootStore = this.context;
                 var store = this.store;
+                (_a = this.unReaction) === null || _a === void 0 ? void 0 : _a.call(this);
                 isAlive(store) && rootStore.removeStore(store);
                 // @ts-ignore
                 delete this.store;
@@ -143,15 +158,11 @@ function HocStoreFactory(renderer) {
                 return render(region, node, __assign(__assign({ data: this.store.data, dataUpdatedAt: this.store.updatedAt }, subProps), { scope: this.store.data, store: this.store }));
             };
             StoreFactory.prototype.render = function () {
-                var _a = this.props, detectField = _a.detectField, rest = __rest(_a, ["detectField"]);
-                var exprProps = {};
-                if (!detectField || detectField === 'data') {
-                    exprProps = getExprProperties(rest, this.store.data, undefined, rest);
-                    if (exprProps.hidden || exprProps.visible === false) {
-                        return null;
-                    }
+                var _a = this.props; _a.detectField; var rest = __rest(_a, ["detectField"]);
+                if (this.state.hidden || this.state.visible === false) {
+                    return null;
                 }
-                return (React.createElement(Component, __assign({}, rest /* todo */, exprProps, { ref: this.refFn, data: this.store.data, dataUpdatedAt: this.store.updatedAt, store: this.store, scope: this.store.data, render: this.renderChild })));
+                return (React.createElement(Component, __assign({}, rest /* todo */, this.state, { ref: this.refFn, data: this.store.data, dataUpdatedAt: this.store.updatedAt, store: this.store, scope: this.store.data, render: this.renderChild })));
             };
             StoreFactory.displayName = "WithStore(".concat(Component.displayName || Component.name, ")");
             StoreFactory.ComposedComponent = Component;

package/esm/_virtual/index.js

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

package/esm/_virtual/index2.js

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

package/esm/_virtual/react-is.development.js

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

package/esm/_virtual/react-is.production.min.js

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

package/esm/actions/Action.js

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

package/esm/actions/AjaxAction.js

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

package/esm/actions/BreakAction.js

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

package/esm/actions/BroadcastAction.js

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

package/esm/actions/CmptAction.js

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

package/esm/actions/ContinueAction.js

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

package/esm/actions/CopyAction.js

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

package/esm/actions/CustomAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.2.0
+ * amis-core v2.3.0
  * Copyright 2018-2022 fex
  */
 
@@ -24,6 +24,7 @@ import 'lodash/isObject';
 import 'lodash/isString';
 import 'lodash/isBoolean';
 import '../utils/image.js';
+import 'lodash';
 import { registerAction, runActions } from './Action.js';
 import '../utils/resize-sensor.js';
 import '../node_modules/dom-helpers/esm/addEventListener.js';

package/esm/actions/Decorators.js

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

package/esm/actions/DialogAction.js

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

package/esm/actions/DrawerAction.js

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

package/esm/actions/EmailAction.js

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

package/esm/actions/LinkAction.js

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

package/esm/actions/LoopAction.js

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

package/esm/actions/PageAction.js

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

package/esm/actions/ParallelAction.js

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

package/esm/actions/SwitchAction.js

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

package/esm/actions/ToastAction.js

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

package/esm/components/LazyComponent.js

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

package/esm/components/Overlay.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.2.0
+ * amis-core v2.3.0
  * Copyright 2018-2022 fex
  */
 
@@ -26,6 +26,7 @@ import 'lodash/isObject';
 import 'lodash/isString';
 import 'lodash/isBoolean';
 import '../utils/image.js';
+import 'lodash';
 import '../actions/Action.js';
 import { getComputedStyle, resizeSensor } from '../utils/resize-sensor.js';
 import { RootClose } from '../utils/RootClose.js';
@@ -131,7 +132,7 @@ var Position = /** @class */ (function (_super) {
         delete props.containerPadding;
         delete props.shouldUpdatePosition;
         var child = React.Children.only(children);
-        return cloneElement(child, __assign(__assign(__assign({}, props), arrowPosition), { 
+        return cloneElement(child, __assign(__assign(__assign(__assign({}, props), arrowPosition), (child.props.offset ? { offset: child.props.offset } : {})), { 
             // FIXME: Don't forward `positionLeft` and `positionTop` via both props
             // and `props.style`.
             positionLeft: positionLeft, positionTop: positionTop, className: cx(className, child.props.className), style: __assign(__assign({}, child.props.style), { left: positionLeft, top: positionTop }) }));

package/esm/components/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.2.0
+ * amis-core v2.3.0
  * Copyright 2018-2022 fex
  */
 
@@ -25,6 +25,7 @@ import 'lodash/isObject';
 import 'lodash/isString';
 import 'lodash/isBoolean';
 import '../utils/image.js';
+import 'lodash';
 import '../actions/Action.js';
 import '../utils/resize-sensor.js';
 import '../node_modules/dom-helpers/esm/addEventListener.js';

package/esm/env.js

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

package/esm/envOverwrite.js

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

package/esm/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.2.0
+ * amis-core v2.3.0
  * Copyright 2018-2022 fex
  */
 
@@ -9,7 +9,7 @@ import { RendererStore } from './store/index.js';
 import { destroy, getEnv } from 'mobx-state-tree';
 import { wrapFetcher } from './utils/api.js';
 import { normalizeLink } from './utils/normalizeLink.js';
-import { qsparse, findIndex, promisify } from './utils/helper.js';
+import { qsparse, parseQuery, findIndex, promisify } from './utils/helper.js';
 import { observer } from 'mobx-react';
 import { HocScoped } from './Scoped.js';
 import find from 'lodash/find';
@@ -176,7 +176,7 @@ var defaultOptions = {
                 return false;
             }
             var query_1 = qsparse(search.substring(1));
-            var currentQuery_1 = qsparse(location.search.substring(1));
+            var currentQuery_1 = parseQuery(location);
             return Object.keys(query_1).every(function (key) { return query_1[key] === currentQuery_1[key]; });
         }
         else if (pathname === location.pathname) {

package/esm/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.2.0
+ * amis-core v2.3.0
  * Copyright 2018-2022 fex
  */
 
@@ -32,7 +32,7 @@ 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, 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, 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';

package/esm/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.2.0
+ * amis-core v2.3.0
  * Copyright 2018-2022 fex
  */
 
@@ -42,7 +42,7 @@ function makeTranslator(locale) {
         if (!str || typeof str !== 'string') {
             return str;
         }
-        var dict = locales[locale] || locales[defaultLocale];
+        var dict = locales[locale] || locales[defaultLocale] || locales['zh-CN'];
         return format.apply(void 0, __spreadArray([(dict === null || dict === void 0 ? void 0 : dict[str]) || str], args, false));
     };
     locale && (fns[locale] = fn);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.2.0
+ * amis-core v2.3.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.2.0
+ * amis-core v2.3.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.2.0
+ * amis-core v2.3.0
  * Copyright 2018-2022 fex
  */
 

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

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

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

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

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

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

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

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

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

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