amis-core 3.4.1 → 3.4.3

package/esm/utils/resize-sensor.js

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

package/esm/utils/resolveCondition.js

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

package/esm/utils/resolveVariable.js

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

package/esm/utils/resolveVariableAndFilter.js

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

package/esm/utils/resolveVariableAndFilterForAsync.js

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

package/esm/utils/scrollPosition.js

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

package/esm/utils/string2regExp.js

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

package/esm/utils/stripNumber.js

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

package/esm/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.1
+ * amis-core v3.4.3
  * Copyright 2018-2023 fex
  */
 
@@ -9,6 +9,7 @@ import cloneDeep from 'lodash/cloneDeep';
 import isObject from 'lodash/isObject';
 import map from 'lodash/map';
 import isEmpty from 'lodash/isEmpty';
+import kebabCase from 'lodash/kebabCase';
 
 var valueMap = {
     'marginTop': 'margin-top',
@@ -150,7 +151,7 @@ function formatStyle(themeCss, classNames, id, defaultData) {
             var styles = [];
             var fn = function (key, value) {
                 key = valueMap[key] || key;
-                styles.push("".concat(key, ": ").concat(value, ";"));
+                styles.push("".concat(kebabCase(key), ": ").concat(value, ";"));
             };
             Object.keys(statusMap[status]).forEach(function (key) {
                 if (key !== '$$id') {

package/esm/utils/style.js

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

package/esm/utils/toNumber.js

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

package/esm/utils/tokenize.js

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

package/esm/utils/tpl-builtin.js

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

package/esm/utils/tpl-lodash.js

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

package/esm/utils/tpl.js

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

package/esm/utils/uncontrollable.js

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

package/esm/utils/validations.js

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

package/lib/Root.js

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

package/lib/RootRenderer.js

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

package/lib/SchemaRenderer.js

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

package/lib/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.1
+ * amis-core v3.4.3
  * 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.1
+ * amis-core v3.4.3
  * Copyright 2018-2023 fex
  */
 

package/lib/WithRootStore.js

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

package/lib/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.1
+ * amis-core v3.4.3
  * 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.1
+ * amis-core v3.4.3
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/AjaxAction.js

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

package/lib/actions/BreakAction.js

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

package/lib/actions/BroadcastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.1
+ * amis-core v3.4.3
  * 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.1
+ * amis-core v3.4.3
  * 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.1
+ * amis-core v3.4.3
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/CopyAction.js

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

package/lib/actions/CustomAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.1
+ * amis-core v3.4.3
  * 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.1
+ * amis-core v3.4.3
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/DrawerAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.1
+ * amis-core v3.4.3
  * Copyright 2018-2023 fex
  */
 
@@ -24,6 +24,10 @@ var DrawerAction = /** @class */ (function () {
         var _a, _b;
         return tslib.__awaiter(this, void 0, void 0, function () {
             return tslib.__generator(this, function (_c) {
+                // 防止editor preview模式下执行
+                if (action.$$id !== undefined) {
+                    return [2 /*return*/];
+                }
                 (_b = (_a = renderer.props).onAction) === null || _b === void 0 ? void 0 : _b.call(_a, event, {
                     actionType: 'drawer',
                     drawer: action.drawer,

package/lib/actions/EmailAction.js

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

package/lib/actions/LinkAction.js

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

package/lib/actions/LoopAction.js

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

package/lib/actions/PageAction.js

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

package/lib/actions/ParallelAction.js

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

package/lib/actions/StatusAction.js

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

package/lib/actions/SwitchAction.js

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

package/lib/actions/ToastAction.js

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

package/lib/components/CustomStyle.d.ts

@@ -7,5 +7,6 @@ interface CustomStyleProps {
     } & InsertCustomStyle;
     env: RendererEnv;
 }
+export declare const styleIdCount: Map<any, any>;
 export default function (props: CustomStyleProps): null;
 export {};

package/lib/components/CustomStyle.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.1
+ * amis-core v3.4.3
  * Copyright 2018-2023 fex
  */
 
@@ -10,12 +10,29 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var React = require('react');
 var styleHelper = require('../utils/style-helper.js');
 
+var styleIdCount = new Map();
 function CustomStyle (props) {
     var config = props.config, env = props.env;
     var themeCss = config.themeCss, classNames = config.classNames, id = config.id, defaultData = config.defaultData, wrapperCustomStyle = config.wrapperCustomStyle;
     if (!themeCss && !wrapperCustomStyle) {
         return null;
     }
+    React.useEffect(function () {
+        if (styleIdCount.has(id)) {
+            styleIdCount.set(id, styleIdCount.get(id) + 1);
+        }
+        else if (id) {
+            styleIdCount.set(id, 1);
+        }
+        return function () {
+            if (styleIdCount.has(id)) {
+                styleIdCount.set(id, styleIdCount.get(id) - 1);
+                if (styleIdCount.get(id) === 0) {
+                    styleIdCount.delete(id);
+                }
+            }
+        };
+    }, [id]);
     React.useEffect(function () {
         var _a;
         if (themeCss && id) {
@@ -23,7 +40,7 @@ function CustomStyle (props) {
         }
         return function () {
             var _a;
-            if (id) {
+            if (id && !styleIdCount.get(id)) {
                 styleHelper.removeCustomStyle('', id, (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env).ownerDocument);
             }
         };
@@ -35,7 +52,7 @@ function CustomStyle (props) {
         }
         return function () {
             var _a;
-            if (id) {
+            if (id && !styleIdCount.get(id)) {
                 styleHelper.removeCustomStyle('wrapperCustomStyle', id, (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env).ownerDocument);
             }
         };
@@ -44,3 +61,4 @@ function CustomStyle (props) {
 }
 
 exports["default"] = CustomStyle;
+exports.styleIdCount = styleIdCount;

package/lib/components/LazyComponent.js

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

package/lib/components/Overlay.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.1
+ * amis-core v3.4.3
  * 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.1
+ * amis-core v3.4.3
  * 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.js

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