amis-core 3.1.0 → 3.2.0

package/esm/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.0
+ * amis-core v3.2.0
  * Copyright 2018-2023 fex
  */
 
@@ -272,8 +272,9 @@ var FormItemWrap = /** @class */ (function (_super) {
             return (React.createElement(Overlay, { container: popOverContainer || this.target, target: function () { return _this.target; }, placement: position || 'left-bottom-left-top', show: true },
                 React.createElement(PopOver, { classPrefix: ns, className: cx("".concat(ns, "auto-fill-popOver"), popOverClassName), style: {
                         minWidth: this.target ? this.target.offsetWidth : undefined
-                    }, offset: offset, onHide: this.hanldeClose, overlay: true }, render('popOver-auto-fill-form', form, {
-                    onSubmit: this.hanldeSubmit
+                    }, offset: offset, onHide: this.handleClose, overlay: true }, render('popOver-auto-fill-form', form, {
+                    onAction: this.handleAction,
+                    onSubmit: this.handleSubmit
                 }))));
         }
         else {
@@ -281,15 +282,20 @@ var FormItemWrap = /** @class */ (function (_super) {
         }
     };
     // 参照录入popOver提交
-    FormItemWrap.prototype.hanldeSubmit = function (values) {
+    FormItemWrap.prototype.handleSubmit = function (values) {
         var _a = this.props; _a.onBulkChange; var autoFill = _a.autoFill;
         if (!autoFill || (autoFill && !(autoFill === null || autoFill === void 0 ? void 0 : autoFill.hasOwnProperty('api')))) {
             return;
         }
         this.updateAutoFillData(values.selectedItems);
-        this.hanldeClose();
+        this.handleClose();
     };
-    FormItemWrap.prototype.hanldeClose = function () {
+    FormItemWrap.prototype.handleAction = function (e, action, data) {
+        if (action.actionType === 'cancel') {
+            this.handleClose();
+        }
+    };
+    FormItemWrap.prototype.handleClose = function () {
         this.setState({
             isOpened: false
         });
@@ -476,6 +482,7 @@ var FormItemWrap = /** @class */ (function (_super) {
         normal: function (props, renderControl) {
             var _a;
             var className = props.className, style = props.style, cx = props.classnames, desc = props.desc, description = props.description, label = props.label, render = props.render, required = props.required, caption = props.caption, remark = props.remark, labelRemark = props.labelRemark, env = props.env, descriptionClassName = props.descriptionClassName, captionClassName = props.captionClassName, model = props.formItem, renderLabel = props.renderLabel, renderDescription = props.renderDescription, hint = props.hint, data = props.data, showErrorMsg = props.showErrorMsg, useMobileUI = props.useMobileUI; props.translate; var isStatic = props.static, staticClassName = props.staticClassName;
+            var mobileUI = useMobileUI && isMobile();
             description = description || desc;
             return (React.createElement("div", { "data-role": "form-item", className: cx("Form-item Form-item--normal", isStatic && staticClassName ? staticClassName : className, (_a = {
                         'is-error': model && !model.valid
@@ -502,38 +509,71 @@ var FormItemWrap = /** @class */ (function (_super) {
                                         : undefined
                             })
                             : null))) : null,
-                renderControl(),
-                caption
-                    ? render('caption', caption, {
-                        className: cx("Form-caption", captionClassName)
-                    })
-                    : null,
-                remark
-                    ? render('remark', {
-                        type: 'remark',
-                        icon: remark.icon || 'warning-mark',
-                        className: cx("Form-remark"),
-                        tooltip: remark,
-                        useMobileUI: useMobileUI,
-                        container: env && env.getModalContainer
-                            ? env.getModalContainer
-                            : undefined
-                    })
-                    : null,
-                hint && model && model.isFocused
-                    ? render('hint', hint, {
-                        className: cx("Form-hint")
-                    })
-                    : null,
-                model &&
-                    !model.valid &&
-                    showErrorMsg !== false &&
-                    Array.isArray(model.errors) ? (React.createElement("ul", { className: cx("Form-feedback") }, model.errors.map(function (msg, key) { return (React.createElement("li", { key: key }, msg)); }))) : null,
-                renderDescription !== false && description
-                    ? render('description', description, {
-                        className: cx("Form-description", descriptionClassName)
-                    })
-                    : null));
+                mobileUI ? (React.createElement("div", { className: cx('Form-item-controlBox') },
+                    renderControl(),
+                    caption
+                        ? render('caption', caption, {
+                            className: cx("Form-caption", captionClassName)
+                        })
+                        : null,
+                    remark
+                        ? render('remark', {
+                            type: 'remark',
+                            icon: remark.icon || 'warning-mark',
+                            className: cx("Form-remark"),
+                            tooltip: remark,
+                            useMobileUI: useMobileUI,
+                            container: env && env.getModalContainer
+                                ? env.getModalContainer
+                                : undefined
+                        })
+                        : null,
+                    hint && model && model.isFocused
+                        ? render('hint', hint, {
+                            className: cx("Form-hint")
+                        })
+                        : null,
+                    model &&
+                        !model.valid &&
+                        showErrorMsg !== false &&
+                        Array.isArray(model.errors) ? (React.createElement("ul", { className: cx("Form-feedback") }, model.errors.map(function (msg, key) { return (React.createElement("li", { key: key }, msg)); }))) : null,
+                    renderDescription !== false && description
+                        ? render('description', description, {
+                            className: cx("Form-description", descriptionClassName)
+                        })
+                        : null)) : (React.createElement(React.Fragment, null,
+                    renderControl(),
+                    caption
+                        ? render('caption', caption, {
+                            className: cx("Form-caption", captionClassName)
+                        })
+                        : null,
+                    remark
+                        ? render('remark', {
+                            type: 'remark',
+                            icon: remark.icon || 'warning-mark',
+                            className: cx("Form-remark"),
+                            tooltip: remark,
+                            useMobileUI: useMobileUI,
+                            container: env && env.getModalContainer
+                                ? env.getModalContainer
+                                : undefined
+                        })
+                        : null,
+                    hint && model && model.isFocused
+                        ? render('hint', hint, {
+                            className: cx("Form-hint")
+                        })
+                        : null,
+                    model &&
+                        !model.valid &&
+                        showErrorMsg !== false &&
+                        Array.isArray(model.errors) ? (React.createElement("ul", { className: cx("Form-feedback") }, model.errors.map(function (msg, key) { return (React.createElement("li", { key: key }, msg)); }))) : null,
+                    renderDescription !== false && description
+                        ? render('description', description, {
+                            className: cx("Form-description", descriptionClassName)
+                        })
+                        : null))));
         },
         inline: function (props, renderControl) {
             var _a;
@@ -680,13 +720,19 @@ var FormItemWrap = /** @class */ (function (_super) {
         __metadata("design:type", Function),
         __metadata("design:paramtypes", [Object]),
         __metadata("design:returntype", void 0)
-    ], FormItemWrap.prototype, "hanldeSubmit", null);
+    ], FormItemWrap.prototype, "handleSubmit", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object, Object, Object]),
+        __metadata("design:returntype", void 0)
+    ], FormItemWrap.prototype, "handleAction", null);
     __decorate([
         autobind,
         __metadata("design:type", Function),
         __metadata("design:paramtypes", []),
         __metadata("design:returntype", void 0)
-    ], FormItemWrap.prototype, "hanldeClose", null);
+    ], FormItemWrap.prototype, "handleClose", null);
     __decorate([
         autobind,
         __metadata("design:type", Function),

package/esm/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.0
+ * amis-core v3.2.0
  * Copyright 2018-2023 fex
  */
 

package/esm/renderers/Placeholder.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.0
+ * amis-core v3.2.0
  * Copyright 2018-2023 fex
  */
 

package/esm/renderers/builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.0
+ * amis-core v3.2.0
  * Copyright 2018-2023 fex
  */
 

package/esm/renderers/register.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.0
+ * amis-core v3.2.0
  * Copyright 2018-2023 fex
  */
 

package/esm/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/esm/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.0
+ * amis-core v3.2.0
  * Copyright 2018-2023 fex
  */
 
@@ -73,15 +73,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 = isExpression(value)
+                    var isExp = isExpression(value);
+                    var curTmpValue = isExp
                         ? FormulaExec['formula'](value, data) // 对组件默认值进行运算
                         : (_b = store === null || store === void 0 ? void 0 : store.getValueByName(model.name)) !== null && _b !== void 0 ? _b : replaceExpression(value); // 优先使用公式表达式
                     // 同步 value
-                    model.changeTmpValue(curTmpValue);
+                    model.changeTmpValue(curTmpValue, isExp ? 'formulaChanged' : 'defaultValue');
                 }
                 if (onChange &&
                     value !== undefined &&
@@ -181,7 +182,7 @@ function wrapControl(ComposedComponent) {
                     if (!isEqual(props.value, prevProps.value) &&
                         !isEqual(props.value, model.tmpValue)) {
                         // 外部直接传入的 value 无需执行运算器
-                        model.changeTmpValue(props.value);
+                        model.changeTmpValue(props.value, 'controlled');
                     }
                 }
                 else if (model &&
@@ -198,43 +199,35 @@ function wrapControl(ComposedComponent) {
                         if (!isEqual(curResult, prevResult) &&
                             !isEqual(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(props.data, model.name);
-                    if (isEqual(props.defaultValue, prevProps.defaultValue)) {
-                        // value 非公式表达式时，name 值优先，若 defaultValue 主动变动时，则使用 defaultValue
-                        if (
-                        // 然后才是查看关联的 name 属性值是否变化
-                        props.data !== prevProps.data &&
-                            (!model.emitedValue ||
-                                isEqual(model.emitedValue, model.tmpValue))) {
-                            model.changeEmitedValue(undefined);
-                            var prevValueByName = getVariable(props.data, model.name);
-                            if ((!isEqual(valueByName, prevValueByName) ||
-                                getVariable(props.data, model.name, false) !==
-                                    getVariable(prevProps.data, model.name, false)) &&
-                                !isEqual(valueByName, model.tmpValue)) {
-                                model.changeTmpValue(valueByName);
-                            }
-                        }
-                    }
-                    else if (!isEqual(props.defaultValue, prevProps.defaultValue) &&
-                        !isEqual(props.defaultValue, model.tmpValue)) {
-                        // 组件默认值非公式
-                        var curValue = 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(model.emitedValue, model.tmpValue))) {
+                        model.changeEmitedValue(undefined);
+                        var prevValueByName = getVariable(props.data, model.name);
+                        if ((!isEqual(valueByName, prevValueByName) ||
+                            getVariable(props.data, model.name, false) !==
+                                getVariable(prevProps.data, model.name, false)) &&
+                            !isEqual(valueByName, model.tmpValue)) {
+                            model.changeTmpValue(valueByName, props.formInited && !prevProps.formInited
+                                ? 'formInited'
+                                : 'dataChanged');
+                            this.checkValidate();
                         }
                     }
                 }
@@ -305,14 +298,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 __awaiter(this, void 0, void 0, function () {
-                    var _a, form, data, formItemDispatchEvent, result, combo, group, validPromises, validPromises;
+                    var _a, form, data, formItemDispatchEvent, result, combo, group, validPromises;
                     return __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 === ComboStore.name)) return [3 /*break*/, 2];
@@ -325,12 +337,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) {
@@ -367,7 +376,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);
                 }
@@ -377,9 +386,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;
                 }
@@ -408,19 +416,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;
@@ -477,6 +474,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/esm/store/app.js

@@ -1,13 +1,47 @@
 /**
- * amis-core v3.1.0
+ * amis-core v3.2.0
  * Copyright 2018-2023 fex
  */
 
 import { __assign } from 'tslib';
 import { types } from 'mobx-state-tree';
-import { mapTree, findTree, guid } from '../utils/helper.js';
+import { mapTree, findTree, isVisible, guid } from '../utils/helper.js';
 import { ServiceStore } from './service.js';
+import '../utils/api.js';
+import '../utils/ColorScale.js';
+import 'react';
+import 'lodash/chunk';
+import 'amis-formula';
+import 'lodash/isPlainObject';
 import { createObject } from '../utils/object.js';
+import '../utils/DataSchema.js';
+import '../utils/DataScope.js';
+import 'moment';
+import '../utils/debug.js';
+import 'react-dom';
+import '../utils/errors.js';
+import '../utils/tpl.js';
+import 'classnames';
+import '../utils/filter.js';
+import 'lodash/isObject';
+import 'lodash/isString';
+import 'lodash/isBoolean';
+import 'lodash';
+import '../utils/image.js';
+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 'uncontrollable';
+import 'hoist-non-react-statics';
+import '../utils/validations.js';
+import '../utils/resolveCondition.js';
+import 'mobx';
+import '../utils/Animation.js';
 
 var AppStore = ServiceStore.named('AppStore')
     .props({
@@ -20,7 +54,7 @@ var AppStore = ServiceStore.named('AppStore')
     get navigations() {
         if (Array.isArray(self.pages)) {
             return mapTree(self.pages, function (item) {
-                var visible = item.visible;
+                var visible = isVisible(item, self.data);
                 if (visible !== false &&
                     item.path &&
                     !~item.path.indexOf('http') &&