amis-core 2.8.0 → 3.0.0

package/esm/utils/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -15,7 +15,7 @@ import './filter.js';
 import { evalExpression } from './tpl.js';
 import { qsparse, JSONTraverse, uuid, qsstringify, isObjectShallowModified, hasFile, object2formData } from './helper.js';
 import isPlainObject from 'lodash/isPlainObject';
-import { debug, warning } from './debug.js';
+import { debug } from './debug.js';
 
 var rSchema = /(?:^|raw\:)(get|post|put|delete|patch|options|head|jsonp|js):/i;
 var apiCaches = [];
@@ -350,7 +350,10 @@ function wrapFetcher(fn, tracker) {
             api = api.requestAdaptor(api) || api;
             debug('api', 'after requestAdaptor', api);
         }
-        if (api.data && (hasFile(api.data) || api.dataType === 'form-data')) {
+        if (api.data &&
+            (api.data instanceof FormData ||
+                hasFile(api.data) ||
+                api.dataType === 'form-data')) {
             api.data =
                 api.data instanceof FormData
                     ? api.data
@@ -371,8 +374,7 @@ function wrapFetcher(fn, tracker) {
             api.headers['Content-Type'] = 'application/json';
         }
         if (!isValidApi(api.url)) {
-            warning('api', 'invalid api url', api);
-            return Promise.resolve();
+            throw new Error("invalid api url:".concat(api.url));
         }
         debug('api', 'request api', api);
         tracker === null || tracker === void 0 ? void 0 : tracker({ eventType: 'api', eventData: omit(api, ['config', 'data', 'body']) }, api.data);
@@ -523,6 +525,10 @@ function isApiOutdated(prevApi, nextApi, prevData, nextData) {
     if (!nextApi) {
         return false;
     }
+    // 通常是编辑器里加了属性，一开始没值，后来有了
+    if (prevApi === undefined && !nextApi !== undefined) {
+        return true;
+    }
     nextApi = normalizeApi(nextApi);
     if (nextApi.autoRefresh === false) {
         return false;

package/esm/utils/attachmentAdpator.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/autobind.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/columnsSplit.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/dataMapping.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/date.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/debug.d.ts

@@ -5,6 +5,7 @@ import React, { Component } from 'react';
 export declare function enableDebug(): void;
 interface DebugWrapperProps {
     renderer: any;
+    children?: React.ReactNode;
 }
 export declare class DebugWrapper extends Component<DebugWrapperProps> {
     debugId: string;

package/esm/utils/debug.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -351,12 +351,12 @@ var DebugWrapper = /** @class */ (function (_super) {
  * @param ext 扩展信息
  */
 function debug(cat, msg, ext) {
-    console.groupCollapsed('[amis debug]', msg);
-    console.debug(ext);
-    console.groupEnd();
     if (!isEnabled) {
         return;
     }
+    console.groupCollapsed('[amis debug]', msg);
+    console.debug(ext);
+    console.groupEnd();
     var log = {
         cat: cat,
         level: 'debug',

package/esm/utils/decodeEntity.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/dom.d.ts

@@ -11,3 +11,5 @@ export declare function calculatePosition(placement: any, overlayNode: any, targ
  * 专门用来获取样式的像素值，默认返回 0
  */
 export declare function getStyleNumber(element: HTMLElement, styleName: string): number;
+/** 根据关键字高亮显示文本内容 */
+export declare function renderTextByKeyword(rendererText: string, curKeyword: string): string | JSX.Element;

package/esm/utils/dom.js

@@ -1,10 +1,11 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
 import { __read } from 'tslib';
 import ReactDOM from 'react-dom';
+import React from 'react';
 import { offset } from './offset.js';
 import { position } from './position.js';
 
@@ -78,16 +79,27 @@ function calculatePosition(placement, overlayNode, target, container, padding, c
         ? clip2.height / overlayNode.offsetHeight
         : 1;
     // auto 尝试四个方向对齐。
-    placement =
-        placement === 'auto'
-            ? 'left-bottom-left-top right-bottom-right-top left-top-left-bottom right-top-right-bottom left-bottom-left-top'
-            : placement;
+    var isAuto = placement === 'auto';
+    // 兜底方向
+    var autoDefaultPlacement = 'left-bottom-left-top';
+    placement = isAuto
+        ? "left-bottom-left-top right-bottom-right-top left-top-left-bottom right-top-right-bottom ".concat(autoDefaultPlacement)
+        : placement;
     var positionLeft = 0, positionTop = 0, arrowOffsetLeft = '', arrowOffsetTop = '', activePlacement = placement;
     if (~placement.indexOf('-')) {
         var tests = placement.split(/\s+/);
+        // 收集可见方向
+        var visiblePlacement = {};
         while (tests.length) {
             var current = (activePlacement = tests.shift());
-            var _b = __read(current.split('-'), 4), atX = _b[0], atY = _b[1], myX = _b[2], myY = _b[3];
+            // 自动对齐模式下，当四个方向都无法完全可见时
+            // 根据之前的计算结果，使用收集的可见方向作为兜底，避免完全不可见
+            if (isAuto && tests.length === 0) {
+                var _b = __read(autoDefaultPlacement.split('-'), 4), _atX = _b[0], _atY = _b[1], _myX = _b[2], _myY = _b[3];
+                var _c = visiblePlacement.atX, atX_1 = _c === void 0 ? _atX : _c, _d = visiblePlacement.atY, atY_1 = _d === void 0 ? _atY : _d, _e = visiblePlacement.myX, myX_1 = _e === void 0 ? _myX : _e, _f = visiblePlacement.myY, myY_1 = _f === void 0 ? _myY : _f;
+                current = activePlacement = [atX_1, atY_1, myX_1, myY_1].join('-');
+            }
+            var _g = __read(current.split('-'), 4), atX = _g[0], atY = _g[1], myX = _g[2], myY = _g[3];
             myX = myX || atX;
             myY = myY || atY;
             positionLeft =
@@ -118,10 +130,21 @@ function calculatePosition(placement, overlayNode, target, container, padding, c
                     width: overlayWidth,
                     height: overlayHeight
                 };
+                var visibleX = false;
+                var visibleY = false;
                 if (transformed.x > 0 &&
-                    transformed.x + transformed.width < window.innerWidth &&
-                    transformed.y > 0 &&
+                    transformed.x + transformed.width < window.innerWidth) {
+                    visibleX = true;
+                    !visiblePlacement.atX && (visiblePlacement.atX = atX);
+                    !visiblePlacement.myX && (visiblePlacement.myX = myX);
+                }
+                if (transformed.y > 0 &&
                     transformed.y + transformed.height < window.innerHeight) {
+                    visibleY = true;
+                    !visiblePlacement.atY && (visiblePlacement.atY = atY);
+                    !visiblePlacement.myY && (visiblePlacement.myY = myY);
+                }
+                if (visibleX && visibleY) {
                     break;
                 }
             }
@@ -167,7 +190,7 @@ function calculatePosition(placement, overlayNode, target, container, padding, c
     else {
         throw new Error("calcOverlayPosition(): No such placement of \"".concat(placement, "\" found."));
     }
-    var _c = __read(customOffset, 2), _d = _c[0], offSetX = _d === void 0 ? 0 : _d, _e = _c[1], offSetY = _e === void 0 ? 0 : _e;
+    var _h = __read(customOffset, 2), _j = _h[0], offSetX = _j === void 0 ? 0 : _j, _k = _h[1], offSetY = _k === void 0 ? 0 : _k;
     return {
         positionLeft: (positionLeft + offSetX) / scaleX,
         positionTop: (positionTop + offSetY) / scaleY,
@@ -185,5 +208,19 @@ function getStyleNumber(element, styleName) {
     }
     return (parseInt(getComputedStyle(element).getPropertyValue(styleName), 10) || 0);
 }
+/** 根据关键字高亮显示文本内容 */
+function renderTextByKeyword(rendererText, curKeyword) {
+    if (curKeyword && ~rendererText.indexOf(curKeyword)) {
+        var keywordStartIndex = rendererText.indexOf(curKeyword);
+        var keywordEndIndex = keywordStartIndex + curKeyword.length;
+        return (React.createElement("span", null,
+            rendererText.substring(0, keywordStartIndex),
+            React.createElement("span", { className: "is-keyword" }, curKeyword),
+            rendererText.substring(keywordEndIndex)));
+    }
+    else {
+        return rendererText;
+    }
+}
 
-export { calculatePosition, getContainer, getStyleNumber, ownerDocument };
+export { calculatePosition, getContainer, getStyleNumber, ownerDocument, renderTextByKeyword };

package/esm/utils/errors.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/escapeHtml.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/filter-schema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/filter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/formatDuration.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/formula.d.ts

@@ -13,4 +13,5 @@ export declare function isNeedFormula(expression: any, prevData: {
 }, curData: {
     [propName: string]: any;
 }): boolean;
+export declare function isNowFormula(expression: string): boolean;
 export declare function replaceExpression(expression: any): any;

package/esm/utils/formula.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -8,8 +8,8 @@ import isString from 'lodash/isString';
 import isBoolean from 'lodash/isBoolean';
 import { evaluate, getFilters } from 'amis-formula';
 import { filter } from './tpl.js';
-import 'moment';
 import 'tslib';
+import 'moment';
 import 'lodash/isPlainObject';
 import { getVariable } from './getVariable.js';
 import { resolveVariableAndFilter } from './resolveVariableAndFilter.js';
@@ -206,6 +206,10 @@ function isNeedFormula(expression, prevData, curData) {
         return false;
     }
 }
+function isNowFormula(expression) {
+    var block = expression.split(/\${|\||}/).filter(function (item) { return item; });
+    return block[1] === 'now';
+}
 // 将 \${xx} 替换成 ${xx}
 function replaceExpression(expression) {
     if (expression &&
@@ -216,4 +220,4 @@ function replaceExpression(expression) {
     return expression;
 }
 
-export { FormulaExec, formulaExec, isExpression, isNeedFormula, registerFormulaExec, replaceExpression };
+export { FormulaExec, formulaExec, isExpression, isNeedFormula, isNowFormula, registerFormulaExec, replaceExpression };

package/esm/utils/getVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/grammar.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/handleAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/helper.d.ts

@@ -144,6 +144,12 @@ export declare function eachTree<T extends TreeItem>(tree: Array<T>, iterator: (
  * @param iterator
  */
 export declare function findTree<T extends TreeItem>(tree: Array<T>, iterator: (item: T, key: number, level: number, paths: Array<T>) => any): T | null;
+/**
+ * 在树中查找节点。
+ * @param tree
+ * @param iterator
+ */
+export declare function findTreeAll<T extends TreeItem>(tree: Array<T>, iterator: (item: T, key: number, level: number, paths: Array<T>) => any): Array<T>;
 /**
  * 在树中查找节点, 返回下标数组。
  * @param tree
@@ -259,6 +265,7 @@ export declare function chainFunctions(...fns: Array<(...args: Array<any>) => vo
 export declare function chainEvents(props: any, schema: any): any;
 export declare function mapObject(value: any, fn: Function, skipFn?: (value: any) => boolean): any;
 export declare function loadScript(src: string): Promise<void>;
+export declare function loadStyle(href: string): Promise<void>;
 export declare class SkipOperation extends Error {
 }
 /**

package/esm/utils/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -597,6 +597,21 @@ function findTree(tree, iterator) {
     });
     return result;
 }
+/**
+ * 在树中查找节点。
+ * @param tree
+ * @param iterator
+ */
+function findTreeAll(tree, iterator) {
+    var result = [];
+    everyTree(tree, function (item, key, level, paths) {
+        if (iterator(item, key, level, paths)) {
+            result.push(item);
+        }
+        return true;
+    });
+    return result;
+}
 /**
  * 在树中查找节点, 返回下标数组。
  * @param tree
@@ -1003,6 +1018,16 @@ function loadScript(src) {
         document.head.appendChild(script);
     });
 }
+function loadStyle(href) {
+    return new Promise(function (ok, fail) {
+        var link = document.createElement('link');
+        link.rel = 'stylesheet';
+        link.onerror = function (reason) { return fail(reason); };
+        link.onload = function () { return ok(); };
+        link.href = href;
+        document.head.appendChild(link);
+    });
+}
 var SkipOperation = /** @class */ (function (_super) {
     __extends(SkipOperation, _super);
     function SkipOperation() {
@@ -1177,7 +1202,7 @@ function isClickOnInput(e) {
     var formItem;
     if (!e.currentTarget.contains(target) ||
         ~['INPUT', 'TEXTAREA'].indexOf(target.tagName) ||
-        ((formItem = target.closest("button, a, [data-role=\"form-item\"]")) &&
+        ((formItem = target.closest("button, a, [data-role=\"form-item\"], label[data-role=\"checkbox\"]")) &&
             e.currentTarget.contains(formItem))) {
         return true;
     }
@@ -1258,4 +1283,4 @@ function parseQuery(location) {
     return merge(normalizedQuery, hashQuery);
 }
 
-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, parseQuery, 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, findTreeAll, 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, loadStyle, makeColumnClassBuild, makeHorizontalDeeper, mapObject, mapTree, noop, normalizeNodePath, object2formData, omitControls, padArr, parseQuery, 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.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/icon.d.ts

@@ -6,6 +6,11 @@ import { ClassNamesFn } from '../theme';
 export interface IconCheckedSchema {
     id: string;
     name?: string;
+    svg?: string;
+}
+export interface IconCheckedSchemaNew {
+    type: 'icon';
+    icon: IconCheckedSchema;
 }
 /**
  * 判断字符串来生成 i 或 img
@@ -13,4 +18,4 @@ export interface IconCheckedSchema {
  * @param className 内部用的 className
  * @param classNameProp amis 配置里设置的 className
  */
-export declare const generateIcon: (cx: ClassNamesFn, icon?: string | IconCheckedSchema | React.ReactNode, className?: string, classNameProp?: string) => JSX.Element | null | undefined;
+export declare const generateIcon: (cx: ClassNamesFn, icon?: string | IconCheckedSchema | React.ReactNode | IconCheckedSchemaNew, className?: string, classNameProp?: string) => JSX.Element | null | undefined;

package/esm/utils/icon.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -16,6 +16,11 @@ import { isObject } from 'lodash';
  * @param classNameProp amis 配置里设置的 className
  */
 var generateIcon = function (cx, icon, className, classNameProp) {
+    if (isObject(icon) &&
+        icon.type === 'icon' &&
+        icon.icon) {
+        icon = icon.icon;
+    }
     if (React.isValidElement(icon)) {
         return icon;
     }

package/esm/utils/image.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/index.d.ts

@@ -39,6 +39,7 @@ export * from './replaceText';
 export * from './resize-sensor';
 export * from './resolveVariable';
 export * from './resolveVariableAndFilter';
+export * from './resolveVariableAndFilterForAsync';
 export * from './RootClose';
 export * from './scrollPosition';
 export * from './SimpleMap';
@@ -52,5 +53,6 @@ export * from './validations';
 export * from './toNumber';
 export * from './decodeEntity';
 export * from './style-helper';
+export * from './resolveCondition';
 import animation from './Animation';
 export { animation };

package/esm/utils/isPureVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/keyToPath.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/makeSorter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/normalizeLink.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/normalizeOptions.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/object.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/offset.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/offsetParent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/optionValueCompare.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -13,9 +13,13 @@ function matchOptionValue(a, b, valueField) {
     var aValue = isObject(a) && a && a.hasOwnProperty(valueField)
         ? a[valueField]
         : a;
+    var bValue = b[valueField || 'value'];
     return isObject(aValue)
-        ? isEqual(aValue, b[valueField || 'value'])
-        : String(b[valueField || 'value']) === String(aValue);
+        ? isEqual(aValue, bValue)
+        : // 当值均为 undefined 时，不应该判定相等
+            aValue !== undefined &&
+                bValue !== undefined &&
+                String(bValue) === String(aValue);
 }
 function optionValueCompare(a, valueField) {
     if (valueField === void 0) { valueField = 'value'; }

package/esm/utils/position.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/prettyBytes.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */