amis-core 3.6.4 → 6.1.0

package/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -23,12 +23,13 @@ var WithRootStore = require('../WithRootStore.js');
 var table = require('../store/table.js');
 var pick = require('lodash/pick');
 var api = require('../utils/api.js');
+require('../utils/browser.js');
 require('../utils/ColorScale.js');
 require('../utils/columnsSplit.js');
+var getVariable = require('../utils/getVariable.js');
+require('lodash/isPlainObject');
 require('amis-formula');
 var tokenize = require('../utils/tokenize.js');
-require('lodash/isPlainObject');
-var getVariable = require('../utils/getVariable.js');
 require('../utils/DataSchema.js');
 require('../utils/DataScope.js');
 require('moment');
@@ -41,13 +42,13 @@ require('../utils/highlight.js');
 require('../utils/icon.js');
 require('../utils/image.js');
 require('../actions/Action.js');
-require('lodash/cloneDeep');
 require('../utils/resize-sensor.js');
 require('react-overlays/useRootClose');
 require('react-dom');
 require('../utils/SimpleMap.js');
 require('lodash/mapValues');
 require('lodash/camelCase');
+require('lodash/cloneDeep');
 require('lodash/isObject');
 require('lodash/map');
 require('lodash/isEmpty');
@@ -127,26 +128,7 @@ function wrapControl(ComposedComponent) {
                     model.setIsControlled(true);
                 }
                 else {
-                    var isExp = formula.isExpression(value);
-                    if (isExp) {
-                        model.changeTmpValue(formula.FormulaExec['formula'](value, data), // 对组件默认值进行运算
-                        'formulaChanged');
-                    }
-                    else {
-                        var initialValue = model.extraName
-                            ? [
-                                store === null || store === void 0 ? void 0 : store.getValueByName(model.name, form === null || form === void 0 ? void 0 : form.canAccessSuperData),
-                                store === null || store === void 0 ? void 0 : store.getValueByName(model.extraName, form === null || form === void 0 ? void 0 : form.canAccessSuperData)
-                            ]
-                            : store === null || store === void 0 ? void 0 : store.getValueByName(model.name, form === null || form === void 0 ? void 0 : form.canAccessSuperData);
-                        if (model.extraName &&
-                            initialValue.every(function (item) { return item === undefined; })) {
-                            initialValue = undefined;
-                        }
-                        model.changeTmpValue(initialValue !== null && initialValue !== void 0 ? initialValue : formula.replaceExpression(value), typeof initialValue !== 'undefined'
-                            ? 'initialValue'
-                            : 'defaultValue');
-                    }
+                    _this.setInitialValue(value);
                 }
                 if (onChange &&
                     value !== undefined &&
@@ -184,9 +166,7 @@ function wrapControl(ComposedComponent) {
                 var _this = this;
                 var _a = this.props; _a.store; _a.formStore; var validate = _a.$schema.validate, addHook = _a.addHook;
                 // 提交前先把之前的 lazyEmit 执行一下。
-                this.hook3 = function () {
-                    _this.lazyEmitChange.flush();
-                };
+                this.hook3 = function () { return _this.lazyEmitChange.flush(); };
                 addHook === null || addHook === void 0 ? void 0 : addHook(this.hook3, 'flush');
                 var formItem = this.model;
                 if (formItem && validate) {
@@ -203,6 +183,7 @@ function wrapControl(ComposedComponent) {
                 }
             };
             class_1.prototype.componentDidUpdate = function (prevProps) {
+                var _this = this;
                 var _a, _b, _c;
                 var props = this.props;
                 var model = this.model;
@@ -210,6 +191,7 @@ function wrapControl(ComposedComponent) {
                     return;
                 }
                 helper.changedEffect([
+                    'name',
                     'id',
                     'validations',
                     'validationErrors',
@@ -236,6 +218,9 @@ function wrapControl(ComposedComponent) {
                     model.config(tslib.__assign(tslib.__assign({}, changes), { 
                         // todo 优化后面两个
                         isValueSchemaExp: formula.isExpression(props.$schema.value), inputGroupControl: props === null || props === void 0 ? void 0 : props.inputGroupControl }));
+                    if (changes.hasOwnProperty('name')) {
+                        _this.setInitialValue(_this.props.$schema.value);
+                    }
                 });
                 if (props.required !== prevProps.required) {
                     model.config({
@@ -311,6 +296,30 @@ function wrapControl(ComposedComponent) {
                 (_g = this.reaction) === null || _g === void 0 ? void 0 : _g.call(this);
                 this.disposeModel();
             };
+            class_1.prototype.setInitialValue = function (value) {
+                var model = this.model;
+                var _a = this.props, form = _a.formStore, data = _a.data;
+                var isExp = formula.isExpression(value);
+                if (isExp) {
+                    model.changeTmpValue(formula.FormulaExec['formula'](value, data), // 对组件默认值进行运算
+                    'formulaChanged');
+                }
+                else {
+                    var initialValue = model.extraName
+                        ? [
+                            getVariable.getVariable(data, model.name, form === null || form === void 0 ? void 0 : form.canAccessSuperData),
+                            getVariable.getVariable(data, model.extraName, form === null || form === void 0 ? void 0 : form.canAccessSuperData)
+                        ]
+                        : getVariable.getVariable(data, model.name, form === null || form === void 0 ? void 0 : form.canAccessSuperData);
+                    if (model.extraName &&
+                        initialValue.every(function (item) { return item === undefined; })) {
+                        initialValue = undefined;
+                    }
+                    model.changeTmpValue(initialValue !== null && initialValue !== void 0 ? initialValue : formula.replaceExpression(value), typeof initialValue !== 'undefined'
+                        ? 'initialValue'
+                        : 'defaultValue');
+                }
+            };
             class_1.prototype.disposeModel = function () {
                 var _a;
                 var _b = this.props, form = _b.formStore, formItem = _b.formItem, rootStore = _b.rootStore;
@@ -523,10 +532,10 @@ function wrapControl(ComposedComponent) {
                 }
             };
             class_1.prototype.getValue = function () {
-                var _a = this.props, data = _a.formStore, control = _a.$schema;
+                var _a = this.props, formStore = _a.formStore, data = _a.data, control = _a.$schema;
                 var value = this.model ? this.model.tmpValue : control.value;
                 if (control.pipeIn) {
-                    value = api.callStrFunction.call(this, control.pipeIn, ['value', 'data'], value, data);
+                    value = api.callStrFunction.call(this, control.pipeIn, ['value', 'store', 'data'], value, formStore, data);
                 }
                 return value;
             };

package/lib/store/app.d.ts

@@ -52,7 +52,7 @@ export declare const AppStore: import("mobx-state-tree").IModelType<{
     setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean): void;
     reset(): void;
-    updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): 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;
     setCurrentAction(action: object): void;
     openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
@@ -69,7 +69,7 @@ export declare const AppStore: import("mobx-state-tree").IModelType<{
     markBusying: (busying?: boolean) => void;
     fetchInitData: (api: import("../types").Api, data?: object | undefined, options?: import("../types").fetchOptions | undefined) => Promise<any>;
     fetchData: (api: import("../types").Api, data?: object | undefined, options?: import("../types").fetchOptions | undefined) => Promise<any>;
-    reInitData: (data: object | undefined, replace?: boolean) => void;
+    reInitData: (data: object | undefined, replace?: boolean, concatFields?: string | string[] | undefined) => void;
     updateMessage: (msg?: string | undefined, error?: boolean) => void;
     clearMessage: () => void;
     setHasRemoteData: () => void;

package/lib/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -12,11 +12,12 @@ var mobxStateTree = require('mobx-state-tree');
 var helper = require('../utils/helper.js');
 var service = require('./service.js');
 require('../utils/api.js');
+require('../utils/browser.js');
 require('../utils/ColorScale.js');
 require('../utils/columnsSplit.js');
+var object = require('../utils/object.js');
 require('amis-formula');
 require('lodash/isPlainObject');
-var object = require('../utils/object.js');
 require('../utils/DataSchema.js');
 require('../utils/DataScope.js');
 require('moment');
@@ -34,7 +35,6 @@ require('../utils/image.js');
 require('lodash/isEqual');
 require('../actions/Action.js');
 require('lodash/debounce');
-require('lodash/cloneDeep');
 require('../utils/resize-sensor.js');
 require('react');
 require('react-overlays/useRootClose');
@@ -42,6 +42,7 @@ require('react-dom');
 require('../utils/SimpleMap.js');
 require('lodash/mapValues');
 require('lodash/camelCase');
+require('lodash/cloneDeep');
 require('lodash/map');
 require('lodash/isEmpty');
 require('lodash/kebabCase');

package/lib/store/combo.d.ts

@@ -95,7 +95,8 @@ export declare const UniqueGroup: import("mobx-state-tree").IModelType<{
     } & {
         focus: () => void;
         blur: () => void;
-        config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+        config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            name?: string | undefined;
             extraName?: string | undefined;
             required?: boolean | undefined;
             unique?: boolean | undefined;
@@ -604,7 +605,8 @@ export declare const UniqueGroup: import("mobx-state-tree").IModelType<{
     } & {
         focus: () => void;
         blur: () => void;
-        config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+        config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            name?: string | undefined;
             extraName?: string | undefined;
             required?: boolean | undefined;
             unique?: boolean | undefined;
@@ -1145,7 +1147,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         } & {
             focus: () => void;
             blur: () => void;
-            config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                name?: string | undefined;
                 extraName?: string | undefined;
                 required?: boolean | undefined;
                 unique?: boolean | undefined;
@@ -1654,7 +1657,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         } & {
             focus: () => void;
             blur: () => void;
-            config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                name?: string | undefined;
                 extraName?: string | undefined;
                 required?: boolean | undefined;
                 unique?: boolean | undefined;
@@ -2105,7 +2109,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
     setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean): void;
     reset(): void;
-    updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): 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;
     setCurrentAction(action: object): void;
     openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
@@ -2167,7 +2171,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         setTopStore(value: any): void;
         initData(data?: object, skipSetPristine?: boolean): void;
         reset(): void;
-        updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): 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;
         setCurrentAction(action: object): void;
         openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
@@ -2184,7 +2188,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         markBusying: (busying?: boolean) => void;
         fetchInitData: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
         fetchData: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
-        reInitData: (data: object | undefined, replace?: boolean) => void;
+        reInitData: (data: object | undefined, replace?: boolean, concatFields?: string | string[] | undefined) => void;
         updateMessage: (msg?: string | undefined, error?: boolean) => void;
         clearMessage: () => void;
         setHasRemoteData: () => void;
@@ -2284,7 +2288,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         } & {
             focus: () => void;
             blur: () => void;
-            config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                name?: string | undefined;
                 extraName?: string | undefined;
                 required?: boolean | undefined;
                 unique?: boolean | undefined;
@@ -2793,7 +2798,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         } & {
             focus: () => void;
             blur: () => void;
-            config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                name?: string | undefined;
                 extraName?: string | undefined;
                 required?: boolean | undefined;
                 unique?: boolean | undefined;
@@ -3306,7 +3312,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         } & {
             focus: () => void;
             blur: () => void;
-            config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                name?: string | undefined;
                 extraName?: string | undefined;
                 required?: boolean | undefined;
                 unique?: boolean | undefined;
@@ -3815,7 +3822,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         } & {
             focus: () => void;
             blur: () => void;
-            config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                name?: string | undefined;
                 extraName?: string | undefined;
                 required?: boolean | undefined;
                 unique?: boolean | undefined;
@@ -4333,7 +4341,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         } & {
             focus: () => void;
             blur: () => void;
-            config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                name?: string | undefined;
                 extraName?: string | undefined;
                 required?: boolean | undefined;
                 unique?: boolean | undefined;
@@ -4842,7 +4851,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         } & {
             focus: () => void;
             blur: () => void;
-            config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                name?: string | undefined;
                 extraName?: string | undefined;
                 required?: boolean | undefined;
                 unique?: boolean | undefined;
@@ -5355,7 +5365,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         } & {
             focus: () => void;
             blur: () => void;
-            config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                name?: string | undefined;
                 extraName?: string | undefined;
                 required?: boolean | undefined;
                 unique?: boolean | undefined;
@@ -5864,7 +5875,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         } & {
             focus: () => void;
             blur: () => void;
-            config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                name?: string | undefined;
                 extraName?: string | undefined;
                 required?: boolean | undefined;
                 unique?: boolean | undefined;
@@ -6377,7 +6389,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         } & {
             focus: () => void;
             blur: () => void;
-            config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                name?: string | undefined;
                 extraName?: string | undefined;
                 required?: boolean | undefined;
                 unique?: boolean | undefined;
@@ -6886,7 +6899,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         } & {
             focus: () => void;
             blur: () => void;
-            config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                name?: string | undefined;
                 extraName?: string | undefined;
                 required?: boolean | undefined;
                 unique?: boolean | undefined;
@@ -7315,7 +7329,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         readonly persistKey: string;
     } & {
         setInited: (value: boolean) => void;
-        setValues: (values: object, tag?: object | undefined, replace?: boolean | undefined) => void;
+        setValues: (values: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined) => void;
         setValueByName: (name: string, value: any, isPristine?: boolean, force?: boolean) => void;
         trimValues: () => void;
         submit: (fn?: ((values: object) => Promise<any>) | undefined, hooks?: (() => Promise<any>)[] | undefined, failedMessage?: string | undefined, validateErrCb?: (() => void) | undefined, throwErrors?: boolean | undefined) => Promise<any>;
@@ -7401,7 +7415,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         setTopStore(value: any): void;
         initData(data?: object, skipSetPristine?: boolean): void;
         reset(): void;
-        updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): 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;
         setCurrentAction(action: object): void;
         openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
@@ -7418,7 +7432,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         markBusying: (busying?: boolean) => void;
         fetchInitData: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
         fetchData: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
-        reInitData: (data: object | undefined, replace?: boolean) => void;
+        reInitData: (data: object | undefined, replace?: boolean, concatFields?: string | string[] | undefined) => void;
         updateMessage: (msg?: string | undefined, error?: boolean) => void;
         clearMessage: () => void;
         setHasRemoteData: () => void;
@@ -7518,7 +7532,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         } & {
             focus: () => void;
             blur: () => void;
-            config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                name?: string | undefined;
                 extraName?: string | undefined;
                 required?: boolean | undefined;
                 unique?: boolean | undefined;
@@ -8027,7 +8042,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         } & {
             focus: () => void;
             blur: () => void;
-            config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                name?: string | undefined;
                 extraName?: string | undefined;
                 required?: boolean | undefined;
                 unique?: boolean | undefined;
@@ -8540,7 +8556,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         } & {
             focus: () => void;
             blur: () => void;
-            config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                name?: string | undefined;
                 extraName?: string | undefined;
                 required?: boolean | undefined;
                 unique?: boolean | undefined;
@@ -9049,7 +9066,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         } & {
             focus: () => void;
             blur: () => void;
-            config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                name?: string | undefined;
                 extraName?: string | undefined;
                 required?: boolean | undefined;
                 unique?: boolean | undefined;
@@ -9567,7 +9585,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         } & {
             focus: () => void;
             blur: () => void;
-            config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                name?: string | undefined;
                 extraName?: string | undefined;
                 required?: boolean | undefined;
                 unique?: boolean | undefined;
@@ -10076,7 +10095,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         } & {
             focus: () => void;
             blur: () => void;
-            config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                name?: string | undefined;
                 extraName?: string | undefined;
                 required?: boolean | undefined;
                 unique?: boolean | undefined;
@@ -10589,7 +10609,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         } & {
             focus: () => void;
             blur: () => void;
-            config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                name?: string | undefined;
                 extraName?: string | undefined;
                 required?: boolean | undefined;
                 unique?: boolean | undefined;
@@ -11098,7 +11119,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         } & {
             focus: () => void;
             blur: () => void;
-            config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                name?: string | undefined;
                 extraName?: string | undefined;
                 required?: boolean | undefined;
                 unique?: boolean | undefined;
@@ -11611,7 +11633,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         } & {
             focus: () => void;
             blur: () => void;
-            config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                name?: string | undefined;
                 extraName?: string | undefined;
                 required?: boolean | undefined;
                 unique?: boolean | undefined;
@@ -12120,7 +12143,8 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         } & {
             focus: () => void;
             blur: () => void;
-            config: ({ extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+            config: ({ name, extraName, required, unique, value, isValueSchemaExp, rules, messages, delimiter, multiple, valueField, labelField, joinValues, extractValue, type, id, selectFirst, autoFill, clearValueOnHidden, validateApi, maxLength, minLength, validateOnChange, label, inputGroupControl, pagination }: {
+                name?: string | undefined;
                 extraName?: string | undefined;
                 required?: boolean | undefined;
                 unique?: boolean | undefined;
@@ -12549,7 +12573,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
         readonly persistKey: string;
     } & {
         setInited: (value: boolean) => void;
-        setValues: (values: object, tag?: object | undefined, replace?: boolean | undefined) => void;
+        setValues: (values: object, tag?: object | undefined, replace?: boolean | undefined, concatFields?: string | string[] | undefined) => void;
         setValueByName: (name: string, value: any, isPristine?: boolean, force?: boolean) => void;
         trimValues: () => void;
         submit: (fn?: ((values: object) => Promise<any>) | undefined, hooks?: (() => Promise<any>)[] | undefined, failedMessage?: string | undefined, validateErrCb?: (() => void) | undefined, throwErrors?: boolean | undefined) => Promise<any>;

package/lib/store/combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

package/lib/store/crud.d.ts

@@ -77,7 +77,7 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
     setTopStore(value: any): void;
     initData(data?: object, skipSetPristine?: boolean): void;
     reset(): void;
-    updateData(data?: object, tag?: object | undefined, replace?: boolean | undefined): 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;
     setCurrentAction(action: object): void;
     openDialog(ctx: any, additonal?: object | undefined, callback?: ((ret: any) => void) | undefined, scoped?: import("..").IScopedContext | undefined): void;
@@ -94,7 +94,7 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
     markBusying: (busying?: boolean) => void;
     fetchInitData: (api: Api, data?: object | undefined, options?: fetchOptions | undefined) => Promise<any>;
     fetchData: (api: Api, data?: object | undefined, options?: fetchOptions | undefined) => Promise<any>;
-    reInitData: (data: object | undefined, replace?: boolean) => void;
+    reInitData: (data: object | undefined, replace?: boolean, concatFields?: string | string[] | undefined) => void;
     updateMessage: (msg?: string | undefined, error?: boolean) => void;
     clearMessage: () => void;
     setHasRemoteData: () => void;
@@ -149,6 +149,7 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
     }) => Promise<void>;
     updateColumns: (columns: Array<any>) => void;
     updateTotal: (total: number) => void;
+    resetSelection: () => void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
 export type ICRUDStore = Instance<typeof CRUDStore>;
 export {};

package/lib/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -23,6 +23,7 @@ require('../utils/filter.js');
 var api = require('../utils/api.js');
 var matchSorter = require('match-sorter');
 var tpl = require('../utils/tpl.js');
+var table = require('./table.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -326,7 +327,7 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                             self.columns = options.columns;
                         }
                         self.items.replace(rowsData);
-                        self.reInitData(data_2, !!api$1.replaceData);
+                        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;
@@ -391,7 +392,7 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                     if (!helper.isEmpty(json.data) || json.ok) {
                         self.updateData(api.normalizeApiResponseData(json.data), {
                             __saved: Date.now()
-                        }, !!api$1 && api$1.replaceData);
+                        }, !!api$1 && api$1.replaceData, api$1 === null || api$1 === void 0 ? void 0 : api$1.concatDataFields);
                         self.updatedAt = Date.now();
                     }
                     if (!json.ok) {
@@ -610,6 +611,18 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
     var updateTotal = function (total) {
         self.total = total || 0;
     };
+    /** 非Picker模式下，重置当前CRUD的所有的已选择项目 */
+    var resetSelection = function () {
+        var _a, _b, _c, _d;
+        // 初始化CRUD记录的已选择项目和未选择项目
+        setSelectedItems([]);
+        setUnSelectedItems([]);
+        var tableStore = (_b = (_a = self === null || self === void 0 ? void 0 : self.children) === null || _a === void 0 ? void 0 : _a.find) === null || _b === void 0 ? void 0 : _b.call(_a, function (s) { return s.storeType === table.TableStore.name; });
+        if (tableStore) {
+            // 清空Table记录的已选择项目
+            (_d = (_c = tableStore).clear) === null || _d === void 0 ? void 0 : _d.call(_c);
+        }
+    };
     return {
         getData: getData,
         updateSelectData: updateSelectData,
@@ -628,7 +641,8 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
         initFromScope: initFromScope,
         exportAsCSV: exportAsCSV,
         updateColumns: updateColumns,
-        updateTotal: updateTotal
+        updateTotal: updateTotal,
+        resetSelection: resetSelection
     };
 });