amis-core 3.6.4 → 6.1.0

package/esm/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -9,7 +9,7 @@ import debounce from 'lodash/debounce';
 import isEqual from 'lodash/isEqual';
 import { ComboStore } from '../store/combo.js';
 import { guid, promisify, changedEffect } from '../utils/helper.js';
-import { isExpression, FormulaExec, replaceExpression, isNeedFormula } from '../utils/formula.js';
+import { isExpression, isNeedFormula, FormulaExec, replaceExpression } from '../utils/formula.js';
 import { ScopedContext } from '../Scoped.js';
 import { FormItemStore } from '../store/formItem.js';
 import { isAlive } from 'mobx-state-tree';
@@ -19,12 +19,13 @@ import { withRootStore } from '../WithRootStore.js';
 import { TableStore } from '../store/table.js';
 import pick from 'lodash/pick';
 import { callStrFunction } from '../utils/api.js';
+import '../utils/browser.js';
 import '../utils/ColorScale.js';
 import 'lodash/chunk';
+import { getVariable } from '../utils/getVariable.js';
+import 'lodash/isPlainObject';
 import 'amis-formula';
 import { tokenize } from '../utils/tokenize.js';
-import 'lodash/isPlainObject';
-import { getVariable } from '../utils/getVariable.js';
 import '../utils/DataSchema.js';
 import '../utils/DataScope.js';
 import 'moment';
@@ -36,12 +37,12 @@ import '../utils/filter.js';
 import 'lodash/isObject';
 import '../utils/image.js';
 import '../actions/Action.js';
-import 'lodash/cloneDeep';
 import '../utils/resize-sensor.js';
 import 'react-overlays/useRootClose';
 import '../utils/SimpleMap.js';
 import 'lodash/mapValues';
 import 'lodash/camelCase';
+import 'lodash/cloneDeep';
 import 'lodash/map';
 import 'lodash/isEmpty';
 import 'lodash/kebabCase';
@@ -109,26 +110,7 @@ function wrapControl(ComposedComponent) {
                     model.setIsControlled(true);
                 }
                 else {
-                    var isExp = isExpression(value);
-                    if (isExp) {
-                        model.changeTmpValue(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 : replaceExpression(value), typeof initialValue !== 'undefined'
-                            ? 'initialValue'
-                            : 'defaultValue');
-                    }
+                    _this.setInitialValue(value);
                 }
                 if (onChange &&
                     value !== undefined &&
@@ -166,9 +148,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) {
@@ -185,6 +165,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;
@@ -192,6 +173,7 @@ function wrapControl(ComposedComponent) {
                     return;
                 }
                 changedEffect([
+                    'name',
                     'id',
                     'validations',
                     'validationErrors',
@@ -218,6 +200,9 @@ function wrapControl(ComposedComponent) {
                     model.config(__assign(__assign({}, changes), { 
                         // todo 优化后面两个
                         isValueSchemaExp: 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({
@@ -293,6 +278,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 = isExpression(value);
+                if (isExp) {
+                    model.changeTmpValue(FormulaExec['formula'](value, data), // 对组件默认值进行运算
+                    'formulaChanged');
+                }
+                else {
+                    var initialValue = model.extraName
+                        ? [
+                            getVariable(data, model.name, form === null || form === void 0 ? void 0 : form.canAccessSuperData),
+                            getVariable(data, model.extraName, form === null || form === void 0 ? void 0 : form.canAccessSuperData)
+                        ]
+                        : 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 : 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;
@@ -505,10 +514,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 = callStrFunction.call(this, control.pipeIn, ['value', 'data'], value, data);
+                    value = callStrFunction.call(this, control.pipeIn, ['value', 'store', 'data'], value, formStore, data);
                 }
                 return value;
             };

package/esm/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/esm/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -8,12 +8,13 @@ import { types } from 'mobx-state-tree';
 import { mapTree, findTree, isVisible, guid, replaceUrlParams } from '../utils/helper.js';
 import { ServiceStore } from './service.js';
 import '../utils/api.js';
+import '../utils/browser.js';
 import '../utils/ColorScale.js';
 import 'react';
 import 'lodash/chunk';
+import { createObject } from '../utils/object.js';
 import 'amis-formula';
 import 'lodash/isPlainObject';
-import { createObject } from '../utils/object.js';
 import '../utils/DataSchema.js';
 import '../utils/DataScope.js';
 import 'moment';
@@ -29,12 +30,12 @@ import '../utils/image.js';
 import 'lodash/isEqual';
 import '../actions/Action.js';
 import 'lodash/debounce';
-import 'lodash/cloneDeep';
 import '../utils/resize-sensor.js';
 import 'react-overlays/useRootClose';
 import '../utils/SimpleMap.js';
 import 'lodash/mapValues';
 import 'lodash/camelCase';
+import 'lodash/cloneDeep';
 import 'lodash/map';
 import 'lodash/isEmpty';
 import 'lodash/kebabCase';