amis-core 6.13.0-beta.0 → 6.13.0-beta.10

package/esm/utils/loopTooMuch.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/makeSorter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/math.d.ts

@@ -1,6 +1,7 @@
 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;
+export declare function numberReverter(value: string | number | undefined): string;
 /**
  * 判断一个数字是否为整数，且在给定范围内
  *

package/esm/utils/math.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 
@@ -51,6 +51,20 @@ function numberFormatter(num, precision) {
     }
     return ZERO.toFixed(finalP);
 }
+// 还原千分符格式化的值，并保留小数点后的精度
+function numberReverter(value) {
+    if (!value)
+        return '';
+    var stringValue = value.toString();
+    var withoutCommas = stringValue.replace(/,/g, '');
+    // 如果原始字符串有小数点，保留小数部分的精度
+    if (stringValue.includes('.')) {
+        var decimalPlaces = stringValue.split('.')[1].length;
+        return Number(withoutCommas).toFixed(decimalPlaces);
+    }
+    // 对于整数，直接返回转换后的数字
+    return withoutCommas;
+}
 /**
  * 判断一个数字是否为整数，且在给定范围内
  *
@@ -81,4 +95,4 @@ function isIntegerInRange(num, options) {
     }
 }
 
-export { isIntegerInRange, numberFormatter, safeAdd, safeSub };
+export { isIntegerInRange, numberFormatter, numberReverter, safeAdd, safeSub };

package/esm/utils/memoryParse.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/normalizeLink.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/normalizeOptions.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 
@@ -64,7 +64,11 @@ function normalizeOptions(options, share, valueField) {
             }
             var option = __assign(__assign({}, item), (_a = {}, _a[valueField] = value, _a));
             if (typeof option.children !== 'undefined') {
-                option.children = normalizeOptions(option.children, share, valueField);
+                // 用新的 share 避免 children 内部复用全局缓存
+                option.children = normalizeOptions(option.children, {
+                    values: [],
+                    options: []
+                }, valueField);
             }
             else if (value !== undefined) {
                 share.values.push(value);

package/esm/utils/object.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/offset.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/offsetParent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/optionValueCompare.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/position.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/prettyBytes.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/printElement.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/renderer-event.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/replaceText.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/resize-sensor.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 
@@ -172,18 +172,21 @@ function resizeSensor(element, callback, once, type) {
             if (once) {
                 observer_1.disconnect();
             }
-            if (type === 'both') {
-                callback();
-            }
-            else {
-                var entry = entries[0];
-                var cr = entry.contentRect;
-                if ((type === 'width' && cr.width !== originWidth_1) ||
-                    (type === 'height' && cr.height !== originHeight_1)) {
+            var entry = entries[0];
+            var cr = entry.contentRect;
+            // 变化大于0.5px时才触发回调,允许一定的误差
+            var widthChanged = Math.abs(cr.width - originWidth_1) > 0.5;
+            var heightChanged = Math.abs(cr.height - originHeight_1) > 0.5;
+            if (widthChanged || heightChanged) {
+                if (type === 'both') {
+                    callback();
+                }
+                else if ((type === 'width' && widthChanged) ||
+                    (type === 'height' && heightChanged)) {
                     callback();
-                    originWidth_1 = cr.width;
-                    originHeight_1 = cr.height;
                 }
+                originWidth_1 = cr.width;
+                originHeight_1 = cr.height;
             }
         });
         observer_1.observe(element);

package/esm/utils/resolveCondition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/resolveVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/resolveVariableAndFilter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/resolveVariableAndFilterForAsync.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/scrollPosition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/string2regExp.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/stripNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/style.d.ts

@@ -8,3 +8,16 @@
  * 3. 针对 image 自动加 url
  */
 export declare function buildStyle(style: any, data: any): any;
+/**
+ * 将 style 转换为对象
+ * @param style
+ * @returns
+ */
+export declare function normalizeStyle(style: any): any;
+/**
+ * 合并 style
+ * @param to
+ * @param from
+ * @returns
+ */
+export declare function mergeStyle(to: any, from: any): any;

package/esm/utils/style.js

@@ -1,9 +1,9 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 
-import 'tslib';
+import { __read } from 'tslib';
 import 'amis-formula';
 import 'moment';
 import 'lodash/isPlainObject';
@@ -69,5 +69,45 @@ function buildStyle(style, data) {
     }
     return styleVar;
 }
+/**
+ * 将 style 转换为对象
+ * @param style
+ * @returns
+ */
+function normalizeStyle(style) {
+    if (!style) {
+        return {};
+    }
+    else if (typeof style === 'string') {
+        return style.split(';').reduce(function (acc, item) {
+            var _a = __read(item.split(':').map(function (item) { return item.trim(); }), 2), key = _a[0], value = _a[1];
+            if (key && value) {
+                acc[camelCase(key)] = value;
+            }
+            return acc;
+        }, {});
+    }
+    else {
+        return style;
+    }
+}
+/**
+ * 合并 style
+ * @param to
+ * @param from
+ * @returns
+ */
+function mergeStyle(to, from) {
+    if (!to && !from) {
+        return {};
+    }
+    if (!to) {
+        return from;
+    }
+    if (!from) {
+        return to;
+    }
+    return Object.assign({}, normalizeStyle(to), normalizeStyle(from));
+}
 
-export { buildStyle };
+export { buildStyle, mergeStyle, normalizeStyle };

package/esm/utils/toNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/tokenize.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/tpl-builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/tpl-lodash.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 
@@ -58,6 +58,7 @@ function asyncFilter(tpl, data) {
 }
 // 缓存一下提升性能
 var EVAL_CACHE = {};
+var WARNING_CACHE = {};
 var customEvalExpressionFn;
 function setCustomEvalExpression(fn) {
     customEvalExpressionFn = fn;
@@ -98,7 +99,10 @@ function evalExpression(expression, data) {
         return fn.call(data, data, getFilters());
     }
     catch (e) {
-        console.warn(expression, e);
+        if (!WARNING_CACHE[expression]) {
+            console.warn(expression, e);
+            WARNING_CACHE[expression] = true;
+        }
         return false;
     }
 }

package/esm/utils/uncontrollable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/validateId.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/visitedCache.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/Root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 

package/lib/RootRenderer.d.ts

@@ -31,5 +31,5 @@ export declare class RootRenderer extends React.Component<RootRendererProps> {
     renderError(): React.ReactNode;
     renderDialog(): React.ReactNode;
     renderDrawer(): React.ReactNode;
-    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 v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 
@@ -46,7 +46,7 @@ var RootRenderer = /** @class */ (function (_super) {
             storeType: root.RootStore.name,
             parentId: ''
         });
-        _this.store.updateContext(props.context);
+        _this.store.updateContext(props.context, true);
         _this.store.initData(props.data);
         _this.store.updateLocation(props.location, (_a = _this.props.env) === null || _a === void 0 ? void 0 : _a.parseLocation);
         _this.store.setGlobalVars(props.globalVars);
@@ -65,7 +65,17 @@ var RootRenderer = /** @class */ (function (_super) {
                 return;
             }
             var schema = props.schema;
-            var types = ['tpl', 'dialog', 'drawer'];
+            var types = [
+                'tpl',
+                'dialog',
+                'drawer',
+                'cell',
+                'spinner',
+                'group',
+                'container',
+                'dropdown-button',
+                'plain'
+            ];
             helper.JSONTraverse(schema, function (value, key) {
                 if (key === 'type') {
                     types.push(value);
@@ -374,14 +384,12 @@ var RootRenderer = /** @class */ (function (_super) {
     RootRenderer.prototype.renderDialog = function () {
         var _a = this.props, render = _a.render, rest = tslib.__rest(_a, ["render"]);
         var store = this.store;
-        return render('dialog', tslib.__assign(tslib.__assign({}, (store.action &&
-            store.action.dialog)), { type: 'dialog' }), tslib.__assign(tslib.__assign({}, rest), { key: 'dialog', topStore: this.store, data: store.dialogData, context: store.context, onConfirm: this.handleDialogConfirm, onClose: this.handleDialogClose, show: store.dialogOpen, onAction: this.handleAction, dispatchEvent: this.dispatchEvent }));
+        return render('dialog', tslib.__assign(tslib.__assign({}, store.dialogSchema), { type: 'dialog' }), tslib.__assign(tslib.__assign({}, rest), { key: 'dialog', topStore: this.store, data: store.dialogData, context: store.context, onConfirm: this.handleDialogConfirm, onClose: this.handleDialogClose, show: store.dialogOpen, onAction: this.handleAction, dispatchEvent: this.dispatchEvent }));
     };
     RootRenderer.prototype.renderDrawer = function () {
         var _a = this.props, render = _a.render, rest = tslib.__rest(_a, ["render"]);
         var store = this.store;
-        return render('drawer', tslib.__assign(tslib.__assign({}, (store.action &&
-            store.action.drawer)), { type: 'drawer' }), tslib.__assign(tslib.__assign({}, rest), { key: 'drawer', topStore: this.store, data: store.drawerData, context: store.context, onConfirm: this.handleDrawerConfirm, onClose: this.handleDrawerClose, show: store.drawerOpen, onAction: this.handleAction, dispatchEvent: this.dispatchEvent }));
+        return render('drawer', tslib.__assign(tslib.__assign({}, store.drawerSchema), { type: 'drawer' }), tslib.__assign(tslib.__assign({}, rest), { key: 'drawer', topStore: this.store, data: store.drawerData, context: store.context, onConfirm: this.handleDrawerConfirm, onClose: this.handleDrawerClose, show: store.drawerOpen, onAction: this.handleAction, dispatchEvent: this.dispatchEvent }));
     };
     RootRenderer.prototype.render = function () {
         var _a = this.props, pathPrefix = _a.pathPrefix, schema = _a.schema, render = _a.render; _a.globalVars; var rest = tslib.__rest(_a, ["pathPrefix", "schema", "render", "globalVars"]);

package/lib/SchemaRenderer.d.ts

@@ -4,6 +4,7 @@ import { IScopedContext } from './Scoped';
 import { Schema, SchemaNode } from './types';
 import { RendererEvent } from './utils/renderer-event';
 import { StatusScopedProps } from './StatusScoped';
+import { IIRendererStore } from './store/index';
 interface SchemaRendererProps extends Partial<Omit<RendererProps, 'statusStore'>>, StatusScopedProps {
     schema: Schema;
     $path: string;
@@ -24,9 +25,11 @@ export declare class SchemaRenderer extends React.Component<SchemaRendererProps,
     unbindEvent: (() => void) | undefined;
     unbindGlobalEvent: (() => void) | undefined;
     isStatic: any;
+    subStore?: IIRendererStore | null;
     constructor(props: SchemaRendererProps);
     componentWillUnmount(): void;
     shouldComponentUpdate(nextProps: SchemaRendererProps): boolean;
+    storeRef(store: IIRendererStore | null): void;
     handleGlobalVarChange(): void;
     resolveRenderer(props: SchemaRendererProps, force?: boolean): any;
     getWrappedInstance(): any;