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

package/lib/SchemaRenderer.js

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

package/lib/StatusScoped.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/StyleManager.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/WithRootStore.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/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 
@@ -49,7 +49,9 @@ function HocStoreFactory(renderer) {
         var StoreFactory = /** @class */ (function (_super) {
             tslib.__extends(StoreFactory, _super);
             function StoreFactory(props, context) {
-                var _this = _super.call(this, props) || this;
+                var _this = this;
+                var _a;
+                _this = _super.call(this, props) || this;
                 var rootStore = context;
                 _this.renderChild = _this.renderChild.bind(_this);
                 _this.refFn = _this.refFn.bind(_this);
@@ -60,6 +62,7 @@ function HocStoreFactory(renderer) {
                     parentId: _this.props.store ? _this.props.store.id : ''
                 });
                 store.setTopStore(props.topStore);
+                (_a = props.storeRef) === null || _a === void 0 ? void 0 : _a.call(props, store);
                 _this.store = store;
                 var extendsData = typeof renderer.extendsData === 'function'
                     ? renderer.extendsData(props)
@@ -194,7 +197,7 @@ function HocStoreFactory(renderer) {
                 }
             };
             StoreFactory.prototype.componentWillUnmount = function () {
-                var _a;
+                var _a, _b, _c;
                 var rootStore = this.context;
                 var store = this.store;
                 (_a = this.unReaction) === null || _a === void 0 ? void 0 : _a.call(this);
@@ -204,6 +207,7 @@ function HocStoreFactory(renderer) {
                 }
                 // @ts-ignore
                 delete this.store;
+                (_c = (_b = this.props).storeRef) === null || _c === void 0 ? void 0 : _c.call(_b, null);
             };
             StoreFactory.prototype.renderChild = function (region, node, subProps) {
                 if (subProps === void 0) { subProps = {}; }
@@ -212,7 +216,7 @@ function HocStoreFactory(renderer) {
             };
             StoreFactory.prototype.render = function () {
                 var _a;
-                var _b = this.props; _b.detectField; var rest = tslib.__rest(_b, ["detectField"]);
+                var _b = this.props; _b.detectField; _b.storeRef; var rest = tslib.__rest(_b, ["detectField", "storeRef"]);
                 if (this.state.hidden || this.state.visible === false) {
                     return null;
                 }

package/lib/actions/Action.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/actions/AjaxAction.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/actions/BreakAction.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/actions/BroadcastAction.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/actions/CmptAction.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/actions/ContinueAction.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/actions/CopyAction.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/actions/CustomAction.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/actions/DialogAction.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/actions/DrawerAction.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/actions/EmailAction.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/actions/EventAction.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/actions/LinkAction.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/actions/LoopAction.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/actions/PageAction.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/actions/ParallelAction.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/actions/PrintAction.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/actions/StatusAction.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/actions/SwitchAction.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/actions/ToastAction.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/actions/WaitAction.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/components/Animations.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/components/CustomStyle.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/components/ErrorBoundary.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/components/LazyComponent.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/components/Overlay.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/components/PopOver.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/env.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/envOverwrite.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/factory.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/globalVar.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 
@@ -10,6 +10,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var formula = require('./utils/formula.js');
 var mobx = require('mobx');
 var resolveVariableAndFilter = require('./utils/resolveVariableAndFilter.js');
+var isPlainObject = require('lodash/isPlainObject');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var isPlainObject__default = /*#__PURE__*/_interopDefaultLegacy(isPlainObject);
 
 /**
  * 全局变量
@@ -81,6 +86,18 @@ function observeGlobalVars(schema, topStore, callback) {
                 value: value
             });
         }
+        else if (isPlainObject__default["default"](value) && !value.type) {
+            // 最多支持两层，多了可能就会有性能问题了
+            // 再多一层主要是为了支持某些 api 配置的是对象形式
+            Object.keys(value).forEach(function (k) {
+                if (isGlobalVarExpression(value[k])) {
+                    expressions.push({
+                        key: "".concat(key, ".").concat(k),
+                        value: value[k]
+                    });
+                }
+            });
+        }
         else if ([
             'items',
             'body',
@@ -115,7 +132,7 @@ function observeGlobalVars(schema, topStore, callback) {
     var unReaction = mobx.reaction(function () {
         return expressions
             .map(function (exp) {
-            return "".concat(exp.key, ":").concat(resolveVariableAndFilter.resolveVariableAndFilter(exp.value, topStore.downStream, '| json' // 如果用了复杂对象，要靠这个来比较
+            return "".concat(exp.key, ":").concat(resolveVariableAndFilter.resolveVariableAndFilter(exp.value, topStore.nextGlobalData, '| json' // 如果用了复杂对象，要靠这个来比较
             ));
         })
             .join(',');

package/lib/globalVarClientHandler.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/globalVarDefaultValueHandler.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/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 
@@ -145,10 +145,10 @@ var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
 (__react_jsx__["default"] || __react_jsx__).Fragment;
 var classPrefix = theme.getClassPrefix();
 // @ts-ignore
-var version = '6.13.0-beta.0';
+var version = '6.13.0-beta.10';
 window.amisVersionInfo = {
-    version: '6.13.0-beta.0',
-    buildTime: '2025-04-08T09:27:21.090Z'
+    version: '6.13.0-beta.10',
+    buildTime: '2025-05-13T09:16:53.653Z'
 };
 function render(schema, _a, options, pathPrefix) {
     if (_a === void 0) { _a = {}; }
@@ -461,6 +461,8 @@ exports.scrollPosition = scrollPosition.scrollPosition;
 exports.SimpleMap = SimpleMap.SimpleMap;
 exports.string2regExp = string2regExp.string2regExp;
 exports.buildStyle = style.buildStyle;
+exports.mergeStyle = style.mergeStyle;
+exports.normalizeStyle = style.normalizeStyle;
 exports.memoParse = tokenize.memoParse;
 exports.tokenize = tokenize.tokenize;
 exports.register = tplBuiltin.register;
@@ -503,6 +505,7 @@ exports.setConditionComputeErrorHandler = resolveCondition.setConditionComputeEr
 exports.arraySlice = arraySlice.arraySlice;
 exports.isIntegerInRange = math.isIntegerInRange;
 exports.numberFormatter = math.numberFormatter;
+exports.numberReverter = math.numberReverter;
 exports.safeAdd = math.safeAdd;
 exports.safeSub = math.safeSub;
 exports.animation = Animation["default"];

package/lib/locale.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/polyfills.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/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.13.0-beta.0
+ * amis-core v6.13.0-beta.10
  * Copyright 2018-2025 fex
  */
 
@@ -1289,16 +1289,14 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
             }),
             padDom,
             restError && restError.length ? (_J$X_("ul", { className: cx('Form-restError', 'Form-feedback') }, restError.map(function (item, idx) { return (_J$X_("li", { key: idx }, item)); }))) : null,
-            render('modal', tslib.__assign(tslib.__assign({}, (store.action &&
-                store.action.dialog)), { type: 'dialog' }), {
+            render('modal', tslib.__assign(tslib.__assign({}, store.dialogSchema), { type: 'dialog' }), {
                 key: 'dialog',
                 data: store.dialogData,
                 onConfirm: this.handleDialogConfirm,
                 onClose: this.handleDialogClose,
                 show: store.dialogOpen
             }),
-            render('modal', tslib.__assign(tslib.__assign({}, (store.action &&
-                store.action.drawer)), { type: 'drawer' }), {
+            render('modal', tslib.__assign(tslib.__assign({}, store.drawerSchema), { type: 'drawer' }), {
                 key: 'drawer',
                 data: store.drawerData,
                 onConfirm: this.handleDrawerConfirm,

package/lib/renderers/Item.d.ts

@@ -609,7 +609,7 @@ export declare class FormItemWrap extends React.Component<FormItemProps> {
     static layoutRenderers: {
         [propsName: string]: (props: FormItemProps, renderControl: () => JSX.Element | null) => JSX.Element;
     };
-    render(): React.JSX.Element | null;
+    render(): JSX.Element | null;
 }
 export declare const detectProps: string[];
 export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (Control: FormControlComponent) => {