amis-core 2.0.2 → 2.2.0

package/esm/utils/dataMapping.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 
@@ -18,6 +18,20 @@ function resolveMapping(value, data, defaultFilter) {
             ? tokenize(value, data, defaultFilter)
             : value;
 }
+/**
+ * 遍历对象，对每个字符串 key 进行数据映射
+ * @param value 要映射的对象
+ * @param data 数据上下文
+ */
+function resolveMappingObject(value, data) {
+    for (var _i = 0, _a = Object.keys(value); _i < _a.length; _i++) {
+        var key = _a[_i];
+        if (typeof value[key] === 'string') {
+            value[key] = resolveMapping(value[key], data);
+        }
+    }
+    return value;
+}
 function dataMapping(to, from, ignoreFunction, convertKeyToPath) {
     if (from === void 0) { from = {}; }
     if (ignoreFunction === void 0) { ignoreFunction = false; }
@@ -124,4 +138,4 @@ function dataMapping(to, from, ignoreFunction, convertKeyToPath) {
     return ret;
 }
 
-export { dataMapping, resolveMapping };
+export { dataMapping, resolveMapping, resolveMappingObject };

package/esm/utils/date.js

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

package/esm/utils/debug.js

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

package/esm/utils/dom.js

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

package/esm/utils/errors.js

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

package/esm/utils/escapeHtml.js

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

package/esm/utils/filter-schema.js

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

package/esm/utils/filter.js

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

package/esm/utils/formatDuration.js

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

package/esm/utils/formula.js

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

package/esm/utils/getVariable.js

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

package/esm/utils/grammar.js

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

package/esm/utils/handleAction.js

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

package/esm/utils/helper.d.ts

@@ -79,7 +79,13 @@ export declare function makeHorizontalDeeper(horizontal: {
 export declare function promisify<T extends Function>(fn: T): (...args: Array<any>) => Promise<any> & {
     raw: T;
 };
-export declare function getScrollParent(node: HTMLElement): HTMLElement | null;
+/**
+ *
+ * @param node 当前元素
+ * @param compute 自定义计算，找到的父元素是否满足特殊场景
+ * @returns 返回控制当前元素滚动的父元素
+ */
+export declare function getScrollParent(node: HTMLElement, compute?: (parent: HTMLElement) => boolean): HTMLElement | null;
 /**
  * Deep diff between two object, using lodash
  * @param  {Object} object Object compared
@@ -93,7 +99,7 @@ export declare function difference<T extends {
 }>(object: T, base: U, keepProps?: Array<string>): {
     [propName: string]: any;
 };
-export declare const padArr: (arr: Array<any>, size?: number) => Array<Array<any>>;
+export declare const padArr: (arr: Array<any>, size?: number, fillUndefined?: boolean) => Array<Array<any>>;
 export declare function __uri(id: string): string;
 export declare function isBreakpoint(str: string): boolean;
 export declare function until(fn: () => Promise<any>, when: (ret: any) => boolean, getCanceler: (fn: () => any) => void, interval?: number): Promise<unknown>;
@@ -184,6 +190,26 @@ export declare function someTree<T extends TreeItem>(tree: Array<T>, iterator: (
  */
 export declare function flattenTree<T extends TreeItem>(tree: Array<T>): Array<T>;
 export declare function flattenTree<T extends TreeItem, U>(tree: Array<T>, mapper: (value: T, index: number) => U): Array<U>;
+/**
+ * 将树打平变成一维数组，用法和flattenTree类似，区别是结果仅保留叶节点
+ *
+ * 比如：
+ *
+ * flattenTreeWithLeafNodes([
+ *     {
+ *         id: 1,
+ *         children: [
+ *              { id: 2 },
+ *              { id: 3 },
+ *         ]
+ *     }
+ * ], item => item.id); // 输出为 [2, 3]
+ *
+ * @param tree
+ * @param mapper
+ */
+export declare function flattenTreeWithLeafNodes<T extends TreeItem>(tree: Array<T>): Array<T>;
+export declare function flattenTreeWithLeafNodes<T extends TreeItem, U>(tree: Array<T>, mapper: (value: T, index: number) => U): Array<U>;
 /**
  * 操作树，遵循 imutable, 每次返回一个新的树。
  * 类似数组的 splice 不同的地方这个方法不修改原始数据，
@@ -231,7 +257,7 @@ export declare function qsparse(data: string, options?: any): qs.ParsedQs;
 export declare function object2formData(data: any, options?: any, fd?: FormData): any;
 export declare function chainFunctions(...fns: Array<(...args: Array<any>) => void>): (...args: Array<any>) => void;
 export declare function chainEvents(props: any, schema: any): any;
-export declare function mapObject(value: any, fn: Function): any;
+export declare function mapObject(value: any, fn: Function, skipFn?: (value: any) => boolean): any;
 export declare function loadScript(src: string): Promise<void>;
 export declare class SkipOperation extends Error {
 }
@@ -250,7 +276,7 @@ export declare function getPropValue<T extends {
     name?: string;
     data?: any;
     defaultValue?: any;
-}>(props: T, getter?: (props: T) => any): any;
+}>(props: T, getter?: (props: T) => any, canAccessSuper?: boolean): any;
 export declare function detectPropValueChanged<T extends {
     value?: any;
     name?: string;

package/esm/utils/helper.js

@@ -1,9 +1,9 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 
-import { __extends, __assign, __awaiter, __generator, __spreadArray } from 'tslib';
+import { __extends, __assign, __spreadArray, __awaiter, __generator } from 'tslib';
 import isPlainObject from 'lodash/isPlainObject';
 import isEqual from 'lodash/isEqual';
 import isNaN from 'lodash/isNaN';
@@ -332,7 +332,14 @@ function promisify(fn) {
     promisified.raw = fn;
     return promisified;
 }
-function getScrollParent(node) {
+/**
+ *
+ * @param node 当前元素
+ * @param compute 自定义计算，找到的父元素是否满足特殊场景
+ * @returns 返回控制当前元素滚动的父元素
+ */
+function getScrollParent(node, compute) {
+    if (compute === void 0) { compute = function () { return true; }; }
     if (node == null) {
         return null;
     }
@@ -343,10 +350,10 @@ function getScrollParent(node) {
     var text = style.getPropertyValue('overflow') +
         style.getPropertyValue('overflow-x') +
         style.getPropertyValue('overflow-y');
-    if (/auto|scroll/.test(text) || node.nodeName === 'BODY') {
+    if (node.nodeName === 'BODY' || (/auto|scroll/.test(text) && compute(node))) {
         return node;
     }
-    return getScrollParent(node.parentNode);
+    return getScrollParent(node.parentNode, compute);
 }
 /**
  * Deep diff between two object, using lodash
@@ -386,12 +393,13 @@ function difference(object, base, keepProps) {
     }
     return changes(object, base);
 }
-var padArr = function (arr, size) {
+var padArr = function (arr, size, fillUndefined) {
     if (size === void 0) { size = 4; }
-    var ret = [];
+    if (fillUndefined === void 0) { fillUndefined = false; }
+    var ret = [[]];
     var pool = arr.concat();
     var from = 0;
-    while (pool.length) {
+    while (pool.length || (fillUndefined && ret[ret.length - 1].length < size)) {
         var host = ret[from] || (ret[from] = []);
         if (host.length >= size) {
             from += 1;
@@ -698,6 +706,15 @@ function flattenTree(tree, mapper) {
     });
     return flattened;
 }
+function flattenTreeWithLeafNodes(tree, mapper) {
+    var flattened = [];
+    eachTree(tree, function (item, index) {
+        if (!item.hasOwnProperty('children')) {
+            flattened.push(mapper ? mapper(item, index) : item);
+        }
+    });
+    return flattened;
+}
 /**
  * 操作树，遵循 imutable, 每次返回一个新的树。
  * 类似数组的 splice 不同的地方这个方法不修改原始数据，
@@ -931,7 +948,21 @@ function chainEvents(props, schema) {
     });
     return ret;
 }
-function mapObject(value, fn) {
+function mapObject(value, fn, skipFn) {
+    // 如果value值满足skipFn条件则不做map操作
+    skipFn =
+        skipFn && typeof skipFn === 'function'
+            ? skipFn
+            : function (value) {
+                // File类型处理之后会变成plain object
+                if (value instanceof File) {
+                    return true;
+                }
+                return false;
+            };
+    if (!!skipFn(value)) {
+        return value;
+    }
     if (Array.isArray(value)) {
         return value.map(function (item) { return mapObject(item, fn); });
     }
@@ -1044,16 +1075,16 @@ function getScrollbarWidth() {
     return scrollbarWidth;
 }
 // 后续改用 FormulaExec['formula']
-function resolveValueByName(data, name) {
+function resolveValueByName(data, name, canAccessSuper) {
     return isPureVariable(name)
         ? resolveVariableAndFilter(name, data)
-        : resolveVariable(name, data);
+        : resolveVariable(name, data, canAccessSuper);
 }
 // 统一的获取 value 值方法
-function getPropValue(props, getter) {
+function getPropValue(props, getter, canAccessSuper) {
     var _a, _b;
     var name = props.name, value = props.value, data = props.data, defaultValue = props.defaultValue;
-    return ((_b = (_a = value !== null && value !== void 0 ? value : getter === null || getter === void 0 ? void 0 : getter(props)) !== null && _a !== void 0 ? _a : resolveValueByName(data, name)) !== null && _b !== void 0 ? _b : defaultValue);
+    return ((_b = (_a = value !== null && value !== void 0 ? value : getter === null || getter === void 0 ? void 0 : getter(props)) !== null && _a !== void 0 ? _a : resolveValueByName(data, name, canAccessSuper)) !== null && _b !== void 0 ? _b : defaultValue);
 }
 // 检测 value 是否有变化，有变化就执行 onChange
 function detectPropValueChanged(props, prevProps, onChange, getter) {
@@ -1199,4 +1230,4 @@ function isNumeric(value) {
     return /^[-+]?(?:\d*[.])?\d+$/.test(value);
 }
 
-export { JSONTraverse, SkipOperation, __uri, anyChanged, autobind, bulkBindFunctions, camel, chainEvents, chainFunctions, convertArrayValueToMoment, detectPropValueChanged, difference, eachTree, everyTree, filterTree, findIndex, findObjectsWithKey, findTree, findTreeIndex, flattenTree, getLevelFromClassName, getPropValue, getRange, getScrollParent, getScrollbarWidth, getTree, getTreeAncestors, getTreeDepth, getTreeParent, getWidthRate, guid, hasAbility, hasFile, hasOwnPropertyInPath, hasVisibleExpression, hashCode, immutableExtends, injectPropsToObject, isArrayChildrenModified, isBreakpoint, isClickOnInput, isDisabled, isEmpty, isMobile, isNumeric, isObjectShallowModified, isSuperDataModified, isUnfolded, isVisible, lcFirst, loadScript, makeColumnClassBuild, makeHorizontalDeeper, mapObject, mapTree, noop, normalizeNodePath, object2formData, omitControls, padArr, pickEventsProps, preventDefault, promisify, qsparse, qsstringify, range, removeHTMLTag, repeatCount, rmUndefined, someTree, sortArray, spliceTree, syncDataFromSuper, ucFirst, until, uuid, uuidv4, visibilityFilter };
+export { JSONTraverse, SkipOperation, __uri, anyChanged, autobind, bulkBindFunctions, camel, chainEvents, chainFunctions, convertArrayValueToMoment, detectPropValueChanged, difference, eachTree, everyTree, filterTree, findIndex, findObjectsWithKey, findTree, findTreeIndex, flattenTree, flattenTreeWithLeafNodes, getLevelFromClassName, getPropValue, getRange, getScrollParent, getScrollbarWidth, getTree, getTreeAncestors, getTreeDepth, getTreeParent, getWidthRate, guid, hasAbility, hasFile, hasOwnPropertyInPath, hasVisibleExpression, hashCode, immutableExtends, injectPropsToObject, isArrayChildrenModified, isBreakpoint, isClickOnInput, isDisabled, isEmpty, isMobile, isNumeric, isObjectShallowModified, isSuperDataModified, isUnfolded, isVisible, lcFirst, loadScript, makeColumnClassBuild, makeHorizontalDeeper, mapObject, mapTree, noop, normalizeNodePath, object2formData, omitControls, padArr, pickEventsProps, preventDefault, promisify, qsparse, qsstringify, range, removeHTMLTag, repeatCount, rmUndefined, someTree, sortArray, spliceTree, syncDataFromSuper, ucFirst, until, uuid, uuidv4, visibilityFilter };

package/esm/utils/highlight.js

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

package/esm/utils/icon.js

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

package/esm/utils/image.js

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

package/esm/utils/index.d.ts

@@ -49,5 +49,6 @@ export * from './tpl-builtin';
 export * from './tpl';
 export * from './uncontrollable';
 export * from './validations';
+export * from './toNumber';
 import animation from './Animation';
 export { animation };

package/esm/utils/isPureVariable.js

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

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

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

package/esm/utils/keyToPath.js

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

package/esm/utils/makeSorter.js

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

package/esm/utils/normalizeLink.js

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

package/esm/utils/normalizeOptions.js

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

package/esm/utils/object.js

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

package/esm/utils/offset.js

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

package/esm/utils/offsetParent.js

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

package/esm/utils/optionValueCompare.js

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

package/esm/utils/position.d.ts

@@ -10,8 +10,8 @@
 export declare function position(node: HTMLElement, offsetParent?: HTMLElement): {
     top: number;
     left: number;
-    height: number;
     width: number;
+    height: number;
 } | {
     top: number;
     left: number;

package/esm/utils/position.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 
@@ -30,6 +30,14 @@ function position(node, offsetParent$1) {
     else {
         var parent_1 = offsetParent$1 || offsetParent(node);
         offset$1 = offset(node);
+        if (parent_1 === node) {
+            return {
+                top: 0,
+                left: 0,
+                width: offset$1.width,
+                height: offset$1.height
+            };
+        }
         if (nodeName(parent_1) !== 'html')
             parentOffset = offset(parent_1);
         var borderTop = String(getComputedStyle(parent_1).getPropertyValue('border-top-width') || 0);

package/esm/utils/prettyBytes.js

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

package/esm/utils/renderer-event.js

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

package/esm/utils/replaceText.js

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

package/esm/utils/resize-sensor.js

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

package/esm/utils/resolveVariable.d.ts

@@ -1 +1 @@
-export declare function resolveVariable(path?: string, data?: any): any;
+export declare function resolveVariable(path?: string, data?: any, canAccessSuper?: boolean): any;

package/esm/utils/resolveVariable.js

@@ -1,12 +1,12 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 
 import { Evaluator, parse } from 'amis-formula';
 import { getVariable } from './getVariable.js';
 
-function resolveVariable(path, data) {
+function resolveVariable(path, data, canAccessSuper) {
     if (data === void 0) { data = {}; }
     if (path === '&' || path == '$$') {
         return data;
@@ -16,7 +16,7 @@ function resolveVariable(path, data) {
     }
     else if (!~path.indexOf(':')) {
         // 简单用法直接用 getVariable
-        return getVariable(data, path[0] === '$' ? path.substring(1) : path);
+        return getVariable(data, path[0] === '$' ? path.substring(1) : path, canAccessSuper);
     }
     // window:xxx  ls:xxx.xxx
     // 带 namespace 的用公式

package/esm/utils/resolveVariableAndFilter.js

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

package/esm/utils/scrollPosition.d.ts

@@ -1,8 +1,8 @@
 export declare function scrollPosition(dom: HTMLElement): {
     top: number;
     left: number;
-    height: number;
     width: number;
+    height: number;
 } | {
     top: number;
     left: number;

package/esm/utils/scrollPosition.js

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

package/esm/utils/string2regExp.js

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

package/esm/utils/stripNumber.js

@@ -1,11 +1,11 @@
 /**
- * amis-core v2.0.2
+ * amis-core v2.2.0
  * Copyright 2018-2022 fex
  */
 
 // 主要用于解决 0.1+0.2 结果的精度问题导致太长
 function stripNumber(number) {
-    if (typeof number === 'number') {
+    if (typeof number === 'number' && !Number.isInteger(number)) {
         return parseFloat(number.toPrecision(12));
     }
     else {

package/esm/utils/style.js

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

package/esm/utils/toNumber.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 默认的 parseInt 如果解析失败会返回 NaN，这个函数会返回 0
+ * @param value 要解析的值
+ * @param defaultValue
+ * @returns 默认按十进制解析，失败就返回 defaultValue 或 0
+ */
+export declare function toNumber(value: any, defaultValue?: number): number;

package/esm/utils/toNumber.js

@@ -0,0 +1,18 @@
+/**
+ * amis-core v2.2.0
+ * Copyright 2018-2022 fex
+ */
+
+/**
+ * 默认的 parseInt 如果解析失败会返回 NaN，这个函数会返回 0
+ * @param value 要解析的值
+ * @param defaultValue
+ * @returns 默认按十进制解析，失败就返回 defaultValue 或 0
+ */
+function toNumber(value, defaultValue) {
+    if (defaultValue === void 0) { defaultValue = 0; }
+    var num = parseInt(value, 10);
+    return isNaN(num) ? defaultValue : num;
+}
+
+export { toNumber };

package/esm/utils/tokenize.js

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

package/esm/utils/tpl-builtin.d.ts

@@ -10,9 +10,9 @@ import { stripNumber } from './stripNumber';
 import { tokenize } from './tokenize';
 import { resolveVariable } from './resolveVariable';
 import { resolveVariableAndFilter } from './resolveVariableAndFilter';
-import { dataMapping, resolveMapping } from './dataMapping';
+import { dataMapping, resolveMapping, resolveMappingObject } from './dataMapping';
 import './filter';
-export { prettyBytes, escapeHtml, formatDuration, filterDate, relativeValueRe, parseDuration, getFilters, registerFilter, pickValues, isPureVariable, stripNumber, tokenize, resolveVariable, resolveVariableAndFilter, resolveMapping, dataMapping };
+export { prettyBytes, escapeHtml, formatDuration, filterDate, relativeValueRe, parseDuration, getFilters, registerFilter, pickValues, isPureVariable, stripNumber, tokenize, resolveVariable, resolveVariableAndFilter, resolveMapping, resolveMappingObject, dataMapping };
 export declare function register(): Enginer & {
     name: string;
 };

package/esm/utils/tpl-builtin.js

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