amis-core 6.4.0 → 6.5.0

package/lib/store/table.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="lodash" />
 import { SnapshotIn, IAnyModelType, Instance } from 'mobx-state-tree';
 import { IFormStore } from './form';
 export declare enum SELECTED_STATUS {
@@ -649,7 +650,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closeDialog: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -1167,7 +1168,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closeDialog: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -1689,7 +1690,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closeDialog: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -2207,7 +2208,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closeDialog: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -2734,7 +2735,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closeDialog: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -3252,7 +3253,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closeDialog: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -3774,7 +3775,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closeDialog: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -4292,7 +4293,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closeDialog: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -4814,7 +4815,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closeDialog: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -5332,7 +5333,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closeDialog: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -5973,7 +5974,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closeDialog: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -6491,7 +6492,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closeDialog: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -7013,7 +7014,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closeDialog: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -7531,7 +7532,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closeDialog: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -8058,7 +8059,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closeDialog: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -8576,7 +8577,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closeDialog: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -9098,7 +9099,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closeDialog: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -9616,7 +9617,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closeDialog: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -10138,7 +10139,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closeDialog: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;
@@ -10656,7 +10657,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
                 resetValidationStatus: (tag?: string | undefined) => void;
                 openDialog: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
                 closeDialog: (confirmed?: any, result?: any) => void;
-                changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+                changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
                 changeEmitedValue: (value: any) => void;
                 addSubFormItem: (item: {
                     id: string;

package/lib/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 
@@ -13,6 +13,7 @@ var iRenderer = require('./iRenderer.js');
 require('amis-formula');
 require('moment');
 var object = require('../utils/object.js');
+require('@rc-component/mini-decimal');
 var resolveVariable = require('../utils/resolveVariable.js');
 var resolveVariableAndFilter = require('../utils/resolveVariableAndFilter.js');
 require('lodash/isPlainObject');

package/lib/store/table2.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/theme.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/types.d.ts

@@ -186,6 +186,7 @@ export interface ApiObject extends BaseApiObject {
         withCredentials?: boolean;
         cancelExecutor?: (cancel: Function) => void;
     };
+    originUrl?: string;
     jsonql?: any;
     graphql?: string;
     operationName?: string;

package/lib/utils/Animation.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/ColorScale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/DataSchema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/DataScope.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/RootClose.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/SimpleMap.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 
@@ -15,17 +15,22 @@ require('moment');
 var object = require('./object.js');
 var tokenize = require('./tokenize.js');
 var memoryParse = require('./memoryParse.js');
+require('@rc-component/mini-decimal');
 var dataMapping = require('./dataMapping.js');
 require('./filter.js');
 var tpl = require('./tpl.js');
 var helper = require('./helper.js');
 var isPlainObject = require('lodash/isPlainObject');
 var debug = require('./debug.js');
+var cloneDeep = require('lodash/cloneDeep');
+var isEqual = require('lodash/isEqual');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
 var isPlainObject__default = /*#__PURE__*/_interopDefaultLegacy(isPlainObject);
+var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
+var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
 
 var rSchema = /(?:^|raw\:)(get|post|put|delete|patch|options|head|jsonp|js):/i;
 var apiCaches = [];
@@ -100,13 +105,19 @@ function buildApi(api, data, options) {
         return helper.qsstringify(query, (api === null || api === void 0 ? void 0 : api.filterEmptyQuery)
             ? {
                 filter: function (key, value) {
-                    return value === '' ? undefined : value;
+                    return value === ''
+                        ? undefined
+                        : // qs源码中有filter后，不会默认使用serializeDate处理date类型
+                            value instanceof Date
+                                ? Date.prototype.toISOString.call(value)
+                                : value;
                 }
             }
             : undefined);
     };
     /** 追加data到请求的Query中 */
     var attachDataToQuery = function (apiObject, ctx, merge) {
+        apiObject.originUrl = apiObject.originUrl || apiObject.url;
         var idx = apiObject.url.indexOf('?');
         if (~idx) {
             var params = (apiObject.query = tslib.__assign(tslib.__assign(tslib.__assign({}, helper.qsparse(apiObject.url.substring(idx + 1))), apiObject.query), ctx));
@@ -375,7 +386,7 @@ function wrapFetcher(fn, tracker) {
     var wrappedFetcher = function (api, data, options) {
         var _a, _b, _c;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var apiCache, timeStamp;
+            var originQuery, originQueryCopy, idx, apiCache, timeStamp;
             return tslib.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -383,9 +394,18 @@ function wrapFetcher(fn, tracker) {
                         api.context = data;
                         if (!api.requestAdaptor) return [3 /*break*/, 2];
                         debug.debug('api', 'before requestAdaptor', api);
+                        originQuery = api.query;
+                        originQueryCopy = isPlainObject__default["default"](api.query)
+                            ? cloneDeep__default["default"](api.query)
+                            : api.query;
                         return [4 /*yield*/, api.requestAdaptor(api, data)];
                     case 1:
                         api = (_d.sent()) || api;
+                        if (api.query !== originQuery ||
+                            (isPlainObject__default["default"](api.query) && !isEqual__default["default"](api.query, originQueryCopy))) {
+                            idx = api.url.indexOf('?');
+                            api.url = "".concat(~idx ? api.url.substring(0, idx) : api.url, "?").concat(helper.qsstringify(api.query));
+                        }
                         debug.debug('api', 'after requestAdaptor', api);
                         _d.label = 2;
                     case 2:

package/lib/utils/arraySlice.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/attachmentAdpator.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/autobind.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/browser.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/columnsSplit.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/concatData.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/dataMapping.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/date.d.ts

@@ -8,4 +8,6 @@ export declare function parseDuration(str: string): moment.Duration | undefined;
  * @param format
  * @returns
  */
-export declare function normalizeDate(value: any, format?: string): moment.Moment | undefined;
+export declare function normalizeDate(value: any, format?: string, options?: {
+    utc?: boolean;
+}): moment.Moment | undefined;

package/lib/utils/date.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 
@@ -70,8 +70,12 @@ var filterDate = function (value, data, format, utc) {
         return mm([date_2.getFullYear(), date_2.getMonth(), date_2.getDate()]);
     }
     else {
-        var result = mm(value);
-        return result.isValid() ? result : mm(value, format);
+        var result = utc ? mm(value).local() : mm(value);
+        return result.isValid()
+            ? result
+            : utc
+                ? mm(value, format).local()
+                : mm(value, format);
     }
 };
 function parseDuration(str) {
@@ -90,11 +94,13 @@ function parseDuration(str) {
  * @param format
  * @returns
  */
-function normalizeDate(value, format) {
+function normalizeDate(value, format, options) {
     if (!value || value === '0') {
         return undefined;
     }
-    var v = moment__default["default"](value, format, true);
+    var v = (options === null || options === void 0 ? void 0 : options.utc)
+        ? moment__default["default"].utc(value, format).local()
+        : moment__default["default"](value, format, true);
     if (v.isValid()) {
         return v;
     }

package/lib/utils/debug.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/decodeEntity.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/dom.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/errors.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/escapeHtml.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/filter-schema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 
@@ -58,7 +58,8 @@ function getExprProperties(schema, data, ignoreList, props) {
         var type = parts === null || parts === void 0 ? void 0 : parts[2];
         var value = schema[key];
         if (value &&
-            typeof value === 'string' &&
+            (typeof value === 'string' ||
+                Object.prototype.toString.call(value) === '[object Object]') &&
             (parts === null || parts === void 0 ? void 0 : parts[1]) &&
             (type === 'On' || type === 'Expr')) {
             key = parts[1];
@@ -72,7 +73,9 @@ function getExprProperties(schema, data, ignoreList, props) {
                     });
                 }
                 if (type === 'On') {
-                    value = (props === null || props === void 0 ? void 0 : props[key]) || tpl.evalExpression(value, ctx || data);
+                    value =
+                        (props === null || props === void 0 ? void 0 : props[key]) ||
+                            tpl.evalExpressionWithConditionBuilder(value, ctx || data);
                 }
                 else {
                     value = tpl.filter(value, ctx || data);

package/lib/utils/filter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/formatDuration.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/formula.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 
@@ -16,6 +16,7 @@ require('tslib');
 require('moment');
 require('lodash/isPlainObject');
 var getVariable = require('./getVariable.js');
+require('@rc-component/mini-decimal');
 var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
 require('./filter.js');
 var grammar = require('./grammar.js');

package/lib/utils/getVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/grammar.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/handleAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 
@@ -25,6 +25,7 @@ require('moment');
 var object = require('./object.js');
 var tokenize = require('./tokenize.js');
 var isPureVariable = require('./isPureVariable.js');
+require('@rc-component/mini-decimal');
 var resolveVariable = require('./resolveVariable.js');
 var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
 require('./filter.js');

package/lib/utils/highlight.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/icon.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/image.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/isPureVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.0
+ * amis-core v6.5.0
  * Copyright 2018-2024 fex
  */