amis-core 6.7.0 → 6.9.0-beta.0

package/lib/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-beta.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-beta.0
  * Copyright 2018-2024 fex
  */
 

package/lib/renderers/builtin.js

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

package/lib/renderers/register.js

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

package/lib/renderers/wrapControl.d.ts

@@ -3,7 +3,7 @@ import { IFormStore, IFormItemStore } from '../store/form';
 import { RendererProps } from '../factory';
 import { IIRendererStore } from '../store';
 import hoistNonReactStatic from 'hoist-non-react-statics';
-import { Api } from '../types';
+import { Api, DataChangeReason } from '../types';
 export interface ControlOutterProps extends RendererProps {
     formStore?: IFormStore;
     name?: string;
@@ -40,12 +40,12 @@ export interface ControlOutterProps extends RendererProps {
         [propName: string]: any;
     };
     store?: IIRendererStore;
-    onChange?: (value: any, name: string, submit?: boolean, changePristine?: boolean) => void;
+    onChange?: (value: any, name: string, submit?: boolean, changePristine?: boolean, changeReason?: DataChangeReason) => void;
     formItemDispatchEvent: (type: string, data: any) => void;
     formItemRef?: (control: any) => void;
 }
 export interface ControlProps {
-    onBulkChange?: (values: Object) => void;
+    onBulkChange?: (values: Object, submitOnChange?: boolean, changeReason?: DataChangeReason) => void;
     onChange?: (value: any, name: string, submit: boolean) => void;
     store: IIRendererStore;
 }

package/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-beta.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');
@@ -77,14 +78,14 @@ function wrapControl(ComposedComponent) {
             tslib.__extends(class_1, _super);
             function class_1(props) {
                 var _this = this;
-                var _a;
+                var _a, _b;
                 _this = _super.call(this, props) || this;
                 _this.value = undefined;
                 _this.lazyEmitChange = debounce__default["default"](_this.emitChange.bind(_this), 250, {
                     trailing: true,
                     leading: false
                 });
-                var _b = _this.props, form = _b.formStore, formItem$1 = _b.formItem, rootStore = _b.rootStore, store = _b.store, onChange = _b.onChange, data = _b.data, inputGroupControl = _b.inputGroupControl, colIndex = _b.colIndex, rowIndex = _b.rowIndex, _c = _b.$schema, id = _c.id, type = _c.type, required = _c.required, validations = _c.validations, validationErrors = _c.validationErrors, unique = _c.unique, value = _c.value, extraName = _c.extraName; _c.multiple; var delimiter = _c.delimiter, valueField = _c.valueField, labelField = _c.labelField, joinValues = _c.joinValues, extractValue = _c.extractValue, selectFirst = _c.selectFirst, autoFill = _c.autoFill, clearValueOnHidden = _c.clearValueOnHidden, validateApi = _c.validateApi, minLength = _c.minLength, maxLength = _c.maxLength, validateOnChange = _c.validateOnChange, label = _c.label, pagination = _c.pagination;
+                var _c = _this.props, form = _c.formStore, formItem$1 = _c.formItem, rootStore = _c.rootStore, store = _c.store, onChange = _c.onChange, data = _c.data, inputGroupControl = _c.inputGroupControl, colIndex = _c.colIndex, rowIndex = _c.rowIndex, _d = _c.$schema, id = _d.id, type = _d.type, required = _d.required, validations = _d.validations, validationErrors = _d.validationErrors, unique = _d.unique, value = _d.value, extraName = _d.extraName; _d.multiple; var delimiter = _d.delimiter, valueField = _d.valueField, labelField = _d.labelField, joinValues = _d.joinValues, extractValue = _d.extractValue, selectFirst = _d.selectFirst, autoFill = _d.autoFill, clearValueOnHidden = _d.clearValueOnHidden, validateApi = _d.validateApi, minLength = _d.minLength, maxLength = _d.maxLength, validateOnChange = _d.validateOnChange, label = _d.label, pagination = _d.pagination;
                 _this.getValue = _this.getValue.bind(_this);
                 _this.setValue = _this.setValue.bind(_this);
                 _this.handleChange = _this.handleChange.bind(_this);
@@ -94,7 +95,8 @@ function wrapControl(ComposedComponent) {
                 _this.validate = _this.validate.bind(_this);
                 _this.flushChange = _this.flushChange.bind(_this);
                 _this.renderChild = _this.renderChild.bind(_this);
-                var name = _this.props.$schema.name;
+                var name = _this.props.$schema.name ||
+                    ((_a = ComposedComponent.defaultProps) === null || _a === void 0 ? void 0 : _a.name);
                 // 如果 name 是表达式
                 // 扩充 each 用法
                 if (formula.isExpression(name)) {
@@ -119,7 +121,7 @@ function wrapControl(ComposedComponent) {
                 model.config(tslib.__assign(tslib.__assign({}, pick__default["default"](tslib.__assign(tslib.__assign({}, ComposedComponent.defaultProps), _this.props.$schema), ['multiple'])), { id: id, type: type, required: props.required || required, unique: unique, value: value, isValueSchemaExp: formula.isExpression(value), rules: validations, messages: validationErrors, delimiter: delimiter, valueField: valueField, labelField: labelField, joinValues: joinValues, extractValue: extractValue, selectFirst: selectFirst, autoFill: autoFill, clearValueOnHidden: clearValueOnHidden, validateApi: validateApi, minLength: minLength, maxLength: maxLength, validateOnChange: validateOnChange, label: label, inputGroupControl: inputGroupControl, extraName: extraName, pagination: pagination }));
                 // issue 这个逻辑应该在 combo 里面自己实现。
                 if (_this.model.unique &&
-                    ((_a = form === null || form === void 0 ? void 0 : form.parentStore) === null || _a === void 0 ? void 0 : _a.storeType) === combo.ComboStore.name) {
+                    ((_b = form === null || form === void 0 ? void 0 : form.parentStore) === null || _b === void 0 ? void 0 : _b.storeType) === combo.ComboStore.name) {
                     var combo$1 = form.parentStore;
                     combo$1.bindUniuqueItem(model);
                 }
@@ -339,7 +341,9 @@ function wrapControl(ComposedComponent) {
                         mobxStateTree.isAlive(formItem) &&
                         formItem.removeSubFormItem(this.model);
                     this.model.clearValueOnHidden &&
-                        ((_a = this.model.form) === null || _a === void 0 ? void 0 : _a.deleteValueByName(this.model.name));
+                        ((_a = this.model.form) === null || _a === void 0 ? void 0 : _a.deleteValueByName(this.model.name, {
+                            type: 'hide'
+                        }));
                     mobxStateTree.isAlive(rootStore) && rootStore.removeStore(this.model);
                 }
                 delete this.model;
@@ -462,7 +466,7 @@ function wrapControl(ComposedComponent) {
                     var oldValue = this.model.value;
                     value = api.callStrFunction.call(this, pipeOut, ['value', 'oldValue', 'data'], value, oldValue, data);
                 }
-                this.model.changeTmpValue(value, 'input');
+                this.model.changeTmpValue(value, type === 'formula' ? 'formulaChanged' : 'input');
                 if (changeImmediately || conrolChangeImmediately || !formInited) {
                     this.emitChange(submitOnChange);
                 }
@@ -512,13 +516,24 @@ function wrapControl(ComposedComponent) {
                 if (!this.model) {
                     return;
                 }
+                var changeReason = {
+                    type: 'input'
+                };
+                if (model.changeMotivation === 'formulaChanged') {
+                    changeReason.type = 'formula';
+                }
+                else if (model.changeMotivation === 'initialValue' ||
+                    model.changeMotivation === 'formInited' ||
+                    model.changeMotivation === 'defaultValue') {
+                    changeReason.type = 'init';
+                }
                 if (model.extraName) {
                     var values = model.splitExtraValue(value);
-                    onChange === null || onChange === void 0 ? void 0 : onChange(values[0], model.name);
-                    onChange === null || onChange === void 0 ? void 0 : onChange(values[1], model.extraName, submitOnChange === true);
+                    onChange === null || onChange === void 0 ? void 0 : onChange(values[0], model.name, undefined, undefined, changeReason);
+                    onChange === null || onChange === void 0 ? void 0 : onChange(values[1], model.extraName, submitOnChange === true, undefined, changeReason);
                 }
                 else {
-                    onChange === null || onChange === void 0 ? void 0 : onChange(value, model.name, submitOnChange === true);
+                    onChange === null || onChange === void 0 ? void 0 : onChange(value, model.name, submitOnChange === true, undefined, changeReason);
                 }
                 this.checkValidate();
             };

package/lib/store/app.d.ts

@@ -53,10 +53,10 @@ export declare const AppStore: import("mobx-state-tree").IModelType<{
     readonly pristineDiff: any;
 } & {
     setTopStore(value: any): void;
-    initData(data?: object, skipSetPristine?: boolean): void;
+    initData(data?: object, skipSetPristine?: boolean, changeReason?: import("../types").DataChangeReason | undefined): void;
     reset(): void;
-    updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined): void;
-    changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined): void;
+    updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined, changeReason?: import("../types").DataChangeReason | undefined): void;
+    changeValue(name: string, value: any, changePristine?: boolean | undefined, force?: boolean | undefined, otherModifier?: ((data: Object) => void) | undefined, changeReason?: import("../types").DataChangeReason | undefined): void;
     setCurrentAction(action: any, resolveDefinitions?: ((schema: any) => any) | undefined): void;
     openDialog(ctx: any, additonal?: object | undefined, callback?: ((confirmed: boolean, values: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
     closeDialog(confirmed?: any, data?: any): void;

package/lib/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-beta.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');