amis-core 3.1.1 → 3.2.0

package/lib/utils/formula.js

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

package/lib/utils/getVariable.js

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

package/lib/utils/grammar.js

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

package/lib/utils/handleAction.js

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

package/lib/utils/helper.d.ts

@@ -256,7 +256,7 @@ export declare const autobind: typeof autobindMethod;
 export declare const bulkBindFunctions: <T extends {
     [propName: string]: any;
 }>(context: T, funNames: FunctionPropertyNames<T>[]) => void;
-export declare function sortArray<T extends any>(items: Array<T>, field: string, dir: -1 | 1): Array<T>;
+export declare function sortArray<T extends any>(items: Array<T>, field: string, dir: -1 | 1, fieldGetter?: (item: T, field: string) => any): Array<T>;
 export declare function hasFile(object: any): boolean;
 export declare function qsstringify(data: any, options?: any, keepEmptyArray?: boolean): string;
 export declare function qsparse(data: string, options?: any): qs.ParsedQs;
@@ -314,6 +314,13 @@ export declare function hashCode(s: string): number;
  * @param mapper
  */
 export declare function JSONTraverse(json: any, mapper: (value: any, key: string | number, host: Object) => any): void;
+/**
+ * 每层都会执行，返回新的对象，新对象不会递归下去
+ * @param json
+ * @param mapper
+ * @returns
+ */
+export declare function JSONValueMap(json: any, mapper: (value: any, key: string | number, host: Object, stack: Array<Object>) => any, stack?: Array<Object>): any;
 export declare function convertArrayValueToMoment(value: number[], types: string[], mom: moment.Moment): moment.Moment;
 export declare function getRange(min: number, max: number, step?: number): number[];
 export declare function repeatCount(count: number, iterator: (index: number) => any): any[];

package/lib/utils/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.2.0
  * Copyright 2018-2023 fex
  */
 
@@ -870,11 +870,11 @@ var autobind = autobind$1.autobindMethod;
 var bulkBindFunctions = function (context, funNames) {
     funNames.forEach(function (key) { return (context[key] = context[key].bind(context)); });
 };
-function sortArray(items, field, dir) {
+function sortArray(items, field, dir, fieldGetter) {
     return items.sort(function (a, b) {
         var ret;
-        var a1 = a[field];
-        var b1 = b[field];
+        var a1 = fieldGetter ? fieldGetter(a, field) : a[field];
+        var b1 = fieldGetter ? fieldGetter(b, field) : b[field];
         if (typeof a1 === 'number' && typeof b1 === 'number') {
             ret = a1 < b1 ? -1 : a1 === b1 ? 0 : 1;
         }
@@ -897,11 +897,12 @@ function qsstringify(data, options, keepEmptyArray) {
         arrayFormat: 'indices',
         encodeValuesOnly: true
     }; }
-    // qs会保留空字符串。fix: Combo模式的空数组，无法清空。改为存为空字符串；只转换一层
-    keepEmptyArray &&
-        Object.keys(data).forEach(function (key) {
-            Array.isArray(data[key]) && !data[key].length && (data[key] = '');
+    // qs会保留空字符串。fix: Combo模式的空数组，无法清空。改为存为空字符串；
+    if (keepEmptyArray) {
+        data = JSONValueMap(data, function (value) {
+            return Array.isArray(value) && !value.length ? '' : value;
         });
+    }
     return qs__default["default"].stringify(data, options);
 }
 function qsparse(data, options) {
@@ -970,6 +971,7 @@ function chainFunctions() {
 function chainEvents(props, schema) {
     var ret = {};
     Object.keys(props).forEach(function (key) {
+        var _a;
         if (key.substr(0, 2) === 'on' &&
             typeof props[key] === 'function' &&
             typeof schema[key] === 'function' &&
@@ -983,7 +985,7 @@ function chainEvents(props, schema) {
             }
         }
         else {
-            ret[key] = props[key];
+            ret[key] = (_a = props[key]) !== null && _a !== void 0 ? _a : schema[key];
         }
     });
     return ret;
@@ -1249,6 +1251,51 @@ function JSONTraverse(json, mapper) {
         }
     });
 }
+/**
+ * 每层都会执行，返回新的对象，新对象不会递归下去
+ * @param json
+ * @param mapper
+ * @returns
+ */
+function JSONValueMap(json, mapper, stack) {
+    if (stack === void 0) { stack = []; }
+    if (!isPlainObject__default["default"](json) && !Array.isArray(json)) {
+        return json;
+    }
+    var iterator = function (origin, key, host, stack) {
+        if (stack === void 0) { stack = []; }
+        var maped = mapper(origin, key, host, stack);
+        if (maped === origin && (isPlainObject__default["default"](origin) || Array.isArray(origin))) {
+            return JSONValueMap(origin, mapper, stack);
+        }
+        return maped;
+    };
+    if (Array.isArray(json)) {
+        var flag_1 = false;
+        var mapped = json.map(function (value, index) {
+            var result = iterator(value, index, json, [json].concat(stack));
+            if (result !== value) {
+                flag_1 = true;
+                return result;
+            }
+            return value;
+        });
+        return flag_1 ? mapped : json;
+    }
+    var flag = false;
+    var toUpdate = {};
+    Object.keys(json).forEach(function (key) {
+        var value = json[key];
+        var result = iterator(value, key, json, [json].concat(stack));
+        if (result !== value) {
+            flag = true;
+            toUpdate[key] = result;
+            return;
+        }
+    });
+    return flag
+        ? tslib.__assign(tslib.__assign({}, json), toUpdate) : json;
+}
 function convertArrayValueToMoment(value, types, mom) {
     if (value.length === 0)
         return mom;
@@ -1312,6 +1359,7 @@ exports.string2regExp = string2regExp.string2regExp;
 exports.getVariable = getVariable.getVariable;
 exports.keyToPath = keyToPath.keyToPath;
 exports.JSONTraverse = JSONTraverse;
+exports.JSONValueMap = JSONValueMap;
 exports.SkipOperation = SkipOperation;
 exports.__uri = __uri;
 exports.anyChanged = anyChanged;

package/lib/utils/highlight.js

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

package/lib/utils/icon.js

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

package/lib/utils/image.js

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

package/lib/utils/index.d.ts

@@ -54,5 +54,6 @@ export * from './toNumber';
 export * from './decodeEntity';
 export * from './style-helper';
 export * from './resolveCondition';
+export * from './arraySlice';
 import animation from './Animation';
 export { animation };

package/lib/utils/isPureVariable.js

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

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

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

package/lib/utils/keyToPath.js

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

package/lib/utils/makeSorter.js

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

package/lib/utils/memoryParse.js

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

package/lib/utils/normalizeLink.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.2.0
  * Copyright 2018-2023 fex
  */
 
@@ -18,13 +18,21 @@ var normalizeLink = function (to, location) {
     }
     var idx = to.indexOf('?');
     var idx2 = to.indexOf('#');
-    var pathname = ~idx
-        ? to.substring(0, idx)
-        : ~idx2
-            ? to.substring(0, idx2)
-            : to;
-    var search = ~idx ? to.substring(idx, ~idx2 ? idx2 : undefined) : '';
-    var hash = ~idx2 ? to.substring(idx2) : location.hash;
+    var pathname = to;
+    var search = '';
+    var hash = location.hash;
+    // host?a=a#b 的情况
+    if (idx < idx2) {
+        pathname = ~idx ? to.substring(0, idx) : ~idx2 ? to.substring(0, idx2) : to;
+        hash = ~idx2 ? to.substring(idx2) : location.hash;
+        search = ~idx ? to.substring(idx, ~idx2 ? idx2 : undefined) : '';
+    }
+    // host#b?a=a 的情况
+    else if (idx > idx2) {
+        pathname = ~idx2 ? to.substring(0, idx2) : ~idx ? to.substring(0, idx) : to;
+        hash = ~idx2 ? to.substring(idx2, ~idx ? idx : undefined) : location.hash;
+        search = ~idx ? to.substring(idx) : '';
+    }
     if (!pathname) {
         pathname = location.pathname;
     }
@@ -41,7 +49,8 @@ var normalizeLink = function (to, location) {
         }
         pathname = paths.concat(pathname).join('/');
     }
-    return pathname + search + hash;
+    var rest = idx < idx2 ? search + hash : hash + search;
+    return pathname + rest;
 };
 
 exports.normalizeLink = normalizeLink;

package/lib/utils/normalizeOptions.js

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

package/lib/utils/object.js

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

package/lib/utils/offset.js

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

package/lib/utils/offsetParent.js

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

package/lib/utils/optionValueCompare.js

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

package/lib/utils/position.js

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

package/lib/utils/prettyBytes.js

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

package/lib/utils/renderer-event.js

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

package/lib/utils/replaceText.js

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

package/lib/utils/resize-sensor.js

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

package/lib/utils/resolveCondition.js

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

package/lib/utils/resolveVariable.js

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

package/lib/utils/resolveVariableAndFilter.js

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

package/lib/utils/resolveVariableAndFilterForAsync.js

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

package/lib/utils/scrollPosition.js

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

package/lib/utils/string2regExp.js

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

package/lib/utils/stripNumber.js

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

package/lib/utils/style-helper.js

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

package/lib/utils/style.js

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

package/lib/utils/toNumber.js

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

package/lib/utils/tokenize.js

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

package/lib/utils/tpl-builtin.js

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

package/lib/utils/tpl-lodash.js

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

package/lib/utils/tpl.js

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

package/lib/utils/uncontrollable.js

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

package/lib/utils/validations.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-core",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "description": "amis-core",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -45,7 +45,7 @@
     "esm"
   ],
   "dependencies": {
-    "amis-formula": "^3.1.1",
+    "amis-formula": "^3.2.0",
     "classnames": "2.3.1",
     "file-saver": "^2.0.2",
     "hoist-non-react-statics": "^3.3.2",
@@ -69,6 +69,11 @@
   },
   "jest": {
     "testEnvironment": "jsdom",
+    "collectCoverage": true,
+    "coverageReporters": [
+      "text",
+      "cobertura"
+    ],
     "collectCoverageFrom": [
       "src/**/*"
     ],
@@ -101,5 +106,5 @@
       "/.rollup.cache/"
     ]
   },
-  "gitHead": "17e32ce204cfacf65f00db8ea0109295406d9282"
+  "gitHead": "910dddafdbcaf3b11012ade7c593c24b285dfeb5"
 }