amis-core 3.4.0 → 3.4.2

package/lib/utils/api.d.ts

@@ -1,5 +1,5 @@
 import { Api, ApiObject, EventTrack, fetcherResult, Payload } from '../types';
-import { fetcherConfig } from '../factory';
+import { FetcherConfig } from '../factory';
 interface ApiCacheConfig extends ApiObject {
     cachedPromise: Promise<any>;
     requestTime: number;
@@ -14,14 +14,14 @@ export declare function str2function(contents: string, ...args: Array<string>):
 export declare function str2AsyncFunction(contents: string, ...args: Array<string>): Function | null;
 export declare function callStrFunction(this: any, fn: string | Function, argNames: Array<string>, ...args: Array<any>): any;
 export declare function responseAdaptor(ret: fetcherResult, api: ApiObject): Payload;
-export declare function wrapFetcher(fn: (config: fetcherConfig) => Promise<fetcherResult>, tracker?: (eventTrack: EventTrack, data: any) => void): any;
+export declare function wrapFetcher(fn: (config: FetcherConfig) => Promise<fetcherResult>, tracker?: (eventTrack: EventTrack, data: any) => void): any;
 export declare function wrapAdaptor(promise: Promise<fetcherResult>, api: ApiObject, context: any): Promise<Payload>;
 /**
  * 请求远程 js 文件然后 new Function 执行，用于 schemaApi 支持 JavaScript
  * @param api
  * @returns
  */
-export declare function jsFetcher(fetcher: (config: fetcherConfig) => Promise<fetcherResult>, api: ApiObject): Promise<fetcherResult>;
+export declare function jsFetcher(fetcher: (config: FetcherConfig) => Promise<fetcherResult>, api: ApiObject): Promise<fetcherResult>;
 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;

package/lib/utils/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 
@@ -153,6 +153,7 @@ function buildApi(api, data, options) {
     if (ignoreData) {
         return api;
     }
+    var hasCustomData = api.data;
     if (api.data) {
         api.body = api.data = dataMapping.dataMapping(api.data, data, undefined, api.convertKeyToPath);
     }
@@ -217,7 +218,7 @@ function buildApi(api, data, options) {
         object.extendObject(data, tslib.__assign(tslib.__assign({}, api.query), data), false), undefined, false, true);
         /** 同时设置了JSONQL和data时走兼容场景 */
         api.body = api.data =
-            api.data && api.jsonql
+            hasCustomData && api.jsonql
                 ? {
                     data: api.data,
                     jsonql: api.jsonql

package/lib/utils/arraySlice.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/attachmentAdpator.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/autobind.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/columnsSplit.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/dataMapping.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/date.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/debug.d.ts

@@ -29,4 +29,5 @@ export declare function debug(cat: Category, msg: string, ext?: object): void;
  * @param ext 扩展信息
  */
 export declare function warning(cat: Category, msg: string, ext?: object): void;
+export declare function traceProps(props: any, prevProps: any, componentName: string): void;
 export {};

package/lib/utils/debug.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 
@@ -421,10 +421,33 @@ function warning(cat, msg, ext) {
     console.groupEnd();
     store.logs.push(log);
 }
+// 辅助定位是因为什么属性变化导致了组件更新
+function traceProps(props, prevProps, componentName) {
+    console.log(componentName, Object.keys(props)
+        .map(function (key) {
+        if (props[key] !== prevProps[key]) {
+            if (key === 'data') {
+                return "data[".concat(Object.keys(props[key])
+                    .map(function (item) {
+                    if (props[key][item] !== prevProps[key][item]) {
+                        return "".concat(item);
+                    }
+                    return '';
+                })
+                    .filter(function (item) { return item; })
+                    .join(', '), "]");
+            }
+            return key;
+        }
+        return '';
+    })
+        .filter(function (item) { return item; }));
+}
 
 exports.DebugWrapper = DebugWrapper;
 exports.JsonView = JsonView;
 exports.debug = debug;
 exports.disableDebug = disableDebug;
 exports.enableDebug = enableDebug;
+exports.traceProps = traceProps;
 exports.warning = warning;

package/lib/utils/decodeEntity.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/dom.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/errors.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/escapeHtml.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/filter-schema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/filter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/formatDuration.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/formula.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/getVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/grammar.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/handleAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/helper.d.ts

@@ -36,6 +36,10 @@ export declare function anyChanged(attrs: string | Array<string>, from: {
 }, to: {
     [propName: string]: any;
 }, strictMode?: boolean): boolean;
+type Mutable<T> = {
+    -readonly [k in keyof T]: T[k];
+};
+export declare function changedEffect<T extends Record<string, any>>(attrs: string | Array<string>, origin: T, data: T, effect: (changes: Partial<Mutable<T>>) => void, strictMode?: boolean): void;
 export declare function rmUndefined(obj: PlainObject): PlainObject;
 export declare function isObjectShallowModified(prev: any, next: any, strictMode?: boolean, ignoreUndefined?: boolean, statck?: Array<any>): boolean;
 export declare function isArrayChildrenModified(prev: Array<any>, next: Array<any>, strictMode?: boolean): boolean;
@@ -329,7 +333,7 @@ export declare function hashCode(s: string): number;
  * @param json
  * @param mapper
  */
-export declare function JSONTraverse(json: any, mapper: (value: any, key: string | number, host: Object) => any): void;
+export declare function JSONTraverse(json: any, mapper: (value: any, key: string | number, host: Object) => any, maxDeep?: number): void;
 /**
  * 每层都会执行，返回新的对象，新对象不会递归下去
  * @param json
@@ -352,3 +356,11 @@ export declare function parseQuery(location?: Location | {
     [propName: string]: any;
 }): Record<string, any>;
 export declare function differenceFromAll<T>(allOptions: Array<T>, options: Array<T>, getValue: (item: T) => any): Array<T>;
+/**
+ * 基于 schema 自动提取 trackExpression
+ * 可能会不准确，建议用户自己配置
+ * @param schema
+ * @returns
+ */
+export declare function buildTrackExpression(schema: any): string;
+export declare function evalTrackExpression(expression: string, data: Record<string, any>): string;

package/lib/utils/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 
@@ -23,6 +23,7 @@ var autobind$1 = require('./autobind.js');
 require('amis-formula');
 require('moment');
 var object = require('./object.js');
+var tokenize = require('./tokenize.js');
 var isPureVariable = require('./isPureVariable.js');
 var resolveVariable = require('./resolveVariable.js');
 var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
@@ -146,7 +147,22 @@ function hasOwnPropertyInPath(data, key) {
 function noop() { }
 function anyChanged(attrs, from, to, strictMode) {
     if (strictMode === void 0) { strictMode = true; }
-    return (typeof attrs === 'string' ? attrs.split(/\s*,\s*/) : attrs).some(function (key) { return (strictMode ? from[key] !== to[key] : from[key] != to[key]); });
+    return (typeof attrs === 'string'
+        ? attrs.split(',').map(function (item) { return item.trim(); })
+        : attrs).some(function (key) { return (strictMode ? from[key] !== to[key] : from[key] != to[key]); });
+}
+function changedEffect(attrs, origin, data, effect, strictMode) {
+    if (strictMode === void 0) { strictMode = true; }
+    var changes = {};
+    var keys = typeof attrs === 'string'
+        ? attrs.split(',').map(function (item) { return item.trim(); })
+        : attrs;
+    keys.forEach(function (key) {
+        if (strictMode ? origin[key] !== data[key] : origin[key] != data[key]) {
+            changes[key] = data[key];
+        }
+    });
+    Object.keys(changes).length && effect(changes);
 }
 function rmUndefined(obj) {
     var newObj = {};
@@ -1322,12 +1338,16 @@ function hashCode(s) {
  * @param json
  * @param mapper
  */
-function JSONTraverse(json, mapper) {
+function JSONTraverse(json, mapper, maxDeep) {
+    if (maxDeep === void 0) { maxDeep = Number.MAX_VALUE; }
+    if (maxDeep <= 0) {
+        return;
+    }
     Object.keys(json).forEach(function (key) {
         var value = json[key];
         if (!mobx.isObservable(value)) {
             if (isPlainObject__default["default"](value) || Array.isArray(value)) {
-                JSONTraverse(value, mapper);
+                JSONTraverse(value, mapper, maxDeep - 1);
             }
             else {
                 mapper(value, key, json);
@@ -1458,6 +1478,80 @@ function differenceFromAll(allOptions, options, getValue) {
     differenceFromAllCache.res = res;
     return res;
 }
+/**
+ * 基于 schema 自动提取 trackExpression
+ * 可能会不准确，建议用户自己配置
+ * @param schema
+ * @returns
+ */
+function buildTrackExpression(schema) {
+    if (!isPlainObject__default["default"](schema) && !Array.isArray(schema)) {
+        return '';
+    }
+    var trackExpressions = [];
+    JSONTraverse(schema, function (value, key) {
+        if (typeof value !== 'string') {
+            return;
+        }
+        if (key === 'name') {
+            trackExpressions.push(isPureVariable.isPureVariable(value) ? value : "${".concat(value, "}"));
+        }
+        else if (key === 'source') {
+            trackExpressions.push(value);
+        }
+        else if (key.endsWith('On') ||
+            key === 'condition' ||
+            key === 'trackExpression') {
+            trackExpressions.push(value.startsWith('${') ? value : "<script>".concat(value, "</script>"));
+        }
+        else if (value.includes('$')) {
+            trackExpressions.push(value);
+        }
+    }, 10 // 最多遍历 10 层
+    );
+    return trackExpressions.join('|');
+}
+function evalTrackExpression(expression, data) {
+    if (typeof expression !== 'string') {
+        return '';
+    }
+    var parts = [];
+    while (true) {
+        // 这个是自动提取的时候才会用到，用户配置不要用到这个语法
+        var idx = expression.indexOf('<script>');
+        if (idx === -1) {
+            break;
+        }
+        var endIdx = expression.indexOf('</script>');
+        if (endIdx === -1) {
+            throw new Error('Invalid trackExpression miss end script token `</script>`');
+        }
+        if (idx) {
+            parts.push({
+                type: 'text',
+                value: expression.substring(0, idx)
+            });
+        }
+        parts.push({
+            type: 'script',
+            value: expression.substring(idx + 8, endIdx)
+        });
+        expression = expression.substring(endIdx + 9);
+    }
+    expression &&
+        parts.push({
+            type: 'text',
+            value: expression
+        });
+    return parts
+        .map(function (item) {
+        if (item.type === 'text') {
+            return tokenize.tokenize(item.value, data);
+        }
+        return tpl.evalExpression(item.value, data);
+    })
+        .join('');
+}
 
 exports.cloneObject = object.cloneObject;
 exports.createObject = object.createObject;
@@ -1475,15 +1569,18 @@ exports.ValidateError = ValidateError;
 exports.__uri = __uri;
 exports.anyChanged = anyChanged;
 exports.autobind = autobind;
+exports.buildTrackExpression = buildTrackExpression;
 exports.bulkBindFunctions = bulkBindFunctions;
 exports.camel = camel;
 exports.chainEvents = chainEvents;
 exports.chainFunctions = chainFunctions;
+exports.changedEffect = changedEffect;
 exports.convertArrayValueToMoment = convertArrayValueToMoment;
 exports.detectPropValueChanged = detectPropValueChanged;
 exports.difference = difference;
 exports.differenceFromAll = differenceFromAll;
 exports.eachTree = eachTree;
+exports.evalTrackExpression = evalTrackExpression;
 exports.everyTree = everyTree;
 exports.filterTree = filterTree;
 exports.findIndex = findIndex;

package/lib/utils/highlight.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/icon.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/image.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/isPureVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/keyToPath.d.ts

@@ -3,4 +3,4 @@
  *
  * @param string 要转换的字符串
  */
-export declare const keyToPath: (string: string) => string[];
+export declare const keyToPath: (string?: string) => string[];

package/lib/utils/keyToPath.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 
@@ -13,6 +13,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
  * @param string 要转换的字符串
  */
 var keyToPath = function (string) {
+    if (string === void 0) { string = ''; }
     var result = [];
     if (string.charCodeAt(0) === '.'.charCodeAt(0)) {
         result.push('');

package/lib/utils/makeSorter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/math.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/memoryParse.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/normalizeLink.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/normalizeOptions.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/object.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/offset.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/offsetParent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/optionValueCompare.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/position.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/prettyBytes.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/renderer-event.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 
@@ -96,7 +96,7 @@ var bindEvent = function (renderer) {
         return function (eventName) {
             // eventName用来避免过滤广播事件
             rendererEventListeners = rendererEventListeners.filter(function (item) {
-                return item.renderer !== renderer && eventName !== undefined
+                return item.renderer === renderer && eventName !== undefined
                     ? item.type !== eventName
                     : true;
             });

package/lib/utils/replaceText.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.2
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/resize-sensor.d.ts

@@ -2,5 +2,7 @@
  * @file resize-sensor.js.
  * @author fex
  */
+type EventType = 'both' | 'width' | 'height';
 export declare function getComputedStyle(element: HTMLElement, prop: string): any;
-export declare function resizeSensor(element: HTMLElement, callback: () => void): () => void;
+export declare function resizeSensor(element: HTMLElement, callback: () => void, once?: boolean, type?: EventType): () => void;
+export {};