amis-core 3.1.1 → 3.3.0

package/lib/utils/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.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;
@@ -1051,6 +1053,17 @@ var SkipOperation = /** @class */ (function (_super) {
     }
     return SkipOperation;
 }(Error));
+var ValidateError = /** @class */ (function (_super) {
+    tslib.__extends(ValidateError, _super);
+    function ValidateError(message, error) {
+        var _this = _super.call(this) || this;
+        _this.name = 'ValidateError';
+        _this.message = message;
+        _this.detail = error;
+        return _this;
+    }
+    return ValidateError;
+}(Error));
 /**
  * 检查对象是否有循环引用，来自 https://stackoverflow.com/a/34909127
  * @param obj
@@ -1133,6 +1146,7 @@ function resolveValueByName(data, name, canAccessSuper) {
 // 统一的获取 value 值方法
 function getPropValue(props, getter, canAccessSuper) {
     var _a, _b;
+    if (canAccessSuper === void 0) { canAccessSuper = props.canAccessSuperData; }
     var name = props.name, value = props.value, data = props.data, defaultValue = props.defaultValue;
     return ((_b = (_a = value !== null && value !== void 0 ? value : getter === null || getter === void 0 ? void 0 : getter(props)) !== null && _a !== void 0 ? _a : resolveValueByName(data, name, canAccessSuper)) !== null && _b !== void 0 ? _b : defaultValue);
 }
@@ -1249,6 +1263,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,7 +1371,9 @@ exports.string2regExp = string2regExp.string2regExp;
 exports.getVariable = getVariable.getVariable;
 exports.keyToPath = keyToPath.keyToPath;
 exports.JSONTraverse = JSONTraverse;
+exports.JSONValueMap = JSONValueMap;
 exports.SkipOperation = SkipOperation;
+exports.ValidateError = ValidateError;
 exports.__uri = __uri;
 exports.anyChanged = anyChanged;
 exports.autobind = autobind;

package/lib/utils/highlight.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -7,12 +7,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var React = require('react');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+require('react');
 
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 function highlight(text, input, hlClassName) {
     if (hlClassName === void 0) { hlClassName = 'is-matched'; }
     if (!input) {
@@ -29,13 +28,13 @@ function highlight(text, input, hlClassName) {
     reg.lastIndex = 0;
     while ((match = reg.exec(text))) {
         var prev = text.substring(start, match.index);
-        prev && dom.push(React__default["default"].createElement("span", { key: dom.length }, prev));
+        prev && dom.push(_J$X_("span", { key: dom.length }, prev));
         match[0] &&
-            dom.push(React__default["default"].createElement("span", { className: hlClassName, key: dom.length }, match[0]));
+            dom.push(_J$X_("span", { className: hlClassName, key: dom.length }, match[0]));
         start = match.index + match[0].length;
     }
     var rest = text.substring(start);
-    rest && dom.push(React__default["default"].createElement("span", { key: dom.length }, rest));
+    rest && dom.push(_J$X_("span", { key: dom.length }, rest));
     // const parts = text.split(reg);
     // parts.forEach((text: string, index) => {
     //   text && dom.push(<span key={index}>{text}</span>);

package/lib/utils/icon.d.ts

@@ -3,19 +3,21 @@
  */
 import React from 'react';
 import { ClassNamesFn } from '../theme';
-export interface IconCheckedSchema {
+interface IconCheckedSchema {
     id: string;
     name?: string;
     svg?: string;
 }
-export interface IconCheckedSchemaNew {
+interface IconCheckedSchemaNew {
     type: 'icon';
     icon: IconCheckedSchema;
 }
 /**
+ * 废弃，不建议使用
  * 判断字符串来生成 i 或 img
  * @param icon icon 设置
  * @param className 内部用的 className
  * @param classNameProp amis 配置里设置的 className
  */
 export declare const generateIcon: (cx: ClassNamesFn, icon?: string | IconCheckedSchema | React.ReactNode | IconCheckedSchemaNew, className?: string, classNameProp?: string) => React.JSX.Element | null | undefined;
+export {};

package/lib/utils/icon.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -8,23 +8,25 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
-var lodash = require('lodash');
+var isObject = require('lodash/isObject');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
 
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 /**
- * @file 图标支持的公共方法，主要是支持自动识别地址和 icon-font
- */
-/**
+ * 废弃，不建议使用
  * 判断字符串来生成 i 或 img
  * @param icon icon 设置
  * @param className 内部用的 className
  * @param classNameProp amis 配置里设置的 className
  */
 var generateIcon = function (cx, icon, className, classNameProp) {
-    if (lodash.isObject(icon) &&
+    if (isObject__default["default"](icon) &&
         icon.type === 'icon' &&
         icon.icon) {
         icon = icon.icon;
@@ -33,16 +35,16 @@ var generateIcon = function (cx, icon, className, classNameProp) {
         return icon;
     }
     if (typeof icon !== 'string') {
-        if (lodash.isObject(icon) &&
+        if (isObject__default["default"](icon) &&
             typeof icon.id === 'string' &&
             icon.id.startsWith('svg-')) {
-            return (React__default["default"].createElement("svg", { className: cx('icon', 'icon-object', className, classNameProp) },
-                React__default["default"].createElement("use", { xlinkHref: "#".concat(icon.id.replace(/^svg-/, '')) })));
+            return (_J$X_("svg", { className: cx('icon', 'icon-object', className, classNameProp) },
+                _J$X_("use", { xlinkHref: "#".concat(icon.id.replace(/^svg-/, '')) })));
         }
         return;
     }
     var isURLIcon = (icon === null || icon === void 0 ? void 0 : icon.indexOf('.')) !== -1;
-    return icon ? (isURLIcon ? (React__default["default"].createElement("img", { className: cx(className, classNameProp), src: icon, key: icon })) : (React__default["default"].createElement("i", { className: cx(className, icon, classNameProp), key: icon }))) : null;
+    return icon ? (isURLIcon ? (_J$X_("img", { className: cx(className, classNameProp), src: icon, key: icon })) : (_J$X_("i", { className: cx(className, icon, classNameProp), key: icon }))) : null;
 };
 
 exports.generateIcon = generateIcon;

package/lib/utils/image.js

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

package/lib/utils/index.d.ts

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

package/lib/utils/isPureVariable.js

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

package/lib/utils/keyToPath.js

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

package/lib/utils/makeSorter.js

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

package/lib/utils/math.d.ts

@@ -0,0 +1,3 @@
+export declare function safeAdd(arg1: number, arg2: number): number;
+export declare function safeSub(arg1: number, arg2: number): number;
+export declare function numberFormatter(num: number | string, precision?: number): string;

package/lib/utils/math.js

@@ -0,0 +1,58 @@
+/**
+ * amis-core v3.3.0
+ * Copyright 2018-2023 fex
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+function safeAdd(arg1, arg2) {
+    var digits1, digits2, maxDigits;
+    try {
+        digits1 = arg1.toString().split('.')[1].length;
+    }
+    catch (e) {
+        digits1 = 0;
+    }
+    try {
+        digits2 = arg2.toString().split('.')[1].length;
+    }
+    catch (e) {
+        digits2 = 0;
+    }
+    maxDigits = Math.pow(10, Math.max(digits1, digits2));
+    return (arg1 * maxDigits + arg2 * maxDigits) / maxDigits;
+}
+//减
+function safeSub(arg1, arg2) {
+    var digits1, digits2, maxDigits;
+    try {
+        digits1 = arg1.toString().split('.')[1].length;
+    }
+    catch (e) {
+        digits1 = 0;
+    }
+    try {
+        digits2 = arg2.toString().split('.')[1].length;
+    }
+    catch (e) {
+        digits2 = 0;
+    }
+    maxDigits = Math.pow(10, Math.max(digits1, digits2));
+    return (arg1 * maxDigits - arg2 * maxDigits) / maxDigits;
+}
+function numberFormatter(num, precision) {
+    if (precision === void 0) { precision = 0; }
+    var ZERO = 0;
+    var number = +num;
+    if (typeof number === 'number' && !isNaN(number)) {
+        var regexp = precision ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(\d{3})+$)/g;
+        return number.toFixed(precision).replace(regexp, '$1,');
+    }
+    return ZERO.toFixed(precision);
+}
+
+exports.numberFormatter = numberFormatter;
+exports.safeAdd = safeAdd;
+exports.safeSub = safeSub;

package/lib/utils/memoryParse.js

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

package/lib/utils/normalizeLink.js

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

package/lib/utils/object.d.ts

@@ -5,6 +5,13 @@ export declare function createObject(superProps?: {
 }, properties?: any): object;
 export declare function extractObjectChain(value: any): object[];
 export declare function createObjectFromChain(chain: Array<object>): object;
+/**
+ * 向最近一层插入新链
+ * @param obj
+ * @param value
+ * @returns
+ */
+export declare function injectObjectChain(obj: any, value: any): object;
 export declare function cloneObject(target: any, persistOwnProps?: boolean): any;
 export declare function extendObject(target: any, src?: any, persistOwnProps?: boolean): any;
 export declare function isObject(obj: any): any;

package/lib/utils/object.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -58,6 +58,17 @@ function createObjectFromChain(chain) {
         }), value);
     });
 }
+/**
+ * 向最近一层插入新链
+ * @param obj
+ * @param value
+ * @returns
+ */
+function injectObjectChain(obj, value) {
+    var chain = extractObjectChain(obj);
+    chain.splice(chain.length - 1, 0, value);
+    return createObjectFromChain(chain);
+}
 function cloneObject(target, persistOwnProps) {
     if (persistOwnProps === void 0) { persistOwnProps = true; }
     var obj = target && target.__super
@@ -178,6 +189,7 @@ exports.createObjectFromChain = createObjectFromChain;
 exports.deleteVariable = deleteVariable;
 exports.extendObject = extendObject;
 exports.extractObjectChain = extractObjectChain;
+exports.injectObjectChain = injectObjectChain;
 exports.isObject = isObject;
 exports.pickValues = pickValues;
 exports.setVariable = setVariable;

package/lib/utils/offset.js

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

package/lib/utils/offsetParent.js

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

package/lib/utils/optionValueCompare.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -8,9 +8,13 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('./helper.js');
-var lodash = require('lodash');
+var isEqual = require('lodash/isEqual');
 var object = require('./object.js');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
+
 function matchOptionValue(a, b, valueField) {
     if (valueField === void 0) { valueField = 'value'; }
     // a 可能为 Option, 此时需要取其value
@@ -19,7 +23,7 @@ function matchOptionValue(a, b, valueField) {
         : a;
     var bValue = b[valueField || 'value'];
     return object.isObject(aValue)
-        ? lodash.isEqual(aValue, bValue)
+        ? isEqual__default["default"](aValue, bValue)
         : // 当值均为 undefined 时，不应该判定相等
             aValue !== undefined &&
                 bValue !== undefined &&

package/lib/utils/position.js

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

package/lib/utils/prettyBytes.js

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

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

@@ -48,7 +48,7 @@ export interface RendererEventContext {
     [propName: string]: any;
 }
 export declare function createRendererEvent<T extends RendererEventContext>(type: string, context: T): RendererEvent<T>;
-export declare const bindEvent: (renderer: any) => (() => void) | undefined;
+export declare const bindEvent: (renderer: any) => ((eventName?: string) => void) | undefined;
 export declare function dispatchEvent(e: string | React.MouseEvent<any>, renderer: React.Component<RendererProps>, scoped: IScopedContext, data: any, broadcast?: RendererEvent<any>): Promise<RendererEvent<any> | void>;
 export declare const getRendererEventListeners: () => RendererEventListener[];
 /**

package/lib/utils/renderer-event.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -20,7 +20,7 @@ var rendererEventListeners = [];
 // 创建渲染器事件对象
 function createRendererEvent(type, context) {
     var rendererEvent = {
-        context: context,
+        context: object.extendObject({ pristineData: context.data }, context),
         type: type,
         prevented: false,
         stoped: false,
@@ -33,6 +33,9 @@ function createRendererEvent(type, context) {
         get data() {
             return rendererEvent.context.data;
         },
+        get pristineData() {
+            return rendererEvent.context.pristineData;
+        },
         setData: function (data) {
             rendererEvent.context.data = data;
         }
@@ -90,8 +93,13 @@ var bindEvent = function (renderer) {
             }
             finally { if (e_1) throw e_1.error; }
         }
-        return function () {
-            rendererEventListeners = rendererEventListeners.filter(function (item) { return item.renderer !== renderer; });
+        return function (eventName) {
+            // eventName用来避免过滤广播事件
+            rendererEventListeners = rendererEventListeners.filter(function (item) {
+                return item.renderer !== renderer && eventName !== undefined
+                    ? item.type !== eventName
+                    : true;
+            });
         };
     }
     return undefined;
@@ -141,7 +149,7 @@ function dispatchEvent(e, renderer, scoped, data, broadcast) {
                     checkExecuted = function () {
                         executedCount++;
                         if (executedCount === listeners.length) {
-                            unbindEvent === null || unbindEvent === void 0 ? void 0 : unbindEvent();
+                            unbindEvent === null || unbindEvent === void 0 ? void 0 : unbindEvent(eventName);
                         }
                     };
                     _loop_2 = function (listener) {

package/lib/utils/replaceText.js

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

package/lib/utils/resize-sensor.js

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

package/lib/utils/resolveCondition.js

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

package/lib/utils/resolveVariable.js

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

package/lib/utils/resolveVariableAndFilter.js

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

package/lib/utils/resolveVariableAndFilterForAsync.js

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