amis-editor 5.6.0-beta.0 → 5.6.1

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

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -17,9 +18,9 @@ var cloneDeep = require('lodash/cloneDeep');
 var amisCore = require('amis-core');
 var actionConfigDialog = require('./action-config-dialog.js');
 var helper = require('./helper.js');
+var amisEditorCore = require('amis-editor-core');
 var i18nRuntime = require('i18n-runtime');
 var mobx = require('mobx');
-var amisEditorCore = require('amis-editor-core');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -28,6 +29,11 @@ var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 var Sortable__default = /*#__PURE__*/_interopDefaultLegacy(Sortable);
 var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
 
+var dialogObjMap = {
+  dialog: 'dialog',
+  drawer: 'drawer',
+  confirmDialog: ['dialog', 'args']
+};
 var EventControl = /** @class */function (_super) {
   tslib.__extends(EventControl, _super);
   function EventControl(props) {
@@ -301,7 +307,8 @@ var EventControl = /** @class */function (_super) {
     var eventPanel = Array.prototype.slice.call(dom.getElementsByClassName('item-content'));
     // 找到激活的事件面板
     Object.keys(onEvent).filter(function (key) {
-      return onEvent[key].actions.length && eventPanelActive[key];
+      var _a, _b;
+      return ((_b = (_a = onEvent[key]) === null || _a === void 0 ? void 0 : _a.actions) === null || _b === void 0 ? void 0 : _b.length) && eventPanelActive[key];
     }).forEach(function (key, index) {
       if (!_this.eventPanelSortMap[key]) {
         _this.eventPanelSortMap[key] = _this.genSortPanel(key, eventPanel[index]);
@@ -352,8 +359,8 @@ var EventControl = /** @class */function (_super) {
   EventControl.prototype.destroyDragging = function () {
     var _this = this;
     Object.keys(this.eventPanelSortMap).forEach(function (key) {
-      var _a;
-      (_a = _this.eventPanelSortMap[key]) === null || _a === void 0 ? void 0 : _a.destroy();
+      var _a, _b;
+      ((_a = _this.eventPanelSortMap[key]) === null || _a === void 0 ? void 0 : _a.el) && ((_b = _this.eventPanelSortMap[key]) === null || _b === void 0 ? void 0 : _b.destroy());
     });
   };
   EventControl.prototype.buildEventDataSchema = function (data, manager) {
@@ -515,22 +522,32 @@ var EventControl = /** @class */function (_super) {
       });
     });
   };
+  // 获取现有弹窗列表
+  EventControl.prototype.getDialogList = function (manager, action, actionType) {
+    var _a;
+    if (action && actionType && dialogObjMap[actionType] && !((_a = action === null || action === void 0 ? void 0 : action.args) === null || _a === void 0 ? void 0 : _a.fromCurrentDialog)) {
+      var dialogBodyContent = dialogObjMap[actionType];
+      var filterId = Array.isArray(dialogBodyContent) ? action[dialogBodyContent[0]].id || action[dialogBodyContent[1]].id : action[dialogBodyContent].id;
+      return amisEditorCore.getDialogActions(manager.store.schema, 'source', filterId);
+    } else return amisEditorCore.getDialogActions(manager.store.schema, 'source');
+  };
   // 唤起动作配置弹窗
   EventControl.prototype.activeActionDialog = function (data) {
+    var _a, _b, _c, _d;
     return tslib.__awaiter(this, void 0, void 0, function () {
-      var _a, pluginActions, getContextSchemas, actionConfigInitFormatter, getComponents, actionTree, allComponents, manager, variables, action_1, actionConfig, actionNode, hasSubActionNode, supportComponents, node, setValueDs, contextSchema, dataSchema, targetVariables;
-      return tslib.__generator(this, function (_b) {
-        switch (_b.label) {
+      var _e, pluginActions, getContextSchemas, actionConfigInitFormatter, getComponents, actionTree, allComponents, manager, variables, action_1, actionConfig, actionNode, hasSubActionNode, supportComponents, node, setValueDs, contextSchema, dataSchema, targetVariables, actionGroupType, definitions, dialogBody, dialogObj, dialogRef;
+      return tslib.__generator(this, function (_f) {
+        switch (_f.label) {
           case 0:
-            _a = this.props, pluginActions = _a.actions, getContextSchemas = _a.getContextSchemas, actionConfigInitFormatter = _a.actionConfigInitFormatter, getComponents = _a.getComponents, actionTree = _a.actionTree, allComponents = _a.allComponents, manager = _a.manager, _a.node;
+            _e = this.props, pluginActions = _e.actions, getContextSchemas = _e.getContextSchemas, actionConfigInitFormatter = _e.actionConfigInitFormatter, getComponents = _e.getComponents, actionTree = _e.actionTree, allComponents = _e.allComponents, manager = _e.manager, _e.node;
             return [4 /*yield*/, this.buildContextSchema(data)];
           case 1:
-            variables = _b.sent();
+            variables = _f.sent();
             if (!(data.type === 'update')) return [3 /*break*/, 5];
             action_1 = data.actionData.action;
             return [4 /*yield*/, actionConfigInitFormatter === null || actionConfigInitFormatter === void 0 ? void 0 : actionConfigInitFormatter(action_1)];
           case 2:
-            actionConfig = _b.sent();
+            actionConfig = _f.sent();
             actionNode = helper.findActionNode(actionTree, actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig.actionType);
             hasSubActionNode = helper.findSubActionNode(actionTree, action_1.actionType);
             supportComponents = getComponents(actionNode);
@@ -541,14 +558,15 @@ var EventControl = /** @class */function (_super) {
             if (!((actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig.actionType) === 'setValue' && (node === null || node === void 0 ? void 0 : node.id) && helper.SELECT_PROPS_CONTAINER.includes((node === null || node === void 0 ? void 0 : node.type) || ''))) return [3 /*break*/, 4];
             return [4 /*yield*/, manager.getContextSchemas(node.id, true)];
           case 3:
-            contextSchema = _b.sent();
+            contextSchema = _f.sent();
             dataSchema = new amis.DataSchema(contextSchema || []);
             targetVariables = (dataSchema === null || dataSchema === void 0 ? void 0 : dataSchema.getDataPropsAsOptions()) || [];
             setValueDs = targetVariables === null || targetVariables === void 0 ? void 0 : targetVariables.filter(function (item) {
               return item.value !== '$$id';
             });
-            _b.label = 4;
+            _f.label = 4;
           case 4:
+            actionGroupType = (actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig.__actionType) || action_1.actionType;
             data.actionData = tslib.__assign(tslib.__assign({
               eventKey: data.actionData.eventKey,
               actionIndex: data.actionData.actionIndex,
@@ -556,15 +574,34 @@ var EventControl = /** @class */function (_super) {
               pluginActions: pluginActions,
               getContextSchemas: getContextSchemas
             }, actionConfig), {
-              groupType: (actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig.__actionType) || action_1.actionType,
-              __actionDesc: actionNode.description,
+              groupType: actionGroupType,
+              __actionDesc: (_a = actionNode === null || actionNode === void 0 ? void 0 : actionNode.description) !== null && _a !== void 0 ? _a : '',
               __actionSchema: actionNode.schema,
               __subActions: hasSubActionNode === null || hasSubActionNode === void 0 ? void 0 : hasSubActionNode.actions,
               __cmptTreeSource: supportComponents !== null && supportComponents !== void 0 ? supportComponents : [],
+              __dialogActions: this.getDialogList(manager, action_1, actionGroupType),
               __superCmptTreeSource: allComponents,
               // __supersCmptTreeSource: '',
               __setValueDs: setValueDs
             });
+            // 编辑时准备已选的弹窗来源和标题
+            if ((actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig.actionType) == 'openDialog') {
+              definitions = manager.store.schema.definitions;
+              dialogBody = dialogObjMap[actionGroupType];
+              dialogObj = Array.isArray(dialogBody) ? dialogBody[0] || dialogBody[1] : dialogBody;
+              dialogRef = (_b = actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig[dialogObj]) === null || _b === void 0 ? void 0 : _b.$ref;
+              if (dialogRef) {
+                data.actionData.__dialogTitle = definitions[dialogRef].title;
+              } else {
+                data.actionData.__dialogTitle = (_c = actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig[dialogObj]) === null || _c === void 0 ? void 0 : _c.title;
+              }
+              if ((_d = actionConfig.args) === null || _d === void 0 ? void 0 : _d.fromCurrentDialog) {
+                data.actionData.__dialogSource = 'current';
+                data.actionData.__selectDialog = definitions[dialogRef].$$id;
+              } else {
+                data.actionData.__dialogSource = 'new';
+              }
+            }
             // 选中项自动滚动至可见位置
             setTimeout(function () {
               var _a;
@@ -577,9 +614,10 @@ var EventControl = /** @class */function (_super) {
               variables: variables,
               pluginActions: pluginActions,
               getContextSchemas: getContextSchemas,
-              __superCmptTreeSource: allComponents
+              __superCmptTreeSource: allComponents,
+              __dialogActions: this.getDialogList(manager)
             };
-            _b.label = 6;
+            _f.label = 6;
           case 6:
             this.setState(data);
             return [2 /*return*/];
@@ -616,15 +654,68 @@ var EventControl = /** @class */function (_super) {
       className: "action-control-content"
     }, (desc === null || desc === void 0 ? void 0 : desc(info)) || '-') : null;
   };
+  EventControl.prototype.getRefsFromCurrentDialog = function (store, action) {
+    var definitions = store.schema.definitions;
+    var dialogMaxIndex = 0;
+    var dialogRefsName = '';
+    if (definitions) {
+      Object.keys(definitions).forEach(function (k) {
+        var dialog = definitions[k];
+        if (dialog.$$id === action.__selectDialog) {
+          dialogRefsName = k;
+        }
+        if (k.includes('ref-')) {
+          var index = Number(k.split('-')[2]);
+          dialogMaxIndex = Math.max(dialogMaxIndex, index);
+        }
+      });
+    }
+    var dialogType = amisEditorCore.getFixDialogType(store.schema, action.__selectDialog);
+    if (!dialogRefsName) {
+      dialogRefsName = dialogMaxIndex ? "".concat(dialogType, "-ref-").concat(dialogMaxIndex + 1) : "".concat(dialogType, "-ref-1");
+    }
+    return dialogRefsName;
+  };
   EventControl.prototype.onSubmit = function (type, config) {
-    var _a, _b, _c;
-    var actionConfigSubmitFormatter = this.props.actionConfigSubmitFormatter;
-    var action = (_a = actionConfigSubmitFormatter === null || actionConfigSubmitFormatter === void 0 ? void 0 : actionConfigSubmitFormatter(config)) !== null && _a !== void 0 ? _a : config;
+    var _a, _b, _c, _d, _e;
+    var _f = this.props,
+      actionConfigSubmitFormatter = _f.actionConfigSubmitFormatter,
+      manager = _f.manager;
+    var actionData = this.state.actionData;
+    var store = manager.store;
+    var action = (_a = actionConfigSubmitFormatter === null || actionConfigSubmitFormatter === void 0 ? void 0 : actionConfigSubmitFormatter(config, type, actionData, store.schema)) !== null && _a !== void 0 ? _a : config;
     delete action.__actionSchema;
     if (type === 'add') {
-      (_b = this.addAction) === null || _b === void 0 ? void 0 : _b.call(this, config.eventKey, action);
+      if (['dialog', 'drawer', 'confirmDialog'].includes(action.actionType)) {
+        var args = action.actionType === 'dialog' ? 'dialog' : action.actionType === 'drawer' ? 'drawer' : 'dialog';
+        if (!(config === null || config === void 0 ? void 0 : config.__dialogSource) || (config === null || config === void 0 ? void 0 : config.__dialogSource) === 'new') {
+          var actionLength = this.state.onEvent[config.eventKey].actions.length;
+          var path = "".concat(store.getSchemaPath(store.activeId), "/onEvent/").concat(config.eventKey, "/actions/").concat(actionLength, "/").concat(args);
+          store.setActiveDialogPath(path);
+        } else if ((config === null || config === void 0 ? void 0 : config.__dialogSource) === 'current') {
+          var dialogRefsName = this.getRefsFromCurrentDialog(store, action);
+          var path = "definitions/".concat(dialogRefsName);
+          store.setActiveDialogPath(path);
+        }
+        (_b = this.addAction) === null || _b === void 0 ? void 0 : _b.call(this, config.eventKey, action);
+      } else {
+        (_c = this.addAction) === null || _c === void 0 ? void 0 : _c.call(this, config.eventKey, action);
+      }
     } else if (type === 'update') {
-      (_c = this.updateAction) === null || _c === void 0 ? void 0 : _c.call(this, config.eventKey, config.actionIndex, action);
+      if (['dialog', 'drawer', 'confirmDialog'].includes(action.actionType)) {
+        var args = action.actionType === 'dialog' ? 'dialog' : action.actionType === 'drawer' ? 'drawer' : 'dialog';
+        if (config.__dialogSource === 'new') {
+          var path = "".concat(store.getSchemaPath(store.activeId), "/onEvent/").concat(config.eventKey, "/actions/").concat(config.actionIndex, "/").concat(args);
+          store.setActiveDialogPath(path);
+        } else if (config.__dialogSource === 'current') {
+          var dialogRefsName = this.getRefsFromCurrentDialog(store, action);
+          var path = "definitions/".concat(dialogRefsName);
+          store.setActiveDialogPath(path);
+        }
+        (_d = this.updateAction) === null || _d === void 0 ? void 0 : _d.call(this, config.eventKey, config.actionIndex, action);
+      } else {
+        (_e = this.updateAction) === null || _e === void 0 ? void 0 : _e.call(this, config.eventKey, config.actionIndex, action);
+      }
     }
     this.removeDataSchema();
     this.setState({
@@ -918,3 +1009,4 @@ exports.hasActionType = helper.hasActionType;
 exports.renderCmptActionSelect = helper.renderCmptActionSelect;
 exports.renderCmptSelect = helper.renderCmptSelect;
 exports.EventControl = EventControl;
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

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

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -491,3 +492,4 @@ var Background = function (props) {
 })(React__default["default"].Component);
 
 exports["default"] = Background;
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

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

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -223,3 +224,4 @@ mobxReact.observer(BoxBorder);
   })], BorderRenderer);
   return BorderRenderer;
 })(React__default["default"].Component);
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

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

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -73,3 +74,4 @@ mobxReact.observer(BoxModel);
     ], BoxModelRenderer);
     return BoxModelRenderer;
 })(React__default["default"].Component));
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

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

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -121,3 +122,4 @@ function BoxShadow(_a) {
 })(React__default["default"].Component);
 
 exports["default"] = BoxShadow;
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

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

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -190,3 +191,4 @@ var Display = function (props) {
   })], DisplayRenderer);
   return DisplayRenderer;
 })(React__default["default"].Component);
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

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

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -188,3 +189,4 @@ var Font = function (props) {
 })(React__default["default"].Component);
 
 exports["default"] = Font;
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

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

@@ -1,5 +1,6 @@
 /**
- * amis-editor v5.6.0-beta.0
+ * amis-editor v5.5.2-beta.2
+ * build time: 2023-09-28
  * Copyright 2018-2023 @fex
  */
 
@@ -70,3 +71,4 @@ mobxReact.observer(InsetBoxModel);
     ], BoxModelRenderer);
     return BoxModelRenderer;
 })(React__default["default"].Component));
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};