amis-core 6.7.0 → 6.9.0-rc.0

package/lib/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 
@@ -19,6 +19,7 @@ require('moment');
 var object = require('../utils/object.js');
 var isPureVariable = require('../utils/isPureVariable.js');
 require('@rc-component/mini-decimal');
+require('../utils/memoryParse.js');
 var resolveVariableAndFilter = require('../utils/resolveVariableAndFilter.js');
 require('lodash/isPlainObject');
 require('../utils/filter.js');
@@ -533,12 +534,12 @@ function registerOptionsControl(config) {
             var formItem = this.props.formItem;
             formItem && formItem.setLoading(value);
         };
-        FormOptionsItem.prototype.handleOptionAdd = function (idx, value, skipForm) {
+        FormOptionsItem.prototype.handleOptionAdd = function (idx, value, skipForm, callback) {
             var _a, _b;
             if (idx === void 0) { idx = -1; }
             if (skipForm === void 0) { skipForm = false; }
             return tslib.__awaiter(this, void 0, void 0, function () {
-                var _c, addControls, addDialog, disabled, labelField, onOpenDialog, optionLabel, addApi, source, data, valueField, deferField, model, createBtnLabel, env, __, parent, ctx, customAddPrevent, result, _d, prevent, payload, e_1, isPrevented, options;
+                var _c, addControls, addDialog, disabled, labelField, onOpenDialog, optionLabel, addApi, source, data, valueField, deferField, model, createBtnLabel, env, __, parent, ctx, customAddPrevent, result, _d, prevent, payload, e_1, isPrevented, ret, options;
                 var _e;
                 var _this = this;
                 return tslib.__generator(this, function (_f) {
@@ -668,13 +669,24 @@ function registerOptionsControl(config) {
                             if (isPrevented) {
                                 return [2 /*return*/];
                             }
-                            if (!(((parent === null || parent === void 0 ? void 0 : parent.hasOwnProperty(deferField)) && parent[deferField]) ||
-                                (parent === null || parent === void 0 ? void 0 : parent.defer))) return [3 /*break*/, 13];
-                            return [4 /*yield*/, this.deferLoad(parent)];
+                            return [4 /*yield*/, (callback === null || callback === void 0 ? void 0 : callback(result))];
                         case 12:
-                            _f.sent();
-                            return [3 /*break*/, 14];
+                            ret = _f.sent();
+                            if (!(ret === false)) return [3 /*break*/, 13];
+                            // 如果回调里面返回 false，就不继续了。
+                            return [2 /*return*/];
                         case 13:
+                            if (!
+                            // 如果是懒加载的，只懒加载当前节点。
+                            (((parent === null || parent === void 0 ? void 0 : parent.hasOwnProperty(deferField)) && parent[deferField]) ||
+                                (parent === null || parent === void 0 ? void 0 : parent.defer))) 
+                            // 如果是懒加载的，只懒加载当前节点。
+                            return [3 /*break*/, 15];
+                            return [4 /*yield*/, this.deferLoad(parent)];
+                        case 14:
+                            _f.sent();
+                            return [3 /*break*/, 16];
+                        case 15:
                             if (source && addApi) {
                                 // 如果配置了 source 且配置了 addApi 直接重新拉取接口就够了
                                 // 不能不判断 addApi 就刷新，因为有些场景就是临时添加的。
@@ -692,18 +704,18 @@ function registerOptionsControl(config) {
                                 }
                                 model.setOptions(options, this.changeOptionValue, data);
                             }
-                            _f.label = 14;
-                        case 14: return [2 /*return*/];
+                            _f.label = 16;
+                        case 16: return [2 /*return*/];
                     }
                 });
             });
         };
-        FormOptionsItem.prototype.handleOptionEdit = function (value, origin, skipForm) {
+        FormOptionsItem.prototype.handleOptionEdit = function (value, origin, skipForm, callback) {
             var _a, _b;
             if (origin === void 0) { origin = value; }
             if (skipForm === void 0) { skipForm = false; }
             return tslib.__awaiter(this, void 0, void 0, function () {
-                var _c, editControls, editDialog, disabled, labelField, valueField, onOpenDialog, editApi, editInitApi, env, source, data, model, optionLabel, __, customEditPrevent, result, _d, prevent, payload, e_2, isPrevented, indexes;
+                var _c, editControls, editDialog, disabled, labelField, valueField, onOpenDialog, editApi, editInitApi, env, source, data, model, optionLabel, __, customEditPrevent, result, _d, prevent, payload, e_2, isPrevented, ret, indexes;
                 var _this = this;
                 return tslib.__generator(this, function (_e) {
                     switch (_e.label) {
@@ -812,7 +824,14 @@ function registerOptionsControl(config) {
                             if (isPrevented) {
                                 return [2 /*return*/];
                             }
-                            if (source && editApi) {
+                            return [4 /*yield*/, (callback === null || callback === void 0 ? void 0 : callback(result))];
+                        case 12:
+                            ret = _e.sent();
+                            if (ret === false) {
+                                // 如果回调里面返回 false，就不继续了。
+                                return [2 /*return*/];
+                            }
+                            else if (source && editApi) {
                                 this.reload();
                             }
                             else {
@@ -826,10 +845,10 @@ function registerOptionsControl(config) {
                 });
             });
         };
-        FormOptionsItem.prototype.handleOptionDelete = function (value) {
+        FormOptionsItem.prototype.handleOptionDelete = function (value, callback) {
             var _a, _b;
             return tslib.__awaiter(this, void 0, void 0, function () {
-                var _c, deleteConfirmText, disabled, data, deleteApi, onDelete, env, model, source, valueField, __, ctx, confirmed, _d, isPrevented, delConfirmPrevent, result, options, indexes, e_3;
+                var _c, deleteConfirmText, disabled, data, deleteApi, onDelete, env, model, source, valueField, __, ctx, confirmed, _d, isPrevented, delConfirmPrevent, result, ret, options, indexes, e_3;
                 return tslib.__generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -885,7 +904,12 @@ function registerOptionsControl(config) {
                             if (onDelete) {
                                 onDelete(ctx);
                             }
-                            if (source) {
+                            ret = callback === null || callback === void 0 ? void 0 : callback(ctx);
+                            if (ret === false) {
+                                // 如果回调里面返回 false，就不继续了。
+                                return [2 /*return*/];
+                            }
+                            else if (source) {
                                 this.reload();
                             }
                             else {
@@ -999,19 +1023,19 @@ function registerOptionsControl(config) {
         tslib.__decorate([
             helper.autobind,
             tslib.__metadata("design:type", Function),
-            tslib.__metadata("design:paramtypes", [Object, Object, Boolean]),
+            tslib.__metadata("design:paramtypes", [Object, Object, Boolean, Function]),
             tslib.__metadata("design:returntype", Promise)
         ], FormOptionsItem.prototype, "handleOptionAdd", null);
         tslib.__decorate([
             helper.autobind,
             tslib.__metadata("design:type", Function),
-            tslib.__metadata("design:paramtypes", [Object, Object, Boolean]),
+            tslib.__metadata("design:paramtypes", [Object, Object, Boolean, Function]),
             tslib.__metadata("design:returntype", Promise)
         ], FormOptionsItem.prototype, "handleOptionEdit", null);
         tslib.__decorate([
             helper.autobind,
             tslib.__metadata("design:type", Function),
-            tslib.__metadata("design:paramtypes", [Object]),
+            tslib.__metadata("design:paramtypes", [Object, Function]),
             tslib.__metadata("design:returntype", Promise)
         ], FormOptionsItem.prototype, "handleOptionDelete", null);
         return FormOptionsItem;

package/lib/renderers/Placeholder.js

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

package/lib/renderers/builtin.js

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

package/lib/renderers/register.js

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

package/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 
@@ -29,6 +29,7 @@ require('../utils/columnsSplit.js');
 var getVariable = require('../utils/getVariable.js');
 require('lodash/isPlainObject');
 require('amis-formula');
+require('../utils/memoryParse.js');
 var tokenize = require('../utils/tokenize.js');
 require('../utils/DataSchema.js');
 require('../utils/DataScope.js');

package/lib/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 
@@ -16,6 +16,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');