amis-core 6.14.0-beta.1 → 6.14.0-beta.11

package/lib/utils/RootClose.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 
@@ -14,6 +14,7 @@ var ReactDOM = require('react-dom');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var useRootClose__default = /*#__PURE__*/_interopDefaultLegacy(useRootClose);
 
 /**
@@ -23,7 +24,17 @@ var RootClose = function (_a) {
     var children = _a.children, onRootClose = _a.onRootClose, props = tslib.__rest(_a, ["children", "onRootClose"]);
     var _b = tslib.__read(React.useState(null), 2), rootComponent = _b[0], attachRef = _b[1];
     var rootElement = ReactDOM.findDOMNode(rootComponent);
-    useRootClose__default["default"](rootElement, onRootClose, props);
+    var onClose = React__default["default"].useCallback(function (e) {
+        var target = e.target;
+        var belongedModal = target.closest('[role=dialog]');
+        if (!target.isConnected || // 如果不在文档树中，忽略
+            (rootElement && belongedModal && !belongedModal.contains(rootElement)) // 如果点击的是 modal 里面的，但是 rootElement 不在 modal 里面，忽略
+        ) {
+            return;
+        }
+        onRootClose && onRootClose(e);
+    }, [rootComponent, onRootClose]);
+    useRootClose__default["default"](rootElement, onClose, props);
     return typeof children === 'function' ? children(attachRef) : children;
 };
 

package/lib/utils/SimpleMap.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/animations.d.ts

@@ -1,29 +1,4 @@
-export interface AnimationsProps {
-    enter?: {
-        type: string;
-        duration?: number;
-        delay?: number;
-        repeat?: boolean;
-        inView?: boolean;
-    };
-    attention?: {
-        type: string;
-        duration?: number;
-        repeat?: string;
-        delay?: number;
-    };
-    hover?: {
-        type: string;
-        duration?: number;
-        delay?: number;
-        repeat?: string;
-    };
-    exit?: {
-        type: string;
-        duration?: number;
-        delay?: number;
-        repeat?: boolean;
-        outView?: boolean;
-    };
+import { AMISAnimations } from '../schema';
+export interface AnimationsProps extends AMISAnimations {
 }
 export declare function createAnimationStyle(id: string, animationsConfig: AnimationsProps): void;

package/lib/utils/animations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/api.d.ts

@@ -47,7 +47,7 @@ export declare function jsonpFetcher(api: ApiObject): Promise<fetcherResult>;
 export declare function isApiOutdatedWithData(prevApi: Api | undefined, nextApi: Api | undefined, prevData: any, nextData: any): nextApi is Api;
 export declare function isApiOutdated(prevApi: Api | undefined, nextApi: Api | undefined, prevData: any, nextData: any): nextApi is Api;
 export declare function isValidApi(api: string): boolean;
-export declare function isEffectiveApi(api?: Api, data?: any, initFetch?: boolean, initFetchOn?: string): api is Api;
+export declare function isEffectiveApi(api?: Api | false, data?: any, initFetch?: boolean, initFetchOn?: string): api is Api;
 export declare function shouldBlockedBySendOnApi(api?: Api, data?: any): boolean;
 export declare function isSameApi(apiA: ApiObject | ApiCacheConfig, apiB: ApiObject | ApiCacheConfig): boolean;
 export declare function getApiCache(api: ApiObject): ApiCacheConfig | undefined;

package/lib/utils/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 
@@ -431,10 +431,10 @@ function wrapFetcher(fn, tracker) {
         return fn;
     }
     var wrappedFetcher = function (api, data, options) {
-        var _a, _b, _c, _d, _e;
         return tslib.__awaiter(this, void 0, void 0, function () {
             var adaptors, adaptor_1, apiCache, timeStamp;
             var _this = this;
+            var _a, _b, _c, _d, _e;
             return tslib.__generator(this, function (_f) {
                 switch (_f.label) {
                     case 0:

package/lib/utils/arraySlice.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/attachmentAdpator.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/autobind.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/browser.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/columnsSplit.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/concatData.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/dataMapping.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/date.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/debug.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 
@@ -436,7 +436,7 @@ function disableDebug() {
 var DebugWrapper = /** @class */ (function (_super) {
     tslib.__extends(DebugWrapper, _super);
     function DebugWrapper() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super.apply(this, tslib.__spreadArray([], tslib.__read(arguments), false)) || this;
         _this.debugId = helper.uuidv4();
         return _this;
     }

package/lib/utils/decodeEntity.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/dom.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 
@@ -88,7 +88,7 @@ function calculatePosition(placement, overlayNode, target, container, padding, c
     var clip2 = overlayNode.getBoundingClientRect();
     var clip3 = scrollParent.getBoundingClientRect();
     var scaleX = overlayNode.offsetWidth
-        ? clip2.width / overlayNode.offsetWidth
+        ? Math.ceil(clip2.width) / overlayNode.offsetWidth
         : 1;
     var scaleY = overlayNode.offsetHeight
         ? clip2.height / overlayNode.offsetHeight

package/lib/utils/errors.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/escapeHtml.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 
@@ -12,11 +12,10 @@ var entityMap = {
     '<': '&lt;',
     '>': '&gt;',
     '"': '&quot;',
-    "'": '&#39;',
-    '/': '&#x2F;'
+    "'": '&#39;'
 };
 var escapeHtml = function (str) {
-    return String(str).replace(/[&<>"'\/]/g, function (s) {
+    return String(str).replace(/[&<>"']/g, function (s) {
         return entityMap[s];
     });
 };

package/lib/utils/filter-schema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/filter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/formatDuration.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/formula.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 
@@ -83,7 +83,7 @@ var FormulaExec = {
         var result = undefined;
         try {
             result = amisFormula.evaluate(expression, curData, {
-                evalMode: true,
+                evalMode: true, // evalMode 为 true 时，不用 ${} 包裹也可以执行，
                 allowFilter: false
             });
         }

package/lib/utils/getPageId.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/getVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/grammar.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/handleAction.d.ts

@@ -1,7 +1,6 @@
 /**
  * 后续好多地方可能都要支持 action，所以提取公共功能
  */
-/// <reference types="react" />
 import { RendererProps } from '../factory';
 export declare function handleAction(e: React.MouseEvent<any>, action: any, props: RendererProps, data?: any): void;
 export default handleAction;

package/lib/utils/handleAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/helper.d.ts

@@ -9,6 +9,7 @@ import { string2regExp } from './string2regExp';
 import { getVariable } from './getVariable';
 import { keyToPath } from './keyToPath';
 import type { IStatusStore } from '../store/status';
+import { AMISExpression } from '../schema';
 export { createObject, cloneObject, isObject, string2regExp, getVariable, setVariable, deleteVariable, keyToPath, extendObject };
 export declare function preventDefault(event: TouchEvent | Event): void;
 export declare function isMobile(): any;
@@ -23,9 +24,9 @@ export declare function injectPropsToObject(target: any, props: any): any;
 export declare function isSuperDataModified(data: any, prevData: any, store: IIRendererStore): boolean;
 export declare function syncDataFromSuper(data: any, superObject: any, prevSuperObject: any, store: IIRendererStore, force: boolean): any;
 /**
- * 生成 8 位随机数字。
+ * 生成 12 位随机数字。
  *
- * @return {string} 8位随机数字
+ * @return {string} 12位随机数字
  */
 export declare function guid(): string;
 export declare function findIndex(arr: Array<any>, detect: (item?: any, index?: number) => boolean): number;
@@ -56,8 +57,8 @@ export declare function hasVisibleExpression(schema: {
 export declare function isVisible(schema: {
     id?: string;
     name?: string;
-    visibleOn?: string;
-    hiddenOn?: string;
+    visibleOn?: AMISExpression;
+    hiddenOn?: AMISExpression;
     visible?: boolean;
     hidden?: boolean;
 }, data?: object, statusStore?: IStatusStore): any;
@@ -72,7 +73,7 @@ export declare function visibilityFilter(items: any, data?: object): any;
 export declare function isDisabled(schema: {
     disabledOn?: string;
     disabled?: boolean;
-}, data?: object): boolean | "" | Promise<boolean> | undefined;
+}, data?: object): boolean | "" | undefined;
 export declare function hasAbility(schema: any, ability: string, data?: object, defaultValue?: boolean): boolean;
 export declare function makeHorizontalDeeper(horizontal: {
     left: string;
@@ -146,7 +147,7 @@ export declare function mapTree<T extends TreeItem>(tree: Array<T>, iterator: (i
  * @param tree
  * @param iterator
  */
-export declare function eachTree<T extends TreeItem>(tree: Array<T>, iterator: (item: T, key: number, level: number, paths?: Array<T>) => any, level?: number, paths?: Array<T>): void;
+export declare function eachTree<T extends TreeItem>(tree: Array<T>, iterator: (item: T, key: number, level: number, paths: Array<T>, indexes: Array<number>) => any, level?: number, paths?: Array<T>, indexes?: Array<number>): void;
 export declare function findTree<T extends TreeItem>(tree: Array<T>, iterator: (item: T, key: number, level: number, paths: Array<T>) => any, withCache?: {
     value: string | number;
     resolve?: (treeItem: T) => any;
@@ -270,7 +271,7 @@ export declare function pickEventsProps(props: any): any;
 export declare const autobind: typeof autobindMethod;
 export declare const bulkBindFunctions: <T extends {
     [propName: string]: any;
-}>(context: T, funNames: FunctionPropertyNames<T>[]) => void;
+}>(context: T, funNames: Array<FunctionPropertyNames<T>>) => void;
 export declare function sortArray<T extends any>(items: Array<T>, field: string, dir: -1 | 1, fieldGetter?: (item: T, field: string) => any): Array<T>;
 export declare function applyFilters<T extends any>(items: Array<T>, options: {
     query: any;

package/lib/utils/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 
@@ -125,9 +125,9 @@ function syncDataFromSuper(data, superObject, prevSuperObject, store, force) {
     return obj;
 }
 /**
- * 生成 8 位随机数字。
+ * 生成 12 位随机数字。
  *
- * @return {string} 8位随机数字
+ * @return {string} 12位随机数字
  */
 function guid() {
     function s4() {
@@ -636,14 +636,15 @@ function mapTree(tree, iterator, level, depthFirst, paths, indexes) {
  * @param tree
  * @param iterator
  */
-function eachTree(tree, iterator, level, paths) {
+function eachTree(tree, iterator, level, paths, indexes) {
     var _a;
     if (level === void 0) { level = 1; }
     if (paths === void 0) { paths = []; }
+    if (indexes === void 0) { indexes = []; }
     var length = tree.length;
     for (var i = 0; i < length; i++) {
         var item = tree[i];
-        var res = iterator(item, i, level, paths);
+        var res = iterator(item, i, level, paths, indexes);
         if (res === 'break') {
             break;
         }
@@ -651,7 +652,7 @@ function eachTree(tree, iterator, level, paths) {
             continue;
         }
         if ((_a = item.children) === null || _a === void 0 ? void 0 : _a.splice) {
-            eachTree(item.children, iterator, level + 1, paths.concat(item));
+            eachTree(item.children, iterator, level + 1, paths.concat(item), indexes.concat(i));
         }
     }
 }
@@ -1090,7 +1091,7 @@ function qsparse(data, options) {
     if (options === void 0) { options = {
         arrayFormat: 'indices',
         encodeValuesOnly: true,
-        depth: 1000,
+        depth: 1000, // 默认是 5， 所以condition-builder只要来个条件组就会导致报错
         arrayLimit: 1000 /** array元素数量超出限制，会被自动转化为object格式，默认值1000 */
     }; }
     return qs__default["default"].parse(data, options);

package/lib/utils/highlight.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/icon.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/image.d.ts

@@ -2,7 +2,6 @@
  * @file image 相关的工具
  * @param url
  */
-/// <reference types="lodash" />
 /**
  * 将 url 转成 dataurl
  * @param url

package/lib/utils/image.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 
@@ -47,6 +47,7 @@ require('lodash/cloneDeep');
 require('lodash/map');
 require('lodash/isEmpty');
 require('lodash/kebabCase');
+require('lodash/some');
 require('uncontrollable');
 require('hoist-non-react-statics');
 var validations = require('./validations.js');

package/lib/utils/isPureVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/keyToPath.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/labelToString.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/loopTooMuch.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/makeSorter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/math.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/memoryParse.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/normalizeLink.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/normalizeOptions.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/object.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/offset.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/offsetParent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/optionValueCompare.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/position.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/prettyBytes.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/lib/utils/printElement.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */