amis-editor 6.2.1 → 6.3.0

package/esm/renderer/event-control/helper.js

@@ -1,16 +1,17 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
-import { __spreadArray, __assign, __read, __awaiter, __generator } from 'tslib';
+import { __spreadArray, __assign, __read, __awaiter, __generator, __rest } from 'tslib';
 import React__default from 'react';
-import { defaultValue, getSchemaTpl, JSONGetById, persistGet, persistSet, tipedLabel, JsonGenerateID, getFixDialogType } from 'amis-editor-core';
-import { findTree, filterTree, normalizeApi, DataSchema, guid } from 'amis-core';
+import { defaultValue, getSchemaTpl, JSONGetById, persistGet, persistSet, tipedLabel, modalsToDefinitions } from 'amis-editor-core';
+import { findTree, filterTree, normalizeApi, DataSchema } from 'amis-core';
 import { Button } from 'amis';
 import without from 'lodash/without';
 import CmptActionSelect from './comp-action-select.js';
+import DialogActionPanel from './DialogActionPanel.js';
 import { i18n } from 'i18n-runtime';
 
 var getArgsWrapper = function (items, multiple, patch) {
@@ -132,6 +133,67 @@ var ACTION_TYPE_TREE = function (manager) {
   /** 变量列表 */
   var variableOptions = (variableManager === null || variableManager === void 0 ? void 0 : variableManager.getVariableOptions()) || [];
   var pageVariableOptions = (variableManager === null || variableManager === void 0 ? void 0 : variableManager.getPageVariablesOptions()) || [];
+  var modalDescDetail = function (info, _a, props) {
+    var _b, _c, _d, _e;
+    var eventKey = _a.eventKey,
+      actionIndex = _a.actionIndex;
+    props.actionTree;
+      props.actions;
+      props.commonActions;
+      props.allComponents;
+      var node = props.node,
+      manager = props.manager;
+    var store = manager.store;
+    var modals = store.modals;
+    var onEvent = (_b = node.schema) === null || _b === void 0 ? void 0 : _b.onEvent;
+    var action = (_c = onEvent === null || onEvent === void 0 ? void 0 : onEvent[eventKey].actions) === null || _c === void 0 ? void 0 : _c[actionIndex];
+    var actionBody = action === null || action === void 0 ? void 0 : action[(action === null || action === void 0 ? void 0 : action.actionType) === 'drawer' ? 'drawer' : 'dialog'];
+    var modalId = actionBody === null || actionBody === void 0 ? void 0 : actionBody.$$id;
+    if (actionBody === null || actionBody === void 0 ? void 0 : actionBody.$ref) {
+      modalId = ((_d = modals.find(function (item) {
+        return item.$$ref === actionBody.$ref;
+      })) === null || _d === void 0 ? void 0 : _d.$$id) || '';
+    }
+    var modal = modalId ? manager.store.modals.find(function (item) {
+      return item.$$id === modalId;
+    }) : '';
+    if (modal) {
+      return React__default.createElement(React__default.Fragment, null, React__default.createElement("div", null, "\u6253\u5F00\u00A0", React__default.createElement("a", {
+        href: "#",
+        onClick: function (e) {
+          e.preventDefault();
+          e.stopPropagation();
+          var modalId = modal.$$id;
+          store.openSubEditor({
+            title: '编辑弹窗',
+            value: __assign(__assign({
+              type: 'dialog'
+            }, modal), {
+              definitions: modalsToDefinitions(store.modals.filter(function (m) {
+                return m.$$id !== modalId;
+              }))
+            }),
+            onChange: function (_a, diff) {
+              var definitions = _a.definitions,
+                modal = __rest(_a, ["definitions"]);
+              store.updateModal(modalId, modal, definitions);
+            }
+          });
+        }
+      }, ((_e = modal.editorSetting) === null || _e === void 0 ? void 0 : _e.displayName) || modal.title || '未命名弹窗'), "\u00A0", modal.actionType === 'confirmDialog' ? '确认框' : modal.type === 'drawer' ? '抽屉弹窗' : i18n("6cff4b6d794cc17f5d24dbe0d21e5732")));
+    } else if (Array.isArray(info.__actionModals)) {
+      var modal_1 = info.__actionModals.find(function (item) {
+        return item.isActive;
+      });
+      if (modal_1) {
+        // 这个时候还不能打开弹窗，schema 还没插入进去不知道 $$id，无法定位
+        return React__default.createElement(React__default.Fragment, null, React__default.createElement("div", null, i18n("d7098f5050f017673319c5db1473ada7"), React__default.createElement("span", {
+          className: "variable-left"
+        }, modal_1.label), "\u00A0", modal_1.tip));
+      }
+    }
+    return null;
+  };
   return [{
     actionLabel: i18n("59ceff465ad16932d8972191ad815dfb"),
     actionType: 'page',
@@ -203,69 +265,27 @@ var ACTION_TYPE_TREE = function (manager) {
       actionType: 'openDialog',
       description: i18n("4a502e748d1335385c2c05bf30e582e7"),
       actions: [{
-        actionType: 'dialog'
+        actionType: 'dialog',
+        descDetail: modalDescDetail
       }, {
-        actionType: 'drawer'
+        actionType: 'drawer',
+        descDetail: modalDescDetail
       }, {
-        actionType: 'confirmDialog'
+        actionType: 'confirmDialog',
+        descDetail: modalDescDetail
       }],
       schema: [{
-        type: 'radios',
-        label: i18n("c1b3a483bf057f5afa118f96644dc8a3"),
-        name: '__dialogSource',
-        required: true,
-        mode: 'horizontal',
-        inputClassName: 'event-action-radio',
-        value: 'new',
-        options: [{
-          label: i18n("0c5cbc9d345936876230a0b09aece2ff"),
-          value: 'current'
-        }, {
-          label: i18n("a781b5903a4013c147783e1047f42e08"),
-          value: 'new'
-        }]
-      }, {
-        name: '__dialogTitle',
-        type: 'input-text',
-        label: i18n("53bed22bc03c0fd61fe4fb81101f712a"),
-        placeholder: i18n("953131d14e66fae5e3611f8b419b7ed5"),
-        mode: 'horizontal',
-        size: 'lg',
-        visibleOn: '__dialogSource === "new"'
-      }, {
-        name: '__selectDialog',
-        type: 'select',
-        label: i18n("7cc53692d650e049802d808b81efe7f5"),
-        source: '${__dialogActions}',
-        mode: 'horizontal',
-        size: 'lg',
-        visibleOn: '__dialogSource === "current"',
-        onChange: function (value, oldValue, model, form) {
-          form.setValueByName('args', {
-            fromCurrentDialog: true
-          });
-        }
-      }, {
-        type: 'radios',
-        label: i18n("939402f3ff754d8d815eb7f6cc991bea"),
-        name: 'groupType',
-        mode: 'horizontal',
-        value: 'dialog',
-        required: true,
-        pipeIn: defaultValue('dialog'),
-        inputClassName: 'event-action-radio',
-        options: [{
-          label: i18n("6cff4b6d794cc17f5d24dbe0d21e5732"),
-          value: 'dialog'
-        }, {
-          label: i18n("2a2924380dfcaea998bd8a49703545a9"),
-          value: 'drawer'
-        }, {
-          label: i18n("fa6b01f51cc2b8e16bfbb914b6c08ace"),
-          value: 'confirmDialog'
-        }],
-        visibleOn: 'data.actionType === "openDialog" && __dialogSource === "new"'
-      }]
+        component: DialogActionPanel
+      }
+      // {
+      //   name: '__selectDialog',
+      //   type: 'select',
+      //   label: '选择弹窗',
+      //   source: '${__dialogActions}',
+      //   mode: 'horizontal',
+      //   size: 'lg'
+      // }
+      ]
     }, {
       actionLabel: i18n("3b02248ca3790e356e47b6900c0e3931"),
       actionType: 'closeDialog',
@@ -850,11 +870,11 @@ var ACTION_TYPE_TREE = function (manager) {
       innerArgs: ['path', 'value', 'index', '__valueInput', '__comboType', '__containerType'],
       descDetail: function (info) {
         var _a;
-        return React__default.createElement("div", null, typeof ((_a = info === null || info === void 0 ? void 0 : info.args) === null || _a === void 0 ? void 0 : _a.path) === 'string' && !(info === null || info === void 0 ? void 0 : info.componentId) ? React__default.createElement(React__default.Fragment, null, i18n("c85c8d61a67014c4b5d44f25e49e87fc"), React__default.createElement("span", {
+        return React__default.createElement("div", null, typeof ((_a = info === null || info === void 0 ? void 0 : info.args) === null || _a === void 0 ? void 0 : _a.path) === 'string' && !(info === null || info === void 0 ? void 0 : info.componentId) ? React__default.createElement(React__default.Fragment, null, "\u8BBE\u7F6E\u53D8\u91CF", React__default.createElement("span", {
           className: "variable-left variable-right"
-        }, variableManager.getNameByPath(info.args.path)), i18n("df24d894cd3331f53964bc75f5c192e2")) : React__default.createElement(React__default.Fragment, null, i18n("9e1bafbb00018beacc8f579c8ddfaa36"), React__default.createElement("span", {
+        }, variableManager.getNameByPath(info.args.path)), i18n("b91ebe714155c83b6d3bc02b675a31e9")) : React__default.createElement(React__default.Fragment, null, "\u8BBE\u7F6E\u7EC4\u4EF6", React__default.createElement("span", {
           className: "variable-left variable-right"
-        }, (info === null || info === void 0 ? void 0 : info.rendererLabel) || info.componentId || '-'), i18n("df24d894cd3331f53964bc75f5c192e2")));
+        }, (info === null || info === void 0 ? void 0 : info.rendererLabel) || info.componentId || '-'), i18n("b91ebe714155c83b6d3bc02b675a31e9")));
       },
       supportComponents: 'byComponent',
       schema: [{
@@ -1915,11 +1935,12 @@ var getOldActionSchema = function (manager, context) {
               showLoading: true
             }),
             asFormItem: true,
+            visibleOn: '${actionType === "dialog"}',
             children: function (_a) {
               var value = _a.value,
-                onChange = _a.onChange,
-                data = _a.data;
-              return data.actionType === 'dialog' ? React__default.createElement(Button, {
+                onChange = _a.onChange;
+                _a.data;
+              return React__default.createElement(Button, {
                 size: "sm",
                 level: "danger",
                 className: "m-b",
@@ -1935,21 +1956,21 @@ var getOldActionSchema = function (manager, context) {
                   });
                 },
                 block: true
-              }, i18n("c3c8422fcecd8c1cc922cba15ab5cbc0")) : null;
+              }, i18n("c3c8422fcecd8c1cc922cba15ab5cbc0"));
             }
           }, {
-            visibleOn: 'data.actionType == "drawer"',
             name: 'drawer',
             pipeIn: defaultValue({
               title: i18n("4cb9c4bc5cb960fcd03fceb2d2e62f3a"),
               body: i18n("1a9aaf05889002e65708c4950012a652")
             }),
             asFormItem: true,
+            visibleOn: '${actionType == "drawer"}',
             children: function (_a) {
               var value = _a.value,
-                onChange = _a.onChange,
-                data = _a.data;
-              return data.actionType == 'drawer' ? React__default.createElement(Button, {
+                onChange = _a.onChange;
+                _a.data;
+              return React__default.createElement(Button, {
                 size: "sm",
                 level: "danger",
                 className: "m-b",
@@ -1965,7 +1986,7 @@ var getOldActionSchema = function (manager, context) {
                   });
                 },
                 block: true
-              }, i18n("262c7c7b9874ae5607fb51da468d0e8c")) : null;
+              }, i18n("262c7c7b9874ae5607fb51da468d0e8c"));
             }
           }, getSchemaTpl('api', {
             label: i18n("5eb694a4252528628929ced97ca95823"),
@@ -1977,11 +1998,12 @@ var getOldActionSchema = function (manager, context) {
               body: i18n("2d711b09bd0db0ad240cc83b30dd8014")
             }),
             asFormItem: true,
+            visibleOn: '${actionType == "ajax"}',
             children: function (_a) {
               var onChange = _a.onChange,
-                value = _a.value,
-                data = _a.data;
-              return data.actionType == 'ajax' ? React__default.createElement("div", {
+                value = _a.value;
+                _a.data;
+              return React__default.createElement("div", {
                 className: "m-b"
               }, React__default.createElement(Button, {
                 size: "sm",
@@ -2004,7 +2026,7 @@ var getOldActionSchema = function (manager, context) {
                 onClick: function () {
                   return onChange('');
                 }
-              }, i18n("215f64480a93893fc56c51aeb5d40f11")) : null) : null;
+              }, i18n("215f64480a93893fc56c51aeb5d40f11")) : null);
             }
           }, {
             name: 'feedback.visibleOn',
@@ -2157,7 +2179,7 @@ var getEventControlConfig = function (manager, context) {
     return false;
   };
   return {
-    showOldEntry: !!context.schema.actionType || ['submit', 'reset'].includes(context.schema.type),
+    showOldEntry: !!(context.schema.actionType && !['dialog', 'drawer'].includes(context.schema.type)) || ['submit', 'reset'].includes(context.schema.type),
     actions: manager === null || manager === void 0 ? void 0 : manager.pluginActions,
     events: manager === null || manager === void 0 ? void 0 : manager.pluginEvents,
     actionTree: actionTree,
@@ -2388,115 +2410,11 @@ var getEventControlConfig = function (manager, context) {
         });
         delete action.addOnArgs;
       }
-      if (config.actionType === 'openDialog') {
-        // 初始化弹窗schema
-        var dialogInitSchema_1 = {
-          type: 'dialog',
-          title: action.__dialogTitle,
-          body: [{
-            type: 'tpl',
-            tpl: i18n("1a9aaf05889002e65708c4950012a652"),
-            wrapperComponent: '',
-            inline: false
-          }],
-          showCloseButton: true,
-          showErrorMsg: true,
-          showLoading: true,
-          className: 'app-popover :AMISCSSWrapper',
-          actions: [{
-            type: 'button',
-            actionType: 'cancel',
-            label: i18n("625fb26b4b3340f7872b411f401e754c")
-          }, {
-            type: 'button',
-            actionType: 'confirm',
-            label: i18n("e83a256e4f5bb4ff8b3d804b5473217a"),
-            primary: true
-          }]
-        };
-        var drawerInitSchema_1 = {
-          type: 'drawer',
-          title: action.__dialogTitle,
-          body: [{
-            type: 'tpl',
-            tpl: i18n("1a9aaf05889002e65708c4950012a652"),
-            wrapperComponent: '',
-            inline: false
-          }],
-          className: 'app-popover :AMISCSSWrapper',
-          actions: [{
-            type: 'button',
-            actionType: 'cancel',
-            label: i18n("625fb26b4b3340f7872b411f401e754c")
-          }, {
-            type: 'button',
-            actionType: 'confirm',
-            label: i18n("e83a256e4f5bb4ff8b3d804b5473217a"),
-            primary: true
-          }]
-        };
-        var confirmDialogInitSchema_1 = {
-          type: 'dialog',
-          title: action.__dialogTitle,
-          body: [{
-            type: 'tpl',
-            tpl: i18n("1a9aaf05889002e65708c4950012a652"),
-            wrapperComponent: '',
-            inline: false
-          }],
-          dialogType: 'confirm',
-          confirmText: i18n("e83a256e4f5bb4ff8b3d804b5473217a"),
-          cancelText: i18n("625fb26b4b3340f7872b411f401e754c"),
-          confirmBtnLevel: 'primary'
-        };
-        var setInitSchema = function (groupType, action) {
-          if (groupType === 'dialog') {
-            JsonGenerateID(dialogInitSchema_1);
-            action.dialog = dialogInitSchema_1;
-          } else if (groupType === 'drawer') {
-            JsonGenerateID(drawerInitSchema_1);
-            action.drawer = drawerInitSchema_1;
-          } else if (groupType === 'confirmDialog') {
-            JsonGenerateID(confirmDialogInitSchema_1);
-            action.dialog = confirmDialogInitSchema_1;
-          }
-        };
-        var chooseCurrentDialog = function (action, schema) {
-          var selectDialog = action.__selectDialog;
-          var dialogType = getFixDialogType(schema, selectDialog);
-          // 选择现有弹窗后为了使之前的弹窗和现有弹窗$$id唯一，这里重新生成一下
-          var newDialogId = guid();
-          action.actionType = dialogType;
-          action[dialogType] = {
-            $$id: newDialogId,
-            type: dialogType
-          };
-          // 在这里记录一下新生成的弹窗id
-          action.__relatedDialogId = newDialogId;
-        };
-        if (type === 'add') {
-          if (config.__dialogSource === 'new') {
-            setInitSchema(config.groupType, action);
-          } else if (config.__dialogSource === 'current') {
-            chooseCurrentDialog(action, shcema);
-          }
-        }
-        // 编辑
-        else if (type === 'update') {
-          if (config.__dialogSource === 'new') {
-            // 如果切换了弹窗类型或切换了弹窗来源，则初始化schema
-            if (config.groupType !== (actionData === null || actionData === void 0 ? void 0 : actionData.groupType) || config.__dialogSource === 'new' && (actionData === null || actionData === void 0 ? void 0 : actionData.__dialogSource) === 'current') {
-              setInitSchema(config.groupType, action);
-            } else {
-              action[config.groupType] = __assign(__assign({}, actionData[config.groupType]), {
-                title: config.__dialogTitle
-              });
-            }
-          } else if (config.__dialogSource === 'current') {
-            chooseCurrentDialog(action, shcema);
-          }
-        }
-      }
+      // 不加回来可能数据会丢失
+      ['drawer', 'dialog', 'args'].forEach(function (key) {
+        var _a;
+        action[key] = (_a = action[key]) !== null && _a !== void 0 ? _a : actionData === null || actionData === void 0 ? void 0 : actionData[key];
+      });
       // 刷新组件时，处理是否追加事件变量
       if (config.actionType === 'reload') {
         action.data = undefined;
@@ -2623,4 +2541,4 @@ var updateCommonUseActions = function (action) {
 };
 
 export { ACTION_TYPE_TREE, COMMON_ACTION_SCHEMA_MAP, DATA_CONTAINER, FORMITEM_CMPTS, SELECT_PROPS_CONTAINER, SHOW_SELECT_PROP, SUPPORT_DISABLED_CMPTS, SUPPORT_STATIC_FORMITEM_CMPTS, findActionNode, findSubActionNode, getActionType, getArgsWrapper, getEventControlConfig, getEventDesc, getEventLabel, getEventStrongDesc, getOldActionSchema, getPropOfAcion, hasActionType, renderCmptActionSelect, renderCmptIdInput, renderCmptSelect, updateCommonUseActions };
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/esm/renderer/event-control/index.d.ts

@@ -21,6 +21,7 @@ interface EventControlProps extends FormControlProps {
     actionConfigInitFormatter?: (actionConfig: ActionConfig) => ActionConfig;
     actionConfigSubmitFormatter?: (actionConfig: ActionConfig, type?: string, actionData?: ActionData, schema?: Schema) => ActionConfig;
     owner?: string;
+    subscribeSchemaSubmit: (fn: (schema: any, value: any, id: string, diff?: any) => any) => () => void;
 }
 interface EventDialogData {
     eventName: string;
@@ -66,11 +67,6 @@ interface EventControlState {
     type: 'update' | 'add';
     appLocaleState?: number;
 }
-declare const dialogObjMap: {
-    dialog: string;
-    drawer: string;
-    confirmDialog: string[];
-};
 export declare class EventControl extends React.Component<EventControlProps, EventControlState> {
     target: HTMLElement | null;
     eventPanelSortMap: {
@@ -78,10 +74,12 @@ export declare class EventControl extends React.Component<EventControlProps, Eve
     };
     drag?: HTMLElement | null;
     unReaction: any;
+    submitSubscribers: Array<(value: any) => any>;
     constructor(props: EventControlProps);
     componentDidMount(): void;
     componentWillUnmount(): void;
     componentDidUpdate(prevProps: EventControlProps, prevState: EventControlState): void;
+    subscribeSubmit(subscriber: (value: any) => any): () => void;
     generateEmptyDefault(events: RendererPluginEvent[]): ActionEventConfig;
     addEvent(event: RendererPluginEvent, disabled: boolean): void;
     activeEventDialog(eventInfo: EventDialogData): void;
@@ -107,13 +105,12 @@ export declare class EventControl extends React.Component<EventControlProps, Eve
     destroyDragging(): void;
     buildEventDataSchema(data: any, manager: EditorManager): void;
     buildContextSchema(data: any): Promise<any>;
-    getDialogList(manager: EditorManager, action?: ActionConfig, actionType?: keyof typeof dialogObjMap): any;
     activeActionDialog(data: Pick<EventControlState, 'showAcionDialog' | 'type' | 'actionData'>): Promise<void>;
-    renderDesc(action: ActionConfig): React.JSX.Element | null;
-    getRefsFromCurrentDialog(store: any, action: any): string;
+    renderDesc(action: ActionConfig, actionIndex: number, eventKey: string): React.JSX.Element | null;
     onSubmit(type: string, config: any): void;
     onClose(): void;
     removeDataSchema(): void;
+    renderActionType(action: any, actionIndex: number, eventKey: string): React.JSX.Element;
     render(): React.JSX.Element;
 }
 export declare class EventControlRenderer extends EventControl {