amis-core 6.14.0-beta.7 → 6.14.0-beta.9

package/esm/utils/resolveCondition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 
@@ -23,10 +23,10 @@ import './filter.js';
 var conditionResolverMap = {};
 var DEFAULT_RESULT = true;
 var conditionComputeErrorHandler;
-function resolveConditionAsync(conditions, data, defaultResult) {
-    if (defaultResult === void 0) { defaultResult = true; }
-    return __awaiter(this, void 0, void 0, function () {
+function resolveConditionAsync(conditions_1, data_1) {
+    return __awaiter(this, arguments, void 0, function (conditions, data, defaultResult) {
         var e_1;
+        if (defaultResult === void 0) { defaultResult = true; }
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -71,10 +71,10 @@ function resolveCondition(conditions, data, defaultResult) {
         return defaultResult;
     }
 }
-function computeConditionsAsync(conditions, conjunction, data) {
-    if (conjunction === void 0) { conjunction = 'and'; }
-    return __awaiter(this, void 0, void 0, function () {
+function computeConditionsAsync(conditions_1) {
+    return __awaiter(this, arguments, void 0, function (conditions, conjunction, data) {
         var computeResult, index, len, item, result, _a;
+        if (conjunction === void 0) { conjunction = 'and'; }
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -126,9 +126,9 @@ function computeConditions(conditions, conjunction, data) {
     return computeResult;
 }
 function computeConditionAsync(rule, index, data) {
-    var _a;
     return __awaiter(this, void 0, void 0, function () {
         var leftValue, rightValue, func;
+        var _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:

package/esm/utils/resolveVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/resolveVariableAndFilter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/resolveVariableAndFilterForAsync.js

@@ -1,9 +1,9 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 
-import { __awaiter, __generator } from 'tslib';
+import { __awaiter, __spreadArray, __read, __generator } from 'tslib';
 import { AsyncEvaluator } from 'amis-formula';
 import { memoryParse } from './memoryParse.js';
 
@@ -15,13 +15,17 @@ var formulaEvalErrorHandler;
 function setFormulaEvalErrorHandler(fn) {
     formulaEvalErrorHandler = fn;
 }
-var resolveVariableAndFilterForAsync = function (path, data, defaultFilter, fallbackValue, skipFormulaEvalErrorHandler) {
-    if (data === void 0) { data = {}; }
-    if (defaultFilter === void 0) { defaultFilter = '| html'; }
-    if (fallbackValue === void 0) { fallbackValue = function (value) { return value; }; }
-    if (skipFormulaEvalErrorHandler === void 0) { skipFormulaEvalErrorHandler = false; }
-    return __awaiter(void 0, void 0, void 0, function () {
+var resolveVariableAndFilterForAsync = function (path_1) {
+    var args_1 = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        args_1[_i - 1] = arguments[_i];
+    }
+    return __awaiter(void 0, __spreadArray([path_1], __read(args_1), false), void 0, function (path, data, defaultFilter, fallbackValue, skipFormulaEvalErrorHandler) {
         var ast, ret, e_1;
+        if (data === void 0) { data = {}; }
+        if (defaultFilter === void 0) { defaultFilter = '| html'; }
+        if (fallbackValue === void 0) { fallbackValue = function (value) { return value; }; }
+        if (skipFormulaEvalErrorHandler === void 0) { skipFormulaEvalErrorHandler = false; }
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:

package/esm/utils/scrollPosition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/string2regExp.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/stripNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/toNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/tokenize.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/tpl-builtin.d.ts

@@ -17,4 +17,4 @@ export { prettyBytes, escapeHtml, formatDuration, filterDate, relativeValueRe, p
 export declare function register(): Enginer & {
     name: string;
 };
-export declare const testResolveVariableAndFilter: (path?: string | undefined, data?: object, defaultFilter?: string, fallbackValue?: (value: any) => any) => any;
+export declare const testResolveVariableAndFilter: (path?: string, data?: object, defaultFilter?: string, fallbackValue?: (value: any) => any) => any;

package/esm/utils/tpl-builtin.js

@@ -1,9 +1,9 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 
-import { __awaiter, __generator } from 'tslib';
+import { __awaiter, __spreadArray, __read, __generator } from 'tslib';
 export { getFilters, registerFilter, registerFunction } from 'amis-formula';
 import 'moment';
 import 'lodash/isPlainObject';
@@ -60,9 +60,13 @@ function register() {
                 return "error: ".concat(e.message);
             }
         },
-        asyncCompile: function (str, data, defaultFilter) {
-            if (defaultFilter === void 0) { defaultFilter = '| html'; }
-            return __awaiter(_this, void 0, void 0, function () {
+        asyncCompile: function (str_1, data_1) {
+            var args_1 = [];
+            for (var _i = 2; _i < arguments.length; _i++) {
+                args_1[_i - 2] = arguments[_i];
+            }
+            return __awaiter(_this, __spreadArray([str_1, data_1], __read(args_1), false), void 0, function (str, data, defaultFilter) {
+                if (defaultFilter === void 0) { defaultFilter = '| html'; }
                 return __generator(this, function (_a) {
                     try {
                         return [2 /*return*/, resolveVariableAndFilterForAsync(str, data, defaultFilter)];

package/esm/utils/tpl-lodash.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/tpl.d.ts

@@ -22,6 +22,6 @@ export declare function evalExpressionWithConditionBuilderAsync(expression: any,
  * @param data 上下文
  * @returns
  */
-export declare function evalExpressionWithConditionBuilder(expression: any, data?: object, defaultResult?: boolean): boolean | Promise<boolean>;
+export declare function evalExpressionWithConditionBuilder(expression: any, data?: object, defaultResult?: boolean): 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.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 
@@ -134,7 +134,11 @@ function evalExpressionWithConditionBuilderAsync(expression, data, defaultResult
 function evalExpressionWithConditionBuilder(expression, data, defaultResult) {
     // 支持ConditionBuilder
     if (Object.prototype.toString.call(expression) === '[object Object]') {
-        return resolveCondition(expression, data, defaultResult);
+        var ret = resolveCondition(expression, data, defaultResult);
+        if (ret === null || ret === void 0 ? void 0 : ret.then) {
+            return false;
+        }
+        return !!ret;
     }
     return evalExpression(String(expression), data);
 }

package/esm/utils/uncontrollable.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare function uncontrollable<T extends React.ComponentType<any>, P extends {
     [propName: string]: any;
 }>(arg: T, config: P, mapping?: Array<string>): T;

package/esm/utils/uncontrollable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/validateId.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/visitedCache.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/lib/Root.d.ts

@@ -15,6 +15,7 @@ export interface RootRenderProps {
     locale?: string;
     [propName: string]: any;
 }
+export declare const AMISPartialPropsContext: React.Context<Partial<RootRenderProps>>;
 export interface RootProps extends StatusScopedProps {
     schema: SchemaNode;
     rootStore: IRendererStore;
@@ -37,7 +38,7 @@ export interface RootWrapperProps {
 }
 export declare function addRootWrapper(fn: (props: RootWrapperProps) => React.ReactNode): void;
 export declare class Root extends React.Component<RootProps> {
-    resolveDefinitions(name: string): {} | undefined;
+    resolveDefinitions(name: string): any;
     render(): React.JSX.Element;
 }
 export interface renderChildProps extends Partial<Omit<RendererProps, 'statusStore'>>, StatusScopedProps {
@@ -47,6 +48,6 @@ export type ReactElement = React.ReactNode[] | JSX.Element | null | false;
 export declare function renderChildren(prefix: string, node: SchemaNode, props: renderChildProps): ReactElement;
 export declare function renderChild(prefix: string, node: SchemaNode, props: renderChildProps): ReactElement;
 declare const _default: (props: Omit<RootProps & {
-    scopeRef?: ((ref: any) => void) | undefined;
+    scopeRef?: (ref: any) => void;
 }, "statusStore">, ref: any) => React.JSX.Element;
 export default _default;

package/lib/Root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 
@@ -27,6 +27,7 @@ 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 AMISPartialPropsContext = React__default["default"].createContext({});
 var rootWrappers = [];
 function addRootWrapper(fn) {
     rootWrappers.push(fn);
@@ -114,6 +115,7 @@ function renderChild(prefix, node, props) {
 }
 var ScopedRootRenderer = StatusScoped.StatusScoped(Scoped.HocScoped(Root));
 
+exports.AMISPartialPropsContext = AMISPartialPropsContext;
 exports.Root = Root;
 exports.addRootWrapper = addRootWrapper;
 exports["default"] = ScopedRootRenderer;

package/lib/RootRenderer.d.ts

@@ -3,9 +3,27 @@ import type { RootProps } from './Root';
 import { IScopedContext } from './Scoped';
 import { IRootStore } from './store/root';
 import { ActionObject } from './types';
+import { GlobalVariableItem } from 'amis-core';
 export interface RootRendererProps extends RootProps {
+    /**
+     * 当前页面的路径信息，用于路由识别
+     */
     location?: any;
+    /**
+     * 当前页面的参数信息，用于路由识别
+     */
+    params?: Record<string, any>;
+    /**
+     * 数据对象，推荐用 context 代替，context 数据在弹窗中也会被继承
+     */
     data?: Record<string, any>;
+    /**
+     * 全局变量清单，只有这里面定义的变量才会被作为全局变量注入到各个组件中
+     */
+    globalVars?: Array<GlobalVariableItem>;
+    /**
+     * 上下文环境变量，所有组件都能获取得到
+     */
     context?: Record<string, any>;
     render: (region: string, schema: any, props: any) => React.ReactNode;
 }

package/lib/RootRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 
@@ -37,9 +37,8 @@ var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
 var RootRenderer = /** @class */ (function (_super) {
     tslib.__extends(RootRenderer, _super);
     function RootRenderer(props) {
-        var _this = this;
         var _a;
-        _this = _super.call(this, props) || this;
+        var _this = _super.call(this, props) || this;
         _this.store = props.rootStore.addStore({
             id: helper.guid(),
             path: _this.props.$path,
@@ -49,6 +48,7 @@ var RootRenderer = /** @class */ (function (_super) {
         _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.updateParams(props.params);
         // 将数据里面的函数批量的绑定到 this 上
         helper.bulkBindFunctions(_this, [
             'handleAction',
@@ -115,6 +115,9 @@ var RootRenderer = /** @class */ (function (_super) {
         if (props.location !== prevProps.location) {
             this.store.updateLocation(props.location, (_a = this.props.env) === null || _a === void 0 ? void 0 : _a.parseLocation);
         }
+        if (props.params !== prevProps.params) {
+            this.store.updateParams(props.params);
+        }
         var contextChanged = false;
         if (props.context !== prevProps.context) {
             contextChanged = true;

package/lib/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 
@@ -500,7 +500,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
 var PlaceholderComponent = /** @class */ (function (_super) {
     tslib.__extends(PlaceholderComponent, _super);
     function PlaceholderComponent() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super.apply(this, tslib.__spreadArray([], tslib.__read(arguments), false)) || this;
         _this.childRef = React__default["default"].createRef();
         return _this;
     }

package/lib/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/lib/StatusScoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/lib/StyleManager.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.7
+ * amis-core v6.14.0-beta.9
  * Copyright 2018-2025 fex
  */