amis-core 2.1.1-beta.2 → 2.2.0

package/esm/store/combo.d.ts

@@ -128,6 +128,7 @@ export declare const UniqueGroup: import("mobx-state-tree").IModelType<{
         setSubStore: (store: any) => void;
         getSubStore: () => any;
         reset: (keepErrors?: boolean) => void;
+        resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
         changeTmpValue: (value: any) => void;
@@ -537,6 +538,7 @@ export declare const UniqueGroup: import("mobx-state-tree").IModelType<{
         setSubStore: (store: any) => void;
         getSubStore: () => any;
         reset: (keepErrors?: boolean) => void;
+        resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
         changeTmpValue: (value: any) => void;
@@ -978,6 +980,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             setSubStore: (store: any) => void;
             getSubStore: () => any;
             reset: (keepErrors?: boolean) => void;
+            resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
@@ -1387,6 +1390,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             setSubStore: (store: any) => void;
             getSubStore: () => any;
             reset: (keepErrors?: boolean) => void;
+            resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
@@ -1910,6 +1914,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             setSubStore: (store: any) => void;
             getSubStore: () => any;
             reset: (keepErrors?: boolean) => void;
+            resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
@@ -2319,6 +2324,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             setSubStore: (store: any) => void;
             getSubStore: () => any;
             reset: (keepErrors?: boolean) => void;
+            resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
@@ -2732,6 +2738,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             setSubStore: (store: any) => void;
             getSubStore: () => any;
             reset: (keepErrors?: boolean) => void;
+            resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
@@ -3141,6 +3148,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             setSubStore: (store: any) => void;
             getSubStore: () => any;
             reset: (keepErrors?: boolean) => void;
+            resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
@@ -3559,6 +3567,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             setSubStore: (store: any) => void;
             getSubStore: () => any;
             reset: (keepErrors?: boolean) => void;
+            resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
@@ -3968,6 +3977,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             setSubStore: (store: any) => void;
             getSubStore: () => any;
             reset: (keepErrors?: boolean) => void;
+            resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
@@ -4381,6 +4391,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             setSubStore: (store: any) => void;
             getSubStore: () => any;
             reset: (keepErrors?: boolean) => void;
+            resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
@@ -4790,6 +4801,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             setSubStore: (store: any) => void;
             getSubStore: () => any;
             reset: (keepErrors?: boolean) => void;
+            resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
@@ -5203,6 +5215,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             setSubStore: (store: any) => void;
             getSubStore: () => any;
             reset: (keepErrors?: boolean) => void;
+            resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
@@ -5612,6 +5625,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             setSubStore: (store: any) => void;
             getSubStore: () => any;
             reset: (keepErrors?: boolean) => void;
+            resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
@@ -6141,6 +6155,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             setSubStore: (store: any) => void;
             getSubStore: () => any;
             reset: (keepErrors?: boolean) => void;
+            resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
@@ -6550,6 +6565,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             setSubStore: (store: any) => void;
             getSubStore: () => any;
             reset: (keepErrors?: boolean) => void;
+            resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
@@ -6963,6 +6979,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             setSubStore: (store: any) => void;
             getSubStore: () => any;
             reset: (keepErrors?: boolean) => void;
+            resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
@@ -7372,6 +7389,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             setSubStore: (store: any) => void;
             getSubStore: () => any;
             reset: (keepErrors?: boolean) => void;
+            resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
@@ -7790,6 +7808,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             setSubStore: (store: any) => void;
             getSubStore: () => any;
             reset: (keepErrors?: boolean) => void;
+            resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
@@ -8199,6 +8218,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             setSubStore: (store: any) => void;
             getSubStore: () => any;
             reset: (keepErrors?: boolean) => void;
+            resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
@@ -8612,6 +8632,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             setSubStore: (store: any) => void;
             getSubStore: () => any;
             reset: (keepErrors?: boolean) => void;
+            resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
@@ -9021,6 +9042,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             setSubStore: (store: any) => void;
             getSubStore: () => any;
             reset: (keepErrors?: boolean) => void;
+            resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
@@ -9434,6 +9456,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             setSubStore: (store: any) => void;
             getSubStore: () => any;
             reset: (keepErrors?: boolean) => void;
+            resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;
@@ -9843,6 +9866,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             setSubStore: (store: any) => void;
             getSubStore: () => any;
             reset: (keepErrors?: boolean) => void;
+            resetValidationStatus: (tag?: string | undefined) => void;
             openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
             closeDialog: (result?: any) => void;
             changeTmpValue: (value: any) => void;

package/esm/store/combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.1.1-beta.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/store/crud.d.ts

@@ -107,7 +107,7 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
         loadDataMode?: boolean;
         syncResponse2Query?: boolean;
         columns?: Array<any>;
-        isTableV2?: Boolean;
+        isTable2?: Boolean;
     }) => Promise<any>;
     changePage: (page: number, perPage?: number | string) => void;
     selectAction: (action: ActionObject) => void;

package/esm/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.1.1-beta.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 
@@ -93,12 +93,12 @@ var CRUDStore = ServiceStore.named('CRUDStore')
     var fetchInitData = flow(function getInitData(api, data, options) {
         var items_1, dir, data_1, ctx, json, result, total, count, page, hasNext, oItems, oRows, columns, rest, items, _i, _a, key, rowsData, data_2, filteredItems_1, dir, e_1, env;
         var _b;
-        var _c, _d, _e, _f, _g;
+        var _c, _d, _e, _f, _g, _h;
         if (options === void 0) { options = {}; }
-        return __generator(this, function (_h) {
-            switch (_h.label) {
+        return __generator(this, function (_j) {
+            switch (_j.label) {
                 case 0:
-                    _h.trys.push([0, 2, , 3]);
+                    _j.trys.push([0, 2, , 3]);
                     if (!options.forceReload && options.loadDataOnce && self.total) {
                         items_1 = options.source
                             ? resolveVariableAndFilter(options.source, createObject(self.mergedData, {
@@ -109,8 +109,7 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                         if (Array.isArray(options.columns)) {
                             options.columns.forEach(function (column) {
                                 var value;
-                                // 兼容新老版本的name和key
-                                var key = column.name || column.key;
+                                var key = column.name;
                                 if (column.searchable &&
                                     key &&
                                     (value = getVariable(self.query, key))) {
@@ -142,7 +141,7 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                     }
                     return [4 /*yield*/, getEnv(self).fetcher(api, ctx, __assign(__assign({}, options), { cancelExecutor: function (executor) { return (fetchCancel = executor); } }))];
                 case 1:
-                    json = _h.sent();
+                    json = _j.sent();
                     fetchCancel = null;
                     if (!json.ok) {
                         self.updateMessage((_e = (_d = json.msg) !== null && _d !== void 0 ? _d : options.errorMessage) !== null && _e !== void 0 ? _e : self.__('CRUD.fetchFailed'), true);
@@ -202,7 +201,7 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                             if (Array.isArray(options.columns)) {
                                 options.columns.forEach(function (column) {
                                     var value;
-                                    var key = column.name || column.key;
+                                    var key = column.name;
                                     if (column.searchable &&
                                         key &&
                                         (value = getVariable(self.query, key))) {
@@ -222,7 +221,7 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                         if (Array.isArray(columns)) {
                             self.columns = columns.concat();
                         }
-                        else if (rest.isTableV2) {
+                        else if (rest.isTable2) {
                             self.columns = options.columns;
                         }
                         self.items.replace(rowsData);
@@ -237,7 +236,7 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                             self.total = 0;
                             self.hasNext = !!hasNext;
                         }
-                        self.updateMessage((_g = json.msg) !== null && _g !== void 0 ? _g : options.successMessage);
+                        self.updateMessage((_h = (_g = json.msg) !== null && _g !== void 0 ? _g : options.successMessage) !== null && _h !== void 0 ? _h : json.defaultMsg);
                         // 配置了获取成功提示后提示，默认是空不会提示。
                         options &&
                             options.successMessage &&
@@ -246,7 +245,7 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                     self.markFetching(false);
                     return [2 /*return*/, json];
                 case 2:
-                    e_1 = _h.sent();
+                    e_1 = _j.sent();
                     env = getEnv(self);
                     if (!isAlive(self) || self.disposed) {
                         return [2 /*return*/];
@@ -271,17 +270,17 @@ var CRUDStore = ServiceStore.named('CRUDStore')
     }
     var saveRemote = flow(function saveRemote(api, data, options) {
         var json, e_2;
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         if (options === void 0) { options = {}; }
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        return __generator(this, function (_e) {
+            switch (_e.label) {
                 case 0:
-                    _d.trys.push([0, 2, , 3]);
+                    _e.trys.push([0, 2, , 3]);
                     options = __assign({ method: 'post' }, options);
                     self.markSaving(true);
                     return [4 /*yield*/, getEnv(self).fetcher(api, data, options)];
                 case 1:
-                    json = _d.sent();
+                    json = _e.sent();
                     self.markSaving(false);
                     if (!isEmpty(json.data) || json.ok) {
                         self.updateData(normalizeApiResponseData(json.data), {
@@ -300,7 +299,7 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                         throw new ServerError(self.msg);
                     }
                     else {
-                        self.updateMessage((_c = json.msg) !== null && _c !== void 0 ? _c : options.successMessage);
+                        self.updateMessage((_d = (_c = json.msg) !== null && _c !== void 0 ? _c : options.successMessage) !== null && _d !== void 0 ? _d : json.defaultMsg);
                         self.msg &&
                             getEnv(self).notify('success', self.msg, json.msgTimeout !== undefined
                                 ? {
@@ -311,7 +310,7 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                     }
                     return [2 /*return*/, json.data];
                 case 2:
-                    e_2 = _d.sent();
+                    e_2 = _e.sent();
                     self.markSaving(false);
                     if (!isAlive(self) || self.disposed) {
                         return [2 /*return*/];
@@ -382,7 +381,23 @@ var CRUDStore = ServiceStore.named('CRUDStore')
                         _a.label = 2;
                     case 2:
                         import('papaparse').then(function (papaparse) {
-                            var csvText = papaparse.unparse(items);
+                            // 将数据里的对象转成 json 字符串，不然输出的 csv 没法显示
+                            var csvData = [];
+                            for (var _i = 0, items_2 = items; _i < items_2.length; _i++) {
+                                var row = items_2[_i];
+                                var rowData = {};
+                                for (var key in row) {
+                                    var value = row[key];
+                                    if (typeof value === 'object') {
+                                        rowData[key] = JSON.stringify(value);
+                                    }
+                                    else {
+                                        rowData[key] = value;
+                                    }
+                                }
+                                csvData.push(rowData);
+                            }
+                            var csvText = papaparse.unparse(csvData);
                             if (csvText) {
                                 var blob = new Blob(
                                 // 加上 BOM 这样 Excel 打开的时候就不会乱码

package/esm/store/form.d.ts

@@ -203,6 +203,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         setSubStore: (store: any) => void;
         getSubStore: () => any;
         reset: (keepErrors?: boolean) => void;
+        resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
         changeTmpValue: (value: any) => void;
@@ -612,6 +613,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         setSubStore: (store: any) => void;
         getSubStore: () => any;
         reset: (keepErrors?: boolean) => void;
+        resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
         changeTmpValue: (value: any) => void;
@@ -1029,6 +1031,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         setSubStore: (store: any) => void;
         getSubStore: () => any;
         reset: (keepErrors?: boolean) => void;
+        resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
         changeTmpValue: (value: any) => void;
@@ -1438,6 +1441,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         setSubStore: (store: any) => void;
         getSubStore: () => any;
         reset: (keepErrors?: boolean) => void;
+        resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
         changeTmpValue: (value: any) => void;
@@ -1856,6 +1860,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         setSubStore: (store: any) => void;
         getSubStore: () => any;
         reset: (keepErrors?: boolean) => void;
+        resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
         changeTmpValue: (value: any) => void;
@@ -2265,6 +2270,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         setSubStore: (store: any) => void;
         getSubStore: () => any;
         reset: (keepErrors?: boolean) => void;
+        resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
         changeTmpValue: (value: any) => void;
@@ -2678,6 +2684,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         setSubStore: (store: any) => void;
         getSubStore: () => any;
         reset: (keepErrors?: boolean) => void;
+        resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
         changeTmpValue: (value: any) => void;
@@ -3087,6 +3094,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         setSubStore: (store: any) => void;
         getSubStore: () => any;
         reset: (keepErrors?: boolean) => void;
+        resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
         changeTmpValue: (value: any) => void;
@@ -3500,6 +3508,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         setSubStore: (store: any) => void;
         getSubStore: () => any;
         reset: (keepErrors?: boolean) => void;
+        resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
         changeTmpValue: (value: any) => void;
@@ -3909,6 +3918,7 @@ export declare const FormStore: import("mobx-state-tree").IModelType<{
         setSubStore: (store: any) => void;
         getSubStore: () => any;
         reset: (keepErrors?: boolean) => void;
+        resetValidationStatus: (tag?: string | undefined) => void;
         openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
         closeDialog: (result?: any) => void;
         changeTmpValue: (value: any) => void;

package/esm/store/form.js

@@ -1,11 +1,12 @@
 /**
- * amis-core v2.1.1-beta.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 
 import { __generator, __assign } from 'tslib';
 import { types, flow, isAlive, getEnv } from 'mobx-state-tree';
 import debouce from 'lodash/debounce';
+import toPairs from 'lodash/toPairs';
 import { ServiceStore } from './service.js';
 import { ServerError } from '../utils/errors.js';
 import { isEmpty, difference, mapObject } from '../utils/helper.js';
@@ -13,10 +14,15 @@ import isEqual from 'lodash/isEqual';
 import flatten from 'lodash/flatten';
 import find from 'lodash/find';
 import { filter } from '../utils/tpl.js';
-import { normalizeApiResponseData } from '../utils/api.js';
+import 'amis-formula';
+import 'moment';
+import { createObject, isObject, cloneObject, setVariable, deleteVariable } from '../utils/object.js';
+import { isPureVariable } from '../utils/isPureVariable.js';
 import { getVariable } from '../utils/getVariable.js';
+import 'lodash/isPlainObject';
+import '../utils/filter.js';
+import { normalizeApiResponseData } from '../utils/api.js';
 import { keyToPath } from '../utils/keyToPath.js';
-import { createObject, cloneObject, setVariable, deleteVariable } from '../utils/object.js';
 
 var FormStore = ServiceStore.named('FormStore')
     .props({
@@ -237,33 +243,33 @@ var FormStore = ServiceStore.named('FormStore')
     }
     var saveRemote = flow(function saveRemote(api, data, options) {
         var ret, json, ret, e_1, ret, result;
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         if (options === void 0) { options = {}; }
-        return __generator(this, function (_h) {
-            switch (_h.label) {
+        return __generator(this, function (_j) {
+            switch (_j.label) {
                 case 0:
                     clearRestError();
-                    _h.label = 1;
+                    _j.label = 1;
                 case 1:
-                    _h.trys.push([1, 12, , 15]);
+                    _j.trys.push([1, 12, , 15]);
                     options = __assign({ method: 'post' }, options);
                     if (!(options && options.beforeSend)) return [3 /*break*/, 4];
                     ret = options.beforeSend(data);
                     if (!(ret && ret.then)) return [3 /*break*/, 3];
                     return [4 /*yield*/, ret];
                 case 2:
-                    ret = _h.sent();
-                    _h.label = 3;
+                    ret = _j.sent();
+                    _j.label = 3;
                 case 3:
                     if (ret === false) {
                         return [2 /*return*/];
                     }
-                    _h.label = 4;
+                    _j.label = 4;
                 case 4:
                     self.markSaving(true);
                     return [4 /*yield*/, getEnv(self).fetcher(api, data, options)];
                 case 5:
-                    json = _h.sent();
+                    json = _j.sent();
                     // 失败也同样修改数据，如果有数据的话。
                     if (!isEmpty(json.data) || json.ok) {
                         self.updatedAt = Date.now();
@@ -288,18 +294,20 @@ var FormStore = ServiceStore.named('FormStore')
                     if (!(ret === null || ret === void 0 ? void 0 : ret.then)) return [3 /*break*/, 8];
                     return [4 /*yield*/, ret];
                 case 7:
-                    ret = _h.sent();
-                    _h.label = 8;
+                    ret = _j.sent();
+                    _j.label = 8;
                 case 8:
                     if (!((_d = ret === null || ret === void 0 ? void 0 : ret.cbResult) === null || _d === void 0 ? void 0 : _d.then)) return [3 /*break*/, 10];
                     return [4 /*yield*/, ret.cbResult];
                 case 9:
-                    _h.sent();
-                    _h.label = 10;
+                    _j.sent();
+                    _j.label = 10;
                 case 10:
                     self.markSaving(false);
-                    self.updateMessage((_e = json.msg) !== null && _e !== void 0 ? _e : self.__(options && options.successMessage));
-                    if (!((_f = ret === null || ret === void 0 ? void 0 : ret.dispatcher) === null || _f === void 0 ? void 0 : _f.prevented)) {
+                    self.updateMessage((_f = (_e = json.msg) !== null && _e !== void 0 ? _e : (options.successMessage === 'saveSuccess'
+                        ? json.defaultMsg
+                        : self.__(options && options.successMessage))) !== null && _f !== void 0 ? _f : json.defaultMsg);
+                    if (!((_g = ret === null || ret === void 0 ? void 0 : ret.dispatcher) === null || _g === void 0 ? void 0 : _g.prevented)) {
                         self.msg &&
                             getEnv(self).notify('success', self.msg, json.msgTimeout !== undefined
                                 ? {
@@ -311,19 +319,19 @@ var FormStore = ServiceStore.named('FormStore')
                     return [2 /*return*/, json.data];
                 case 11: return [3 /*break*/, 15];
                 case 12:
-                    e_1 = _h.sent();
+                    e_1 = _j.sent();
                     self.markSaving(false);
                     ret = options && options.onFailed && options.onFailed(e_1.response || {});
                     if (!(ret === null || ret === void 0 ? void 0 : ret.then)) return [3 /*break*/, 14];
                     return [4 /*yield*/, ret];
                 case 13:
-                    ret = _h.sent();
-                    _h.label = 14;
+                    ret = _j.sent();
+                    _j.label = 14;
                 case 14:
                     if (!isAlive(self) || self.disposed) {
                         return [2 /*return*/];
                     }
-                    if ((_g = ret === null || ret === void 0 ? void 0 : ret.dispatcher) === null || _g === void 0 ? void 0 : _g.prevented) {
+                    if ((_h = ret === null || ret === void 0 ? void 0 : ret.dispatcher) === null || _h === void 0 ? void 0 : _h.prevented) {
                         return [2 /*return*/];
                     }
                     if (e_1.type === 'ServerError') {
@@ -448,7 +456,25 @@ var FormStore = ServiceStore.named('FormStore')
                     item = items[i];
                     // 先清除组合校验的错误
                     item.clearError('rules');
+                    /* 日期类校验存在表单项联动的情况，需要在提交前重置校验状态，避免变量更新后联动校验结果未更新 */
+                    if (item.validated &&
+                        isObject(item.rules) &&
+                        toPairs(item.rules)
+                            .filter(function (_a) {
+                            var key = _a[0]; _a[1];
+                            return /^is(Date)?Time/.test(key);
+                        })
+                            .some(function (_a) {
+                            _a[0]; var value = _a[1];
+                            return Array.isArray(value)
+                                ? value.some(function (item) { return isPureVariable(item); })
+                                : isPureVariable(value);
+                        })) {
+                        item.resetValidationStatus();
+                    }
                     if (!(!item.validated ||
+                        item.rules.equals ||
+                        item.rules.equalsField ||
                         item.unique ||
                         forceValidate ||
                         !!item.validateApi)) return [3 /*break*/, 3];

package/esm/store/formItem.d.ts

@@ -120,6 +120,7 @@ export declare const FormItemStore: import("mobx-state-tree").IModelType<{
     setSubStore: (store: any) => void;
     getSubStore: () => any;
     reset: (keepErrors?: boolean) => void;
+    resetValidationStatus: (tag?: string) => void;
     openDialog: (schema: any, data: any, callback?: ((ret?: any) => void) | undefined) => void;
     closeDialog: (result?: any) => void;
     changeTmpValue: (value: any) => void;

package/esm/store/formItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.1.1-beta.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 
@@ -195,7 +195,7 @@ var FormItemStore = StoreNode.named('FormItemStore')
         typeof validateOnChange !== 'undefined' &&
             (self.validateOnChange = !!validateOnChange);
         typeof label === 'string' && (self.label = label);
-        rules = __assign(__assign({}, rules), { isRequired: self.required });
+        rules = __assign(__assign({}, rules), { isRequired: self.required || (rules === null || rules === void 0 ? void 0 : rules.isRequired) });
         // todo 这个弄个配置由渲染器自己来决定
         // 暂时先这样
         if (~['input-text', 'textarea'].indexOf(self.type)) {
@@ -776,6 +776,10 @@ var FormItemStore = StoreNode.named('FormItemStore')
         }
         !keepErrors && clearError();
     }
+    function resetValidationStatus(tag) {
+        self.validated = false;
+        clearError();
+    }
     function openDialog(schema, data, callback) {
         self.dialogSchema = schema;
         self.dialogData = data;
@@ -823,6 +827,7 @@ var FormItemStore = StoreNode.named('FormItemStore')
         setSubStore: setSubStore,
         getSubStore: getSubStore,
         reset: reset,
+        resetValidationStatus: resetValidationStatus,
         openDialog: openDialog,
         closeDialog: closeDialog,
         changeTmpValue: changeTmpValue,

package/esm/store/iRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.1.1-beta.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 

package/esm/store/index.d.ts

@@ -5,7 +5,7 @@ import { ComboStore, IComboStore } from './combo';
 import { FormStore, IFormStore } from './form';
 import { CRUDStore, ICRUDStore } from './crud';
 import { IColumn, IRow, ITableStore, TableStore } from './table';
-import { IColumnV2, IRowV2, ITableStoreV2, TableStoreV2 } from './table-v2';
+import { IColumn2, IRow2, ITableStore2, TableStore2 } from './table2';
 import { IListStore, ListStore } from './list';
 import { IModalStore, ModalStore } from './modal';
 import { TranslateFn } from '../locale';
@@ -109,4 +109,4 @@ export declare const RendererStore: import("mobx-state-tree").IModelType<{
 export declare type IRendererStore = Instance<typeof RendererStore>;
 export { iRendererStore, IIRendererStore };
 export declare const RegisterStore: (store: any) => void;
-export { ServiceStore, IServiceStore, FormStore, IFormStore, ComboStore, IComboStore, CRUDStore, ICRUDStore, TableStore, IColumn, IRow, ITableStore, TableStoreV2, ITableStoreV2, IColumnV2, IRowV2, ListStore, IListStore, ModalStore, IModalStore, FormItemStore, IFormItemStore, PaginationStore, IPaginationStore, AppStore, IAppStore, StoreNode, IStoreNode };
+export { ServiceStore, IServiceStore, FormStore, IFormStore, ComboStore, IComboStore, CRUDStore, ICRUDStore, TableStore, IColumn, IRow, ITableStore, TableStore2, ITableStore2, IColumn2, IRow2, ListStore, IListStore, ModalStore, IModalStore, FormItemStore, IFormItemStore, PaginationStore, IPaginationStore, AppStore, IAppStore, StoreNode, IStoreNode };