amis-core 6.2.2 → 6.4.0

package/lib/utils/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -13,7 +13,6 @@ var uniq = require('lodash/uniq');
 var last = require('lodash/last');
 var merge = require('lodash/merge');
 var isPlainObject = require('lodash/isPlainObject');
-var isEqual = require('lodash/isEqual');
 var isNaN = require('lodash/isNaN');
 var isNumber = require('lodash/isNumber');
 var isString = require('lodash/isString');
@@ -40,7 +39,6 @@ var uniq__default = /*#__PURE__*/_interopDefaultLegacy(uniq);
 var last__default = /*#__PURE__*/_interopDefaultLegacy(last);
 var merge__default = /*#__PURE__*/_interopDefaultLegacy(merge);
 var isPlainObject__default = /*#__PURE__*/_interopDefaultLegacy(isPlainObject);
-var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
 var isNaN__default = /*#__PURE__*/_interopDefaultLegacy(isNaN);
 var isNumber__default = /*#__PURE__*/_interopDefaultLegacy(isNumber);
 var isString__default = /*#__PURE__*/_interopDefaultLegacy(isString);
@@ -421,7 +419,8 @@ function difference(object$1, base, keepProps) {
                 if (keepProps && ~keepProps.indexOf(key)) {
                     result_1[key] = a;
                 }
-                if (isEqual__default["default"](a, b)) {
+                // isEquals 里面没有处理好递归引用对象的情况
+                if (!isObjectShallowModified(a, b, false, undefined, undefined, 10)) {
                     return;
                 }
                 if (!object$1.hasOwnProperty(key)) {
@@ -1627,21 +1626,44 @@ function replaceUrlParams(path, params) {
     return path;
 }
 var TEST_ID_KEY = 'data-testid';
-function buildTestId(testid, data) {
-    var _a;
-    if (!testid) {
-        return {};
-    }
-    return _a = {},
-        _a[TEST_ID_KEY] = tpl.filter(testid, data),
-        _a;
-}
-function getTestId(testid, data) {
-    if (!testid) {
-        return undefined;
+var TestIdBuilder = /** @class */ (function () {
+    // 为空就表示没有启用testId，后续一直返回都将是空
+    function TestIdBuilder(testId) {
+        this.testId = testId;
     }
-    return buildTestId(testid, data)[TEST_ID_KEY];
-}
+    TestIdBuilder.fast = function (testId) {
+        var _a;
+        return _a = {},
+            _a[TEST_ID_KEY] = testId,
+            _a;
+    };
+    // 生成子区域的testid生成器
+    TestIdBuilder.prototype.getChild = function (childPath, data) {
+        if (this.testId == null) {
+            return new TestIdBuilder();
+        }
+        return new TestIdBuilder(data
+            ? tpl.filter("".concat(this.testId, "-").concat(childPath), data)
+            : "".concat(this.testId, "-").concat(childPath));
+    };
+    // 获取当前组件的testid
+    TestIdBuilder.prototype.getTestId = function (data) {
+        var _a;
+        if (this.testId == null) {
+            return undefined;
+        }
+        return _a = {},
+            _a[TEST_ID_KEY] = data ? tpl.filter(this.testId, data) : this.testId,
+            _a;
+    };
+    TestIdBuilder.prototype.getTestIdValue = function (data) {
+        if (this.testId == null) {
+            return undefined;
+        }
+        return data ? tpl.filter(this.testId, data) : this.testId;
+    };
+    return TestIdBuilder;
+}());
 
 exports.cloneObject = object.cloneObject;
 exports.createObject = object.createObject;
@@ -1656,11 +1678,11 @@ exports.JSONTraverse = JSONTraverse;
 exports.JSONValueMap = JSONValueMap;
 exports.SkipOperation = SkipOperation;
 exports.TEST_ID_KEY = TEST_ID_KEY;
+exports.TestIdBuilder = TestIdBuilder;
 exports.ValidateError = ValidateError;
 exports.__uri = __uri;
 exports.anyChanged = anyChanged;
 exports.autobind = autobind;
-exports.buildTestId = buildTestId;
 exports.buildTrackExpression = buildTrackExpression;
 exports.bulkBindFunctions = bulkBindFunctions;
 exports.camel = camel;
@@ -1688,7 +1710,6 @@ exports.getPropValue = getPropValue;
 exports.getRange = getRange;
 exports.getScrollParent = getScrollParent;
 exports.getScrollbarWidth = getScrollbarWidth;
-exports.getTestId = getTestId;
 exports.getTree = getTree;
 exports.getTreeAncestors = getTreeAncestors;
 exports.getTreeDepth = getTreeDepth;

package/lib/utils/highlight.js

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

package/lib/utils/icon.js

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

package/lib/utils/image.js

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

package/lib/utils/isPureVariable.js

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

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

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

package/lib/utils/keyToPath.js

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

package/lib/utils/labelToString.js

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

package/lib/utils/makeSorter.js

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

package/lib/utils/math.js

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

package/lib/utils/memoryParse.js

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

package/lib/utils/normalizeLink.js

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

package/lib/utils/normalizeOptions.js

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

package/lib/utils/object.js

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

package/lib/utils/offset.js

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

package/lib/utils/offsetParent.js

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

package/lib/utils/optionValueCompare.js

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

package/lib/utils/position.js

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

package/lib/utils/prettyBytes.js

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

package/lib/utils/printElement.js

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

package/lib/utils/renderer-event.d.ts

@@ -2,6 +2,7 @@
 import { ListenerAction } from '../actions/Action';
 import { RendererProps } from '../factory';
 import { IScopedContext } from '../Scoped';
+import { TreeItem } from './helper';
 export interface debounceConfig {
     maxWait?: number;
     wait?: number;
@@ -49,6 +50,8 @@ export type RendererEvent<T, P = any> = {
     preventDefault: () => void;
     stopPropagation: () => void;
     setData: (data: P) => void;
+    pendingPromise: Promise<any>[];
+    allDone: () => Promise<any>;
 };
 export interface RendererEventContext {
     data?: any;
@@ -65,5 +68,15 @@ export declare const getRendererEventListeners: () => RendererEventListener[];
  * @param valueKey
  */
 export declare const resolveEventData: (props: any, data: any, valueKey?: string) => object;
+/**
+ * 基于 index、condition、oldCondition 获取匹配的事件目标
+ * @param tree
+ * @param ctx
+ * @param index
+ * @param condition
+ * @param oldCondition
+ * @returns
+ */
+export declare function getMatchedEventTargets<T extends TreeItem>(tree: Array<T>, ctx: any, index?: string | number, condition?: string, oldCondition?: string): Promise<T[]>;
 declare const _default: {};
 export default _default;

package/lib/utils/renderer-event.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -9,8 +9,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var Action = require('../actions/Action.js');
+var formula = require('./formula.js');
+var helper = require('./helper.js');
 var object = require('./object.js');
 var debounce = require('lodash/debounce');
+var resolveVariableAndFilterForAsync = require('./resolveVariableAndFilterForAsync.js');
+var tpl = require('./tpl.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -38,6 +42,12 @@ function createRendererEvent(type, context) {
         },
         setData: function (data) {
             rendererEvent.context.data = data;
+        },
+        // 用来记录那些还没完的动作
+        // 有时候要等所有完成了才进行下一步
+        pendingPromise: [],
+        allDone: function () {
+            return Promise.all(rendererEvent.pendingPromise);
         }
     }, {
         context: {
@@ -54,6 +64,12 @@ function createRendererEvent(type, context) {
         },
         setData: {
             enumerable: false
+        },
+        pendingPromise: {
+            enumerable: false
+        },
+        allDone: {
+            enumerable: false
         }
     });
     return rendererEvent;
@@ -274,9 +290,103 @@ var resolveEventData = function (props, data, valueKey) {
     return object.createObject(props.data, props.name && valueKey
         ? tslib.__assign(tslib.__assign({}, data), (_a = {}, _a[props.name] = data[valueKey], _a.__rendererData = tslib.__assign(tslib.__assign({}, props.data), (_b = {}, _b[props.name] = data[valueKey], _b)), _a)) : data);
 };
+/**
+ * 基于 index、condition、oldCondition 获取匹配的事件目标
+ * @param tree
+ * @param ctx
+ * @param index
+ * @param condition
+ * @param oldCondition
+ * @returns
+ */
+function getMatchedEventTargets(tree, ctx, index, condition, oldCondition) {
+    return tslib.__awaiter(this, void 0, void 0, function () {
+        var targets, row, _a, promies_1, promies_2;
+        var _this = this;
+        return tslib.__generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    targets = [];
+                    if (!(typeof index === 'number')) return [3 /*break*/, 1];
+                    row = tree[index];
+                    row && targets.push(row);
+                    return [3 /*break*/, 9];
+                case 1:
+                    if (!(typeof index === 'string')) return [3 /*break*/, 5];
+                    if (!formula.isExpression(index)) return [3 /*break*/, 3];
+                    return [4 /*yield*/, resolveVariableAndFilterForAsync.resolveVariableAndFilterForAsync(index, ctx)];
+                case 2:
+                    _a = _b.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    _a = index;
+                    _b.label = 4;
+                case 4:
+                    index = _a;
+                    index.split(',').forEach(function (i) {
+                        i = i.trim();
+                        if (i) {
+                            var indexes = i.split('.').map(function (ii) { return parseInt(ii, 10); });
+                            var row = helper.getTree(tree, indexes);
+                            row && targets.push(row);
+                        }
+                    });
+                    return [3 /*break*/, 9];
+                case 5:
+                    if (!condition) return [3 /*break*/, 7];
+                    promies_1 = [];
+                    helper.eachTree(tree, function (item) {
+                        var data = item.storeType ? item.data : item;
+                        promies_1.push(function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+                            var result;
+                            return tslib.__generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, tpl.evalExpressionWithConditionBuilder(condition, object.createObject(ctx, data))];
+                                    case 1:
+                                        result = _a.sent();
+                                        result && targets.push(item);
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); });
+                    });
+                    return [4 /*yield*/, Promise.all(promies_1.map(function (fn) { return fn(); }))];
+                case 6:
+                    _b.sent();
+                    return [3 /*break*/, 9];
+                case 7:
+                    if (!oldCondition) return [3 /*break*/, 9];
+                    promies_2 = [];
+                    helper.eachTree(tree, function (item, rowIndex) {
+                        var record = item.storeType ? item.data : item;
+                        promies_2.push(function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+                            var result;
+                            return tslib.__generator(this, function (_a) {
+                                result = tpl.evalExpression(oldCondition, object.createObject(ctx, {
+                                    record: record,
+                                    rowIndex: rowIndex,
+                                    item: record,
+                                    index: rowIndex,
+                                    indexPath: item.path
+                                }));
+                                result && targets.push(item);
+                                return [2 /*return*/];
+                            });
+                        }); });
+                    });
+                    return [4 /*yield*/, Promise.all(promies_2.map(function (fn) { return fn(); }))];
+                case 8:
+                    _b.sent();
+                    _b.label = 9;
+                case 9: return [2 /*return*/, targets];
+            }
+        });
+    });
+}
 
 exports.bindEvent = bindEvent;
 exports.createRendererEvent = createRendererEvent;
 exports.dispatchEvent = dispatchEvent;
+exports.getMatchedEventTargets = getMatchedEventTargets;
 exports.getRendererEventListeners = getRendererEventListeners;
 exports.resolveEventData = resolveEventData;

package/lib/utils/replaceText.js

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

package/lib/utils/resize-sensor.js

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

package/lib/utils/resolveCondition.js

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

package/lib/utils/resolveVariable.js

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

package/lib/utils/resolveVariableAndFilter.js

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

package/lib/utils/resolveVariableAndFilterForAsync.js

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

package/lib/utils/scrollPosition.js

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

package/lib/utils/string2regExp.js

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

package/lib/utils/stripNumber.d.ts

@@ -1 +1 @@
-export declare function stripNumber(number: number): number;
+export declare function stripNumber(number: number, precision?: number): number;

package/lib/utils/stripNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -8,9 +8,10 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 // 主要用于解决 0.1+0.2 结果的精度问题导致太长
-function stripNumber(number) {
+function stripNumber(number, precision) {
+    if (precision === void 0) { precision = 16; }
     if (typeof number === 'number' && !Number.isInteger(number)) {
-        return parseFloat(number.toPrecision(16));
+        return parseFloat(number.toPrecision(precision));
     }
     else {
         return number;

package/lib/utils/style-helper.d.ts

@@ -7,8 +7,27 @@ interface extra {
     pre?: string;
     suf?: string;
 }
-export declare function findOrCreateStyle(id: string, doc?: Document): HTMLElement;
-export declare function insertStyle(style: string, id: string, doc?: Document): void;
+/**
+ * 查找或创建style标签
+ * @param param
+ * @param param.classId 根据classId查找或创建style标签
+ * @param param.id 用于赋值给style的class
+ * @param param.doc 文档对象，默认为document
+ * @param param.before 插入到某个class为id的style标签之前
+ */
+export declare function findOrCreateStyle({ classId, doc, before, id }: {
+    classId: string;
+    doc?: Document;
+    before?: string;
+    id?: string;
+}): HTMLElement;
+export declare function insertStyle({ style, classId, id, doc, before }: {
+    style: string;
+    classId: string;
+    id?: string;
+    doc?: Document;
+    before?: string;
+}): void;
 export declare function addStyle(style: string, id: string): void;
 export declare function formatStyle(themeCss: any, classNames?: CustomStyleClassName[], id?: string, defaultData?: any, data?: any): {
     value: string;

package/lib/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -53,18 +53,51 @@ var inheritValueMap = {
     background: 'bg-color',
     radius: 'border'
 };
-function findOrCreateStyle(id, doc) {
+/**
+ * 查找或创建style标签
+ * @param param
+ * @param param.classId 根据classId查找或创建style标签
+ * @param param.id 用于赋值给style的class
+ * @param param.doc 文档对象，默认为document
+ * @param param.before 插入到某个class为id的style标签之前
+ */
+function findOrCreateStyle(_a) {
+    var _b;
+    var classId = _a.classId, doc = _a.doc, before = _a.before, id = _a.id;
     doc = doc || document;
-    var varStyleTag = doc.getElementById(id);
+    var varStyleTag = doc.getElementById(classId);
     if (!varStyleTag) {
         varStyleTag = doc.createElement('style');
-        varStyleTag.id = id;
-        doc.body.appendChild(varStyleTag);
+        varStyleTag.id = classId;
+        varStyleTag.setAttribute('class', id || '');
+        var beforeStyleTag = (_b = doc.getElementsByClassName(before || '')) === null || _b === void 0 ? void 0 : _b[0];
+        // 如果存在before则插入到before之前，否则插入到body中
+        if (beforeStyleTag) {
+            beforeStyleTag.before(varStyleTag);
+        }
+        else {
+            doc.body.appendChild(varStyleTag);
+        }
     }
     return varStyleTag;
 }
-function insertStyle(style, id, doc) {
-    var varStyleTag = findOrCreateStyle('amis-' + id, doc);
+/*
+ * 插入样式
+ * @param param
+ * @param param.style 样式内容
+ * @param param.classId 样式标识，会绑定到id上
+ * @param param.id id,会绑定到class上
+ * @param param.doc 文档对象
+ * @param param.before 插入到某个id之前
+ */
+function insertStyle(_a) {
+    var style = _a.style, classId = _a.classId, id = _a.id, doc = _a.doc, before = _a.before;
+    var varStyleTag = findOrCreateStyle({
+        classId: 'amis-' + classId,
+        doc: doc,
+        before: before,
+        id: id
+    });
     // bca-disable-line
     varStyleTag.innerHTML = style;
     if (!style) {
@@ -72,7 +105,7 @@ function insertStyle(style, id, doc) {
     }
 }
 function addStyle(style, id) {
-    var varStyleTag = findOrCreateStyle(id);
+    var varStyleTag = findOrCreateStyle({ classId: id });
     // bca-disable-line
     varStyleTag.innerHTML += style;
 }
@@ -251,7 +284,14 @@ function insertCustomStyle(prams) {
     if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
         classId += "-".concat(data.index);
     }
-    insertStyle(value, classId, doc);
+    // 这里需要插入到wrapperCustomStyle的前面
+    insertStyle({
+        style: value,
+        classId: classId,
+        doc: doc,
+        id: classId.replace(/(-.*)/, ''),
+        before: classId.replace(/(-.*)/, '')
+    });
 }
 /**
  * 根据路径获取默认值
@@ -330,7 +370,12 @@ function insertEditCustomStyle(params) {
             }
         });
     }
-    insertStyle(content, 'wrapperCustomStyle-' + ((id === null || id === void 0 ? void 0 : id.replace('u:', '')) || helper.uuid()) + index, doc);
+    insertStyle({
+        style: content,
+        classId: 'wrapperCustomStyle-' + ((id === null || id === void 0 ? void 0 : id.replace('u:', '')) || helper.uuid()) + index,
+        doc: doc,
+        id: id === null || id === void 0 ? void 0 : id.replace('u:', '').replace(/(-.*)/, '')
+    });
 }
 /**
  * 移除自定义样式