amis-core 3.2.0 → 3.3.0

package/esm/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/esm/utils/icon.js

@@ -1,15 +1,16 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
 import React from 'react';
-import { isObject } from 'lodash';
+import isObject from 'lodash/isObject';
 
 /**
  * @file 图标支持的公共方法，主要是支持自动识别地址和 icon-font
  */
 /**
+ * 废弃，不建议使用
  * 判断字符串来生成 i 或 img
  * @param icon icon 设置
  * @param className 内部用的 className

package/esm/utils/image.js

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

package/esm/utils/index.d.ts

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

package/esm/utils/isPureVariable.js

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

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

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

package/esm/utils/keyToPath.js

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

package/esm/utils/makeSorter.js

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

package/esm/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/esm/utils/math.js

@@ -0,0 +1,52 @@
+/**
+ * amis-core v3.3.0
+ * Copyright 2018-2023 fex
+ */
+
+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);
+}
+
+export { numberFormatter, safeAdd, safeSub };

package/esm/utils/memoryParse.js

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

package/esm/utils/normalizeLink.js

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

package/esm/utils/normalizeOptions.js

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

package/esm/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/esm/utils/object.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -50,6 +50,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
@@ -164,4 +175,4 @@ function pickValues(names, data) {
     return ret;
 }
 
-export { cloneObject, createObject, createObjectFromChain, deleteVariable, extendObject, extractObjectChain, isObject, pickValues, setVariable };
+export { cloneObject, createObject, createObjectFromChain, deleteVariable, extendObject, extractObjectChain, injectObjectChain, isObject, pickValues, setVariable };

package/esm/utils/offset.js

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

package/esm/utils/offsetParent.js

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

package/esm/utils/optionValueCompare.js

@@ -1,10 +1,10 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
 import './helper.js';
-import { isEqual } from 'lodash';
+import isEqual from 'lodash/isEqual';
 import { isObject } from './object.js';
 
 function matchOptionValue(a, b, valueField) {

package/esm/utils/position.js

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

package/esm/utils/prettyBytes.js

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

package/esm/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/esm/utils/renderer-event.js

@@ -1,18 +1,18 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
 import { __values, __awaiter, __generator, __assign } from 'tslib';
 import { runActions } from '../actions/Action.js';
-import { createObject } from './object.js';
+import { extendObject, createObject } from './object.js';
 import debounce from 'lodash/debounce';
 
 var rendererEventListeners = [];
 // 创建渲染器事件对象
 function createRendererEvent(type, context) {
     var rendererEvent = {
-        context: context,
+        context: extendObject({ pristineData: context.data }, context),
         type: type,
         prevented: false,
         stoped: false,
@@ -25,6 +25,9 @@ function createRendererEvent(type, context) {
         get data() {
             return rendererEvent.context.data;
         },
+        get pristineData() {
+            return rendererEvent.context.pristineData;
+        },
         setData: function (data) {
             rendererEvent.context.data = data;
         }
@@ -82,8 +85,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;
@@ -133,7 +141,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/esm/utils/replaceText.js

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

package/esm/utils/resize-sensor.js

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

package/esm/utils/resolveCondition.js

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

package/esm/utils/resolveVariable.js

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

package/esm/utils/resolveVariableAndFilter.js

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

package/esm/utils/resolveVariableAndFilterForAsync.js

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

package/esm/utils/scrollPosition.js

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

package/esm/utils/string2regExp.js

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

package/esm/utils/stripNumber.js

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

package/esm/utils/style-helper.js

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

package/esm/utils/style.js

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

package/esm/utils/toNumber.js

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

package/esm/utils/tokenize.js

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

package/esm/utils/tpl-builtin.js

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

package/esm/utils/tpl-lodash.js

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

package/esm/utils/tpl.js

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

package/esm/utils/uncontrollable.js

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

package/esm/utils/validations.js

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

package/lib/Root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -24,6 +24,9 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var isPlainObject__default = /*#__PURE__*/_interopDefaultLegacy(isPlainObject);
 
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 var rootWrappers = [];
 function addRootWrapper(fn) {
     rootWrappers.push(fn);
@@ -47,12 +50,12 @@ var Root = /** @class */ (function (_super) {
         if (themeName === 'default') {
             themeName = 'cxd';
         }
-        return (React__default["default"].createElement(WithRootStore.RootStoreContext.Provider, { value: rootStore },
-            React__default["default"].createElement(theme.ThemeContext.Provider, { value: themeName },
-                React__default["default"].createElement(locale.LocaleContext.Provider, { value: this.props.locale }, rootWrappers.reduce(function (props, wrapper) {
+        return (_J$X_(WithRootStore.RootStoreContext.Provider, { value: rootStore },
+            _J$X_(theme.ThemeContext.Provider, { value: themeName },
+                _J$X_(locale.LocaleContext.Provider, { value: this.props.locale }, rootWrappers.reduce(function (props, wrapper) {
                     return tslib.__assign(tslib.__assign({}, props), { children: wrapper(props) });
                 }, tslib.__assign(tslib.__assign({ pathPrefix: pathPrefix || '', schema: isPlainObject__default["default"](schema)
-                        ? tslib.__assign({ type: 'page' }, schema) : schema }, rest), { render: renderChild, rootStore: rootStore, resolveDefinitions: this.resolveDefinitions, location: location, data: data, env: env, classnames: theme$1.classnames, classPrefix: theme$1.classPrefix, locale: locale$1, translate: translate, children: (React__default["default"].createElement(RootRenderer.RootRenderer, tslib.__assign({ pathPrefix: pathPrefix || '', schema: isPlainObject__default["default"](schema)
+                        ? tslib.__assign({ type: 'page' }, schema) : schema }, rest), { render: renderChild, rootStore: rootStore, resolveDefinitions: this.resolveDefinitions, location: location, data: data, env: env, classnames: theme$1.classnames, classPrefix: theme$1.classPrefix, locale: locale$1, translate: translate, children: (_J$X_(RootRenderer.RootRenderer, tslib.__assign({ pathPrefix: pathPrefix || '', schema: isPlainObject__default["default"](schema)
                             ? tslib.__assign({ type: 'page' }, schema) : schema }, rest, { render: renderChild, rootStore: rootStore, resolveDefinitions: this.resolveDefinitions, location: location, data: data, context: context, env: env, classnames: theme$1.classnames, classPrefix: theme$1.classPrefix, locale: locale$1, translate: translate }))) })).children))));
     };
     tslib.__decorate([
@@ -100,9 +103,9 @@ function renderChild(prefix, node, props) {
         // 找渲染器也是在那，所以没办法在之前根据渲染器信息来包裹个组件下发 statusStore
         // 所以这里先根据 type 来处理一下
         // 等后续把状态处理再抽一层，可以把此处放到 SchemaRenderer 里面去
-        return (React__default["default"].createElement(StatusScopedSchemaRenderer, tslib.__assign({ render: renderChild }, props, { schema: schema, propKey: schema.key, "$path": "".concat(prefix ? "".concat(prefix, "/") : '').concat((schema && schema.type) || '') })));
+        return (_J$X_(StatusScopedSchemaRenderer, tslib.__assign({ render: renderChild }, props, { schema: schema, propKey: schema.key, "$path": "".concat(prefix ? "".concat(prefix, "/") : '').concat((schema && schema.type) || '') })));
     }
-    return (React__default["default"].createElement(SchemaRenderer.SchemaRenderer, tslib.__assign({ render: renderChild }, props, { schema: schema, propKey: schema.key, "$path": "".concat(prefix ? "".concat(prefix, "/") : '').concat((schema && schema.type) || '') })));
+    return (_J$X_(SchemaRenderer.SchemaRenderer, tslib.__assign({ render: renderChild }, props, { schema: schema, propKey: schema.key, "$path": "".concat(prefix ? "".concat(prefix, "/") : '').concat((schema && schema.type) || '') })));
 }
 var ScopedRootRenderer = StatusScoped.StatusScoped(Scoped.HocScoped(Root));
 

package/lib/RootRenderer.d.ts

@@ -25,5 +25,5 @@ export declare class RootRenderer extends React.Component<RootRendererProps> {
     handleDrawerClose(): void;
     openFeedback(dialog: any, ctx: any): Promise<unknown>;
     reloadTarget(scoped: IScopedContext, target: string, data?: any): void;
-    render(): string | number | boolean | React.JSX.Element | Iterable<React.ReactNode> | null | undefined;
+    render(): string | number | boolean | Iterable<React.ReactNode> | React.JSX.Element | null | undefined;
 }

package/lib/RootRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -27,6 +27,9 @@ var qs__default = /*#__PURE__*/_interopDefaultLegacy(qs);
 var pick__default = /*#__PURE__*/_interopDefaultLegacy(pick);
 var mapValues__default = /*#__PURE__*/_interopDefaultLegacy(mapValues);
 
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 var RootRenderer = /** @class */ (function (_super) {
     tslib.__extends(RootRenderer, _super);
     function RootRenderer(props) {
@@ -128,7 +131,7 @@ var RootRenderer = /** @class */ (function (_super) {
         }
         else if (action.actionType === 'dialog') {
             store.setCurrentAction(action);
-            store.openDialog(ctx, undefined, action.callback, delegate);
+            store.openDialog(ctx, undefined, action.callback, delegate || this.context);
         }
         else if (action.actionType === 'drawer') {
             store.setCurrentAction(action);
@@ -268,7 +271,7 @@ var RootRenderer = /** @class */ (function (_super) {
             });
             store.openDialog(ctx, undefined, function (confirmed) {
                 resolve(confirmed);
-            });
+            }, _this.context);
         });
     };
     RootRenderer.prototype.reloadTarget = function (scoped, target, data) {
@@ -282,12 +285,12 @@ var RootRenderer = /** @class */ (function (_super) {
             return render('error', {
                 type: 'alert',
                 level: 'danger'
-            }, tslib.__assign(tslib.__assign({}, rest), { topStore: this.store, body: (React__default["default"].createElement(React__default["default"].Fragment, null,
-                    React__default["default"].createElement("h3", null, (_a = this.store.runtimeError) === null || _a === void 0 ? void 0 : _a.toString()),
-                    React__default["default"].createElement("pre", null,
-                        React__default["default"].createElement("code", null, this.store.runtimeErrorStack.componentStack)))) }));
+            }, tslib.__assign(tslib.__assign({}, rest), { topStore: this.store, body: (_J$X_(React__default["default"].Fragment, null,
+                    _J$X_("h3", null, (_a = this.store.runtimeError) === null || _a === void 0 ? void 0 : _a.toString()),
+                    _J$X_("pre", null,
+                        _J$X_("code", null, this.store.runtimeErrorStack.componentStack)))) }));
         }
-        return (React__default["default"].createElement(React__default["default"].Fragment, null,
+        return (_J$X_(React__default["default"].Fragment, null,
             render(pathPrefix, schema, tslib.__assign(tslib.__assign({}, rest), { topStore: this.store, data: this.store.downStream, onAction: this.handleAction })),
             render('spinner', {
                 type: 'spinner'