amis-core 3.4.2 → 3.5.0

package/esm/utils/tpl-builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/tpl-lodash.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/uncontrollable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/esm/utils/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/Root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/RootRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -19,6 +19,7 @@ var pick = require('lodash/pick');
 var mapValues = require('lodash/mapValues');
 var fileSaver = require('file-saver');
 var api = require('./utils/api.js');
+var ReactDOM = require('react-dom');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -58,6 +59,15 @@ var RootRenderer = /** @class */ (function (_super) {
     }
     RootRenderer.prototype.componentDidMount = function () {
         document.addEventListener('visibilitychange', this.handlePageVisibilityChange);
+        // 兼容 affixOffsetTop 和 affixOffsetBottom
+        if (typeof this.props.env.affixOffsetTop !== 'undefined' ||
+            typeof this.props.env.affixOffsetBottom !== 'undefined') {
+            // top: var(--affix-offset-top);
+            var dom = ReactDOM.findDOMNode(this);
+            if (dom === null || dom === void 0 ? void 0 : dom.parentElement) {
+                dom.parentElement.style.cssText += "--affix-offset-top: ".concat(this.props.env.affixOffsetTop || 0, "px; --affix-offset-bottom: ").concat(this.props.env.affixOffsetBottom || 0, "px;");
+            }
+        }
     };
     RootRenderer.prototype.componentDidUpdate = function (prevProps) {
         var props = this.props;
@@ -168,7 +178,7 @@ var RootRenderer = /** @class */ (function (_super) {
                             _a.label = 2;
                         case 2:
                             redirect = action.redirect && tpl.filter(action.redirect, store.data);
-                            redirect && env.jumpTo(redirect, action);
+                            redirect && env.jumpTo(redirect, action, store.data);
                             action.reload &&
                                 this.reloadTarget(delegate || this.context, Scoped.filterTarget(action.reload, ctx), store.data);
                             return [2 /*return*/];

package/lib/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -29,7 +29,6 @@ require('./utils/debug.js');
 require('./utils/dom.js');
 require('./utils/errors.js');
 var tpl = require('./utils/tpl.js');
-require('classnames');
 require('lodash/isObject');
 require('lodash/isString');
 require('lodash/isBoolean');
@@ -48,6 +47,7 @@ require('lodash/mapValues');
 require('lodash/camelCase');
 require('lodash/map');
 require('lodash/isEmpty');
+require('lodash/kebabCase');
 require('uncontrollable');
 require('./utils/validations.js');
 require('./utils/resolveCondition.js');

package/lib/StatusScoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/WithRootStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -97,7 +97,7 @@ function HocStoreFactory(renderer) {
                 return data;
             };
             StoreFactory.prototype.componentDidUpdate = function (prevProps) {
-                var _a, _b;
+                var _a, _b, _c;
                 var props = this.props;
                 var store = this.store;
                 var shouldSync = (_a = renderer.shouldSyncSuperStore) === null || _a === void 0 ? void 0 : _a.call(renderer, store, props, prevProps);
@@ -136,7 +136,11 @@ function HocStoreFactory(renderer) {
                     }
                     else if (props.data && props.data.__super) {
                         store.initData(object.extendObject(props.data, store.hasRemoteData || store.path === 'page'
-                            ? tslib.__assign(tslib.__assign({}, store.data), props.data) : helper.syncDataFromSuper(props.data, props.data.__super, prevProps.data.__super, store, false)), props.updatePristineAfterStoreDataReInit === false);
+                            ? tslib.__assign(tslib.__assign({}, store.data), props.data) : // combo 不需要同步，如果要同步，在 Combo.tsx 里面已经实现了相关逻辑
+                            // 目前主要的问题是，如果 combo 中表单项名字和 combo 本身的名字一样，会导致里面的值会被覆盖成数组
+                            ((_b = props.store) === null || _b === void 0 ? void 0 : _b.storeType) === 'ComboStore'
+                                ? undefined
+                                : helper.syncDataFromSuper(props.data, props.data.__super, prevProps.data.__super, store, false)), props.updatePristineAfterStoreDataReInit === false);
                     }
                     else {
                         store.initData(object.createObject(props.scope, props.data), props.updatePristineAfterStoreDataReInit === false);
@@ -151,7 +155,7 @@ function HocStoreFactory(renderer) {
                         helper.isObjectShallowModified(props.data.__super, prevProps.data.__super, false)) {
                         store.initData(object.createObject(props.data.__super, tslib.__assign(tslib.__assign({}, props.data), store.data)), props.updatePristineAfterStoreDataReInit === false ||
                             (store.storeType === 'FormStore' &&
-                                ((_b = prevProps.store) === null || _b === void 0 ? void 0 : _b.storeType) === 'CRUDStore'));
+                                ((_c = prevProps.store) === null || _c === void 0 ? void 0 : _c.storeType) === 'CRUDStore'));
                     }
                     // nextProps.data.__super !== props.data.__super) &&
                 }

package/lib/actions/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/AjaxAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/BreakAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/BroadcastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/CmptAction.d.ts

@@ -8,6 +8,7 @@ export interface ICmptAction extends ListenerAction {
             [key: string]: string;
         };
         index?: number;
+        condition?: any;
     };
 }
 /**

package/lib/actions/CmptAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -23,12 +23,12 @@ var CmptAction = /** @class */ (function () {
     function CmptAction() {
     }
     CmptAction.prototype.run = function (action, renderer, event) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
         return tslib.__awaiter(this, void 0, void 0, function () {
             var key, dataMergeMode, component, msg, beforeSetData, path, res, result, e_1;
-            var _s, _t;
-            return tslib.__generator(this, function (_u) {
-                switch (_u.label) {
+            var _t, _u;
+            return tslib.__generator(this, function (_v) {
+                switch (_v.label) {
                     case 0:
                         key = action.componentId || action.componentName;
                         dataMergeMode = action.dataMergeMode || 'merge';
@@ -53,48 +53,48 @@ var CmptAction = /** @class */ (function () {
                             typeof beforeSetData === 'function')) return [3 /*break*/, 2];
                         return [4 /*yield*/, beforeSetData(renderer, action, event)];
                     case 1:
-                        res = _u.sent();
+                        res = _v.sent();
                         if (res === false) {
                             return [2 /*return*/];
                         }
-                        _u.label = 2;
+                        _v.label = 2;
                     case 2:
                         if (component === null || component === void 0 ? void 0 : component.setData) {
-                            return [2 /*return*/, component === null || component === void 0 ? void 0 : component.setData((_e = action.args) === null || _e === void 0 ? void 0 : _e.value, dataMergeMode === 'override', (_f = action.args) === null || _f === void 0 ? void 0 : _f.index)];
+                            return [2 /*return*/, component === null || component === void 0 ? void 0 : component.setData((_e = action.args) === null || _e === void 0 ? void 0 : _e.value, dataMergeMode === 'override', (_f = action.args) === null || _f === void 0 ? void 0 : _f.index, (_g = action.args) === null || _g === void 0 ? void 0 : _g.condition)];
                         }
                         else {
-                            return [2 /*return*/, (_h = component === null || component === void 0 ? void 0 : (_g = component.props).onChange) === null || _h === void 0 ? void 0 : _h.call(_g, (_j = action.args) === null || _j === void 0 ? void 0 : _j.value)];
+                            return [2 /*return*/, (_j = component === null || component === void 0 ? void 0 : (_h = component.props).onChange) === null || _j === void 0 ? void 0 : _j.call(_h, (_k = action.args) === null || _k === void 0 ? void 0 : _k.value)];
                         }
                     case 3:
                         // 刷新
                         if (action.actionType === 'reload') {
-                            return [2 /*return*/, (_k = component === null || component === void 0 ? void 0 : component.reload) === null || _k === void 0 ? void 0 : _k.call(component, undefined, action.data, undefined, undefined, dataMergeMode === 'override', action.args)];
+                            return [2 /*return*/, (_l = component === null || component === void 0 ? void 0 : component.reload) === null || _l === void 0 ? void 0 : _l.call(component, undefined, action.data, undefined, undefined, dataMergeMode === 'override', action.args)];
                         }
-                        _u.label = 4;
+                        _v.label = 4;
                     case 4:
-                        _u.trys.push([4, 6, , 7]);
-                        return [4 /*yield*/, ((_l = component === null || component === void 0 ? void 0 : component.doAction) === null || _l === void 0 ? void 0 : _l.call(component, action, action.args, true))];
+                        _v.trys.push([4, 6, , 7]);
+                        return [4 /*yield*/, ((_m = component === null || component === void 0 ? void 0 : component.doAction) === null || _m === void 0 ? void 0 : _m.call(component, action, action.args, true))];
                     case 5:
-                        result = _u.sent();
+                        result = _v.sent();
                         if (['validate', 'submit'].includes(action.actionType)) {
-                            event.setData(object.createObject(event.data, (_s = {},
-                                _s[action.outputVar || "".concat(action.actionType, "Result")] = {
+                            event.setData(object.createObject(event.data, (_t = {},
+                                _t[action.outputVar || "".concat(action.actionType, "Result")] = {
                                     error: '',
-                                    payload: (_m = result === null || result === void 0 ? void 0 : result.__payload) !== null && _m !== void 0 ? _m : (_p = (_o = component === null || component === void 0 ? void 0 : component.props) === null || _o === void 0 ? void 0 : _o.store) === null || _p === void 0 ? void 0 : _p.data,
+                                    payload: (_o = result === null || result === void 0 ? void 0 : result.__payload) !== null && _o !== void 0 ? _o : (_q = (_p = component === null || component === void 0 ? void 0 : component.props) === null || _p === void 0 ? void 0 : _p.store) === null || _q === void 0 ? void 0 : _q.data,
                                     responseData: result === null || result === void 0 ? void 0 : result.__response
                                 },
-                                _s)));
+                                _t)));
                         }
                         return [2 /*return*/, result];
                     case 6:
-                        e_1 = _u.sent();
-                        event.setData(object.createObject(event.data, (_t = {},
-                            _t[action.outputVar || "".concat(action.actionType, "Result")] = {
+                        e_1 = _v.sent();
+                        event.setData(object.createObject(event.data, (_u = {},
+                            _u[action.outputVar || "".concat(action.actionType, "Result")] = {
                                 error: e_1.message,
                                 errors: e_1.name === 'ValidateError' ? e_1.detail : e_1,
-                                payload: (_r = (_q = component === null || component === void 0 ? void 0 : component.props) === null || _q === void 0 ? void 0 : _q.store) === null || _r === void 0 ? void 0 : _r.data
+                                payload: (_s = (_r = component === null || component === void 0 ? void 0 : component.props) === null || _r === void 0 ? void 0 : _r.store) === null || _s === void 0 ? void 0 : _s.data
                             },
-                            _t)));
+                            _u)));
                         return [3 /*break*/, 7];
                     case 7: return [2 /*return*/];
                 }

package/lib/actions/ContinueAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/CopyAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/CustomAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -21,7 +21,6 @@ require('../utils/dom.js');
 require('../utils/errors.js');
 require('../utils/tpl.js');
 require('../utils/helper.js');
-require('classnames');
 require('../utils/filter.js');
 require('lodash/isObject');
 require('lodash/isString');
@@ -42,6 +41,7 @@ require('lodash/mapValues');
 require('lodash/camelCase');
 require('lodash/map');
 require('lodash/isEmpty');
+require('lodash/kebabCase');
 require('uncontrollable');
 require('hoist-non-react-statics');
 require('../utils/validations.js');

package/lib/actions/DialogAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/DrawerAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/EmailAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/LinkAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/LoopAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/PageAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/ParallelAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/StatusAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/SwitchAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/ToastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/CustomStyle.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -34,26 +34,26 @@ function CustomStyle (props) {
         };
     }, [id]);
     React.useEffect(function () {
-        var _a;
+        var _a, _b;
         if (themeCss && id) {
-            styleHelper.insertCustomStyle(themeCss, classNames, id, defaultData, env === null || env === void 0 ? void 0 : env.customStyleClassPrefix, (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env).ownerDocument);
+            styleHelper.insertCustomStyle(themeCss, classNames, id, defaultData, env === null || env === void 0 ? void 0 : env.customStyleClassPrefix, (_b = (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument);
         }
         return function () {
-            var _a;
+            var _a, _b;
             if (id && !styleIdCount.get(id)) {
-                styleHelper.removeCustomStyle('', id, (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env).ownerDocument);
+                styleHelper.removeCustomStyle('', id, (_b = (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument);
             }
         };
     }, [themeCss, id]);
     React.useEffect(function () {
-        var _a;
+        var _a, _b;
         if (wrapperCustomStyle && id) {
-            styleHelper.insertEditCustomStyle(wrapperCustomStyle, id, (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env).ownerDocument);
+            styleHelper.insertEditCustomStyle(wrapperCustomStyle, id, (_b = (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument);
         }
         return function () {
-            var _a;
+            var _a, _b;
             if (id && !styleIdCount.get(id)) {
-                styleHelper.removeCustomStyle('wrapperCustomStyle', id, (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env).ownerDocument);
+                styleHelper.removeCustomStyle('wrapperCustomStyle', id, (_b = (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument);
             }
         };
     }, [wrapperCustomStyle, id]);

package/lib/components/LazyComponent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/Overlay.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -43,6 +43,7 @@ require('lodash/mapValues');
 require('lodash/camelCase');
 require('lodash/map');
 require('lodash/isEmpty');
+require('lodash/kebabCase');
 require('uncontrollable');
 require('hoist-non-react-statics');
 require('../utils/validations.js');

package/lib/components/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -24,7 +24,6 @@ require('../utils/dom.js');
 require('../utils/errors.js');
 require('../utils/tpl.js');
 var helper = require('../utils/helper.js');
-require('classnames');
 require('../utils/filter.js');
 require('lodash/isObject');
 require('lodash/isString');
@@ -43,6 +42,7 @@ require('lodash/mapValues');
 require('lodash/camelCase');
 require('lodash/map');
 require('lodash/isEmpty');
+require('lodash/kebabCase');
 require('uncontrollable');
 require('hoist-non-react-statics');
 require('../utils/validations.js');

package/lib/env.d.ts

@@ -52,8 +52,16 @@ export interface RendererEnv {
     copy?: (contents: string, format?: any) => void;
     getModalContainer?: () => HTMLElement;
     theme: ThemeInstance;
-    affixOffsetTop: number;
-    affixOffsetBottom: number;
+    /**
+     * @deprecated
+     * 请通过外层设置 `--affix-offset-top` css 变量设置
+     */
+    affixOffsetTop?: number;
+    /**
+     * @deprecated
+     * 请通过外层设置 `--affix-offset-bottom` css 变量设置
+     */
+    affixOffsetBottom?: number;
     richTextToken: string;
     loadRenderer: (schema: Schema, path: string, reRender: Function) => Promise<React.ElementType> | React.ElementType | JSX.Element | void;
     loadChartExtends?: () => void | Promise<void>;
@@ -78,7 +86,7 @@ export interface RendererEnv {
     /**
      * 文本替换的黑名单，因为属性太多了所以改成黑名单的 flags
      */
-    replaceTextIgnoreKeys?: String[];
+    replaceTextIgnoreKeys?: String[] | ((key: string, value: any, object: any) => boolean);
     /**
      * 解析url参数
      */

package/lib/env.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/envOverwrite.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 

package/lib/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -102,8 +102,6 @@ function loadRenderer(schema, path) {
 }
 var defaultOptions = {
     session: 'global',
-    affixOffsetTop: 0,
-    affixOffsetBottom: 0,
     richTextToken: '',
     useMobileUI: true,
     enableAMISDebug: (_b = (_a = window.enableAMISDebug) !== null && _a !== void 0 ? _a : location.search.indexOf('amisDebug=1') !== -1) !== null && _b !== void 0 ? _b : false,

package/lib/index.d.ts

@@ -5,6 +5,7 @@
  * This source code is licensed under the Apache license found in the
  * LICENSE file in the root directory of this source tree.
  */
+/// <reference types="react" />
 import { Renderer, getRendererByName, getRenderers, registerRenderer, unRegisterRenderer, resolveRenderer, filterSchema, clearStoresCache, updateEnv, addSchemaFilter, extendDefaultEnv } from './factory';
 import type { RenderOptions, RendererConfig, RendererProps } from './factory';
 import './polyfills';