amis-core 3.4.2 → 3.5.0

package/lib/utils/filter-schema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -10,13 +10,31 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tpl = require('./tpl.js');
 var helper = require('./helper.js');
 var isPlainObject = require('lodash/isPlainObject');
-var cx = require('classnames');
+var tokenize = require('./tokenize.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var isPlainObject__default = /*#__PURE__*/_interopDefaultLegacy(isPlainObject);
-var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 
+/**
+ * 计算下发给子组件的className，处理对象类型的className，将其中的表达式计算出来，避免被classnames识别为true
+ *
+ * @param value - CSS类名值
+ * @param ctx - 数据域
+ */
+function filterClassNameObject(classValue, ctx) {
+    if (ctx === void 0) { ctx = {}; }
+    var result = classValue;
+    if (classValue && typeof classValue === 'string') {
+        result = tokenize.tokenize(classValue, ctx);
+    }
+    else if (classValue && isPlainObject__default["default"](classValue)) {
+        result = helper.mapObject(classValue, function (value) {
+            return typeof value === 'string' ? tpl.evalExpression(value, ctx) : value;
+        }, undefined, function (key) { return tokenize.tokenize(key, ctx); });
+    }
+    return result;
+}
 /**
  * 处理 Props 数据，所有带 On 结束的做一次
  *
@@ -37,13 +55,14 @@ function getExprProperties(schema, data, blackList, props) {
             return;
         }
         var parts = /^(.*)(On|Expr|(?:c|C)lassName)(Raw)?$/.exec(key);
+        var type = parts === null || parts === void 0 ? void 0 : parts[2];
         var value = schema[key];
         if (value &&
             typeof value === 'string' &&
             (parts === null || parts === void 0 ? void 0 : parts[1]) &&
-            (parts[2] === 'On' || parts[2] === 'Expr')) {
+            (type === 'On' || type === 'Expr')) {
             key = parts[1];
-            if (parts[2] === 'On' || parts[2] === 'Expr') {
+            if (type === 'On' || type === 'Expr') {
                 if (!ctx &&
                     props &&
                     typeof value === 'string' &&
@@ -52,7 +71,7 @@ function getExprProperties(schema, data, blackList, props) {
                         __props: props
                     });
                 }
-                if (parts[2] === 'On') {
+                if (type === 'On') {
                     value = (props === null || props === void 0 ? void 0 : props[key]) || tpl.evalExpression(value, ctx || data);
                 }
                 else {
@@ -61,18 +80,17 @@ function getExprProperties(schema, data, blackList, props) {
             }
             exprProps[key] = value;
         }
-        else if (value &&
-            isPlainObject__default["default"](value) &&
-            ((parts === null || parts === void 0 ? void 0 : parts[2]) === 'className' || (parts === null || parts === void 0 ? void 0 : parts[2]) === 'ClassName')) {
-            key = parts[1] + parts[2];
+        else if ((type === 'className' || type === 'ClassName') &&
+            !(props === null || props === void 0 ? void 0 : props[key]) && // 如果 props 里面有则是 props 优先
+            value &&
+            (typeof value === 'string' || isPlainObject__default["default"](value))) {
             exprProps["".concat(key, "Raw")] = value;
-            exprProps[key] = cx__default["default"](helper.mapObject(value, function (value) {
-                return typeof value === 'string' ? tpl.evalExpression(value, data) : value;
-            }));
+            exprProps[key] = filterClassNameObject(value, data);
         }
     });
     return exprProps;
 }
 
 exports["default"] = getExprProperties;
+exports.filterClassNameObject = filterClassNameObject;
 exports.getExprProperties = getExprProperties;

package/lib/utils/filter.js

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

package/lib/utils/formatDuration.js

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

package/lib/utils/formula.js

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

package/lib/utils/getVariable.js

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

package/lib/utils/grammar.js

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

package/lib/utils/handleAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -30,6 +30,7 @@ function handleAction(e, action, props, data) {
         action.actionType = 'ajax';
         var api$1 = api.normalizeApi(action.api);
         api$1.responseType = 'blob';
+        api$1.downloadFileName = action.downloadFileName;
         action.api = api$1;
     }
     onAction(e, action, data || props.data);

package/lib/utils/helper.d.ts

@@ -256,6 +256,7 @@ export declare function getTreeAncestors<T extends TreeItem>(tree: Array<T>, val
  * @param value
  */
 export declare function getTreeParent<T extends TreeItem>(tree: Array<T>, value: T): T | null;
+export declare function countTree<T extends TreeItem>(tree: Array<T>, iterator?: (item: T, key: number, level: number, paths?: Array<T>) => any): number;
 export declare function ucFirst(str?: string): string | undefined;
 export declare function lcFirst(str?: string): string;
 export declare function camel(str?: string): string;
@@ -273,7 +274,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, skipFn?: (value: any) => boolean): any;
+export declare function mapObject(value: any, valueMapper: (value: any) => any, skipFn?: (value: any) => boolean, keyMapper?: (key: string) => string): any;
 export declare function loadScript(src: string): Promise<void>;
 export declare function loadStyle(href: string): Promise<void>;
 export declare class SkipOperation extends Error {
@@ -345,15 +346,26 @@ export declare function convertArrayValueToMoment(value: number[], types: string
 export declare function getRange(min: number, max: number, step?: number): number[];
 export declare function repeatCount(count: number, iterator: (index: number) => any): any[];
 export declare function isNumeric(value: any): boolean;
+/**
+ * 解析Query字符串中的原始类型，目前仅支持转化布尔类型
+ *
+ * @param query 查询字符串
+ * @returns 解析后的查询字符串
+ */
+export declare function parsePrimitiveQueryString(rawQuery: Record<string, any>): any;
 /**
  * 获取URL链接中的query参数（包含hash mode）
  *
  * @param location Location对象，或者类Location结构的对象
+ * @param {Object} options 配置项
+ * @param {Boolean} options.parsePrimitive 是否将query的值解析为原始类型，目前仅支持转化布尔类型
  */
 export declare function parseQuery(location?: Location | {
     query?: any;
     search?: any;
     [propName: string]: any;
+}, options?: {
+    parsePrimitive?: boolean;
 }): Record<string, any>;
 export declare function differenceFromAll<T>(allOptions: Array<T>, options: Array<T>, getValue: (item: T) => any): Array<T>;
 /**
@@ -364,3 +376,5 @@ export declare function differenceFromAll<T>(allOptions: Array<T>, options: Arra
  */
 export declare function buildTrackExpression(schema: any): string;
 export declare function evalTrackExpression(expression: string, data: Record<string, any>): string;
+export declare function importLazyComponent(mod: any): any;
+export declare function replaceUrlParams(path: string, params: Record<string, any>): string;

package/lib/utils/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -18,6 +18,7 @@ var isNaN = require('lodash/isNaN');
 var isNumber = require('lodash/isNumber');
 var isString = require('lodash/isString');
 var qs = require('qs');
+var pathToRegexp = require('path-to-regexp');
 var tpl = require('./tpl.js');
 var autobind$1 = require('./autobind.js');
 require('amis-formula');
@@ -919,6 +920,15 @@ function getTreeParent(tree, value) {
     var ancestors = getTreeAncestors(tree, value);
     return (ancestors === null || ancestors === void 0 ? void 0 : ancestors.length) ? ancestors[ancestors.length - 1] : null;
 }
+function countTree(tree, iterator) {
+    var count = 0;
+    eachTree(tree, function (item, key, level, paths) {
+        if (!iterator || iterator(item, key, level, paths)) {
+            count++;
+        }
+    });
+    return count;
+}
 function ucFirst(str) {
     return typeof str === 'string'
         ? str.substring(0, 1).toUpperCase() + str.substring(1)
@@ -1079,7 +1089,7 @@ function chainEvents(props, schema) {
     });
     return ret;
 }
-function mapObject(value, fn, skipFn) {
+function mapObject(value, valueMapper, skipFn, keyMapper) {
     // 如果value值满足skipFn条件则不做map操作
     skipFn =
         skipFn && typeof skipFn === 'function'
@@ -1091,20 +1101,21 @@ function mapObject(value, fn, skipFn) {
                 }
                 return false;
             };
-    if (!!skipFn(value)) {
+    if (skipFn(value)) {
         return value;
     }
     if (Array.isArray(value)) {
-        return value.map(function (item) { return mapObject(item, fn); });
+        return value.map(function (item) { return mapObject(item, valueMapper, skipFn, keyMapper); });
     }
     if (object.isObject(value)) {
-        var tmpValue_1 = tslib.__assign({}, value);
-        Object.keys(tmpValue_1).forEach(function (key) {
-            tmpValue_1[key] = mapObject(tmpValue_1[key], fn);
+        var tmpValue_1 = {};
+        Object.keys(value).forEach(function (key) {
+            var newKey = keyMapper ? keyMapper(key) : key;
+            tmpValue_1[newKey] = mapObject(value[key], valueMapper, skipFn, keyMapper);
         });
         return tmpValue_1;
     }
-    return fn(value);
+    return valueMapper(value);
 }
 function loadScript(src) {
     return new Promise(function (ok, fail) {
@@ -1229,7 +1240,7 @@ function getScrollbarWidth() {
 // 后续改用 FormulaExec['formula']
 function resolveValueByName(data, name, canAccessSuper) {
     return isPureVariable.isPureVariable(name)
-        ? resolveVariableAndFilter.resolveVariableAndFilter(name, data)
+        ? resolveVariableAndFilter.resolveVariableAndFilter(name, data, '|raw')
         : resolveVariable.resolveVariable(name, data, canAccessSuper);
 }
 // 统一的获取 value 值方法
@@ -1432,16 +1443,43 @@ function isNumeric(value) {
     }
     return /^[-+]?(?:\d*[.])?\d+$/.test(value);
 }
+/**
+ * 解析Query字符串中的原始类型，目前仅支持转化布尔类型
+ *
+ * @param query 查询字符串
+ * @returns 解析后的查询字符串
+ */
+function parsePrimitiveQueryString(rawQuery) {
+    if (!isPlainObject__default["default"](rawQuery)) {
+        return rawQuery;
+    }
+    var query = JSONValueMap(rawQuery, function (value) {
+        /** 解析布尔类型，后续有需要在这里扩充 */
+        if (value === 'true' || value === 'false') {
+            return value === 'true';
+        }
+        return value;
+    });
+    return query;
+}
 /**
  * 获取URL链接中的query参数（包含hash mode）
  *
  * @param location Location对象，或者类Location结构的对象
+ * @param {Object} options 配置项
+ * @param {Boolean} options.parsePrimitive 是否将query的值解析为原始类型，目前仅支持转化布尔类型
  */
-function parseQuery(location) {
+function parseQuery(location, options) {
     var _a;
+    var _b = (options || {}).parsePrimitive, parsePrimitive = _b === void 0 ? false : _b;
     var query = (location && !(location instanceof Location) && (location === null || location === void 0 ? void 0 : location.query)) ||
         (location && (location === null || location === void 0 ? void 0 : location.search) && qsparse(location.search.substring(1))) ||
         (window.location.search && qsparse(window.location.search.substring(1)));
+    var normalizedQuery = isPlainObject__default["default"](query)
+        ? parsePrimitive
+            ? parsePrimitiveQueryString(query)
+            : query
+        : {};
     /* 处理hash中的query */
     var hash = (_a = window.location) === null || _a === void 0 ? void 0 : _a.hash;
     var hashQuery = {};
@@ -1449,7 +1487,6 @@ function parseQuery(location) {
     if (typeof hash === 'string' && ~(idx = hash.indexOf('?'))) {
         hashQuery = qsparse(hash.substring(idx + 1));
     }
-    var normalizedQuery = isPlainObject__default["default"](query) ? query : {};
     return merge__default["default"](normalizedQuery, hashQuery);
 }
 /**
@@ -1552,6 +1589,16 @@ function evalTrackExpression(expression, data) {
     })
         .join('');
 }
+// 很奇怪的问题，react-json-view import 有些情况下 mod.default 才是 esModule
+function importLazyComponent(mod) {
+    return mod.default.__esModule ? mod.default : mod;
+}
+function replaceUrlParams(path, params) {
+    if (typeof path === 'string' && /\:\w+/.test(path)) {
+        return pathToRegexp.compile(path)(params);
+    }
+    return path;
+}
 
 exports.cloneObject = object.cloneObject;
 exports.createObject = object.createObject;
@@ -1576,6 +1623,7 @@ exports.chainEvents = chainEvents;
 exports.chainFunctions = chainFunctions;
 exports.changedEffect = changedEffect;
 exports.convertArrayValueToMoment = convertArrayValueToMoment;
+exports.countTree = countTree;
 exports.detectPropValueChanged = detectPropValueChanged;
 exports.difference = difference;
 exports.differenceFromAll = differenceFromAll;
@@ -1607,6 +1655,7 @@ exports.hasOwnPropertyInPath = hasOwnPropertyInPath;
 exports.hasVisibleExpression = hasVisibleExpression;
 exports.hashCode = hashCode;
 exports.immutableExtends = immutableExtends;
+exports.importLazyComponent = importLazyComponent;
 exports.injectPropsToObject = injectPropsToObject;
 exports.isArrayChildrenModified = isArrayChildrenModified;
 exports.isBreakpoint = isBreakpoint;
@@ -1631,6 +1680,7 @@ exports.normalizeNodePath = normalizeNodePath;
 exports.object2formData = object2formData;
 exports.omitControls = omitControls;
 exports.padArr = padArr;
+exports.parsePrimitiveQueryString = parsePrimitiveQueryString;
 exports.parseQuery = parseQuery;
 exports.pickEventsProps = pickEventsProps;
 exports.preventDefault = preventDefault;
@@ -1640,6 +1690,7 @@ exports.qsstringify = qsstringify;
 exports.range = range;
 exports.removeHTMLTag = removeHTMLTag;
 exports.repeatCount = repeatCount;
+exports.replaceUrlParams = replaceUrlParams;
 exports.rmUndefined = rmUndefined;
 exports.someTree = someTree;
 exports.sortArray = sortArray;

package/lib/utils/highlight.js

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

package/lib/utils/icon.js

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

package/lib/utils/image.js

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

package/lib/utils/isPureVariable.js

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

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

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

package/lib/utils/keyToPath.js

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

package/lib/utils/makeSorter.js

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

package/lib/utils/math.js

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

package/lib/utils/memoryParse.js

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

package/lib/utils/normalizeLink.js

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

package/lib/utils/normalizeOptions.js

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

package/lib/utils/object.js

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

package/lib/utils/offset.js

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

package/lib/utils/offsetParent.js

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

package/lib/utils/optionValueCompare.js

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

package/lib/utils/position.js

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

package/lib/utils/prettyBytes.js

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

package/lib/utils/renderer-event.js

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

package/lib/utils/replaceText.d.ts

@@ -1,3 +1,3 @@
 export declare function replaceText(schema: any, replaceText?: {
     [propName: string]: string;
-}, replaceTextIgnoreKeys?: String[]): any;
+}, replaceTextIgnoreKeys?: String[] | ((key: string, value: any, object: any) => boolean)): any;

package/lib/utils/replaceText.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -22,13 +22,18 @@ function replaceText(schema, replaceText, replaceTextIgnoreKeys) {
         var replicaSchema = cloneDeep__default["default"](schema);
         var replaceKeys_1 = Object.keys(replaceText);
         replaceKeys_1.sort(function (a, b) { return b.length - a.length; }); // 避免用户将短的放前面
-        var IgnoreKeys_1 = new Set(replaceTextIgnoreKeys || []);
+        var IgnoreKeys_1 = new Set(Array.isArray(replaceTextIgnoreKeys) ? replaceTextIgnoreKeys : []);
+        var ignore_1 = typeof replaceTextIgnoreKeys === 'function'
+            ? replaceTextIgnoreKeys
+            : function (key) {
+                return IgnoreKeys_1.has(key);
+            };
         helper.JSONTraverse(replicaSchema, function (value, key, object) {
             var e_1, _a;
             var descriptor = Object.getOwnPropertyDescriptor(object, key);
             if (typeof value === 'string' &&
-                !IgnoreKeys_1.has(key) &&
-                (descriptor === null || descriptor === void 0 ? void 0 : descriptor.writable)) {
+                (descriptor === null || descriptor === void 0 ? void 0 : descriptor.writable) &&
+                !ignore_1(key, value, object)) {
                 try {
                     for (var replaceKeys_2 = tslib.__values(replaceKeys_1), replaceKeys_2_1 = replaceKeys_2.next(); !replaceKeys_2_1.done; replaceKeys_2_1 = replaceKeys_2.next()) {
                         var replaceKey = replaceKeys_2_1.value;

package/lib/utils/resize-sensor.js

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

package/lib/utils/resolveCondition.js

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

package/lib/utils/resolveVariable.js

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

package/lib/utils/resolveVariableAndFilter.js

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

package/lib/utils/resolveVariableAndFilterForAsync.js

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

package/lib/utils/scrollPosition.js

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

package/lib/utils/string2regExp.js

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

package/lib/utils/stripNumber.js

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