amis-core 6.4.1 → 6.6.0

package/esm/utils/resolveCondition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -12,11 +12,17 @@ import startsWith from 'lodash/startsWith';
 import { resolveVariableAndFilterForAsync } from './resolveVariableAndFilterForAsync.js';
 import moment from 'moment';
 import capitalize from 'lodash/capitalize';
+import 'amis-formula';
+import 'lodash/isPlainObject';
+import { isPureVariable } from './isPureVariable.js';
+import '@rc-component/mini-decimal';
+import { resolveVariableAndFilter } from './resolveVariableAndFilter.js';
+import './filter.js';
 
 var conditionResolverMap = {};
 var DEFAULT_RESULT = true;
 var conditionComputeErrorHandler;
-function resolveCondition(conditions, data, defaultResult) {
+function resolveConditionAsync(conditions, data, defaultResult) {
     if (defaultResult === void 0) { defaultResult = true; }
     return __awaiter(this, void 0, void 0, function () {
         var e_1;
@@ -32,7 +38,7 @@ function resolveCondition(conditions, data, defaultResult) {
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 3, , 6]);
-                    return [4 /*yield*/, computeConditions(conditions.children, conditions.conjunction, data)];
+                    return [4 /*yield*/, computeConditionsAsync(conditions.children, conditions.conjunction, data)];
                 case 2: return [2 /*return*/, _a.sent()];
                 case 3:
                     e_1 = _a.sent();
@@ -45,7 +51,26 @@ function resolveCondition(conditions, data, defaultResult) {
         });
     });
 }
-function computeConditions(conditions, conjunction, data) {
+function resolveCondition(conditions, data, defaultResult) {
+    if (defaultResult === void 0) { defaultResult = true; }
+    if (!conditions ||
+        !conditions.conjunction ||
+        !Array.isArray(conditions.children) ||
+        !conditions.children.length) {
+        return defaultResult;
+    }
+    try {
+        return computeConditions(conditions.children, conditions.conjunction, data);
+    }
+    catch (e) {
+        // 如果函数未定义，则交给handler
+        if (e.name === 'FormulaEvalError') {
+            return conditionComputeErrorHandler === null || conditionComputeErrorHandler === void 0 ? void 0 : conditionComputeErrorHandler(conditions.children, conditions.conjunction, data);
+        }
+        return defaultResult;
+    }
+}
+function computeConditionsAsync(conditions, conjunction, data) {
     if (conjunction === void 0) { conjunction = 'and'; }
     return __awaiter(this, void 0, void 0, function () {
         var computeResult, index, len, item, result, _a;
@@ -59,11 +84,11 @@ function computeConditions(conditions, conjunction, data) {
                     if (!(index < len)) return [3 /*break*/, 7];
                     item = conditions[index];
                     if (!(item.conjunction && Array.isArray(item.children) && item.children.length)) return [3 /*break*/, 3];
-                    return [4 /*yield*/, computeConditions(item.children, item.conjunction, data)];
+                    return [4 /*yield*/, computeConditionsAsync(item.children, item.conjunction, data)];
                 case 2:
                     _a = _b.sent();
                     return [3 /*break*/, 5];
-                case 3: return [4 /*yield*/, computeCondition(item, index, data)];
+                case 3: return [4 /*yield*/, computeConditionAsync(item, index, data)];
                 case 4:
                     _a = _b.sent();
                     _b.label = 5;
@@ -83,7 +108,23 @@ function computeConditions(conditions, conjunction, data) {
         });
     });
 }
-function computeCondition(rule, index, data) {
+function computeConditions(conditions, conjunction, data) {
+    if (conjunction === void 0) { conjunction = 'and'; }
+    var computeResult = true;
+    for (var index = 0, len = conditions.length; index < len; index++) {
+        var item = conditions[index];
+        var result = item.conjunction && Array.isArray(item.children) && item.children.length
+            ? computeConditions(item.children, item.conjunction, data)
+            : computeCondition(item, index, data);
+        computeResult = !!result;
+        if ((result && conjunction === 'or') ||
+            (!result && conjunction === 'and')) {
+            break;
+        }
+    }
+    return computeResult;
+}
+function computeConditionAsync(rule, index, data) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
         var leftValue, rightValue, func;
@@ -100,6 +141,17 @@ function computeCondition(rule, index, data) {
         });
     });
 }
+function computeCondition(rule, index, data) {
+    var _a;
+    var leftValue = get(data, rule.left.field);
+    var rightValue = isPureVariable(rule.right)
+        ? resolveVariableAndFilter(rule.right, data)
+        : rule.right;
+    var func = (_a = conditionResolverMap["".concat(rule.op, "For").concat(capitalize(rule.left.type))]) !== null && _a !== void 0 ? _a : conditionResolverMap[rule.op];
+    return func && typeof func === 'function'
+        ? func(leftValue, rightValue, rule.left.type)
+        : DEFAULT_RESULT;
+}
 function startsWithFunc(left, right) {
     if (left === undefined || right === undefined) {
         return DEFAULT_RESULT;
@@ -318,4 +370,4 @@ registerConditionComputer('select_not_any_in', selectNotAnyInFunc);
 registerConditionComputer('starts_with', startsWithFunc);
 registerConditionComputer('ends_with', endsWithFunc);
 
-export { getConditionComputers, registerConditionComputer, resolveCondition, setConditionComputeErrorHandler };
+export { getConditionComputers, registerConditionComputer, resolveCondition, resolveConditionAsync, setConditionComputeErrorHandler };

package/esm/utils/resolveVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/resolveVariableAndFilter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/resolveVariableAndFilterForAsync.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/scrollPosition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/string2regExp.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/stripNumber.js

@@ -1,9 +1,9 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
-import { toFixed } from '../node_modules/@rc-component/mini-decimal/es/MiniDecimal.js';
+import { toFixed } from '@rc-component/mini-decimal';
 
 // 主要用于解决 0.1+0.2 结果的精度问题导致太长
 function stripNumber(number, precision) {

package/esm/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -262,13 +262,14 @@ function formatStyle(themeCss, classNames, id, defaultData, data) {
     };
 }
 function insertCustomStyle(prams) {
+    var _a;
     var themeCss = prams.themeCss, classNames = prams.classNames, id = prams.id, defaultData = prams.defaultData, customStyleClassPrefix = prams.customStyleClassPrefix, doc = prams.doc, data = prams.data;
     if (!themeCss) {
         return;
     }
     var value = formatStyle(themeCss, classNames, id, defaultData, data).value;
     value = customStyleClassPrefix ? "".concat(customStyleClassPrefix, " ").concat(value) : value;
-    var classId = id.replace('u:', '');
+    var classId = ((_a = id === null || id === void 0 ? void 0 : id.replace) === null || _a === void 0 ? void 0 : _a.call(id, 'u:', '')) || id + '';
     if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
         classId += "-".concat(data.index);
     }
@@ -323,7 +324,9 @@ function traverseStyle(style, path, result) {
  * 设置源码编辑自定义样式
  */
 function insertEditCustomStyle(params) {
-    var customStyle = params.customStyle, id = params.id, doc = params.doc, data = params.data;
+    var _a, _b;
+    var customStyle = params.customStyle, doc = params.doc, data = params.data;
+    var id = ((_b = (_a = params.id) === null || _a === void 0 ? void 0 : _a.replace) === null || _b === void 0 ? void 0 : _b.call(_a, 'u:', '')) || params.id + '';
     var styles = {};
     traverseStyle(customStyle, '', styles);
     var content = '';
@@ -332,7 +335,7 @@ function insertEditCustomStyle(params) {
         index = "-".concat(data.index);
     }
     if (!isEmpty(styles)) {
-        var className_1 = "wrapperCustomStyle-".concat(id === null || id === void 0 ? void 0 : id.replace('u:', '')).concat(index);
+        var className_1 = "wrapperCustomStyle-".concat(id).concat(index);
         Object.keys(styles).forEach(function (key) {
             if (!isObject(styles[key])) {
                 content += "\n.".concat(className_1, " {\n  ").concat(key, ": ").concat(resolveVariableAndFilter(styles[key].replace(/['|"]/g, ''), data, '| raw') || styles[key], "\n}");
@@ -360,16 +363,17 @@ function insertEditCustomStyle(params) {
     }
     insertStyle({
         style: content,
-        classId: 'wrapperCustomStyle-' + ((id === null || id === void 0 ? void 0 : id.replace('u:', '')) || uuid()) + index,
+        classId: 'wrapperCustomStyle-' + (id || uuid()) + index,
         doc: doc,
-        id: id === null || id === void 0 ? void 0 : id.replace('u:', '').replace(/(-.*)/, '')
+        id: id.replace(/(-.*)/, '')
     });
 }
 /**
  * 移除自定义样式
  */
 function removeCustomStyle(type, id, doc, data) {
-    var styleId = 'amis-' + (type ? type + '-' : '') + id.replace('u:', '');
+    var _a;
+    var styleId = 'amis-' + (type ? type + '-' : '') + (((_a = id.replace) === null || _a === void 0 ? void 0 : _a.call(id, 'u:', '')) || id + '');
     if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
         styleId += "-".concat(data.index);
     }
@@ -393,6 +397,7 @@ function formatInputThemeCss(themeCss) {
     return inputFontThemeCss;
 }
 function setThemeClassName(params) {
+    var _a;
     var name = params.name, id = params.id, themeCss = params.themeCss, extra = params.extra, data = params.data;
     if (!id || !themeCss) {
         return '';
@@ -404,7 +409,9 @@ function setThemeClassName(params) {
     if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
         index = "-".concat(data.index);
     }
-    return "".concat(name, "-").concat(id.replace('u:', '')) + (extra ? "-".concat(extra) : '') + index;
+    return ("".concat(name, "-").concat(((_a = id.replace) === null || _a === void 0 ? void 0 : _a.call(id, 'u:', '')) || id) +
+        (extra ? "-".concat(extra) : '') +
+        index);
 }
 
 export { addStyle, findOrCreateStyle, formatInputThemeCss, formatStyle, getValueByPath, inheritValueMap, insertCustomStyle, insertEditCustomStyle, insertStyle, removeCustomStyle, setThemeClassName, valueMap };

package/esm/utils/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -7,6 +7,7 @@ import 'tslib';
 import 'amis-formula';
 import 'moment';
 import 'lodash/isPlainObject';
+import '@rc-component/mini-decimal';
 import { resolveVariableAndFilter } from './resolveVariableAndFilter.js';
 import './filter.js';
 import mapValues from 'lodash/mapValues';

package/esm/utils/toNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/tokenize.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/tpl-builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -9,6 +9,7 @@ import 'moment';
 import 'lodash/isPlainObject';
 import { tokenize } from './tokenize.js';
 export { tokenize } from './tokenize.js';
+import '@rc-component/mini-decimal';
 import { resolveVariableAndFilterForAsync } from './resolveVariableAndFilterForAsync.js';
 export { resolveVariableAndFilterForAsync } from './resolveVariableAndFilterForAsync.js';
 import './filter.js';

package/esm/utils/tpl-lodash.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -8,6 +8,7 @@ import template from 'lodash/template';
 import { getFilters } from 'amis-formula';
 import moment from 'moment';
 import 'lodash/isPlainObject';
+import '@rc-component/mini-decimal';
 import './filter.js';
 
 var imports = {

package/esm/utils/tpl.d.ts

@@ -15,6 +15,13 @@ export declare function evalExpression(expression: string, data?: object): boole
  * @param data 上下文
  * @returns
  */
-export declare function evalExpressionWithConditionBuilder(expression: any, data?: object, defaultResult?: boolean): Promise<boolean>;
+export declare function evalExpressionWithConditionBuilderAsync(expression: any, data?: object, defaultResult?: boolean): Promise<boolean>;
+/**
+ * 解析表达式（支持condition-builder）
+ * @param expression 表达式 or condition-builder对象
+ * @param data 上下文
+ * @returns
+ */
+export declare function evalExpressionWithConditionBuilder(expression: any, data?: object, defaultResult?: boolean): boolean | Promise<boolean>;
 export declare function setCustomEvalJs(fn: (expression: string, data?: any) => any): void;
 export declare function evalJS(js: string, data: object): any;

package/esm/utils/tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -7,7 +7,7 @@ import { __spreadArray, __read, __awaiter, __generator } from 'tslib';
 import { register } from './tpl-builtin.js';
 import { register as register$1 } from './tpl-lodash.js';
 import { getFilters, evaluate } from 'amis-formula';
-import { resolveCondition } from './resolveCondition.js';
+import { resolveConditionAsync, resolveCondition } from './resolveCondition.js';
 import { memoParse } from './tokenize.js';
 
 var enginers = {};
@@ -108,19 +108,32 @@ function evalExpression(expression, data) {
  * @param data 上下文
  * @returns
  */
-function evalExpressionWithConditionBuilder(expression, data, defaultResult) {
+function evalExpressionWithConditionBuilderAsync(expression, data, defaultResult) {
     return __awaiter(this, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     if (!(Object.prototype.toString.call(expression) === '[object Object]')) return [3 /*break*/, 2];
-                    return [4 /*yield*/, resolveCondition(expression, data, defaultResult)];
+                    return [4 /*yield*/, resolveConditionAsync(expression, data, defaultResult)];
                 case 1: return [2 /*return*/, _a.sent()];
                 case 2: return [2 /*return*/, evalExpression(String(expression), data)];
             }
         });
     });
 }
+/**
+ * 解析表达式（支持condition-builder）
+ * @param expression 表达式 or condition-builder对象
+ * @param data 上下文
+ * @returns
+ */
+function evalExpressionWithConditionBuilder(expression, data, defaultResult) {
+    // 支持ConditionBuilder
+    if (Object.prototype.toString.call(expression) === '[object Object]') {
+        return resolveCondition(expression, data, defaultResult);
+    }
+    return evalExpression(String(expression), data);
+}
 function evalFormula(expression, data) {
     var ast = memoParse(expression, {
         evalMode: false
@@ -168,4 +181,4 @@ function evalJS(js, data) {
     });
 });
 
-export { asyncFilter, evalExpression, evalExpressionWithConditionBuilder, evalJS, filter, registerTplEnginer, setCustomEvalExpression, setCustomEvalJs };
+export { asyncFilter, evalExpression, evalExpressionWithConditionBuilder, evalExpressionWithConditionBuilderAsync, evalJS, filter, registerTplEnginer, setCustomEvalExpression, setCustomEvalJs };

package/esm/utils/uncontrollable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/validateId.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -9,6 +9,7 @@ import { filter } from './tpl.js';
 import 'amis-formula';
 import isPlainObject from 'lodash/isPlainObject';
 import { isPureVariable } from './isPureVariable.js';
+import '@rc-component/mini-decimal';
 import { resolveVariableAndFilter } from './resolveVariableAndFilter.js';
 import './filter.js';
 import memoize from 'lodash/memoize';

package/lib/Root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/RootRenderer.d.ts

@@ -30,5 +30,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.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -26,6 +26,7 @@ var mobx = require('mobx');
 require('amis-formula');
 require('moment');
 require('lodash/isPlainObject');
+require('@rc-component/mini-decimal');
 var resolveVariableAndFilter = require('./utils/resolveVariableAndFilter.js');
 require('./utils/filter.js');
 var style = require('./utils/style.js');
@@ -48,6 +49,7 @@ var RENDERER_TRANSMISSION_OMIT_PROPS = [
     'className',
     'style',
     'data',
+    'originData',
     'children',
     'ref',
     'visible',
@@ -177,9 +179,15 @@ var SchemaRenderer = /** @class */ (function (_super) {
         this.ref = ref;
     };
     SchemaRenderer.prototype.childRef = function (ref) {
+        var _this = this;
         while (ref && ref.getWrappedInstance) {
             ref = ref.getWrappedInstance();
         }
+        if (ref && !ref.props) {
+            Object.defineProperty(ref, 'props', {
+                get: function () { return _this.props; }
+            });
+        }
         this.cRef = ref;
     };
     SchemaRenderer.prototype.dispatchEvent = function (e, data, renderer // for didmount
@@ -262,7 +270,9 @@ var SchemaRenderer = /** @class */ (function (_super) {
                 ? null
                 : React__default["default"].isValidElement(schema.children)
                     ? schema.children
-                    : schema.children(tslib.__assign(tslib.__assign(tslib.__assign({}, rest), exprProps), { $path: $path, $schema: schema, render: this.renderChild, forwardedRef: this.refFn, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent }));
+                    : typeof schema.children !== 'function'
+                        ? null
+                        : schema.children(tslib.__assign(tslib.__assign(tslib.__assign({}, rest), exprProps), { $path: $path, $schema: schema, render: this.renderChild, forwardedRef: this.refFn, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent }));
         }
         else if (schema.component && reactIs.isValidElementType(schema.component)) {
             var isSFC = !(schema.component.prototype instanceof React__default["default"].Component);
@@ -317,10 +327,11 @@ var SchemaRenderer = /** @class */ (function (_super) {
         if (renderer.storeType) {
             exprProps = {};
         }
-        var isClassComponent = (_e = Component.prototype) === null || _e === void 0 ? void 0 : _e.isReactComponent;
+        var supportRef = ((_e = Component.prototype) === null || _e === void 0 ? void 0 : _e.isReactComponent) ||
+            Component.$$typeof === Symbol.for('react.forward_ref');
         var props = tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign({}, theme.getRendererConfig(renderer.name)), restSchema), helper.chainEvents(rest, restSchema)), exprProps), { 
             // value: defaultValue, // 备注: 此处并没有将value传递给渲染器
-            defaultData: (_f = restSchema.defaultData) !== null && _f !== void 0 ? _f : defaultData, defaultValue: (_g = restSchema.defaultValue) !== null && _g !== void 0 ? _g : defaultValue, defaultActiveKey: defaultActiveKey, propKey: propKey, $path: $path, $schema: schema, ref: this.refFn, render: this.renderChild, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent, mobileUI: schema.useMobileUI === false ? false : rest.mobileUI });
+            defaultData: (_f = restSchema.defaultData) !== null && _f !== void 0 ? _f : defaultData, defaultValue: (_g = restSchema.defaultValue) !== null && _g !== void 0 ? _g : defaultValue, defaultActiveKey: defaultActiveKey, propKey: propKey, $path: $path, $schema: schema, render: this.renderChild, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent, mobileUI: schema.useMobileUI === false ? false : rest.mobileUI });
         // style 支持公式
         if (schema.style) {
             props.style = style.buildStyle(schema.style, detectData);
@@ -358,7 +369,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
                 finally { if (e_1) throw e_1.error; }
             }
         }
-        var component = isClassComponent ? (_J$X_(Component, tslib.__assign({}, props, { ref: this.childRef }))) : (_J$X_(Component, tslib.__assign({}, props)));
+        var component = supportRef ? (_J$X_(Component, tslib.__assign({}, props, { ref: this.childRef }))) : (_J$X_(Component, tslib.__assign({}, props, { forwardedRef: this.childRef })));
         return this.props.env.enableAMISDebug ? (_J$X_(debug.DebugWrapper, { renderer: renderer }, component)) : (component);
     };
     SchemaRenderer.displayName = 'Renderer';

package/lib/Scoped.d.ts

@@ -24,7 +24,7 @@ export interface ScopedComponentType extends React.Component<RendererProps> {
     focus?: () => void;
     doAction?: (action: ActionObject, data: RendererData, throwErrors?: boolean, args?: any) => void;
     receive?: (values: RendererData, subPath?: string, replace?: boolean) => void;
-    reload?: (subPath?: string, query?: RendererData | null, ctx?: RendererData) => void;
+    reload?: (subPath?: string, query?: RendererData | null, ctx?: RendererData, silent?: boolean, replace?: boolean, args?: any) => void;
     context: any;
     setData?: (value?: object, replace?: boolean, index?: number) => void;
 }

package/lib/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -17,6 +17,7 @@ require('moment');
 var object = require('./utils/object.js');
 var tokenize = require('./utils/tokenize.js');
 var isPureVariable = require('./utils/isPureVariable.js');
+require('@rc-component/mini-decimal');
 var getVariable = require('./utils/getVariable.js');
 var dataMapping = require('./utils/dataMapping.js');
 require('./utils/filter.js');
@@ -160,6 +161,9 @@ function createScopedTools(path, parent, env, rendererType) {
         unRegisterComponent: function (component) {
             // 自己本身实际上注册在父级 Scoped 上。
             if (component.props.$path === path && parent) {
+                // 如果是自己，尝试把自己从父级 Scoped 上移除，否则在某些场景下会导致父级的 children 一直增长。
+                var idx_1 = parent.children.indexOf(self);
+                ~idx_1 && parent.children.splice(idx_1, 1);
                 return parent.unRegisterComponent(component);
             }
             var idx = components.indexOf(component);

package/lib/StatusScoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/WithRootStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -19,6 +19,7 @@ require('amis-formula');
 require('moment');
 var object = require('./utils/object.js');
 var tokenize = require('./utils/tokenize.js');
+require('@rc-component/mini-decimal');
 var dataMapping = require('./utils/dataMapping.js');
 require('./utils/filter.js');
 var WithRootStore = require('./WithRootStore.js');
@@ -164,7 +165,7 @@ function HocStoreFactory(renderer) {
                             // 目前主要的问题是，如果 combo 中表单项名字和 combo 本身的名字一样，会导致里面的值会被覆盖成数组
                             ((_e = props.store) === null || _e === void 0 ? void 0 : _e.storeType) === 'ComboStore'
                                 ? undefined
-                                : helper.syncDataFromSuper(tslib.__assign(tslib.__assign({}, store.data), props.data), props.data.__super, prevProps.data.__super, store, false)), ((_f = props.updatePristineAfterStoreDataReInit) !== null && _f !== void 0 ? _f : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
+                                : helper.syncDataFromSuper(tslib.__assign(tslib.__assign({}, store.pristineDiff), props.data), props.data.__super, prevProps.data.__super, store, false)), ((_f = props.updatePristineAfterStoreDataReInit) !== null && _f !== void 0 ? _f : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
                     }
                     else {
                         store.initData(object.createObject(props.scope, props.data), ((_g = props.updatePristineAfterStoreDataReInit) !== null && _g !== void 0 ? _g : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
@@ -210,11 +211,16 @@ function HocStoreFactory(renderer) {
                 return render(region, node, tslib.__assign(tslib.__assign({ data: this.store.data, dataUpdatedAt: this.store.updatedAt }, subProps), { scope: this.store.data, store: this.store }));
             };
             StoreFactory.prototype.render = function () {
-                var _a = this.props; _a.detectField; var rest = tslib.__rest(_a, ["detectField"]);
+                var _a;
+                var _b = this.props; _b.detectField; var rest = tslib.__rest(_b, ["detectField"]);
                 if (this.state.hidden || this.state.visible === false) {
                     return null;
                 }
-                return (_J$X_(Component, tslib.__assign({}, rest /* todo */, this.state, { ref: this.refFn, data: this.store.data, dataUpdatedAt: this.store.updatedAt, store: this.store, scope: this.store.data, render: this.renderChild })));
+                var refConfig = ((_a = Component.prototype) === null || _a === void 0 ? void 0 : _a.isReactComponent) ||
+                    Component.$$typeof === Symbol.for('react.forward_ref')
+                    ? { ref: this.refFn }
+                    : { forwardedRef: this.refFn };
+                return (_J$X_(Component, tslib.__assign({}, rest /* todo */, this.state, refConfig, { data: this.store.data, dataUpdatedAt: this.store.updatedAt, store: this.store, scope: this.store.data, render: this.renderChild })));
             };
             StoreFactory.displayName = "WithStore(".concat(Component.displayName || Component.name, ")");
             StoreFactory.ComposedComponent = Component;