amis-editor 5.2.1-beta.31 → 5.2.1-beta.33

package/lib/renderer/event-control/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 
@@ -61,6 +61,7 @@ var EventControl = /** @class */function (_super) {
       events: pluginEvents,
       eventPanelActive: eventPanelActive,
       showAcionDialog: false,
+      showEventDialog: false,
       actionData: undefined,
       type: 'add'
     };
@@ -124,6 +125,56 @@ var EventControl = /** @class */function (_super) {
       onChange && onChange(onEvent);
     }
   });
+  Object.defineProperty(EventControl.prototype, "activeEventDialog", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (eventInfo) {
+      if (!eventInfo.debounce) {
+        // 防抖配置的默认值
+        eventInfo.debounce = {
+          open: false,
+          wait: 100
+        };
+      } else {
+        eventInfo.debounce = tslib.__assign({
+          open: true
+        }, eventInfo.debounce);
+      }
+      this.setState({
+        eventDialogData: eventInfo,
+        showEventDialog: true
+      });
+    }
+  });
+  Object.defineProperty(EventControl.prototype, "eventDialogSubmit", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (formData) {
+      var onChange = this.props.onChange;
+      var eventName = formData.eventName,
+        _a = formData.debounce,
+        debounce = _a === void 0 ? {} : _a;
+      var onEvent = tslib.__assign({}, this.state.onEvent);
+      var eventConfig = onEvent["".concat(eventName)];
+      if (!debounce.open) {
+        delete eventConfig.debounce;
+      } else {
+        eventConfig = tslib.__assign(tslib.__assign({}, eventConfig), {
+          debounce: {
+            wait: debounce.wait
+          }
+        });
+      }
+      onEvent["".concat(eventName)] = tslib.__assign({}, eventConfig);
+      this.setState({
+        onEvent: onEvent,
+        showEventDialog: false
+      });
+      onChange && onChange(onEvent);
+    }
+  });
   Object.defineProperty(EventControl.prototype, "delEvent", {
     enumerable: false,
     configurable: true,
@@ -162,10 +213,9 @@ var EventControl = /** @class */function (_super) {
       }
       activeConfig[event] = true;
       if (config.actionType) {
-        onEventConfig[event] = {
-          actions: onEventConfig[event].actions.concat(config),
-          weight: onEvent[event].weight
-        };
+        onEventConfig[event] = tslib.__assign(tslib.__assign({}, onEventConfig[event]), {
+          actions: onEventConfig[event].actions.concat(config)
+        });
       }
       this.setState({
         onEvent: onEventConfig,
@@ -279,14 +329,13 @@ var EventControl = /** @class */function (_super) {
             }),
             weight: onEvent[event].weight
           };
-          onEventConfig[event] = {
+          onEventConfig[event] = tslib.__assign(tslib.__assign({}, onEvent[event]), {
             actions: onEvent[event].actions.map(function (item, actionIndex) {
               return actionIndex === index ? typeof config === 'string' ? tslib.__assign(tslib.__assign({}, item), {
                 actionType: config
               }) : config : item;
-            }),
-            weight: onEvent[event].weight
-          };
+            })
+          });
           this.setState({
             onEvent: onEventConfig
           });
@@ -497,7 +546,7 @@ var EventControl = /** @class */function (_super) {
                 getContextSchemas: getContextSchemas,
                 rawVariables: rawVariables
               }, actionConfig), {
-                groupType: action_1.actionType,
+                groupType: (actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig.__actionType) || action_1.actionType,
                 __actionDesc: actionNode.description,
                 __actionSchema: actionNode.schema,
                 __subActions: hasSubActionNode === null || hasSubActionNode === void 0 ? void 0 : hasSubActionNode.actions,
@@ -613,11 +662,13 @@ var EventControl = /** @class */function (_super) {
         events = _b.events,
         eventPanelActive = _b.eventPanelActive,
         showAcionDialog = _b.showAcionDialog,
+        showEventDialog = _b.showEventDialog,
         type = _b.type,
-        actionData = _b.actionData;
-      var enventSnapshot = cloneDeep__default["default"](onEvent);
+        actionData = _b.actionData,
+        eventDialogData = _b.eventDialogData;
+      var eventSnapshot = cloneDeep__default["default"](onEvent);
       var showOldEntry = this.props.showOldEntry;
-      var eventKeys = Object.keys(enventSnapshot);
+      var eventKeys = Object.keys(eventSnapshot);
       return React__default["default"].createElement("div", {
         className: "ae-event-control"
       }, React__default["default"].createElement("header", {
@@ -660,7 +711,7 @@ var EventControl = /** @class */function (_super) {
         }, React__default["default"].createElement("div", {
           className: cx__default["default"]({
             'event-item-header': true,
-            'no-bd-btm': !(((_a = enventSnapshot[eventKey].actions) === null || _a === void 0 ? void 0 : _a.length) && eventPanelActive[eventKey]) && !helper.getEventStrongDesc(events, eventKey)
+            'no-bd-btm': !(((_a = eventSnapshot[eventKey].actions) === null || _a === void 0 ? void 0 : _a.length) && eventPanelActive[eventKey]) && !helper.getEventStrongDesc(events, eventKey)
           })
         }, React__default["default"].createElement(amis.TooltipWrapper, {
           tooltipClassName: "event-item-header-tip",
@@ -689,6 +740,14 @@ var EventControl = /** @class */function (_super) {
         }, React__default["default"].createElement(amis.Icon, {
           className: "icon",
           icon: "delete-bold-btn"
+        })), React__default["default"].createElement("div", {
+          onClick: _this.activeEventDialog.bind(_this, tslib.__assign({
+            eventName: eventKey,
+            eventLabel: helper.getEventLabel(events, eventKey) || eventKey
+          }, eventSnapshot[eventKey]))
+        }, React__default["default"].createElement(amis.Icon, {
+          className: "icon",
+          icon: "event-setting"
         })), React__default["default"].createElement("div", {
           onClick: _this.toggleActivePanel.bind(_this, eventKey)
         }, eventPanelActive[eventKey] ? React__default["default"].createElement(amis.Icon, {
@@ -704,9 +763,9 @@ var EventControl = /** @class */function (_super) {
           showCloseButton: true,
           showIcon: true,
           className: 'event-item-desc'
-        }) : null, enventSnapshot[eventKey].actions.length && eventPanelActive[eventKey] ? React__default["default"].createElement("ul", {
+        }) : null, eventSnapshot[eventKey].actions.length && eventPanelActive[eventKey] ? React__default["default"].createElement("ul", {
           className: "item-content"
-        }, enventSnapshot[eventKey].actions.map(function (action, actionIndex) {
+        }, eventSnapshot[eventKey].actions.map(function (action, actionIndex) {
           return React__default["default"].createElement("li", {
             className: "ae-option-control-item",
             key: "item-content_".concat(actionIndex)
@@ -745,7 +804,62 @@ var EventControl = /** @class */function (_super) {
         })) : null);
       }) : React__default["default"].createElement("div", {
         className: "ae-event-control-placeholder"
-      }, i18nRuntime.i18n('4db5110d41293fef57f5a1f364187896'))), React__default["default"].createElement(actionConfigDialog["default"], {
+      }, i18nRuntime.i18n('4db5110d41293fef57f5a1f364187896'))), showEventDialog ? amis.render({
+        type: 'dialog',
+        title: "".concat(eventDialogData === null || eventDialogData === void 0 ? void 0 : eventDialogData.eventLabel, "-\u4E8B\u4EF6\u914D\u7F6E"),
+        showCloseButton: false,
+        body: [{
+          type: 'form',
+          title: i18nRuntime.i18n("eee1e2258d7ea163fec625ee44be9637"),
+          data: {
+            '&': '$$'
+          },
+          mode: 'horizontal',
+          horizontal: {
+            left: 3,
+            right: 9
+          },
+          body: [{
+            label: '事件防重',
+            type: 'switch',
+            name: 'debounce.open',
+            description: '开启事件防重后，防重时间内多次触发事件只会执行最后一次'
+          }, {
+            label: '防重时间',
+            required: true,
+            hiddenOn: '!debounce.open',
+            name: 'debounce.wait',
+            suffix: 'ms',
+            max: 10000,
+            min: 0,
+            type: 'input-number'
+          }],
+          onSubmit: this.eventDialogSubmit.bind(this)
+        }],
+        actions: [{
+          type: 'button',
+          label: i18nRuntime.i18n("625fb26b4b3340f7872b411f401e754c"),
+          onEvent: {
+            click: {
+              actions: [{
+                actionType: 'custom',
+                script: function () {
+                  _this.setState({
+                    showEventDialog: false
+                  });
+                }
+              }]
+            }
+          }
+        }, {
+          type: 'button',
+          actionType: 'confirm',
+          label: i18nRuntime.i18n("e83a256e4f5bb4ff8b3d804b5473217a"),
+          primary: true
+        }]
+      }, {
+        data: eventDialogData
+      }) : null, React__default["default"].createElement(actionConfigDialog["default"], {
         show: showAcionDialog,
         type: type,
         actionTree: actionTree,

package/lib/renderer/event-control/types.d.ts

@@ -8,6 +8,9 @@ export interface ActionEventConfig {
         weight?: number;
         actions: ActionConfig[];
         __isBroadcast?: boolean;
+        debounce?: {
+            wait: number;
+        };
     };
 }
 export interface ComponentInfo {

package/lib/renderer/style-control/Background.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/style-control/Border.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/style-control/BoxModel.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/style-control/BoxShadow.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/style-control/Display.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/style-control/Font.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/style-control/InsetBoxModel.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/style-control/font-family.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/style-control/transformation.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/textarea-formula/FormulaPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/textarea-formula/TextareaFormulaControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/textarea-formula/plugin.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 

package/lib/renderer/textarea-formula/utils.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 

package/lib/tpl/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 

package/lib/tpl/common.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 

package/lib/tpl/horizontal.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 

package/lib/tpl/layout.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 
@@ -168,6 +168,7 @@ amisEditorCore.setSchemaTpl('layout:display', function (config) {
         form.setValueByName('style.flexDirection', undefined);
         form.setValueByName('style.justifyContent', undefined);
         form.setValueByName('style.alignItems', undefined);
+        form.setValueByName('style.flexWrap', undefined);
       }
     }
   };

package/lib/tpl/options.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 

package/lib/tpl/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 

package/lib/tpl/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 

package/lib/util.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 

package/lib/validator.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-editor",
-  "version": "5.2.1-beta.31",
+  "version": "5.2.1-beta.33",
   "description": "amis 可视化编辑器",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -53,10 +53,10 @@
     "@types/sortablejs": "^1.10.7",
     "@types/tinycolor2": "^1.4.3",
     "ajv": "^8.8.2",
-    "amis": "2.5.0-rc.0",
-    "amis-core": "2.5.0-rc.0",
-    "amis-formula": "2.5.0-rc.0",
-    "amis-ui": "2.5.0-rc.0",
+    "amis": "2.5.2",
+    "amis-core": "2.5.2",
+    "amis-formula": "2.5.2",
+    "amis-ui": "2.5.2",
     "axios": "0.21.1",
     "concurrently": "^6.2.0",
     "css-loader": "^6.2.0",