amis-editor 5.6.0-beta.0 → 5.6.1

package/lib/renderer/event-control/helper.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
  */
 
@@ -12,9 +13,9 @@ var React = require('react');
 var amisEditorCore = require('amis-editor-core');
 var amisCore = require('amis-core');
 var amis = require('amis');
-var i18nRuntime = require('i18n-runtime');
 var without = require('lodash/without');
 var compActionSelect = require('./comp-action-select.js');
+var i18nRuntime = require('i18n-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -221,12 +222,12 @@ var ACTION_TYPE_TREE = function (manager) {
       }
     }]
   }, {
-    actionLabel: i18nRuntime.i18n("f80d12dcd65429fd28841e768062d3c2"),
+    actionLabel: i18nRuntime.i18n("0db9e779f5cd9ad8bd3d16d7e8a16b64"),
     actionType: 'dialogs',
     children: [{
       actionLabel: i18nRuntime.i18n("0561589c26e732981f29709a9b574234"),
       actionType: 'openDialog',
-      description: i18nRuntime.i18n("256dbc5161ae393ec8a0e83ae6cf9469"),
+      description: i18nRuntime.i18n("4a502e748d1335385c2c05bf30e582e7"),
       actions: [{
         actionType: 'dialog'
       }, {
@@ -236,7 +237,43 @@ var ACTION_TYPE_TREE = function (manager) {
       }],
       schema: [{
         type: 'radios',
-        label: i18nRuntime.i18n("226b0912184333c81babf2f1894ec0c1"),
+        label: i18nRuntime.i18n("c1b3a483bf057f5afa118f96644dc8a3"),
+        name: '__dialogSource',
+        required: true,
+        mode: 'horizontal',
+        inputClassName: 'event-action-radio',
+        value: 'new',
+        options: [{
+          label: i18nRuntime.i18n("0c5cbc9d345936876230a0b09aece2ff"),
+          value: 'current'
+        }, {
+          label: i18nRuntime.i18n("a781b5903a4013c147783e1047f42e08"),
+          value: 'new'
+        }]
+      }, {
+        name: '__dialogTitle',
+        type: 'input-text',
+        label: i18nRuntime.i18n("53bed22bc03c0fd61fe4fb81101f712a"),
+        placeholder: i18nRuntime.i18n("953131d14e66fae5e3611f8b419b7ed5"),
+        mode: 'horizontal',
+        size: 'lg',
+        visibleOn: '__dialogSource === "new"'
+      }, {
+        name: '__selectDialog',
+        type: 'select',
+        label: i18nRuntime.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: i18nRuntime.i18n("939402f3ff754d8d815eb7f6cc991bea"),
         name: 'groupType',
         mode: 'horizontal',
         value: 'dialog',
@@ -253,113 +290,7 @@ var ACTION_TYPE_TREE = function (manager) {
           label: i18nRuntime.i18n("fa6b01f51cc2b8e16bfbb914b6c08ace"),
           value: 'confirmDialog'
         }],
-        visibleOn: 'data.actionType === "openDialog"'
-      }, {
-        name: 'dialog',
-        label: i18nRuntime.i18n("507c1d40c5d6b990cf8c832b0a91cadb"),
-        mode: 'horizontal',
-        required: true,
-        pipeIn: amisEditorCore.defaultValue({
-          title: i18nRuntime.i18n("8a089992349df754f182a5d02de8e8e0"),
-          body: i18nRuntime.i18n("1a9aaf05889002e65708c4950012a652"),
-          showCloseButton: true,
-          showErrorMsg: true,
-          showLoading: true,
-          className: 'app-popover'
-        }),
-        asFormItem: true,
-        visibleOn: 'data.groupType === "dialog"',
-        children: function (_a) {
-          var value = _a.value,
-            onChange = _a.onChange,
-            data = _a.data;
-          return React__default["default"].createElement(amis.Button, {
-            size: "sm",
-            className: "action-btn-width",
-            onClick: function () {
-              return manager.openSubEditor({
-                title: i18nRuntime.i18n("c3c8422fcecd8c1cc922cba15ab5cbc0"),
-                value: tslib.__assign({
-                  type: 'dialog'
-                }, value),
-                data: data,
-                onChange: function (value) {
-                  return onChange(value);
-                }
-              });
-            },
-            block: true
-          }, i18nRuntime.i18n('a532be3ad5f3fda70d228b8542e81835'));
-        }
-      }, {
-        name: 'drawer',
-        label: i18nRuntime.i18n("b67cbb1ca7439053f06d59aac5e410dc"),
-        mode: 'horizontal',
-        required: true,
-        pipeIn: amisEditorCore.defaultValue({
-          title: i18nRuntime.i18n("4cb9c4bc5cb960fcd03fceb2d2e62f3a"),
-          body: i18nRuntime.i18n("1a9aaf05889002e65708c4950012a652"),
-          className: 'app-popover'
-        }),
-        asFormItem: true,
-        visibleOn: 'data.groupType === "drawer"',
-        children: function (_a) {
-          var value = _a.value,
-            onChange = _a.onChange;
-            _a.data;
-          return React__default["default"].createElement(amis.Button, {
-            size: "sm",
-            className: "action-btn-width",
-            onClick: function () {
-              return manager.openSubEditor({
-                title: i18nRuntime.i18n("262c7c7b9874ae5607fb51da468d0e8c"),
-                value: tslib.__assign({
-                  type: 'drawer'
-                }, value),
-                onChange: function (value) {
-                  return onChange(value);
-                }
-              });
-            },
-            block: true
-          }, i18nRuntime.i18n('a532be3ad5f3fda70d228b8542e81835'));
-        }
-      }, {
-        name: 'dialog',
-        label: i18nRuntime.i18n("507c1d40c5d6b990cf8c832b0a91cadb"),
-        mode: 'horizontal',
-        required: true,
-        pipeIn: amisEditorCore.defaultValue({
-          title: i18nRuntime.i18n("8a089992349df754f182a5d02de8e8e0"),
-          confirmText: i18nRuntime.i18n("e83a256e4f5bb4ff8b3d804b5473217a"),
-          cancelText: i18nRuntime.i18n("625fb26b4b3340f7872b411f401e754c"),
-          confirmBtnLevel: 'primary',
-          body: i18nRuntime.i18n("1a9aaf05889002e65708c4950012a652"),
-          dialogType: 'confirm'
-        }),
-        asFormItem: true,
-        visibleOn: 'data.groupType === "confirmDialog"',
-        children: function (_a) {
-          var value = _a.value,
-            onChange = _a.onChange;
-            _a.data;
-          return React__default["default"].createElement(amis.Button, {
-            size: "sm",
-            className: "action-btn-width",
-            onClick: function () {
-              return manager.openSubEditor({
-                title: i18nRuntime.i18n("c3c8422fcecd8c1cc922cba15ab5cbc0"),
-                value: tslib.__assign({
-                  type: 'dialog'
-                }, value),
-                onChange: function (value) {
-                  return onChange(value);
-                }
-              });
-            },
-            block: true
-          }, i18nRuntime.i18n('a532be3ad5f3fda70d228b8542e81835'));
-        }
+        visibleOn: 'data.actionType === "openDialog" && __dialogSource === "new"'
       }]
     }, {
       actionLabel: i18nRuntime.i18n("3b02248ca3790e356e47b6900c0e3931"),
@@ -1573,6 +1504,13 @@ var COMMON_ACTION_SCHEMA_MAP = {
       }, info === null || info === void 0 ? void 0 : info.rendererLabel), (info === null || info === void 0 ? void 0 : info.__rendererName) === 'carousel' ? i18nRuntime.i18n("47b9cbf9f3a3f08264b19f4a1228e865") : null, (info === null || info === void 0 ? void 0 : info.__rendererName) === 'wizard' ? i18nRuntime.i18n("832efcc5c30746b84b910cde8630d491") : null);
     }
   },
+  expand: {
+    descDetail: function (info) {
+      return React__default["default"].createElement("div", null, React__default["default"].createElement("span", {
+        className: "variable-right"
+      }, info === null || info === void 0 ? void 0 : info.rendererLabel), i18nRuntime.i18n("e2edde5adbdf33f6dce59a299cbf5fad"));
+    }
+  },
   collapse: {
     descDetail: function (info) {
       return React__default["default"].createElement("div", null, React__default["default"].createElement("span", {
@@ -2009,14 +1947,14 @@ var getEventControlConfig = function (manager, context) {
   var allComponents = (_e = manager === null || manager === void 0 ? void 0 : manager.store) === null || _e === void 0 ? void 0 : _e.getComponentTreeSource();
   var checkComponent = function (node, action) {
     var _a;
-    var actionType = action.actionType;
+    var actionType = action === null || action === void 0 ? void 0 : action.actionType;
     var actions = manager === null || manager === void 0 ? void 0 : manager.pluginActions[node.type];
     var haveChild = !!((_a = node.children) === null || _a === void 0 ? void 0 : _a.length);
     var isSupport = false;
     if (typeof action.supportComponents === 'string') {
       isSupport = action.supportComponents === '*' || action.supportComponents === node.type;
       // 内置逻辑
-      if (action.supportComponents === 'byComponent') {
+      if (action.supportComponents === 'byComponent' && actionType) {
         isSupport = hasActionType(actionType, actions);
         node.scoped = isSupport;
       }
@@ -2064,6 +2002,9 @@ var getEventControlConfig = function (manager, context) {
     },
     getComponents: function (action) {
       var _a;
+      if (!action) {
+        return [];
+      }
       var components = (_a = manager === null || manager === void 0 ? void 0 : manager.store) === null || _a === void 0 ? void 0 : _a.getComponentTreeSource();
       var finalCmpts = [];
       if (isSubEditor) {
@@ -2214,7 +2155,7 @@ var getEventControlConfig = function (manager, context) {
         });
       });
     },
-    actionConfigSubmitFormatter: function (config) {
+    actionConfigSubmitFormatter: function (config, type, actionData, shcema) {
       var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
       var action = tslib.__assign(tslib.__assign({}, config), {
         groupType: undefined
@@ -2241,6 +2182,115 @@ 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: i18nRuntime.i18n("1a9aaf05889002e65708c4950012a652"),
+            wrapperComponent: '',
+            inline: false
+          }],
+          showCloseButton: true,
+          showErrorMsg: true,
+          showLoading: true,
+          className: 'app-popover',
+          actions: [{
+            type: 'button',
+            actionType: 'cancel',
+            label: i18nRuntime.i18n("625fb26b4b3340f7872b411f401e754c")
+          }, {
+            type: 'button',
+            actionType: 'confirm',
+            label: i18nRuntime.i18n("e83a256e4f5bb4ff8b3d804b5473217a"),
+            primary: true
+          }]
+        };
+        var drawerInitSchema_1 = {
+          type: 'drawer',
+          title: action.__dialogTitle,
+          body: [{
+            type: 'tpl',
+            tpl: i18nRuntime.i18n("1a9aaf05889002e65708c4950012a652"),
+            wrapperComponent: '',
+            inline: false
+          }],
+          className: 'app-popover',
+          actions: [{
+            type: 'button',
+            actionType: 'cancel',
+            label: i18nRuntime.i18n("625fb26b4b3340f7872b411f401e754c")
+          }, {
+            type: 'button',
+            actionType: 'confirm',
+            label: i18nRuntime.i18n("e83a256e4f5bb4ff8b3d804b5473217a"),
+            primary: true
+          }]
+        };
+        var confirmDialogInitSchema_1 = {
+          type: 'dialog',
+          title: action.__dialogTitle,
+          body: [{
+            type: 'tpl',
+            tpl: i18nRuntime.i18n("1a9aaf05889002e65708c4950012a652"),
+            wrapperComponent: '',
+            inline: false
+          }],
+          dialogType: 'confirm',
+          confirmText: i18nRuntime.i18n("e83a256e4f5bb4ff8b3d804b5473217a"),
+          cancelText: i18nRuntime.i18n("625fb26b4b3340f7872b411f401e754c"),
+          confirmBtnLevel: 'primary'
+        };
+        var setInitSchema = function (groupType, action) {
+          if (groupType === 'dialog') {
+            amisEditorCore.JsonGenerateID(dialogInitSchema_1);
+            action.dialog = dialogInitSchema_1;
+          } else if (groupType === 'drawer') {
+            amisEditorCore.JsonGenerateID(drawerInitSchema_1);
+            action.drawer = drawerInitSchema_1;
+          } else if (groupType === 'confirmDialog') {
+            amisEditorCore.JsonGenerateID(confirmDialogInitSchema_1);
+            action.dialog = confirmDialogInitSchema_1;
+          }
+        };
+        var chooseCurrentDialog = function (action, schema) {
+          var selectDialog = action.__selectDialog;
+          var dialogType = amisEditorCore.getFixDialogType(schema, selectDialog);
+          // 选择现有弹窗后为了使之前的弹窗和现有弹窗$$id唯一，这里重新生成一下
+          var newDialogId = amisCore.guid();
+          action.actionType = dialogType;
+          action.dialog = {
+            $$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] = tslib.__assign(tslib.__assign({}, actionData[config.groupType]), {
+                title: config.__dialogTitle
+              });
+            }
+          } else if (config.__dialogSource === 'current') {
+            chooseCurrentDialog(action, shcema);
+          }
+        }
+      }
       // 刷新组件时，处理是否追加事件变量
       if (config.actionType === 'reload') {
         action.data = undefined;
@@ -2337,6 +2387,8 @@ var getEventControlConfig = function (manager, context) {
         delete action.__statusType;
       }
       delete action.config;
+      delete action.__keywords;
+      delete action.__resultActionTree;
       return action;
     }
   };
@@ -2363,3 +2415,4 @@ exports.getPropOfAcion = getPropOfAcion;
 exports.hasActionType = hasActionType;
 exports.renderCmptActionSelect = renderCmptActionSelect;
 exports.renderCmptSelect = renderCmptSelect;
+window.amisEditorVersionInfo={version:'5.5.2-beta.2',buildTime:'2023-09-28'};

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import Sortable from 'sortablejs';
 import { DataSchema } from 'amis';
-import { FormControlProps } from 'amis-core';
+import { FormControlProps, Schema } from 'amis-core';
 import { ActionConfig, ActionEventConfig, ComponentInfo, ContextVariables } from './types';
 import { EditorManager, PluginActions, PluginEvents, RendererPluginAction, RendererPluginEvent, SubRendererPluginAction } from 'amis-editor-core';
 export * from './helper';
@@ -19,7 +19,7 @@ interface EventControlProps extends FormControlProps {
     getComponents: (action: any) => ComponentInfo[];
     getContextSchemas?: (id?: string, withoutSuper?: boolean) => DataSchema;
     actionConfigInitFormatter?: (actionConfig: ActionConfig) => ActionConfig;
-    actionConfigSubmitFormatter?: (actionConfig: ActionConfig) => ActionConfig;
+    actionConfigSubmitFormatter?: (actionConfig: ActionConfig, type?: string, actionData?: ActionData, schema?: Schema) => ActionConfig;
     owner?: string;
 }
 interface EventDialogData {
@@ -32,6 +32,22 @@ interface EventDialogData {
     };
     [propName: string]: any;
 }
+export interface ActionData {
+    eventKey: string;
+    actionIndex?: number;
+    action?: ActionConfig;
+    variables?: ContextVariables[];
+    pluginActions: PluginActions;
+    getContextSchemas?: (id?: string, withoutSuper?: boolean) => DataSchema;
+    groupType?: string;
+    __actionDesc?: string;
+    __cmptTreeSource?: ComponentInfo[];
+    __superCmptTreeSource?: ComponentInfo[];
+    __actionSchema?: any;
+    __subActions?: SubRendererPluginAction[];
+    __setValueDs?: any[];
+    [propName: string]: any;
+}
 interface EventControlState {
     onEvent: ActionEventConfig;
     events: RendererPluginEvent[];
@@ -41,24 +57,15 @@ interface EventControlState {
     showAcionDialog: boolean;
     showEventDialog: boolean;
     eventDialogData?: EventDialogData;
-    actionData: {
-        eventKey: string;
-        actionIndex?: number;
-        action?: ActionConfig;
-        variables?: ContextVariables[];
-        pluginActions: PluginActions;
-        getContextSchemas?: (id?: string, withoutSuper?: boolean) => DataSchema;
-        groupType?: string;
-        __actionDesc?: string;
-        __cmptTreeSource?: ComponentInfo[];
-        __superCmptTreeSource?: ComponentInfo[];
-        __actionSchema?: any;
-        __subActions?: SubRendererPluginAction[];
-        __setValueDs?: any[];
-    } | undefined;
+    actionData: ActionData | undefined;
     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: {
@@ -95,8 +102,10 @@ 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;
     onSubmit(type: string, config: any): void;
     onClose(): void;
     removeDataSchema(): void;