amis-core 6.7.0 → 6.8.0

package/esm/Root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/RootRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/SchemaRenderer.d.ts

@@ -23,7 +23,6 @@ export declare class SchemaRenderer extends React.Component<SchemaRendererProps,
     unbindEvent: (() => void) | undefined;
     isStatic: any;
     constructor(props: SchemaRendererProps);
-    componentDidMount(): void;
     componentWillUnmount(): void;
     shouldComponentUpdate(nextProps: SchemaRendererProps): boolean;
     resolveRenderer(props: SchemaRendererProps, force?: boolean): any;

package/esm/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -22,6 +22,7 @@ import { reaction } from 'mobx';
 import 'amis-formula';
 import 'moment';
 import 'lodash/isPlainObject';
+import './utils/memoryParse.js';
 import '@rc-component/mini-decimal';
 import { resolveVariableAndFilter } from './utils/resolveVariableAndFilter.js';
 import './utils/filter.js';
@@ -88,10 +89,6 @@ var SchemaRenderer = /** @class */ (function (_super) {
         }, function () { return _this.forceUpdate(); });
         return _this;
     }
-    SchemaRenderer.prototype.componentDidMount = function () {
-        // 这里无法区分监听的是不是广播，所以又bind一下，主要是为了绑广播
-        this.unbindEvent = bindEvent(this.cRef);
-    };
     SchemaRenderer.prototype.componentWillUnmount = function () {
         var _a, _b;
         (_a = this.reaction) === null || _a === void 0 ? void 0 : _a.call(this);
@@ -167,7 +164,15 @@ var SchemaRenderer = /** @class */ (function (_super) {
     };
     SchemaRenderer.prototype.childRef = function (ref) {
         var _this = this;
-        while (ref && ref.getWrappedInstance) {
+        var _a;
+        // todo 这里有个问题，就是注意以下的这段注释
+        // > // 原来表单项的 visible: false 和 hidden: true 表单项的值和验证是有效的
+        // > 而 visibleOn 和 hiddenOn 是无效的，
+        // > 这个本来就是个bug，但是已经被广泛使用了
+        // > 我只能继续实现这个bug了
+        // 这样会让子组件去根据是 hidden 的情况去渲染个 null，这样会导致这里 ref 有值，但是 ref.getWrappedInstance() 为 null
+        // 这样会和直接渲染的组件时有些区别，至少 cRef 的指向是不一样的
+        while ((_a = ref === null || ref === void 0 ? void 0 : ref.getWrappedInstance) === null || _a === void 0 ? void 0 : _a.call(ref)) {
             ref = ref.getWrappedInstance();
         }
         if (ref && !ref.props) {
@@ -175,6 +180,10 @@ var SchemaRenderer = /** @class */ (function (_super) {
                 get: function () { return _this.props; }
             });
         }
+        if (ref) {
+            // 这里无法区分监听的是不是广播，所以又bind一下，主要是为了绑广播
+            this.unbindEvent = bindEvent(this.ref);
+        }
         this.cRef = ref;
     };
     SchemaRenderer.prototype.dispatchEvent = function (e, data, renderer // for didmount

package/esm/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -15,6 +15,7 @@ import { memoParse } from './utils/tokenize.js';
 import { isPureVariable } from './utils/isPureVariable.js';
 import '@rc-component/mini-decimal';
 import { getVariable } from './utils/getVariable.js';
+import './utils/memoryParse.js';
 import { dataMapping } from './utils/dataMapping.js';
 import './utils/filter.js';
 import { findTree, eachTree, qsparse, qsstringify, parseQuery, autobind } from './utils/helper.js';

package/esm/StatusScoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/WithRootStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -15,6 +15,7 @@ import 'amis-formula';
 import 'moment';
 import { createObject, extendObject } from './utils/object.js';
 import { tokenize } from './utils/tokenize.js';
+import './utils/memoryParse.js';
 import '@rc-component/mini-decimal';
 import { dataMapping } from './utils/dataMapping.js';
 import './utils/filter.js';
@@ -130,7 +131,7 @@ function HocStoreFactory(renderer) {
                                 (props.data &&
                                     prevProps.data &&
                                     props.data.__super !== prevProps.data.__super))) {
-                        store.initData(extendObject(props.data, __assign(__assign(__assign({}, (store.hasRemoteData ? store.data : null)), this.formatData(props.defaultData)), this.formatData(props.data))), ((_c = props.updatePristineAfterStoreDataReInit) !== null && _c !== void 0 ? _c : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
+                        store.initData(extendObject(props.data, __assign(__assign(__assign(__assign({}, this.formatData(dataMapping(this.props.defaultData, this.props.data, ignoreSchemaProps))), (store.hasRemoteData ? store.data : null)), this.formatData(props.defaultData)), this.formatData(props.data))), ((_c = props.updatePristineAfterStoreDataReInit) !== null && _c !== void 0 ? _c : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
                     }
                 }
                 else if (shouldSync === true ||
@@ -141,19 +142,18 @@ function HocStoreFactory(renderer) {
                             (props.syncSuperStore !== false &&
                                 isSuperDataModified(props.data, prevProps.data, store)))) {
                     if (props.store && props.scope === props.data) {
-                        store.initData(createObject(props.store.data, props.syncSuperStore === false
-                            ? __assign({}, store.data) : syncDataFromSuper(store.data, props.store.data, prevProps.scope, store, props.syncSuperStore === true)), ((_d = props.updatePristineAfterStoreDataReInit) !== null && _d !== void 0 ? _d : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
+                        store.initData(createObject(props.store.data, __assign(__assign({}, this.formatData(dataMapping(this.props.defaultData, this.props.data, ignoreSchemaProps))), (props.syncSuperStore === false
+                            ? __assign({}, store.data) : syncDataFromSuper(store.data, props.store.data, prevProps.scope, store, props.syncSuperStore === true)))), ((_d = props.updatePristineAfterStoreDataReInit) !== null && _d !== void 0 ? _d : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
                     }
                     else if (props.data && props.data.__super) {
-                        store.initData(extendObject(props.data, 
-                        // 有远程数据
+                        store.initData(extendObject(props.data, __assign(__assign({}, this.formatData(dataMapping(this.props.defaultData, this.props.data, ignoreSchemaProps))), // 有远程数据
                         // 或者顶级 store
-                        store.hasRemoteData || !store.path.includes('/')
+                        (store.hasRemoteData || !store.path.includes('/')
                             ? __assign(__assign({}, store.data), props.data) : // combo 不需要同步，如果要同步，在 Combo.tsx 里面已经实现了相关逻辑
                             // 目前主要的问题是，如果 combo 中表单项名字和 combo 本身的名字一样，会导致里面的值会被覆盖成数组
                             ((_e = props.store) === null || _e === void 0 ? void 0 : _e.storeType) === 'ComboStore'
                                 ? undefined
-                                : syncDataFromSuper(__assign(__assign({}, store.pristineDiff), props.data), props.data.__super, prevProps.data.__super, store, false)), ((_f = props.updatePristineAfterStoreDataReInit) !== null && _f !== void 0 ? _f : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
+                                : syncDataFromSuper(__assign(__assign({}, store.pristineDiff), props.data), props.data.__super, prevProps.data.__super, store, false)))), ((_f = props.updatePristineAfterStoreDataReInit) !== null && _f !== void 0 ? _f : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
                     }
                     else {
                         store.initData(createObject(props.scope, props.data), ((_g = props.updatePristineAfterStoreDataReInit) !== null && _g !== void 0 ? _g : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);

package/esm/actions/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -10,6 +10,7 @@ import { evalExpressionWithConditionBuilderAsync } from '../utils/tpl.js';
 import 'amis-formula';
 import 'moment';
 import { createObject } from '../utils/object.js';
+import '../utils/memoryParse.js';
 import '@rc-component/mini-decimal';
 import { dataMapping } from '../utils/dataMapping.js';
 import '../utils/filter.js';

package/esm/actions/AjaxAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/BreakAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/BroadcastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/CmptAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/ContinueAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/CopyAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/CustomAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -11,6 +11,7 @@ import 'react';
 import 'lodash/chunk';
 import 'lodash/isPlainObject';
 import 'amis-formula';
+import '../utils/memoryParse.js';
 import '../utils/DataSchema.js';
 import '../utils/DataScope.js';
 import 'moment';

package/esm/actions/DialogAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -10,6 +10,7 @@ import '../utils/ColorScale.js';
 import 'react';
 import 'lodash/chunk';
 import { extendObject } from '../utils/object.js';
+import '../utils/memoryParse.js';
 import 'amis-formula';
 import 'lodash/isPlainObject';
 import '../utils/DataSchema.js';
@@ -113,6 +114,7 @@ var CloseDialogAction = /** @class */ (function () {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_c) {
+                // todo 支持 waitForAction，等待弹窗关闭后再执行后续动作
                 if (action.componentId) {
                     // 关闭指定弹窗
                     event.context.scoped.closeById(action.componentId);

package/esm/actions/DrawerAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -10,6 +10,7 @@ import '../utils/ColorScale.js';
 import 'react';
 import 'lodash/chunk';
 import { extendObject } from '../utils/object.js';
+import '../utils/memoryParse.js';
 import 'amis-formula';
 import 'lodash/isPlainObject';
 import '../utils/DataSchema.js';

package/esm/actions/EmailAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/EventAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -10,6 +10,7 @@ import '../utils/ColorScale.js';
 import 'react';
 import 'lodash/chunk';
 import { setVariable, cloneObject } from '../utils/object.js';
+import '../utils/memoryParse.js';
 import 'amis-formula';
 import 'lodash/isPlainObject';
 import '../utils/DataSchema.js';

package/esm/actions/LinkAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/LoopAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -9,6 +9,7 @@ import { registerAction, LoopStatus, runActions } from './Action.js';
 import 'amis-formula';
 import 'moment';
 import { createObject } from '../utils/object.js';
+import '../utils/memoryParse.js';
 import '@rc-component/mini-decimal';
 import { resolveVariable } from '../utils/resolveVariable.js';
 import 'lodash/isPlainObject';

package/esm/actions/PageAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/ParallelAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/PrintAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/StatusAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/SwitchAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/ToastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/WaitAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/components/CustomStyle.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/components/ErrorBoundary.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/components/LazyComponent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/components/Overlay.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -14,6 +14,7 @@ import '../utils/ColorScale.js';
 import 'lodash/chunk';
 import 'lodash/isPlainObject';
 import 'amis-formula';
+import '../utils/memoryParse.js';
 import '../utils/DataSchema.js';
 import '../utils/DataScope.js';
 import 'moment';

package/esm/components/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -13,6 +13,7 @@ import '../utils/ColorScale.js';
 import 'lodash/chunk';
 import 'lodash/isPlainObject';
 import 'amis-formula';
+import '../utils/memoryParse.js';
 import '../utils/DataSchema.js';
 import '../utils/DataScope.js';
 import 'moment';

package/esm/env.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/envOverwrite.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -148,7 +148,7 @@ export { StoreNode } from './store/node.js';
  */
 var classPrefix = getClassPrefix();
 // @ts-ignore
-var version = '6.7.0';
+var version = '6.8.0';
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }

package/esm/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -10,6 +10,7 @@ import moment from 'moment';
 import 'amis-formula';
 import 'lodash/isPlainObject';
 import { resolveVariable } from './utils/resolveVariable.js';
+import './utils/memoryParse.js';
 import '@rc-component/mini-decimal';
 import './utils/filter.js';
 

package/esm/polyfills.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/esm/renderers/Form.js

@@ -1,9 +1,9 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
-import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';
+import { __extends, __awaiter, __generator, __assign, __values, __decorate, __metadata } from 'tslib';
 import React from 'react';
 import { Renderer } from '../factory.js';
 import { FormStore } from '../store/form.js';
@@ -17,6 +17,7 @@ import { filterTarget, ScopedContext } from '../Scoped.js';
 import 'amis-formula';
 import 'moment';
 import { isObject, createObject, cloneObject, injectObjectChain } from '../utils/object.js';
+import '../utils/memoryParse.js';
 import '@rc-component/mini-decimal';
 import { dataMapping } from '../utils/dataMapping.js';
 import '../utils/filter.js';
@@ -91,7 +92,7 @@ var Form = /** @class */ (function (_super) {
         _this.blockRouting = _this.blockRouting.bind(_this);
         _this.beforePageUnload = _this.beforePageUnload.bind(_this);
         _this.formItemDispatchEvent = _this.formItemDispatchEvent.bind(_this);
-        var store = props.store, canAccessSuperData = props.canAccessSuperData, persistData = props.persistData, simpleMode = props.simpleMode;
+        var store = props.store, canAccessSuperData = props.canAccessSuperData, persistData = props.persistData, simpleMode = props.simpleMode, formLazyChange = props.formLazyChange;
         store.setCanAccessSuperData(canAccessSuperData !== false);
         store.setPersistData(persistData);
         if (simpleMode) {
@@ -111,7 +112,7 @@ var Form = /** @class */ (function (_super) {
         // https://github.com/baidu/amis/issues/8773
         _this.toDispose.push(reaction(function () { return store.initedAt; }, function () {
             store.inited &&
-                _this.lazyEmitChange(!!_this.props.submitOnChange, true);
+                (formLazyChange === false ? _this.emitChange : _this.lazyEmitChange)(!!_this.props.submitOnChange, true);
         }));
         return _this;
     }
@@ -470,29 +471,54 @@ var Form = /** @class */ (function (_super) {
     };
     Form.prototype.flush = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var hooks;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var hooks, hooks_1, hooks_1_1, hook, e_1_1;
+            var e_1, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        _a.trys.push([0, , 4, 5]);
+                        _b.trys.push([0, , 11, 12]);
                         if (this.flushing) {
                             return [2 /*return*/];
                         }
                         this.flushing = true;
                         hooks = this.hooks['flush'] || [];
-                        return [4 /*yield*/, Promise.all(hooks.map(function (fn) { return fn(); }))];
+                        _b.label = 1;
                     case 1:
-                        _a.sent();
-                        if (!!this.emitting) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.lazyEmitChange.flush()];
+                        _b.trys.push([1, 6, 7, 8]);
+                        hooks_1 = __values(hooks), hooks_1_1 = hooks_1.next();
+                        _b.label = 2;
                     case 2:
-                        _a.sent();
-                        _a.label = 3;
-                    case 3: return [3 /*break*/, 5];
+                        if (!!hooks_1_1.done) return [3 /*break*/, 5];
+                        hook = hooks_1_1.value;
+                        return [4 /*yield*/, hook()];
+                    case 3:
+                        _b.sent();
+                        _b.label = 4;
                     case 4:
+                        hooks_1_1 = hooks_1.next();
+                        return [3 /*break*/, 2];
+                    case 5: return [3 /*break*/, 8];
+                    case 6:
+                        e_1_1 = _b.sent();
+                        e_1 = { error: e_1_1 };
+                        return [3 /*break*/, 8];
+                    case 7:
+                        try {
+                            if (hooks_1_1 && !hooks_1_1.done && (_a = hooks_1.return)) _a.call(hooks_1);
+                        }
+                        finally { if (e_1) throw e_1.error; }
+                        return [7 /*endfinally*/];
+                    case 8:
+                        if (!!this.emitting) return [3 /*break*/, 10];
+                        return [4 /*yield*/, this.lazyEmitChange.flush()];
+                    case 9:
+                        _b.sent();
+                        _b.label = 10;
+                    case 10: return [3 /*break*/, 12];
+                    case 11:
                         this.flushing = false;
                         return [7 /*endfinally*/];
-                    case 5: return [2 /*return*/];
+                    case 12: return [2 /*return*/];
                 }
             });
         });