amis-core 3.1.1 → 3.2.0

package/lib/renderers/wrapControl.d.ts

@@ -49,30 +49,10 @@ export interface ControlProps {
     store: IIRendererStore;
 }
 export declare function wrapControl<T extends React.ComponentType<React.ComponentProps<T> & ControlProps>>(ComposedComponent: T): {
-    new (props: Omit<any, "rootStore"> | Readonly<Omit<any, "rootStore">>): {
-        render(): React.JSX.Element;
-        context: unknown;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<any, "rootStore">>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
-        forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<any, "rootStore">>;
-        state: Readonly<{}>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
-        componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<Omit<any, "rootStore">>, nextState: Readonly<{}>, nextContext: any): boolean;
-        componentWillUnmount?(): void;
-        componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<any, "rootStore">>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<Omit<any, "rootStore">>, prevState: Readonly<{}>, snapshot?: any): void;
-        componentWillMount?(): void;
-        UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<Omit<any, "rootStore">>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<any, "rootStore">>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<Omit<any, "rootStore">>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<any, "rootStore">>, nextState: Readonly<{}>, nextContext: any): void;
-    };
-    new (props: Omit<any, "rootStore">, context: any): {
+    new (props: Omit<any, "rootStore">): {
+        ref: any;
+        getWrappedInstance(): any;
+        refFn(ref: any): void;
         render(): React.JSX.Element;
         context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<any, "rootStore">>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;

package/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.2.0
  * Copyright 2018-2023 fex
  */
 
@@ -85,15 +85,16 @@ function wrapControl(ComposedComponent) {
                 }
                 if (propValue !== undefined && propValue !== null) {
                     // 同步 value: 优先使用 props 中的 value
-                    model.changeTmpValue(propValue);
+                    model.changeTmpValue(propValue, 'controlled');
                 }
                 else {
                     // 备注: 此处的 value 是 schema 中的 value（和props.defaultValue相同）
-                    var curTmpValue = formula.isExpression(value)
+                    var isExp = formula.isExpression(value);
+                    var curTmpValue = isExp
                         ? formula.FormulaExec['formula'](value, data) // 对组件默认值进行运算
                         : (_b = store === null || store === void 0 ? void 0 : store.getValueByName(model.name)) !== null && _b !== void 0 ? _b : formula.replaceExpression(value); // 优先使用公式表达式
                     // 同步 value
-                    model.changeTmpValue(curTmpValue);
+                    model.changeTmpValue(curTmpValue, isExp ? 'formulaChanged' : 'defaultValue');
                 }
                 if (onChange &&
                     value !== undefined &&
@@ -193,7 +194,7 @@ function wrapControl(ComposedComponent) {
                     if (!isEqual__default["default"](props.value, prevProps.value) &&
                         !isEqual__default["default"](props.value, model.tmpValue)) {
                         // 外部直接传入的 value 无需执行运算器
-                        model.changeTmpValue(props.value);
+                        model.changeTmpValue(props.value, 'controlled');
                     }
                 }
                 else if (model &&
@@ -210,43 +211,35 @@ function wrapControl(ComposedComponent) {
                         if (!isEqual__default["default"](curResult, prevResult) &&
                             !isEqual__default["default"](curResult, model.tmpValue)) {
                             // 识别上下文变动、自身数值变动、公式运算结果变动
-                            model.changeTmpValue(curResult);
+                            model.changeTmpValue(curResult, 'formulaChanged');
                             (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, curResult, model.name, false);
                         }
                         else if (nowFormulaChecked) {
                             var nowData = props.data[model.name];
                             // now 表达式，计算后的值永远相同
-                            model.changeTmpValue(nowData);
+                            model.changeTmpValue(nowData, 'formulaChanged');
                             (_b = props.onChange) === null || _b === void 0 ? void 0 : _b.call(props, nowData, model.name, false);
                         }
                     }
                 }
                 else if (model) {
                     var valueByName = getVariable.getVariable(props.data, model.name);
-                    if (isEqual__default["default"](props.defaultValue, prevProps.defaultValue)) {
-                        // value 非公式表达式时，name 值优先，若 defaultValue 主动变动时，则使用 defaultValue
-                        if (
-                        // 然后才是查看关联的 name 属性值是否变化
-                        props.data !== prevProps.data &&
-                            (!model.emitedValue ||
-                                isEqual__default["default"](model.emitedValue, model.tmpValue))) {
-                            model.changeEmitedValue(undefined);
-                            var prevValueByName = getVariable.getVariable(props.data, model.name);
-                            if ((!isEqual__default["default"](valueByName, prevValueByName) ||
-                                getVariable.getVariable(props.data, model.name, false) !==
-                                    getVariable.getVariable(prevProps.data, model.name, false)) &&
-                                !isEqual__default["default"](valueByName, model.tmpValue)) {
-                                model.changeTmpValue(valueByName);
-                            }
-                        }
-                    }
-                    else if (!isEqual__default["default"](props.defaultValue, prevProps.defaultValue) &&
-                        !isEqual__default["default"](props.defaultValue, model.tmpValue)) {
-                        // 组件默认值非公式
-                        var curValue = formula.replaceExpression(props.defaultValue);
-                        model.changeTmpValue(curValue);
-                        if (props.onChange) {
-                            props.onChange(curValue, model.name, false);
+                    // value 非公式表达式时，name 值优先，若 defaultValue 主动变动时，则使用 defaultValue
+                    if (
+                    // 然后才是查看关联的 name 属性值是否变化
+                    props.data !== prevProps.data &&
+                        (!model.emitedValue ||
+                            isEqual__default["default"](model.emitedValue, model.tmpValue))) {
+                        model.changeEmitedValue(undefined);
+                        var prevValueByName = getVariable.getVariable(props.data, model.name);
+                        if ((!isEqual__default["default"](valueByName, prevValueByName) ||
+                            getVariable.getVariable(props.data, model.name, false) !==
+                                getVariable.getVariable(prevProps.data, model.name, false)) &&
+                            !isEqual__default["default"](valueByName, model.tmpValue)) {
+                            model.changeTmpValue(valueByName, props.formInited && !prevProps.formInited
+                                ? 'formInited'
+                                : 'dataChanged');
+                            this.checkValidate();
                         }
                     }
                 }
@@ -317,14 +310,33 @@ function wrapControl(ComposedComponent) {
                     scoped.unRegisterComponent(originRef);
                 }
             };
+            class_1.prototype.checkValidate = function () {
+                var _a;
+                if (!this.model)
+                    return; // 如果 model 为 undefined 则直接返回
+                var validated = this.model.validated;
+                var _b = this.props, formSubmited = _b.formSubmited, validateOnChange = _b.validateOnChange;
+                if (
+                // 如果配置了 minLength 或者 maxLength 就切成及时验证
+                // this.model.rules.minLength ||
+                // this.model.rules.maxLength ||
+                validateOnChange === true ||
+                    (validateOnChange !== false && (formSubmited || validated))) {
+                    this.validate();
+                }
+                else if (validateOnChange === false) {
+                    (_a = this.model) === null || _a === void 0 ? void 0 : _a.reset();
+                }
+            };
             class_1.prototype.validate = function () {
                 return tslib.__awaiter(this, void 0, void 0, function () {
-                    var _a, form, data, formItemDispatchEvent, result, combo$1, group, validPromises, validPromises;
+                    var _a, form, data, formItemDispatchEvent, result, combo$1, group, validPromises;
                     return tslib.__generator(this, function (_b) {
                         switch (_b.label) {
                             case 0:
+                                if (!this.model)
+                                    return [2 /*return*/];
                                 _a = this.props, form = _a.formStore, data = _a.data, formItemDispatchEvent = _a.formItemDispatchEvent;
-                                if (!this.model) return [3 /*break*/, 4];
                                 if (!(this.model.unique &&
                                     (form === null || form === void 0 ? void 0 : form.parentStore) &&
                                     form.parentStore.storeType === combo.ComboStore.name)) return [3 /*break*/, 2];
@@ -337,12 +349,9 @@ function wrapControl(ComposedComponent) {
                             case 1:
                                 result = _b.sent();
                                 return [3 /*break*/, 4];
-                            case 2:
-                                validPromises = form === null || form === void 0 ? void 0 : form.getItemsByName(this.model.name).map(function (item) { return item.validate(data); });
-                                if (!(validPromises && validPromises.length)) return [3 /*break*/, 4];
-                                return [4 /*yield*/, Promise.all(validPromises)];
+                            case 2: return [4 /*yield*/, this.model.validate(data)];
                             case 3:
-                                result = _b.sent();
+                                result = [_b.sent()];
                                 _b.label = 4;
                             case 4:
                                 if (result && result.length) {
@@ -379,7 +388,7 @@ function wrapControl(ComposedComponent) {
                     var oldValue = this.model.value;
                     value = pipeOut(value, oldValue, data);
                 }
-                this.model.changeTmpValue(value);
+                this.model.changeTmpValue(value, 'input');
                 if (changeImmediately || conrolChangeImmediately || !formInited) {
                     this.emitChange(submitOnChange);
                 }
@@ -389,9 +398,8 @@ function wrapControl(ComposedComponent) {
                 }
             };
             class_1.prototype.emitChange = function (submitOnChange) {
-                var _a;
                 if (submitOnChange === void 0) { submitOnChange = this.props.$schema.submitOnChange; }
-                var _b = this.props, form = _b.formStore, onChange = _b.onChange, _c = _b.$schema, name = _c.name, id = _c.id, label = _c.label, type = _c.type, onFormItemChange = _c.onChange; _c.maxLength; _c.minLength; var data = _b.data, env = _b.env, validateOnChange = _b.validateOnChange, formSubmited = _b.formSubmited;
+                var _a = this.props, form = _a.formStore, onChange = _a.onChange, _b = _a.$schema, name = _b.name, id = _b.id, label = _b.label, type = _b.type, onFormItemChange = _b.onChange; _b.maxLength; _b.minLength; var data = _a.data, env = _a.env; _a.validateOnChange; _a.formSubmited;
                 if (!this.model) {
                     return;
                 }
@@ -420,19 +428,8 @@ function wrapControl(ComposedComponent) {
                 if (!this.model) {
                     return;
                 }
-                var validated = this.model.validated;
                 onChange === null || onChange === void 0 ? void 0 : onChange(value, name, submitOnChange === true);
-                if (
-                // 如果配置了 minLength 或者 maxLength 就切成及时验证
-                // this.model.rules.minLength ||
-                // this.model.rules.maxLength ||
-                validateOnChange === true ||
-                    (validateOnChange !== false && (formSubmited || validated))) {
-                    this.validate();
-                }
-                else if (validateOnChange === false) {
-                    (_a = this.model) === null || _a === void 0 ? void 0 : _a.reset();
-                }
+                this.checkValidate();
             };
             class_1.prototype.handleBlur = function (e) {
                 var _a = this.props, onBlur = _a.onBlur, validateOnBlur = _a.$schema.validateOnBlur;
@@ -489,6 +486,7 @@ function wrapControl(ComposedComponent) {
                     ref: this.controlRef,
                     data: data || (store === null || store === void 0 ? void 0 : store.data),
                     value: value,
+                    changeMotivation: model === null || model === void 0 ? void 0 : model.changeMotivation,
                     defaultValue: control.value,
                     formItemValue: value,
                     onChange: this.handleChange,

package/lib/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.2.0
  * Copyright 2018-2023 fex
  */
 
@@ -11,7 +11,41 @@ var tslib = require('tslib');
 var mobxStateTree = require('mobx-state-tree');
 var helper = require('../utils/helper.js');
 var service = require('./service.js');
+require('../utils/api.js');
+require('../utils/ColorScale.js');
+require('react');
+require('lodash/chunk');
+require('amis-formula');
+require('lodash/isPlainObject');
 var object = require('../utils/object.js');
+require('../utils/DataSchema.js');
+require('../utils/DataScope.js');
+require('moment');
+require('../utils/debug.js');
+require('react-dom');
+require('../utils/errors.js');
+require('../utils/tpl.js');
+require('classnames');
+require('../utils/filter.js');
+require('lodash/isObject');
+require('lodash/isString');
+require('lodash/isBoolean');
+require('lodash');
+require('../utils/image.js');
+require('../actions/Action.js');
+require('lodash/debounce');
+require('lodash/cloneDeep');
+require('../utils/resize-sensor.js');
+require('react-overlays/useRootClose');
+require('../utils/SimpleMap.js');
+require('lodash/mapValues');
+require('lodash/camelCase');
+require('uncontrollable');
+require('hoist-non-react-statics');
+require('../utils/validations.js');
+require('../utils/resolveCondition.js');
+require('mobx');
+require('../utils/Animation.js');
 
 var AppStore = service.ServiceStore.named('AppStore')
     .props({
@@ -24,7 +58,7 @@ var AppStore = service.ServiceStore.named('AppStore')
     get navigations() {
         if (Array.isArray(self.pages)) {
             return helper.mapTree(self.pages, function (item) {
-                var visible = item.visible;
+                var visible = helper.isVisible(item, self.data);
                 if (visible !== false &&
                     item.path &&
                     !~item.path.indexOf('http') &&