amis-core 3.4.3 → 3.5.0

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;
@@ -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>;
 /**
@@ -365,3 +377,4 @@ 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.3
+ * 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)
@@ -1433,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 = {};
@@ -1450,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);
 }
 /**
@@ -1557,6 +1593,12 @@ function evalTrackExpression(expression, data) {
 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;
@@ -1581,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;
@@ -1637,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;
@@ -1646,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.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/icon.js

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

package/lib/utils/image.js

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

package/lib/utils/isPureVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * 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.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/keyToPath.js

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

package/lib/utils/makeSorter.js

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

package/lib/utils/math.js

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

package/lib/utils/memoryParse.js

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

package/lib/utils/normalizeLink.js

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

package/lib/utils/normalizeOptions.js

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

package/lib/utils/object.js

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

package/lib/utils/offset.js

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

package/lib/utils/offsetParent.js

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

package/lib/utils/optionValueCompare.js

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

package/lib/utils/position.js

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

package/lib/utils/prettyBytes.js

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

package/lib/utils/renderer-event.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * 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.3
+ * 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.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/resolveCondition.js

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

package/lib/utils/resolveVariable.js

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

package/lib/utils/resolveVariableAndFilter.js

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

package/lib/utils/resolveVariableAndFilterForAsync.js

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

package/lib/utils/scrollPosition.js

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

package/lib/utils/string2regExp.js

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

package/lib/utils/stripNumber.js

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

package/lib/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -63,7 +63,7 @@ function findOrCreateStyle(id, doc) {
     return varStyleTag;
 }
 function insertStyle(style, id, doc) {
-    var varStyleTag = findOrCreateStyle(id, doc);
+    var varStyleTag = findOrCreateStyle('amis-' + id, doc);
     // bca-disable-line
     varStyleTag.innerHTML = style;
     if (!style) {
@@ -320,7 +320,7 @@ function insertEditCustomStyle(customStyle, id, doc) {
  * 移除自定义样式
  */
 function removeCustomStyle(type, id, doc) {
-    var style = (doc || document).getElementById((type ? type + '-' : '') + id.replace('u:', ''));
+    var style = (doc || document).getElementById('amis-' + (type ? type + '-' : '') + id.replace('u:', ''));
     if (style) {
         style.remove();
     }

package/lib/utils/style.js

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

package/lib/utils/toNumber.js

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

package/lib/utils/tokenize.js

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

package/lib/utils/tpl-builtin.js

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

package/lib/utils/tpl-lodash.js

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

package/lib/utils/tpl.js

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

package/lib/utils/uncontrollable.js

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

package/lib/utils/validations.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-core",
-  "version": "3.4.3",
+  "version": "3.5.0",
   "description": "amis-core",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -46,7 +46,7 @@
     "esm"
   ],
   "dependencies": {
-    "amis-formula": "^3.4.3",
+    "amis-formula": "^3.5.0",
     "classnames": "2.3.2",
     "file-saver": "^2.0.2",
     "hoist-non-react-statics": "^3.3.2",
@@ -57,6 +57,7 @@
     "mobx-state-tree": "^3.17.3",
     "moment": "^2.19.4",
     "papaparse": "^5.3.0",
+    "path-to-regexp": "6.2.0",
     "qs": "6.9.7",
     "react-intersection-observer": "9.5.2",
     "react-json-view": "1.21.3",
@@ -106,5 +107,5 @@
       "/.rollup.cache/"
     ]
   },
-  "gitHead": "a0973fc96e9308311a2002e76cfaf9ee39ad7118"
+  "gitHead": "5f2d0c0f89ab4b1218354b9e5304fba59af75d73"
 }