amis-core 6.11.0-beta.9 → 6.12.0-ab.1

package/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.9
+ * amis-core v6.12.0-ab.1
  * Copyright 2018-2025 fex
  */
 
@@ -13,6 +13,7 @@ var debounce = require('lodash/debounce');
 var isEqual = require('lodash/isEqual');
 var combo = require('../store/combo.js');
 var helper = require('../utils/helper.js');
+var validations = require('../utils/validations.js');
 var formula = require('../utils/formula.js');
 var Scoped = require('../Scoped.js');
 var formItem = require('../store/formItem.js');
@@ -53,7 +54,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                     trailing: true,
                     leading: false
                 });
-                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, multiple = _d.multiple, 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;
+                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$1 = _d.validations, validationErrors = _d.validationErrors, unique = _d.unique, value = _d.value, extraName = _d.extraName, multiple = _d.multiple, 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);
@@ -84,9 +85,13 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                     rowIndex: rowIndex !== undefined ? rowIndex : undefined
                 });
                 _this.model = model;
+                // 如果组件有默认验证器类型，则合并
+                var rules = validations$1 && model && config.validations
+                    ? tslib.__assign(tslib.__assign({}, validations$1), validations.str2rules(config.validations)) : validations$1;
                 // @issue 打算干掉这个
                 formItem$1 === null || formItem$1 === void 0 ? void 0 : formItem$1.addSubFormItem(model);
-                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 }));
+                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) &&
+                        value.replace(/\s/g, '') !== "${".concat(name, "}"), rules: rules, 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 &&
                     ((_b = form === null || form === void 0 ? void 0 : form.parentStore) === null || _b === void 0 ? void 0 : _b.storeType) === combo.ComboStore.name) {
@@ -189,7 +194,9 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                 ], prevProps.$schema, props.$schema, function (changes) {
                     model.config(tslib.__assign(tslib.__assign({}, changes), { 
                         // todo 优化后面两个
-                        isValueSchemaExp: formula.isExpression(props.$schema.value), inputGroupControl: props === null || props === void 0 ? void 0 : props.inputGroupControl }));
+                        isValueSchemaExp: formula.isExpression(props.$schema.value) &&
+                            props.$schema.value.replace(/\s/g, '') !==
+                                "${".concat(props.$schema.name, "}"), inputGroupControl: props === null || props === void 0 ? void 0 : props.inputGroupControl }));
                     if (changes.hasOwnProperty('name')) {
                         _this.setInitialValue(_this.props.$schema.value);
                     }
@@ -210,6 +217,8 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                 }
                 else if (typeof props.defaultValue !== 'undefined' &&
                     formula.isExpression(props.defaultValue) &&
+                    props.defaultValue.replace(/\s/g, '') !==
+                        "${".concat(props.name, "}") &&
                     (!isEqual__default["default"](props.defaultValue, prevProps.defaultValue) ||
                         (props.data !== prevProps.data &&
                             formula.isNeedFormula(props.defaultValue, props.data, prevProps.data)))) {
@@ -270,8 +279,13 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
             };
             class_1.prototype.setInitialValue = function (value) {
                 var model = this.model;
-                var _a = this.props, form = _a.formStore, data = _a.data, canAccessSuperData = _a.canAccessSuperData;
+                var _a = this.props, form = _a.formStore, data = _a.data, canAccessSuperData = _a.canAccessSuperData, name = _a.name;
                 var isExp = formula.isExpression(value);
+                if (isExp && value.replace(/\s/g, '') === "${".concat(name, "}")) {
+                    console.warn('value 不要使用表达式关联自己');
+                    isExp = false;
+                    value = undefined;
+                }
                 var initialValue = model.extraName
                     ? [
                         getVariable.getVariable(data, model.name, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData),

package/lib/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.9
+ * amis-core v6.12.0-ab.1
  * Copyright 2018-2025 fex
  */
 
@@ -12,6 +12,7 @@ var mobxStateTree = require('mobx-state-tree');
 var helper = require('../utils/helper.js');
 var service = require('./service.js');
 require('../utils/api.js');
+require('file-saver');
 require('../utils/browser.js');
 require('../utils/ColorScale.js');
 require('../utils/columnsSplit.js');

package/lib/store/combo.d.ts

@@ -172,7 +172,7 @@ export declare const UniqueGroup: import("mobx-state-tree").IModelType<{
         closeDialog: (confirmed?: any, result?: any) => void;
         openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
         closePopOver: (confirmed?: any, result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -707,7 +707,7 @@ export declare const UniqueGroup: import("mobx-state-tree").IModelType<{
         closeDialog: (confirmed?: any, result?: any) => void;
         openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
         closePopOver: (confirmed?: any, result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -1276,7 +1276,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -1811,7 +1811,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -2471,7 +2471,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -3006,7 +3006,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -3545,7 +3545,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -4080,7 +4080,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -4624,7 +4624,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -5159,7 +5159,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -5698,7 +5698,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -6233,7 +6233,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -6772,7 +6772,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -7307,7 +7307,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -7969,7 +7969,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -8504,7 +8504,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -9043,7 +9043,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -9578,7 +9578,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -10122,7 +10122,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -10657,7 +10657,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -11196,7 +11196,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -11731,7 +11731,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -12270,7 +12270,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -12805,7 +12805,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;

package/lib/store/combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.9
+ * amis-core v6.12.0-ab.1
  * Copyright 2018-2025 fex
  */
 

package/lib/store/crud.d.ts

@@ -137,6 +137,8 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
         matchFunc?: MatchFunc;
         filterOnAllColumns?: boolean;
         isTable2?: Boolean;
+        minLoadingTime?: number;
+        dataAppendTo?: 'top' | 'bottom';
     }) => Promise<any>;
     changePage: (page: number | string, perPage?: number | string) => void;
     changePerPage: (perPage: number | string) => void;

package/lib/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.9
+ * amis-core v6.12.0-ab.1
  * Copyright 2018-2025 fex
  */
 
@@ -141,14 +141,15 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
         }
     }
     var fetchInitData = mobxStateTree.flow(function getInitData(api$1, data, options) {
-        var rawItems, matchFunc, items, dir, data_1, ctx, json, result, total, count, page, hasNext, oItems, oRows, columns, rest, items, _a, _b, key, rowsData, data_2, filteredItems, dir, e_1, env;
+        var startTime, rawItems, matchFunc, items, dir, data_1, ctx, json, elapsedTime, remainingTime_1, result, total, count, page, hasNext, oItems, oRows, columns, rest, items, _a, _b, key, rowsData, data_2, filteredItems, dir, e_1, env;
         var _c, e_2, _d;
         var _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         if (options === void 0) { options = {}; }
         return tslib.__generator(this, function (_q) {
             switch (_q.label) {
                 case 0:
-                    _q.trys.push([0, 2, , 3]);
+                    _q.trys.push([0, 6, , 7]);
+                    startTime = Date.now();
                     rawItems = options.source
                         ? resolveVariableAndFilter.resolveVariableAndFilter(options.source, object.createObject(self.mergedData, {
                             items: self.data.itemsRaw,
@@ -188,116 +189,131 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                 case 1:
                     json = _q.sent();
                     fetchCancel = null;
-                    if (!json.ok) {
-                        self.updateMessage((_j = (_h = (_g = (_f = api$1 === null || api$1 === void 0 ? void 0 : api$1.messages) === null || _f === void 0 ? void 0 : _f.failed) !== null && _g !== void 0 ? _g : json.msg) !== null && _h !== void 0 ? _h : options.errorMessage) !== null && _j !== void 0 ? _j : self.__('CRUD.fetchFailed'), true);
-                        !(api$1 === null || api$1 === void 0 ? void 0 : api$1.silent) &&
-                            mobxStateTree.getEnv(self).notify('error', json.msg, json.msgTimeout !== undefined
-                                ? {
-                                    closeButton: true,
-                                    timeout: json.msgTimeout
-                                }
-                                : undefined);
+                    if (!!json.ok) return [3 /*break*/, 2];
+                    self.updateMessage((_j = (_h = (_g = (_f = api$1 === null || api$1 === void 0 ? void 0 : api$1.messages) === null || _f === void 0 ? void 0 : _f.failed) !== null && _g !== void 0 ? _g : json.msg) !== null && _h !== void 0 ? _h : options.errorMessage) !== null && _j !== void 0 ? _j : self.__('CRUD.fetchFailed'), true);
+                    !(api$1 === null || api$1 === void 0 ? void 0 : api$1.silent) &&
+                        mobxStateTree.getEnv(self).notify('error', json.msg, json.msgTimeout !== undefined
+                            ? {
+                                closeButton: true,
+                                timeout: json.msgTimeout
+                            }
+                            : undefined);
+                    return [3 /*break*/, 5];
+                case 2:
+                    if (!json.data) {
+                        throw new Error(self.__('CRUD.invalidData'));
+                    }
+                    if (!options.minLoadingTime) return [3 /*break*/, 4];
+                    elapsedTime = Date.now() - startTime;
+                    remainingTime_1 = options.minLoadingTime - elapsedTime;
+                    if (!(remainingTime_1 > 0)) return [3 /*break*/, 4];
+                    return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, remainingTime_1); })];
+                case 3:
+                    _q.sent();
+                    _q.label = 4;
+                case 4:
+                    self.updatedAt = Date.now();
+                    result = api.normalizeApiResponseData(json.data);
+                    total = result.total, count = result.count, page = result.page, hasNext = result.hasNext, oItems = result.items, oRows = result.rows, columns = result.columns, rest = tslib.__rest(result, ["total", "count", "page", "hasNext", "items", "rows", "columns"]);
+                    items = void 0;
+                    if (options.source) {
+                        items = resolveVariableAndFilter.resolveVariableAndFilter(options.source, object.createObject(self.filterData, result), '| raw');
                     }
                     else {
-                        if (!json.data) {
-                            throw new Error(self.__('CRUD.invalidData'));
-                        }
-                        self.updatedAt = Date.now();
-                        result = api.normalizeApiResponseData(json.data);
-                        total = result.total, count = result.count, page = result.page, hasNext = result.hasNext, oItems = result.items, oRows = result.rows, columns = result.columns, rest = tslib.__rest(result, ["total", "count", "page", "hasNext", "items", "rows", "columns"]);
-                        items = void 0;
-                        if (options.source) {
-                            items = resolveVariableAndFilter.resolveVariableAndFilter(options.source, object.createObject(self.filterData, result), '| raw');
-                        }
-                        else {
-                            items = result.items || result.rows;
-                        }
-                        if (!Array.isArray(items)) {
-                            try {
-                                // 如果不按照 items 格式返回，就拿第一个数组当成 items
-                                for (_a = tslib.__values(Object.keys(result)), _b = _a.next(); !_b.done; _b = _a.next()) {
-                                    key = _b.value;
-                                    if (result.hasOwnProperty(key) && Array.isArray(result[key])) {
-                                        items = result[key];
-                                        break;
-                                    }
-                                }
-                            }
-                            catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                            finally {
-                                try {
-                                    if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
+                        items = result.items || result.rows;
+                    }
+                    if (!Array.isArray(items)) {
+                        try {
+                            // 如果不按照 items 格式返回，就拿第一个数组当成 items
+                            for (_a = tslib.__values(Object.keys(result)), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                key = _b.value;
+                                if (result.hasOwnProperty(key) && Array.isArray(result[key])) {
+                                    items = result[key];
+                                    break;
                                 }
-                                finally { if (e_2) throw e_2.error; }
                             }
                         }
-                        else if (items == null) {
-                            items = [];
+                        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                        finally {
+                            try {
+                                if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
+                            }
+                            finally { if (e_2) throw e_2.error; }
                         }
-                        if (!Array.isArray(items)) {
-                            throw new Error(self.__('CRUD.invalidArray'));
+                    }
+                    else if (items == null) {
+                        items = [];
+                    }
+                    if (!Array.isArray(items)) {
+                        throw new Error(self.__('CRUD.invalidArray'));
+                    }
+                    else {
+                        // 确保成员是对象。
+                        items.map(function (item) {
+                            return typeof item === 'string' ? { text: item } : item;
+                        });
+                    }
+                    rowsData = [];
+                    if (options.loadDataMode && Array.isArray(self.data.items)) {
+                        if (options.dataAppendTo === 'top') {
+                            rowsData = items.concat(self.data.items);
                         }
                         else {
-                            // 确保成员是对象。
-                            items.map(function (item) {
-                                return typeof item === 'string' ? { text: item } : item;
-                            });
-                        }
-                        rowsData = [];
-                        if (options.loadDataMode && Array.isArray(self.data.items)) {
                             rowsData = self.data.items.concat(items);
                         }
-                        else {
-                            // 第一次的时候就是直接加载请求的数据
-                            rowsData = items;
-                        }
-                        data_2 = tslib.__assign(tslib.__assign(tslib.__assign({}, (api$1.replaceData ? {} : self.pristine)), { items: rowsData, count: count, total: total }), rest);
-                        if (options.loadDataOnce) {
-                            /**
-                             * 1. 记录原始集合，后续可能基于原始数据做排序查找。
-                             * 2. 接口返回中没有 items 和 rows 字段，则直接用查到的数据。
-                             */
-                            data_2.itemsRaw = oItems || oRows || rowsData.concat();
-                            filteredItems = helper.applyFilters(rowsData, {
-                                query: self.query,
-                                columns: options.columns,
-                                filterOnAllColumns: false,
-                                matchFunc: options.matchFunc
-                            });
-                            if (self.query.orderBy) {
-                                dir = /desc/i.test(self.query.orderDir) ? -1 : 1;
-                                filteredItems = helper.sortArray(filteredItems, self.query.orderBy, dir);
-                            }
-                            data_2.items = filteredItems.slice((self.page - 1) * self.perPage, self.page * self.perPage);
-                            data_2.count = data_2.total = filteredItems.length;
-                        }
-                        if (Array.isArray(columns)) {
-                            self.columns = columns.concat();
-                        }
-                        else if (rest.isTable2) {
-                            self.columns = options.columns;
-                        }
-                        self.items.replace(rowsData);
-                        self.reInitData(data_2, !!api$1.replaceData, api$1.concatDataFields);
-                        options.syncResponse2Query !== false &&
-                            updateQuery(pick__default["default"](rest, Object.keys(self.query)), undefined, options.pageField || 'page', options.perPageField || 'perPage');
-                        self.total = parseInt((_k = data_2.total) !== null && _k !== void 0 ? _k : data_2.count, 10) || 0;
-                        typeof page !== 'undefined' && (self.page = parseInt(page, 10));
-                        // 分页情况不清楚，只能知道有没有下一页。
-                        if (typeof hasNext !== 'undefined') {
-                            self.mode = 'simple';
-                            self.total = 0;
-                            self.hasNext = !!hasNext;
+                    }
+                    else {
+                        // 第一次的时候就是直接加载请求的数据
+                        rowsData = items;
+                    }
+                    data_2 = tslib.__assign(tslib.__assign(tslib.__assign({}, (api$1.replaceData ? {} : self.pristine)), { items: rowsData, count: count, total: total }), rest);
+                    if (options.loadDataOnce) {
+                        /**
+                         * 1. 记录原始集合，后续可能基于原始数据做排序查找。
+                         * 2. 接口返回中没有 items 和 rows 字段，则直接用查到的数据。
+                         */
+                        data_2.itemsRaw = oItems || oRows || rowsData.concat();
+                        filteredItems = helper.applyFilters(rowsData, {
+                            query: self.query,
+                            columns: options.columns,
+                            filterOnAllColumns: false,
+                            matchFunc: options.matchFunc
+                        });
+                        if (self.query.orderBy) {
+                            dir = /desc/i.test(self.query.orderDir) ? -1 : 1;
+                            filteredItems = helper.sortArray(filteredItems, self.query.orderBy, dir);
                         }
-                        self.updateMessage((_p = (_o = (_m = (_l = api$1.messages) === null || _l === void 0 ? void 0 : _l.success) !== null && _m !== void 0 ? _m : json.msg) !== null && _o !== void 0 ? _o : options.successMessage) !== null && _p !== void 0 ? _p : json.defaultMsg);
-                        // 配置了获取成功提示后提示，默认是空不会提示。
-                        options &&
-                            options.successMessage &&
-                            mobxStateTree.getEnv(self).notify('success', self.msg);
+                        data_2.items = filteredItems.slice((self.page - 1) * self.perPage, self.page * self.perPage);
+                        data_2.count = data_2.total = filteredItems.length;
+                    }
+                    if (Array.isArray(columns)) {
+                        self.columns = columns.concat();
+                    }
+                    else if (rest.isTable2) {
+                        self.columns = options.columns;
                     }
+                    self.items.replace(rowsData);
+                    self.reInitData(data_2, !!api$1.replaceData, api$1.concatDataFields);
+                    options.syncResponse2Query !== false &&
+                        updateQuery(pick__default["default"](rest, Object.keys(self.query)), undefined, options.pageField || 'page', options.perPageField || 'perPage');
+                    self.total = parseInt((_k = data_2.total) !== null && _k !== void 0 ? _k : data_2.count, 10) || 0;
+                    typeof page !== 'undefined' && (self.page = parseInt(page, 10));
+                    // 分页情况不清楚，只能知道有没有下一页。
+                    if (typeof hasNext !== 'undefined') {
+                        self.mode = 'simple';
+                        self.total = 0;
+                        self.hasNext = !!hasNext;
+                    }
+                    self.updateMessage((_p = (_o = (_m = (_l = api$1.messages) === null || _l === void 0 ? void 0 : _l.success) !== null && _m !== void 0 ? _m : json.msg) !== null && _o !== void 0 ? _o : options.successMessage) !== null && _p !== void 0 ? _p : json.defaultMsg);
+                    // 配置了获取成功提示后提示，默认是空不会提示。
+                    options &&
+                        options.successMessage &&
+                        mobxStateTree.getEnv(self).notify('success', self.msg);
+                    _q.label = 5;
+                case 5:
                     self.markFetching(false);
                     return [2 /*return*/, json];
-                case 2:
+                case 6:
                     e_1 = _q.sent();
                     env = mobxStateTree.getEnv(self);
                     if (!mobxStateTree.isAlive(self) || self.disposed) {
@@ -310,7 +326,7 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                     console.error(e_1);
                     !(api$1 === null || api$1 === void 0 ? void 0 : api$1.silent) && env.notify('error', e_1.message);
                     return [2 /*return*/];
-                case 3: return [2 /*return*/];
+                case 7: return [2 /*return*/];
             }
         });
     });