amis-core 6.4.1 → 6.6.0

package/esm/utils/DataScope.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -187,6 +187,7 @@ var DataScope = /** @class */ (function () {
             value: schema.title === '成员' ? '' : path.value,
             path: schema.title === '成员' ? '' : path.label,
             type: schema.type,
+            schemaType: schema.schemaType,
             tag: (_b = (_a = schema.typeLabel) !== null && _a !== void 0 ? _a : DATASCHEMA_TYPE_MAP[schema.type]) !== null && _b !== void 0 ? _b : schema.type,
             description: schema.description,
             isMember: isMember,

package/esm/utils/RootClose.js

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

package/esm/utils/SimpleMap.js

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

package/esm/utils/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -11,12 +11,15 @@ import 'moment';
 import { cloneObject, extendObject, createObject, isObject } from './object.js';
 import { tokenize } from './tokenize.js';
 import { memoryParse } from './memoryParse.js';
+import '@rc-component/mini-decimal';
 import { dataMapping } from './dataMapping.js';
 import './filter.js';
 import { evalExpression } from './tpl.js';
 import { qsparse, JSONTraverse, isEmpty, uuid, qsstringify, isObjectShallowModified, hasFile, object2formData } from './helper.js';
 import isPlainObject from 'lodash/isPlainObject';
 import { debug } from './debug.js';
+import cloneDeep from 'lodash/cloneDeep';
+import isEqual from 'lodash/isEqual';
 
 var rSchema = /(?:^|raw\:)(get|post|put|delete|patch|options|head|jsonp|js):/i;
 var apiCaches = [];
@@ -91,13 +94,19 @@ function buildApi(api, data, options) {
         return 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 = __assign(__assign(__assign({}, qsparse(apiObject.url.substring(idx + 1))), apiObject.query), ctx));
@@ -366,7 +375,7 @@ function wrapFetcher(fn, tracker) {
     var wrappedFetcher = function (api, data, options) {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function () {
-            var apiCache, timeStamp;
+            var originQuery, originQueryCopy, idx, apiCache, timeStamp;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -374,9 +383,18 @@ function wrapFetcher(fn, tracker) {
                         api.context = data;
                         if (!api.requestAdaptor) return [3 /*break*/, 2];
                         debug('api', 'before requestAdaptor', api);
+                        originQuery = api.query;
+                        originQueryCopy = isPlainObject(api.query)
+                            ? cloneDeep(api.query)
+                            : api.query;
                         return [4 /*yield*/, api.requestAdaptor(api, data)];
                     case 1:
                         api = (_d.sent()) || api;
+                        if (api.query !== originQuery ||
+                            (isPlainObject(api.query) && !isEqual(api.query, originQueryCopy))) {
+                            idx = api.url.indexOf('?');
+                            api.url = "".concat(~idx ? api.url.substring(0, idx) : api.url, "?").concat(qsstringify(api.query));
+                        }
                         debug('api', 'after requestAdaptor', api);
                         _d.label = 2;
                     case 2:

package/esm/utils/arraySlice.js

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

package/esm/utils/attachmentAdpator.js

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

package/esm/utils/autobind.js

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

package/esm/utils/browser.js

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

package/esm/utils/columnsSplit.js

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

package/esm/utils/concatData.js

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

package/esm/utils/dataMapping.js

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

package/esm/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/esm/utils/date.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -62,8 +62,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) {
@@ -82,11 +86,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(value, format, true);
+    var v = (options === null || options === void 0 ? void 0 : options.utc)
+        ? moment.utc(value, format).local()
+        : moment(value, format, true);
     if (v.isValid()) {
         return v;
     }

package/esm/utils/debug.js

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

package/esm/utils/decodeEntity.js

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

package/esm/utils/dom.js

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

package/esm/utils/errors.js

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

package/esm/utils/escapeHtml.js

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

package/esm/utils/filter-schema.js

@@ -1,9 +1,9 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
-import { evalExpression, filter } from './tpl.js';
+import { evalExpression, evalExpressionWithConditionBuilder, filter } from './tpl.js';
 import { mapObject, injectPropsToObject } from './helper.js';
 import isPlainObject from 'lodash/isPlainObject';
 import { tokenize } from './tokenize.js';
@@ -50,7 +50,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];
@@ -64,7 +65,9 @@ function getExprProperties(schema, data, ignoreList, props) {
                     });
                 }
                 if (type === 'On') {
-                    value = (props === null || props === void 0 ? void 0 : props[key]) || evalExpression(value, ctx || data);
+                    value =
+                        (props === null || props === void 0 ? void 0 : props[key]) ||
+                            evalExpressionWithConditionBuilder(value, ctx || data);
                 }
                 else {
                     value = filter(value, ctx || data);

package/esm/utils/filter.js

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

package/esm/utils/formatDuration.js

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

package/esm/utils/formula.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -12,6 +12,7 @@ import 'tslib';
 import 'moment';
 import 'lodash/isPlainObject';
 import { getVariable } from './getVariable.js';
+import '@rc-component/mini-decimal';
 import { resolveVariableAndFilter } from './resolveVariableAndFilter.js';
 import './filter.js';
 import { collectVariables } from './grammar.js';

package/esm/utils/getVariable.js

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

package/esm/utils/grammar.js

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

package/esm/utils/handleAction.js

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

package/esm/utils/helper.d.ts

@@ -68,7 +68,7 @@ export declare function visibilityFilter(items: any, data?: object): any;
 export declare function isDisabled(schema: {
     disabledOn?: string;
     disabled?: boolean;
-}, data?: object): boolean | "" | undefined;
+}, data?: object): boolean | "" | Promise<boolean> | undefined;
 export declare function hasAbility(schema: any, ability: string, data?: object, defaultValue?: boolean): boolean;
 export declare function makeHorizontalDeeper(horizontal: {
     left: string;

package/esm/utils/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -14,7 +14,7 @@ import isNumber from 'lodash/isNumber';
 import isString from 'lodash/isString';
 import qs from 'qs';
 import { compile } from 'path-to-regexp';
-import { evalExpression, filter } from './tpl.js';
+import { evalExpressionWithConditionBuilder, evalExpression, filter } from './tpl.js';
 import { autobindMethod } from './autobind.js';
 import 'amis-formula';
 import 'moment';
@@ -22,6 +22,7 @@ import { isObject } from './object.js';
 export { cloneObject, createObject, deleteVariable, extendObject, isObject, setVariable } from './object.js';
 import { tokenize } from './tokenize.js';
 import { isPureVariable } from './isPureVariable.js';
+import '@rc-component/mini-decimal';
 import { resolveVariable } from './resolveVariable.js';
 import { resolveVariableAndFilter } from './resolveVariableAndFilter.js';
 import './filter.js';
@@ -281,8 +282,10 @@ function hasVisibleExpression(schema) {
 function isVisible(schema, data) {
     return !(schema.hidden ||
         schema.visible === false ||
-        (schema.hiddenOn && evalExpression(schema.hiddenOn, data)) ||
-        (schema.visibleOn && !evalExpression(schema.visibleOn, data)));
+        (schema.hiddenOn &&
+            evalExpressionWithConditionBuilder(schema.hiddenOn, data)) ||
+        (schema.visibleOn &&
+            !evalExpressionWithConditionBuilder(schema.visibleOn, data)));
 }
 function isUnfolded(node, config) {
     var foldedField = config.foldedField, unfoldedField = config.unfoldedField;
@@ -306,14 +309,15 @@ function visibilityFilter(items, data) {
 }
 function isDisabled(schema, data) {
     return (schema.disabled ||
-        (schema.disabledOn && evalExpression(schema.disabledOn, data)));
+        (schema.disabledOn &&
+            evalExpressionWithConditionBuilder(schema.disabledOn, data)));
 }
 function hasAbility(schema, ability, data, defaultValue) {
     if (defaultValue === void 0) { defaultValue = true; }
     return schema.hasOwnProperty(ability)
         ? schema[ability]
         : schema.hasOwnProperty("".concat(ability, "On"))
-            ? evalExpression(schema["".concat(ability, "On")], data || schema)
+            ? evalExpressionWithConditionBuilder(schema["".concat(ability, "On")], data || schema)
             : defaultValue;
 }
 function makeHorizontalDeeper(horizontal, count) {

package/esm/utils/highlight.js

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

package/esm/utils/icon.js

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

package/esm/utils/image.js

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

package/esm/utils/isPureVariable.js

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

package/esm/utils/json-schema-2-amis-schema.js

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

package/esm/utils/keyToPath.js

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

package/esm/utils/labelToString.js

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

package/esm/utils/makeSorter.js

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

package/esm/utils/math.js

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

package/esm/utils/memoryParse.js

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

package/esm/utils/normalizeLink.js

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

package/esm/utils/normalizeOptions.d.ts

@@ -1,7 +1,7 @@
 import { Options } from '../types';
 export declare function normalizeOptions(options: string | {
     [propName: string]: string;
-} | Array<string> | Options, share?: {
+} | Array<string | number> | Options, share?: {
     values: Array<any>;
     options: Array<any>;
 }, valueField?: string): Options;

package/esm/utils/normalizeOptions.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -32,7 +32,8 @@ function normalizeOptions(options, share, valueField) {
         });
     }
     else if (Array.isArray(options) &&
-        typeof options[0] === 'string') {
+        (typeof options[0] === 'string' ||
+            typeof options[0] === 'number')) {
         return options.map(function (item) {
             var _a;
             var idx = share.values.indexOf(item);

package/esm/utils/object.js

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

package/esm/utils/offset.js

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

package/esm/utils/offsetParent.js

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

package/esm/utils/optionValueCompare.js

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

package/esm/utils/position.js

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

package/esm/utils/prettyBytes.js

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

package/esm/utils/printElement.js

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

package/esm/utils/renderer-event.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -10,7 +10,7 @@ import { eachTree, getTree } from './helper.js';
 import { extendObject, createObject } from './object.js';
 import debounce from 'lodash/debounce';
 import { resolveVariableAndFilterForAsync } from './resolveVariableAndFilterForAsync.js';
-import { evalExpression, evalExpressionWithConditionBuilder } from './tpl.js';
+import { evalExpression, evalExpressionWithConditionBuilderAsync } from './tpl.js';
 
 var rendererEventListeners = [];
 // 创建渲染器事件对象
@@ -122,9 +122,10 @@ var bindEvent = function (renderer) {
         return function (eventName) {
             // eventName用来避免过滤广播事件
             rendererEventListeners = rendererEventListeners.filter(function (item) {
-                return item.renderer === renderer && eventName !== undefined
-                    ? item.type !== eventName
-                    : true;
+                // 如果 eventName 为 undefined，表示全部解绑，否则解绑指定事件
+                return eventName === undefined
+                    ? item.renderer !== renderer
+                    : item.renderer !== renderer || item.type !== eventName;
             });
         };
     }
@@ -333,7 +334,7 @@ function getMatchedEventTargets(tree, ctx, index, condition, oldCondition) {
                             var result;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
-                                    case 0: return [4 /*yield*/, evalExpressionWithConditionBuilder(condition, createObject(ctx, data))];
+                                    case 0: return [4 /*yield*/, evalExpressionWithConditionBuilderAsync(condition, createObject(ctx, data))];
                                     case 1:
                                         result = _a.sent();
                                         result && targets.push(item);

package/esm/utils/replaceText.js

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

package/esm/utils/resize-sensor.js

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

package/esm/utils/resolveCondition.d.ts

@@ -1,4 +1,5 @@
-export declare function resolveCondition(conditions: any, data: any, defaultResult?: boolean): Promise<boolean>;
+export declare function resolveConditionAsync(conditions: any, data: any, defaultResult?: boolean): Promise<boolean>;
+export declare function resolveCondition(conditions: any, data: any, defaultResult?: boolean): boolean | Promise<boolean>;
 export declare function registerConditionComputer(op: string, func: (left: any, right: any, fieldType?: string) => boolean, fieldType?: string): void;
 export declare function getConditionComputers(): {
     [op: string]: (left: any, right: any, fieldType?: string | undefined) => boolean;