amis-core 3.1.1 → 3.3.0

package/esm/renderers/Form.js

@@ -1,11 +1,10 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
 import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import extend from 'lodash/extend';
 import { Renderer } from '../factory.js';
 import { FormStore } from '../store/form.js';
 import { evalExpression, filter } from '../utils/tpl.js';
@@ -17,13 +16,38 @@ import find from 'lodash/find';
 import { filterTarget, ScopedContext } from '../Scoped.js';
 import 'amis-formula';
 import 'moment';
-import { isObject, createObject, cloneObject } from '../utils/object.js';
-import { getVariable } from '../utils/getVariable.js';
+import { isObject, createObject, cloneObject, injectObjectChain } from '../utils/object.js';
 import { dataMapping } from '../utils/dataMapping.js';
 import '../utils/filter.js';
 import { isEffectiveApi, isApiOutdated } from '../utils/api.js';
 import LazyComponent from '../components/LazyComponent.js';
 import { isAlive } from 'mobx-state-tree';
+import '../utils/ColorScale.js';
+import 'lodash/chunk';
+import '../utils/DataSchema.js';
+import '../utils/DataScope.js';
+import '../utils/debug.js';
+import 'react-dom';
+import '../utils/errors.js';
+import 'lodash/isObject';
+import 'lodash/isString';
+import 'lodash/isBoolean';
+import '../utils/image.js';
+import 'lodash/isPlainObject';
+import 'lodash/isEqual';
+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 'uncontrollable';
+import 'hoist-non-react-statics';
+import '../utils/validations.js';
+import '../utils/resolveCondition.js';
+import 'mobx';
+import '../utils/Animation.js';
 
 var Form = /** @class */ (function (_super) {
     __extends(Form, _super);
@@ -129,7 +153,8 @@ var Form = /** @class */ (function (_super) {
                 .fetchInitData(initApi, store.data, {
                 successMessage: fetchSuccess,
                 errorMessage: fetchFailed,
-                onSuccess: function () {
+                onSuccess: function (json, data) {
+                    store.setValues(data);
                     if (!isEffectiveApi(initAsyncApi, store.data) ||
                         store.data[initFinishedField || 'finished']) {
                         return;
@@ -183,7 +208,7 @@ var Form = /** @class */ (function (_super) {
                     case 0:
                         _b = this.props, data = _b.data, store = _b.store, dispatchEvent = _b.dispatchEvent;
                         if (store.fetching) {
-                            return [2 /*return*/];
+                            return [2 /*return*/, value];
                         }
                         // 派发init事件，参数为初始化数据
                         return [4 /*yield*/, dispatchEvent('inited', createObject(data, __assign(__assign({}, value === null || value === void 0 ? void 0 : value.data), { responseData: (_a = value === null || value === void 0 ? void 0 : value.data) !== null && _a !== void 0 ? _a : {}, responseStatus: store.error ? 1 : 0, responseMsg: store.msg })))];
@@ -251,53 +276,59 @@ var Form = /** @class */ (function (_super) {
         });
     };
     Form.prototype.reload = function (subPath, query, ctx, silent) {
-        var _a;
-        var _this = this;
-        if (query) {
-            return this.receive(query);
-        }
-        var _b = this.props, store = _b.store, initApi = _b.initApi, initAsyncApi = _b.initAsyncApi, initFinishedField = _b.initFinishedField, _c = _b.messages, fetchSuccess = _c.fetchSuccess, fetchFailed = _c.fetchFailed;
-        isEffectiveApi(initAsyncApi, store.data) &&
-            store.updateData((_a = {},
-                _a[initFinishedField || 'finished'] = false,
-                _a));
-        isEffectiveApi(initApi, store.data)
-            ? store
-                .fetchInitData(initApi, store.data, {
-                successMessage: fetchSuccess,
-                errorMessage: fetchFailed,
-                silent: silent,
-                onSuccess: function () {
-                    if (!isEffectiveApi(initAsyncApi, store.data) ||
-                        store.data[initFinishedField || 'finished']) {
-                        return;
-                    }
-                    return until(function () { return store.checkRemote(initAsyncApi, store.data); }, function (ret) { return ret && ret[initFinishedField || 'finished']; }, function (cancel) { return (_this.asyncCancel = cancel); });
-                }
-            })
-                .then(function (result) { return __awaiter(_this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0: 
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, store, initApi, initAsyncApi, initFinishedField, _b, fetchSuccess, fetchFailed, result;
+            var _c;
+            var _this = this;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        if (query) {
+                            return [2 /*return*/, this.receive(query)];
+                        }
+                        _a = this.props, store = _a.store, initApi = _a.initApi, initAsyncApi = _a.initAsyncApi, initFinishedField = _a.initFinishedField, _b = _a.messages, fetchSuccess = _b.fetchSuccess, fetchFailed = _b.fetchFailed;
+                        isEffectiveApi(initAsyncApi, store.data) &&
+                            store.updateData((_c = {},
+                                _c[initFinishedField || 'finished'] = false,
+                                _c));
+                        if (!isEffectiveApi(initApi, store.data)) return [3 /*break*/, 3];
+                        return [4 /*yield*/, store.fetchInitData(initApi, store.data, {
+                                successMessage: fetchSuccess,
+                                errorMessage: fetchFailed,
+                                silent: silent,
+                                onSuccess: function (json, data) {
+                                    store.setValues(data);
+                                    if (!isEffectiveApi(initAsyncApi, store.data) ||
+                                        store.data[initFinishedField || 'finished']) {
+                                        return;
+                                    }
+                                    return until(function () { return store.checkRemote(initAsyncApi, store.data); }, function (ret) { return ret && ret[initFinishedField || 'finished']; }, function (cancel) { return (_this.asyncCancel = cancel); });
+                                }
+                            })];
+                    case 1:
+                        result = _d.sent();
                         // 派发初始化接口请求完成事件
                         return [4 /*yield*/, this.dispatchInited(result)];
-                        case 1:
-                            // 派发初始化接口请求完成事件
-                            _a.sent();
-                            if (result === null || result === void 0 ? void 0 : result.ok) {
-                                this.initInterval(result);
-                                store.reset(undefined, false);
-                            }
-                            return [2 /*return*/];
-                    }
-                });
-            }); })
-            : store.reset(undefined, false);
+                    case 2:
+                        // 派发初始化接口请求完成事件
+                        _d.sent();
+                        if (result === null || result === void 0 ? void 0 : result.ok) {
+                            this.initInterval(result);
+                            store.reset(undefined, false);
+                        }
+                        return [3 /*break*/, 4];
+                    case 3:
+                        store.reset(undefined, false);
+                        _d.label = 4;
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
     };
     Form.prototype.receive = function (values, name, replace) {
         var store = this.props.store;
         store.updateData(values, undefined, replace);
-        this.reload();
+        return this.reload();
     };
     Form.prototype.silentReload = function (target, query) {
         this.reload(target, query, undefined, true);
@@ -305,7 +336,8 @@ var Form = /** @class */ (function (_super) {
     Form.prototype.initInterval = function (value) {
         var _a = this.props, interval = _a.interval, silentPolling = _a.silentPolling, stopAutoRefreshWhen = _a.stopAutoRefreshWhen, data = _a.data;
         clearTimeout(this.timer);
-        interval &&
+        (value === null || value === void 0 ? void 0 : value.ok) &&
+            interval &&
             this.mounted &&
             (!stopAutoRefreshWhen || !evalExpression(stopAutoRefreshWhen, data)) &&
             (this.timer = setTimeout(silentPolling ? this.silentReload : this.reload, Math.max(interval, 1000)));
@@ -314,11 +346,12 @@ var Form = /** @class */ (function (_super) {
     Form.prototype.isValidated = function () {
         return this.props.store.validated;
     };
-    Form.prototype.validate = function (forceValidate) {
-        var _a = this.props, store = _a.store, dispatchEvent = _a.dispatchEvent, data = _a.data;
+    Form.prototype.validate = function (forceValidate, throwErrors) {
+        if (throwErrors === void 0) { throwErrors = false; }
+        var _a = this.props, store = _a.store, dispatchEvent = _a.dispatchEvent, data = _a.data, messages = _a.messages, __ = _a.translate;
         this.flush();
         return store
-            .validate(this.hooks['validate'] || [], forceValidate)
+            .validate(this.hooks['validate'] || [], forceValidate, throwErrors, __(messages && messages.validateFailed))
             .then(function (result) {
             if (result) {
                 dispatchEvent('validateSucc', data);
@@ -348,11 +381,12 @@ var Form = /** @class */ (function (_super) {
         this.flush();
         store.setValues(value, undefined, replace);
     };
-    Form.prototype.submit = function (fn) {
+    Form.prototype.submit = function (fn, throwErrors) {
+        if (throwErrors === void 0) { throwErrors = false; }
         var _a = this.props, store = _a.store, messages = _a.messages, __ = _a.translate, dispatchEvent = _a.dispatchEvent, data = _a.data;
         this.flush();
         var validateErrCb = function () { return dispatchEvent('validateError', data); };
-        return store.submit(fn, this.hooks['validate'] || [], __(messages && messages.validateFailed), validateErrCb);
+        return store.submit(fn, this.hooks['validate'] || [], __(messages && messages.validateFailed), validateErrCb, throwErrors);
     };
     // 如果开启了 lazyChange，需要一个 flush 方法把队列中值应用上。
     Form.prototype.flush = function () {
@@ -441,27 +475,29 @@ var Form = /** @class */ (function (_super) {
     };
     Form.prototype.handleBulkChange = function (values, submit) {
         var _a = this.props; _a.onChange; var store = _a.store, formLazyChange = _a.formLazyChange;
-        store.updateData(values);
-        store.items.forEach(function (formItem) {
-            var updatedValue = getVariable(values, formItem.name, false);
-            if (updatedValue !== undefined) {
-                // 更新验证状态但保留错误信息
-                formItem.reset(true);
-                // 这里需要更新value，否则提交时不会使用新的字段值校验
-                formItem.changeTmpValue(updatedValue);
-                formItem.validateOnChange && formItem.validate(values);
-            }
-        });
+        store.setValues(values);
+        // store.updateData(values);
+        // store.items.forEach(formItem => {
+        //   const updatedValue = getVariable(values, formItem.name, false);
+        //   if (updatedValue !== undefined) {
+        //     // 更新验证状态但保留错误信息
+        //     formItem.reset(true);
+        //     // 这里需要更新value，否则提交时不会使用新的字段值校验
+        //     formItem.changeTmpValue(updatedValue);
+        //     formItem.validateOnChange && formItem.validate(values);
+        //   }
+        // });
         (formLazyChange === false ? this.emitChange : this.lazyEmitChange)(submit);
     };
     Form.prototype.handleFormSubmit = function (e) {
-        var _a = this.props, preventEnterSubmit = _a.preventEnterSubmit, onActionSensor = _a.onActionSensor;
+        var _a = this.props, preventEnterSubmit = _a.preventEnterSubmit, onActionSensor = _a.onActionSensor, close = _a.close;
         e.preventDefault();
         if (preventEnterSubmit) {
             return false;
         }
         var sensor = this.handleAction(e, {
-            type: 'submit'
+            type: 'submit',
+            close: close
         }, this.props.store.data);
         // 让外层可以监控这个动作执行结果
         onActionSensor === null || onActionSensor === void 0 ? void 0 : onActionSensor(sensor);
@@ -552,7 +588,7 @@ var Form = /** @class */ (function (_super) {
                                         _this.reloadTarget(filterTarget(action.target, values), values);
                                 }
                                 else if (action.actionType === 'dialog') {
-                                    store.openDialog(data);
+                                    store.openDialog(data, undefined, action.callback, delegate || _this.context);
                                 }
                                 else if (action.actionType === 'drawer') {
                                     store.openDrawer(data);
@@ -626,7 +662,10 @@ var Form = /** @class */ (function (_super) {
                                                         throw new SkipOperation();
                                                     }
                                                     _a.label = 2;
-                                                case 2: return [2 /*return*/];
+                                                case 2: return [2 /*return*/, injectObjectChain(store.data, {
+                                                        __payload: values,
+                                                        __response: response
+                                                    })];
                                             }
                                         });
                                     }); });
@@ -636,7 +675,7 @@ var Form = /** @class */ (function (_super) {
                                     dispatchEvent_1('submitSucc', createObject(_this.props.data, values));
                                 }
                                 return Promise.resolve(null);
-                            })
+                            }, throwErrors)
                                 .then(function (values) {
                                 // 有可能 onSubmit return false 了，那么后面的就不应该再执行了。
                                 if (values === false) {
@@ -675,11 +714,11 @@ var Form = /** @class */ (function (_super) {
                         }
                         else if (action.actionType === 'validate') {
                             store.setCurrentAction(action);
-                            this.validate(true);
+                            return [2 /*return*/, this.validate(true, throwErrors)];
                         }
                         else if (action.actionType === 'dialog') {
                             store.setCurrentAction(action);
-                            store.openDialog(data);
+                            store.openDialog(data, undefined, action.callback, delegate || this.context);
                         }
                         else if (action.actionType === 'drawer') {
                             store.setCurrentAction(action);
@@ -752,12 +791,21 @@ var Form = /** @class */ (function (_super) {
         });
     };
     Form.prototype.handleQuery = function (query) {
-        var _a, _b;
         if (this.props.initApi) {
+            // 如果是分页动作，则看接口里面有没有用，没用则  return false
+            // 让组件自己去排序
+            if ((query === null || query === void 0 ? void 0 : query.hasOwnProperty('orderBy')) &&
+                !isApiOutdated(this.props.initApi, this.props.initApi, this.props.store.data, createObject(this.props.store.data, query))) {
+                return false;
+            }
             this.receive(query);
+            return;
+        }
+        if (this.props.onQuery) {
+            return this.props.onQuery(query);
         }
         else {
-            (_b = (_a = this.props).onQuery) === null || _b === void 0 ? void 0 : _b.call(_a, query);
+            return false;
         }
     };
     Form.prototype.handleDialogConfirm = function (values, action, ctx, targets) {
@@ -811,7 +859,7 @@ var Form = /** @class */ (function (_super) {
             });
             store.openDialog(ctx, undefined, function (confirmed) {
                 resolve(confirmed);
-            });
+            }, _this.context);
         });
     };
     Form.prototype.buildActions = function () {
@@ -907,7 +955,7 @@ var Form = /** @class */ (function (_super) {
         }
         var props = __assign(__assign({}, this.props), otherProps);
         var form = this.props.store;
-        var render = props.render, mode = props.mode, horizontal = props.horizontal, store = props.store, disabled = props.disabled, controlWidth = props.controlWidth, resolveDefinitions = props.resolveDefinitions, lazyChange = props.lazyChange; props.formLazyChange; var dispatchEvent = props.dispatchEvent, labelAlign = props.labelAlign, labelWidth = props.labelWidth, isStatic = props.static;
+        var render = props.render, mode = props.mode, horizontal = props.horizontal, store = props.store, disabled = props.disabled, controlWidth = props.controlWidth, resolveDefinitions = props.resolveDefinitions, lazyChange = props.lazyChange; props.formLazyChange; var dispatchEvent = props.dispatchEvent, labelAlign = props.labelAlign, labelWidth = props.labelWidth, isStatic = props.static; props.canAccessSuperData;
         var subProps = __assign(__assign({ formStore: form, data: store.data, key: "".concat(control.name || '', "-").concat(control.type, "-").concat(key), formInited: form.inited, formSubmited: form.submited, formMode: mode, formHorizontal: horizontal, formLabelAlign: labelAlign !== 'left' ? 'right' : labelAlign, formLabelWidth: labelWidth, controlWidth: controlWidth, 
             /**
              * form.loading有为true时才下发disabled属性，否则不显性设置disbaled为false
@@ -934,14 +982,7 @@ var Form = /** @class */ (function (_super) {
         return (React.createElement(WrapperComponent, { className: cx("Form", "Form--".concat(mode || 'normal'), columnCount ? "Form--column Form--column-".concat(columnCount) : null, staticClassName && isStatic ? staticClassName : className, isStatic ? 'Form--isStatic' : null), onSubmit: this.handleFormSubmit, noValidate: true },
             React.createElement("input", { type: "submit", style: { display: 'none' } }),
             debug
-                ? render('form-debug-json', extend({
-                    type: 'json',
-                    value: store.data,
-                    ellipsisThreshold: 120,
-                    className: cx('Form--debug')
-                }, 
-                /** 定制debug输出格式 */
-                isObject(debugConfig) ? debugConfig : {}))
+                ? render('form-debug-json', __assign({ type: 'json', value: store.data, ellipsisThreshold: 120, className: cx('Form--debug') }, debugConfig))
                 : null,
             render('spinner', { type: 'spinner' }, {
                 overlay: true,
@@ -1141,57 +1182,70 @@ var FormRenderer = /** @class */ (function (_super) {
         scoped.close(target);
     };
     FormRenderer.prototype.reload = function (target, query, ctx, silent, replace) {
-        if (query) {
-            return this.receive(query, undefined, replace);
-        }
-        var scoped = this.context;
-        var subPath = '';
-        var idx;
-        var subQuery = null;
-        if (target && ~(idx = target.indexOf('.'))) {
-            subPath = target.substring(idx + 1);
-            target = target.substring(0, idx);
-        }
-        var idx2 = target ? target.indexOf('?') : -1;
-        if (~idx2) {
-            subQuery = dataMapping(qsparse(target.substring(idx2 + 1)), ctx);
-            target = target.substring(0, idx2);
-        }
-        var component;
-        if (target &&
-            (component = scoped.getComponentByName(target)) &&
-            component.reload) {
-            component.reload(subPath, subQuery, ctx);
-        }
-        else if (target === '*') {
-            _super.prototype.reload.call(this, target, query, ctx, silent);
-            var components = scoped.getComponents();
-            components.forEach(function (component) {
-                return component.reload && component.reload('', subQuery, ctx);
+        return __awaiter(this, void 0, void 0, function () {
+            var scoped, subPath, idx, subQuery, idx2, component, components;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (query) {
+                            return [2 /*return*/, this.receive(query, undefined, replace)];
+                        }
+                        scoped = this.context;
+                        subPath = '';
+                        subQuery = null;
+                        if (target && ~(idx = target.indexOf('.'))) {
+                            subPath = target.substring(idx + 1);
+                            target = target.substring(0, idx);
+                        }
+                        idx2 = target ? target.indexOf('?') : -1;
+                        if (~idx2) {
+                            subQuery = dataMapping(qsparse(target.substring(idx2 + 1)), ctx);
+                            target = target.substring(0, idx2);
+                        }
+                        if (!(target &&
+                            (component = scoped.getComponentByName(target)) &&
+                            component.reload)) return [3 /*break*/, 1];
+                        component.reload(subPath, subQuery, ctx);
+                        return [3 /*break*/, 4];
+                    case 1:
+                        if (!(target === '*')) return [3 /*break*/, 3];
+                        return [4 /*yield*/, _super.prototype.reload.call(this, target, query, ctx, silent)];
+                    case 2:
+                        _a.sent();
+                        components = scoped.getComponents();
+                        components.forEach(function (component) {
+                            return component.reload && component.reload('', subQuery, ctx);
+                        });
+                        return [3 /*break*/, 4];
+                    case 3: return [2 /*return*/, _super.prototype.reload.call(this, target, query, ctx, silent)];
+                    case 4: return [2 /*return*/];
+                }
             });
-        }
-        else {
-            _super.prototype.reload.call(this, target, query, ctx, silent);
-        }
+        });
     };
     FormRenderer.prototype.receive = function (values, name, replace) {
-        if (name) {
-            var scoped = this.context;
-            var idx = name.indexOf('.');
-            var subPath = '';
-            if (~idx) {
-                subPath = name.substring(1 + idx);
-                name = name.substring(0, idx);
-            }
-            var component = scoped.getComponentByName(name);
-            component && component.receive && component.receive(values, subPath);
-            return;
-        }
-        return _super.prototype.receive.call(this, values, undefined, replace);
+        return __awaiter(this, void 0, void 0, function () {
+            var scoped, idx, subPath, component;
+            return __generator(this, function (_a) {
+                if (name) {
+                    scoped = this.context;
+                    idx = name.indexOf('.');
+                    subPath = '';
+                    if (~idx) {
+                        subPath = name.substring(1 + idx);
+                        name = name.substring(0, idx);
+                    }
+                    component = scoped.getComponentByName(name);
+                    component && component.receive && component.receive(values, subPath);
+                    return [2 /*return*/];
+                }
+                return [2 /*return*/, _super.prototype.receive.call(this, values, undefined, replace)];
+            });
+        });
     };
     FormRenderer.prototype.setData = function (values, replace) {
         var _a = this.props, onChange = _a.onChange, store = _a.store;
-        _super.prototype.setValues.call(this, values);
+        _super.prototype.setValues.call(this, values, replace);
         // 触发表单change
         onChange &&
             onChange(store.data, difference(store.data, store.pristine), this.props);