amis-core 6.7.0 → 6.8.0

package/lib/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -26,6 +26,7 @@ var mobx = require('mobx');
 require('amis-formula');
 require('moment');
 require('lodash/isPlainObject');
+require('./utils/memoryParse.js');
 require('@rc-component/mini-decimal');
 var resolveVariableAndFilter = require('./utils/resolveVariableAndFilter.js');
 require('./utils/filter.js');
@@ -101,10 +102,6 @@ var SchemaRenderer = /** @class */ (function (_super) {
         }, function () { return _this.forceUpdate(); });
         return _this;
     }
-    SchemaRenderer.prototype.componentDidMount = function () {
-        // 这里无法区分监听的是不是广播，所以又bind一下，主要是为了绑广播
-        this.unbindEvent = rendererEvent.bindEvent(this.cRef);
-    };
     SchemaRenderer.prototype.componentWillUnmount = function () {
         var _a, _b;
         (_a = this.reaction) === null || _a === void 0 ? void 0 : _a.call(this);
@@ -180,7 +177,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) {
@@ -188,6 +193,10 @@ var SchemaRenderer = /** @class */ (function (_super) {
                 get: function () { return _this.props; }
             });
         }
+        if (ref) {
+            // 这里无法区分监听的是不是广播，所以又bind一下，主要是为了绑广播
+            this.unbindEvent = rendererEvent.bindEvent(this.ref);
+        }
         this.cRef = ref;
     };
     SchemaRenderer.prototype.dispatchEvent = function (e, data, renderer // for didmount

package/lib/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -19,6 +19,7 @@ var tokenize = require('./utils/tokenize.js');
 var isPureVariable = require('./utils/isPureVariable.js');
 require('@rc-component/mini-decimal');
 var getVariable = require('./utils/getVariable.js');
+require('./utils/memoryParse.js');
 var dataMapping = require('./utils/dataMapping.js');
 require('./utils/filter.js');
 var helper = require('./utils/helper.js');

package/lib/StatusScoped.js

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

package/lib/WithRootStore.js

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

package/lib/WithStore.js

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

package/lib/actions/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -14,6 +14,7 @@ var tpl = require('../utils/tpl.js');
 require('amis-formula');
 require('moment');
 var object = require('../utils/object.js');
+require('../utils/memoryParse.js');
 require('@rc-component/mini-decimal');
 var dataMapping = require('../utils/dataMapping.js');
 require('../utils/filter.js');

package/lib/actions/AjaxAction.js

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

package/lib/actions/BreakAction.js

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

package/lib/actions/BroadcastAction.js

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

package/lib/actions/CmptAction.js

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

package/lib/actions/ContinueAction.js

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

package/lib/actions/CopyAction.js

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

package/lib/actions/CustomAction.js

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

package/lib/actions/DialogAction.js

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

package/lib/actions/DrawerAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -13,6 +13,7 @@ require('../utils/browser.js');
 require('../utils/ColorScale.js');
 require('../utils/columnsSplit.js');
 var object = require('../utils/object.js');
+require('../utils/memoryParse.js');
 require('amis-formula');
 require('lodash/isPlainObject');
 require('../utils/DataSchema.js');

package/lib/actions/EmailAction.js

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

package/lib/actions/EventAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -13,6 +13,7 @@ require('../utils/browser.js');
 require('../utils/ColorScale.js');
 require('../utils/columnsSplit.js');
 var object = require('../utils/object.js');
+require('../utils/memoryParse.js');
 require('amis-formula');
 require('lodash/isPlainObject');
 require('../utils/DataSchema.js');

package/lib/actions/LinkAction.js

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

package/lib/actions/LoopAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -13,6 +13,7 @@ var Action = require('./Action.js');
 require('amis-formula');
 require('moment');
 var object = require('../utils/object.js');
+require('../utils/memoryParse.js');
 require('@rc-component/mini-decimal');
 var resolveVariable = require('../utils/resolveVariable.js');
 require('lodash/isPlainObject');

package/lib/actions/PageAction.js

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

package/lib/actions/ParallelAction.js

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

package/lib/actions/PrintAction.js

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

package/lib/actions/StatusAction.js

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

package/lib/actions/SwitchAction.js

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

package/lib/actions/ToastAction.js

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

package/lib/actions/WaitAction.js

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

package/lib/components/CustomStyle.js

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

package/lib/components/ErrorBoundary.js

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

package/lib/components/LazyComponent.js

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

package/lib/components/Overlay.js

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

package/lib/components/PopOver.js

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

package/lib/env.js

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

package/lib/envOverwrite.js

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

package/lib/factory.js

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

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -139,7 +139,7 @@ var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
 (__react_jsx__["default"] || __react_jsx__).Fragment;
 var classPrefix = theme.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/lib/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -14,6 +14,7 @@ var moment = require('moment');
 require('amis-formula');
 require('lodash/isPlainObject');
 var resolveVariable = require('./utils/resolveVariable.js');
+require('./utils/memoryParse.js');
 require('@rc-component/mini-decimal');
 require('./utils/filter.js');
 

package/lib/polyfills.js

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

package/lib/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -21,6 +21,7 @@ var Scoped = require('../Scoped.js');
 require('amis-formula');
 require('moment');
 var object = require('../utils/object.js');
+require('../utils/memoryParse.js');
 require('@rc-component/mini-decimal');
 var dataMapping = require('../utils/dataMapping.js');
 require('../utils/filter.js');
@@ -110,7 +111,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) {
@@ -130,7 +131,7 @@ var Form = /** @class */ (function (_super) {
         // https://github.com/baidu/amis/issues/8773
         _this.toDispose.push(mobx.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;
     }
@@ -489,29 +490,54 @@ var Form = /** @class */ (function (_super) {
     };
     Form.prototype.flush = function () {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var hooks;
-            return tslib.__generator(this, function (_a) {
-                switch (_a.label) {
+            var hooks, hooks_1, hooks_1_1, hook, e_1_1;
+            var e_1, _a;
+            return tslib.__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 = tslib.__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*/];
                 }
             });
         });