amis-core 6.13.0-beta.1 → 6.13.0-beta.11

package/esm/utils/makeSorter.js

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

package/esm/utils/math.js

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

package/esm/utils/memoryParse.js

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

package/esm/utils/normalizeLink.js

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

package/esm/utils/normalizeOptions.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.11
  * 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.1
+ * amis-core v6.13.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/offset.js

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

package/esm/utils/offsetParent.js

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

package/esm/utils/optionValueCompare.js

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

package/esm/utils/position.js

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

package/esm/utils/prettyBytes.js

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

package/esm/utils/printElement.js

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

package/esm/utils/renderer-event.js

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

package/esm/utils/replaceText.js

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

package/esm/utils/resize-sensor.js

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

package/esm/utils/resolveCondition.js

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

package/esm/utils/resolveVariable.js

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

package/esm/utils/resolveVariableAndFilter.js

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

package/esm/utils/resolveVariableAndFilterForAsync.js

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

package/esm/utils/scrollPosition.js

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

package/esm/utils/string2regExp.js

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

package/esm/utils/stripNumber.js

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

package/esm/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.11
  * 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.1
+ * amis-core v6.13.0-beta.11
  * 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.1
+ * amis-core v6.13.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/tokenize.js

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

package/esm/utils/tpl-builtin.js

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

package/esm/utils/tpl-lodash.js

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

package/esm/utils/tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.11
  * 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.1
+ * amis-core v6.13.0-beta.11
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/validateId.js

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

package/esm/utils/validations.js

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

package/esm/utils/visitedCache.js

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

package/lib/Root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.11
  * 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.1
+ * amis-core v6.13.0-beta.11
  * 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;

package/lib/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.1
+ * amis-core v6.13.0-beta.11
  * Copyright 2018-2025 fex
  */
 
@@ -9,6 +9,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var difference = require('lodash/difference');
+var findLastIndex = require('lodash/findLastIndex');
 var omit = require('lodash/omit');
 var React = require('react');
 var reactIs = require('react-is');
@@ -36,10 +37,37 @@ var formula = require('./utils/formula.js');
 var tpl = require('./utils/tpl.js');
 var Animations = require('./components/Animations.js');
 var globalVar = require('./globalVar.js');
+require('./utils/api.js');
+require('file-saver');
+require('./utils/browser.js');
+require('./utils/ColorScale.js');
+require('./utils/columnsSplit.js');
+require('./utils/DataSchema.js');
+require('./utils/DataScope.js');
+require('./utils/dom.js');
+require('./utils/errors.js');
+require('./utils/highlight.js');
+require('./utils/icon.js');
+require('./utils/image.js');
+require('lodash/isEqual');
+require('./utils/resize-sensor.js');
+require('react-overlays/useRootClose');
+require('react-dom');
+require('uncontrollable');
+require('hoist-non-react-statics');
+require('./utils/validations.js');
+require('lodash/cloneDeep');
+require('lodash/isObject');
+require('lodash/map');
+require('lodash/isEmpty');
+require('lodash/kebabCase');
+require('./utils/resolveCondition.js');
+require('./utils/Animation.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var difference__default = /*#__PURE__*/_interopDefaultLegacy(difference);
+var findLastIndex__default = /*#__PURE__*/_interopDefaultLegacy(findLastIndex);
 var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
@@ -98,6 +126,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
         _this.reRender = _this.reRender.bind(_this);
         _this.resolveRenderer(_this.props);
         _this.dispatchEvent = _this.dispatchEvent.bind(_this);
+        _this.storeRef = _this.storeRef.bind(_this);
         _this.handleGlobalVarChange = _this.handleGlobalVarChange.bind(_this);
         var schema = props.schema;
         // 监听statusStore更新
@@ -138,18 +167,46 @@ var SchemaRenderer = /** @class */ (function (_super) {
         }
         return false;
     };
+    SchemaRenderer.prototype.storeRef = function (store) {
+        this.subStore = store;
+    };
     SchemaRenderer.prototype.handleGlobalVarChange = function () {
         var _this = this;
-        var _a;
+        var _a, _b;
         var handler = (_a = this.renderer) === null || _a === void 0 ? void 0 : _a.onGlobalVarChanged;
-        var newData = object.cloneObject(this.props.data);
+        var topStore = this.props.topStore;
+        var chain = object.extractObjectChain(this.props.data).filter(function (item) { return !item.hasOwnProperty('__isTempGlobalLayer'); });
+        var globalLayerIdx = findLastIndex__default["default"](chain, function (item) {
+            return item.hasOwnProperty('global') || item.hasOwnProperty('globalState');
+        });
+        var globalData = {
+            global: topStore.nextGlobalData.global,
+            globalState: topStore.nextGlobalData.globalState,
+            // 兼容旧的全局变量
+            __page: topStore.nextGlobalData.__page,
+            appVariables: topStore.nextGlobalData.appVariables,
+            __isTempGlobalLayer: true
+        };
+        if (globalLayerIdx !== -1) {
+            chain.splice(globalLayerIdx + 1, 0, globalData);
+        }
+        var newData = object.createObjectFromChain(chain);
         // 如果渲染器自己做了实现，且返回 false，则不再继续往下执行
         if ((handler === null || handler === void 0 ? void 0 : handler(this.cRef, this.props.schema, newData)) === false) {
             return;
         }
+        // 强制刷新并通过一个临时对象让下发给组件的全局变量更新
+        // 等 react 完成一轮渲染后，将临时渲染切成正式渲染
+        // 也就是说删掉临时对象，后续渲染读取真正变更后的全局变量
+        //
+        // 为什么这么做？因为很多组件内部都会 diff  this.props.data 和 prevProps.data
+        // 如果对应的数据没有发生变化，则会跳过组件状态的更新
         this.tmpData = newData;
-        this.forceUpdate(function () {
+        (_b = this.subStore) === null || _b === void 0 ? void 0 : _b.temporaryUpdateGlobalVars(globalData);
+        topStore.addSyncGlobalVarStatePendingTask(function (callback) { return _this.forceUpdate(callback); }, function () {
+            var _a;
             delete _this.tmpData;
+            (_a = _this.subStore) === null || _a === void 0 ? void 0 : _a.unDoTemporaryUpdateGlobalVars();
         });
     };
     SchemaRenderer.prototype.resolveRenderer = function (props, force) {
@@ -267,6 +324,8 @@ var SchemaRenderer = /** @class */ (function (_super) {
         if (Array.isArray(schema)) {
             return render($path, schema, rest);
         }
+        // 用于全局变量刷新
+        rest.data = this.tmpData || rest.data;
         var detectData = schema &&
             (schema.detectField === '&' ? rest : rest[schema.detectField || 'data']);
         var exprProps = detectData
@@ -383,11 +442,9 @@ var SchemaRenderer = /** @class */ (function (_super) {
         var props = tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign({}, (_f = renderer.defaultProps) === null || _f === void 0 ? void 0 : _f.call(renderer, schema.type, schema)), theme.getRendererConfig(renderer.name)), restSchema), helper.chainEvents(rest, restSchema)), exprProps), { 
             // value: defaultValue, // 备注: 此处并没有将value传递给渲染器
             defaultData: (_g = restSchema.defaultData) !== null && _g !== void 0 ? _g : defaultData, defaultValue: (_h = restSchema.defaultValue) !== null && _h !== void 0 ? _h : 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 });
-        // 用于全局变量刷新
-        props.data = this.tmpData || props.data;
         // style 支持公式
         if (schema.style) {
-            props.style = style.buildStyle(schema.style, detectData);
+            props.style = style.mergeStyle(props.style, style.buildStyle(schema.style, detectData));
         }
         if (disable !== undefined) {
             props.disabled = disable;
@@ -422,7 +479,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
                 finally { if (e_1) throw e_1.error; }
             }
         }
-        var component = supportRef ? (_J$X_(Component, tslib.__assign({}, props, { ref: this.childRef }))) : (_J$X_(Component, tslib.__assign({}, props, { forwardedRef: this.childRef })));
+        var component = supportRef ? (_J$X_(Component, tslib.__assign({}, props, { ref: this.childRef, storeRef: this.storeRef }))) : (_J$X_(Component, tslib.__assign({}, props, { forwardedRef: this.childRef, storeRef: this.storeRef })));
         if (schema.animations) {
             component = (_J$X_(Animations["default"], { schema: schema, component: component, show: animationShow }));
         }

package/lib/Scoped.js

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

package/lib/StatusScoped.js

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

package/lib/StyleManager.js

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

package/lib/WithRootStore.js

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