amis-editor 5.2.5-beta.7 → 5.3.0

package/lib/renderer/ValidationControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -298,7 +298,51 @@ var ValidationControl = /** @class */function (_super) {
     return React__default["default"].createElement("div", {
       className: "ae-ValidationControl-rules",
       key: "rules"
-    }, rules);
+    }, rules, this.renderValidateApiControl());
+  };
+  ValidationControl.prototype.renderValidateApiControl = function () {
+    var _a = this.props,
+      onBulkChange = _a.onBulkChange,
+      render = _a.render;
+    return React__default["default"].createElement("div", {
+      className: 'ae-ValidationControl-item'
+    }, render('validate-api-control', {
+      type: 'form',
+      wrapWithPanel: false,
+      className: 'w-full mb-2',
+      bodyClassName: 'p-none',
+      wrapperComponent: 'div',
+      mode: 'horizontal',
+      data: {
+        validateApi: this.props.data.validateApi,
+        switchStatus: this.props.data.validateApi !== undefined
+      },
+      preventEnterSubmit: true,
+      submitOnChange: true,
+      onSubmit: function (_a) {
+        var switchStatus = _a.switchStatus,
+          validateApi = _a.validateApi;
+        onBulkChange && onBulkChange({
+          validateApi: !switchStatus ? undefined : validateApi
+        });
+      },
+      body: [amisEditorCore.getSchemaTpl('switch', {
+        label: amisEditorCore.tipedLabel(i18nRuntime.i18n("240a19929878c26f5e4c41c08f63cd1c"), "\u914D\u7F6E\u6821\u9A8C\u63A5\u53E3\uFF0C\u5BF9\u8868\u5355\u9879\u8FDB\u884C\u8FDC\u7A0B\u6821\u9A8C\uFF0C\u914D\u7F6E\u65B9\u5F0F\u4E0E\u666E\u901A\u63A5\u53E3\u4E00\u81F4<br />\n              1. \u63A5\u53E3\u8FD4\u56DE <span class=\"ae-ValidationControl-label-code\">{status: 0}</span> \u8868\u793A\u6821\u9A8C\u901A\u8FC7<br />\n              2. \u63A5\u53E3\u8FD4\u56DE <span class=\"ae-ValidationControl-label-code\">{status: 422}</span> \u8868\u793A\u6821\u9A8C\u4E0D\u901A\u8FC7<br />\n              3. \u82E5\u6821\u9A8C\u5931\u8D25\u65F6\u9700\u8981\u663E\u793A\u9519\u8BEF\u63D0\u793A\u4FE1\u606F\uFF0C\u8FD8\u9700\u8FD4\u56DE errors \u5B57\u6BB5\uFF0C\u793A\u4F8B<br />\n              <span class=\"ae-ValidationControl-label-code\">{status: 422, errors: '\u9519\u8BEF\u63D0\u793A\u6D88\u606F'}</span>\n              "),
+        name: 'switchStatus'
+      }), {
+        type: 'container',
+        className: 'ae-ExtendMore ae-ValidationControl-item-input',
+        bodyClassName: 'w-full',
+        visibleOn: 'this.switchStatus',
+        body: [amisEditorCore.getSchemaTpl('apiControl', {
+          name: 'validateApi',
+          renderLabel: true,
+          label: '',
+          mode: 'normal',
+          className: 'w-full'
+        })]
+      }]
+    }));
   };
   ValidationControl.prototype.render = function () {
     var className = this.props.className;

package/lib/renderer/ValidationItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 

package/lib/renderer/event-control/action-config-dialog.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 

package/lib/renderer/event-control/action-config-panel.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -29,9 +29,9 @@ var ActionConfigPanel = /** @class */function (_super) {
   ActionConfigPanel.prototype.render = function () {
     var _a, _b, _c, _d;
     var _e = this.props,
-      data = _e.data,
-      onBulkChange = _e.onBulkChange,
-      render = _e.render,
+      data = _e.data;
+      _e.onBulkChange;
+      var render = _e.render,
       pluginActions = _e.pluginActions,
       actionConfigItemsMap = _e.actionConfigItemsMap;
     var actionType = data.__subActions ? data.groupType : data.actionType;
@@ -49,11 +49,7 @@ var ActionConfigPanel = /** @class */function (_super) {
       schema = data.__actionSchema;
     }
     return schema ? render('inner', schema, {
-      data: data,
-      onChange: function (value, field) {
-        var _a;
-        onBulkChange((_a = {}, _a[field] = value, _a));
-      }
+      data: data
     }) : data.__subActions ? React__default["default"].createElement(React__default["default"].Fragment, null) : React__default["default"].createElement("div", {
       className: cx__default["default"]('ae-event-control-action-placeholder', {
         'no-settings': actionType

package/lib/renderer/event-control/comp-action-select.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 

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

@@ -32,6 +32,7 @@ export declare const renderCmptSelect: (componentLabel: string, required: boolea
         __rendererName: string;
         __nodeId: string;
         __nodeSchema: string;
+        __isScopeContainer: string;
     };
     onChange: (value: string, oldVal: any, data: any, form: any) => Promise<void>;
 }[];
@@ -51,6 +52,7 @@ export declare const renderCmptActionSelect: (componentLabel: string, required:
         __rendererName: string;
         __nodeId: string;
         __nodeSchema: string;
+        __isScopeContainer: string;
     };
     onChange: (value: string, oldVal: any, data: any, form: any) => Promise<void>;
 } | {
@@ -78,9 +80,11 @@ export declare const getPropOfAcion: (action: ActionConfig, propName: string, ac
 } | undefined, allComponents?: ComponentInfo[]) => any;
 export declare const getOldActionSchema: (manager: EditorManager, context: BaseEventContext) => {
     type: string;
+    className: string;
     content: string;
     inline: boolean;
     tooltipTheme: string;
+    placement: string;
     body: {
         type: string;
         label: string;

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -49,7 +49,7 @@ var MSG_TYPES = {
 // 下拉展示可赋值属性范围
 var SELECT_PROPS_CONTAINER = ['form'];
 // 是否数据容器
-var IS_DATA_CONTAINER = "".concat(JSON.stringify(DATA_CONTAINER), ".includes(data.__rendererName)");
+"".concat(JSON.stringify(DATA_CONTAINER), ".includes(data.__rendererName)");
 // 是否下拉展示可赋值属性
 var SHOW_SELECT_PROP = "".concat(JSON.stringify(SELECT_PROPS_CONTAINER), ".includes(data.__rendererName)");
 // 表单项组件
@@ -58,12 +58,88 @@ var SUPPORT_STATIC_FORMITEM_CMPTS = without__default["default"].apply(void 0, ts
 var SUPPORT_DISABLED_CMPTS = ['button-group', 'action', 'button', 'submit', 'reset', 'collapse', 'container', 'dropdown-button', 'flex', 'flex-item', 'grid', 'grid-2d', 'link', 'nav', 'wizard'
 // 'card2'
 ];
-
+// 用于变量赋值 页面变量和内存变量的树选择器中，支持展示变量类型
+var getCustomNodeTreeSelectSchema = function (opts) {
+  return tslib.__assign({
+    type: 'tree-select',
+    name: 'path',
+    label: i18nRuntime.i18n("c6f30c2f084ddeacb7944235348bdaa4"),
+    multiple: false,
+    mode: 'horizontal',
+    required: true,
+    placeholder: i18nRuntime.i18n("844a7a7aacc5be82d0fd6225edc6bf63"),
+    showIcon: false,
+    size: 'lg',
+    hideRoot: false,
+    rootLabel: i18nRuntime.i18n("c6f30c2f084ddeacb7944235348bdaa4"),
+    options: [],
+    menuTpl: {
+      type: 'flex',
+      className: 'p-1',
+      items: [{
+        type: 'container',
+        body: [{
+          type: 'tpl',
+          tpl: '${label}',
+          inline: true,
+          wrapperComponent: ''
+        }],
+        style: {
+          display: 'flex',
+          flexWrap: 'nowrap',
+          alignItems: 'center',
+          position: 'static',
+          overflowY: 'auto',
+          flex: '0 0 auto'
+        },
+        wrapperBody: false,
+        isFixedHeight: true
+      }, {
+        type: 'container',
+        body: [{
+          type: 'tpl',
+          tpl: '${type}',
+          inline: true,
+          wrapperComponent: '',
+          style: {
+            background: '#f5f5f5',
+            paddingLeft: '8px',
+            paddingRight: '8px',
+            borderRadius: '4px'
+          }
+        }],
+        size: 'xs',
+        style: {
+          display: 'flex',
+          flexWrap: 'nowrap',
+          alignItems: 'center',
+          position: 'static',
+          overflowY: 'auto',
+          flex: '0 0 auto'
+        },
+        wrapperBody: false,
+        isFixedHeight: true,
+        isFixedWidth: false
+      }],
+      style: {
+        position: 'relative',
+        inset: 'auto',
+        flexWrap: 'nowrap',
+        justifyContent: 'space-between',
+        alignItems: 'center',
+        height: '24px',
+        overflowY: 'hidden'
+      },
+      isFixedHeight: true,
+      isFixedWidth: false
+    }
+  }, opts);
+};
 var ACTION_TYPE_TREE = function (manager) {
   var variableManager = manager === null || manager === void 0 ? void 0 : manager.variableManager;
   /** 变量列表 */
-  var variableOptions = variableManager.getVariableOptions();
-  var pageVariableOptions = variableManager.getPageVariablesOptions();
+  var variableOptions = (variableManager === null || variableManager === void 0 ? void 0 : variableManager.getVariableOptions()) || [];
+  var pageVariableOptions = (variableManager === null || variableManager === void 0 ? void 0 : variableManager.getPageVariablesOptions()) || [];
   return [{
     actionLabel: i18nRuntime.i18n("59ceff465ad16932d8972191ad815dfb"),
     actionType: 'page',
@@ -186,6 +262,8 @@ var ACTION_TYPE_TREE = function (manager) {
         actionType: 'dialog'
       }, {
         actionType: 'drawer'
+      }, {
+        actionType: 'confirmDialog'
       }],
       schema: [{
         type: 'radios',
@@ -202,6 +280,9 @@ var ACTION_TYPE_TREE = function (manager) {
         }, {
           label: i18nRuntime.i18n("2a2924380dfcaea998bd8a49703545a9"),
           value: 'drawer'
+        }, {
+          label: i18nRuntime.i18n("fa6b01f51cc2b8e16bfbb914b6c08ace"),
+          value: 'confirmDialog'
         }],
         visibleOn: 'data.actionType === "openDialog"'
       }, {
@@ -214,7 +295,8 @@ var ACTION_TYPE_TREE = function (manager) {
           body: i18nRuntime.i18n("1a9aaf05889002e65708c4950012a652"),
           showCloseButton: true,
           showErrorMsg: true,
-          showLoading: true
+          showLoading: true,
+          className: 'app-popover'
         }),
         asFormItem: true,
         visibleOn: 'data.groupType === "dialog"',
@@ -246,8 +328,9 @@ var ACTION_TYPE_TREE = function (manager) {
         mode: 'horizontal',
         required: true,
         pipeIn: amisEditorCore.defaultValue({
-          title: i18nRuntime.i18n("8a089992349df754f182a5d02de8e8e0"),
-          body: i18nRuntime.i18n("1a9aaf05889002e65708c4950012a652")
+          title: i18nRuntime.i18n("4cb9c4bc5cb960fcd03fceb2d2e62f3a"),
+          body: i18nRuntime.i18n("1a9aaf05889002e65708c4950012a652"),
+          className: 'app-popover'
         }),
         asFormItem: true,
         visibleOn: 'data.groupType === "drawer"',
@@ -272,6 +355,30 @@ var ACTION_TYPE_TREE = function (manager) {
             block: true
           }, i18nRuntime.i18n('a532be3ad5f3fda70d228b8542e81835'));
         }
+      }, {
+        name: 'confirmDialog',
+        type: 'container',
+        visibleOn: 'data.groupType === "confirmDialog"',
+        body: [getArgsWrapper({
+          type: 'wrapper',
+          className: 'p-none',
+          body: [{
+            name: 'msg',
+            label: i18nRuntime.i18n("b87b77561e776367e6756e11ea652217"),
+            type: 'ae-textareaFormulaControl',
+            mode: 'horizontal',
+            variables: '${variables}',
+            size: 'lg',
+            required: true
+          }, {
+            name: 'title',
+            label: i18nRuntime.i18n("43ab9af06e1e0f0b2a8767b46cf8b1cf"),
+            type: 'ae-textareaFormulaControl',
+            variables: '${variables}',
+            mode: 'horizontal',
+            size: 'lg'
+          }]
+        })]
       }]
     }, {
       actionLabel: i18nRuntime.i18n("3b02248ca3790e356e47b6900c0e3931"),
@@ -319,7 +426,7 @@ var ACTION_TYPE_TREE = function (manager) {
       actionLabel: i18nRuntime.i18n("e495f416b83e4c7ff3c66ec3be96a76f"),
       actionType: 'toast',
       description: i18nRuntime.i18n("61d7aaa88181c527cfb936d4c686d267"),
-      innerArgs: ['title', 'msgType', 'msg', 'position', 'timeout', 'closeButton', 'showIcon'],
+      innerArgs: ['title', 'msgType', 'msg', 'position', 'timeout', 'closeButton', 'showIcon', 'className'],
       descDetail: function (info) {
         var _a, _b;
         return React__default["default"].createElement("div", null, MSG_TYPES[(_a = info === null || info === void 0 ? void 0 : info.args) === null || _a === void 0 ? void 0 : _a.msgType] || '', "\u6D88\u606F\uFF1A", React__default["default"].createElement("span", {
@@ -758,7 +865,7 @@ var ACTION_TYPE_TREE = function (manager) {
         offText: i18nRuntime.i18n("c9744f45e76d885ae1c74d4f4a934b2e"),
         mode: 'horizontal',
         pipeIn: amisEditorCore.defaultValue(true),
-        visibleOn: "data.actionType === \"reload\" &&  ".concat(IS_DATA_CONTAINER)
+        visibleOn: "data.actionType === \"reload\" &&  data.__isScopeContainer"
       }, {
         type: 'switch',
         name: '__customData',
@@ -767,7 +874,7 @@ var ACTION_TYPE_TREE = function (manager) {
         offText: i18nRuntime.i18n("c9744f45e76d885ae1c74d4f4a934b2e"),
         mode: 'horizontal',
         pipeIn: amisEditorCore.defaultValue(true),
-        visibleOn: "data.__addParam && data.actionType === \"reload\" && ".concat(IS_DATA_CONTAINER),
+        visibleOn: "data.__addParam && data.actionType === \"reload\" && data.__isScopeContainer",
         onChange: function (value, oldVal, data, form) {
           form.setValueByName('__containerType', 'all');
         }
@@ -777,7 +884,7 @@ var ACTION_TYPE_TREE = function (manager) {
         mode: 'horizontal',
         label: '',
         pipeIn: amisEditorCore.defaultValue('all'),
-        visibleOn: "data.__addParam && data.__customData && data.actionType === \"reload\" && ".concat(IS_DATA_CONTAINER),
+        visibleOn: "data.__addParam && data.__customData && data.actionType === \"reload\" && data.__isScopeContainer",
         options: [{
           label: i18nRuntime.i18n("77b1081c177fa3334cc93c99f0ecee75"),
           value: 'all'
@@ -802,7 +909,7 @@ var ACTION_TYPE_TREE = function (manager) {
         label: '',
         size: 'lg',
         mode: 'horizontal',
-        visibleOn: `data.__addParam && data.__customData && data.__containerType === "all" && data.actionType === "reload" && ${IS_DATA_CONTAINER}`
+        visibleOn: `data.__addParam && data.__customData && data.__containerType === "all" && data.actionType === "reload" && data.__isScopeContainer`
       },
       */
       amisEditorCore.getSchemaTpl('formulaControl', {
@@ -812,7 +919,7 @@ var ACTION_TYPE_TREE = function (manager) {
         size: 'lg',
         mode: 'horizontal',
         required: true,
-        visibleOn: "data.__addParam && data.__customData && data.__containerType === \"all\" && data.actionType === \"reload\" && ".concat(IS_DATA_CONTAINER)
+        visibleOn: "data.__addParam && data.__customData && data.__containerType === \"all\" && data.actionType === \"reload\" && data.__isScopeContainer"
       }), {
         type: 'combo',
         name: '__reloadParams',
@@ -848,14 +955,14 @@ var ACTION_TYPE_TREE = function (manager) {
           variables: '${variables}',
           placeholder: i18nRuntime.i18n("bfed4943c5f487de1b63a82f7230cce2")
         })],
-        visibleOn: "data.__addParam && data.__customData && data.__containerType === \"appoint\" && data.actionType === \"reload\" && ".concat(IS_DATA_CONTAINER)
+        visibleOn: "data.__addParam && data.__customData && data.__containerType === \"appoint\" && data.actionType === \"reload\" && data.__isScopeContainer"
       }, {
         type: 'radios',
         name: 'dataMergeMode',
         mode: 'horizontal',
         label: amisEditorCore.tipedLabel(i18nRuntime.i18n("2aecb19ca1655d66fc80fc27a783cc9e"), i18nRuntime.i18n("b67b01a3b9170f1daf78082cfd0df793")),
         pipeIn: amisEditorCore.defaultValue('merge'),
-        visibleOn: "data.__addParam && data.actionType === \"reload\" && ".concat(IS_DATA_CONTAINER),
+        visibleOn: "data.__addParam && data.actionType === \"reload\" && data.__isScopeContainer",
         options: [{
           label: i18nRuntime.i18n("bd81577a6fd4956e676cec499bb70d00"),
           value: 'merge'
@@ -890,7 +997,7 @@ var ACTION_TYPE_TREE = function (manager) {
           label: i18nRuntime.i18n("cc6aeb073ebc3cb29734a49164f8964c"),
           value: 'page'
         }, {
-          label: '内存变量',
+          label: i18nRuntime.i18n("c6f30c2f084ddeacb7944235348bdaa4"),
           value: 'app'
         }],
         value: '${args.fromApp ? "app" : args.fromPage ? "page" : "cmpt"}',
@@ -923,7 +1030,7 @@ var ACTION_TYPE_TREE = function (manager) {
             mode: 'horizontal',
             label: i18nRuntime.i18n("e7af71fb102cc86ab3be6a2fb32b5e3f"),
             pipeIn: amisEditorCore.defaultValue('all'),
-            visibleOn: "".concat(IS_DATA_CONTAINER),
+            visibleOn: 'data.__isScopeContainer',
             options: [{
               label: i18nRuntime.i18n("77b1081c177fa3334cc93c99f0ecee75"),
               value: 'all'
@@ -1001,7 +1108,7 @@ var ACTION_TYPE_TREE = function (manager) {
               variables: '${variables}',
               placeholder: i18nRuntime.i18n("a33903526e8fb3d1ac3066da70e7941e")
             })],
-            visibleOn: "".concat(IS_DATA_CONTAINER, " && data.__containerType === 'appoint' || data.__comboType === 'appoint'")
+            visibleOn: "data.__isScopeContainer && data.__containerType === 'appoint' || data.__comboType === 'appoint'"
           }, {
             type: 'combo',
             name: 'value',
@@ -1065,7 +1172,7 @@ var ACTION_TYPE_TREE = function (manager) {
             label: '',
             size: 'lg',
             mode: 'horizontal',
-            visibleOn: `(${IS_DATA_CONTAINER} || ${SHOW_SELECT_PROP}) && data.__containerType === 'all'`,
+            visibleOn: `(data.__isScopeContainer || ${SHOW_SELECT_PROP}) && data.__containerType === 'all'`,
             required: true
           },
           */
@@ -1075,7 +1182,7 @@ var ACTION_TYPE_TREE = function (manager) {
             variables: '${variables}',
             size: 'lg',
             mode: 'horizontal',
-            visibleOn: "(".concat(IS_DATA_CONTAINER, " || ").concat(SHOW_SELECT_PROP, ") && data.__containerType === 'all'"),
+            visibleOn: "(data.__isScopeContainer || ".concat(SHOW_SELECT_PROP, ") && data.__containerType === 'all'"),
             required: true
           }),
           /*
@@ -1089,7 +1196,7 @@ var ACTION_TYPE_TREE = function (manager) {
             label: '数据设置',
             size: 'lg',
             mode: 'horizontal',
-            visibleOn: `data.__rendererName && !${IS_DATA_CONTAINER} && data.__rendererName !== 'combo'`,
+            visibleOn: `data.__rendererName && !data.__isScopeContainer && data.__rendererName !== 'combo'`,
             required: true
           }
           */
@@ -1099,7 +1206,7 @@ var ACTION_TYPE_TREE = function (manager) {
             variables: '${variables}',
             size: 'lg',
             mode: 'horizontal',
-            visibleOn: "data.__rendererName && !".concat(IS_DATA_CONTAINER, " && data.__rendererName !== 'combo' && data.__rendererName !== 'input-table'"),
+            visibleOn: "data.__rendererName && !data.__isScopeContainer && data.__rendererName !== 'combo' && data.__rendererName !== 'input-table'",
             required: true
           })]
         })], false)
@@ -1111,32 +1218,19 @@ var ACTION_TYPE_TREE = function (manager) {
         body: [getArgsWrapper([{
           type: 'wrapper',
           className: 'p-none',
-          body: [{
-            type: 'tree-select',
-            name: 'path',
+          body: [getCustomNodeTreeSelectSchema({
             label: i18nRuntime.i18n("cc6aeb073ebc3cb29734a49164f8964c"),
-            multiple: false,
-            mode: 'horizontal',
-            required: true,
-            placeholder: i18nRuntime.i18n("844a7a7aacc5be82d0fd6225edc6bf63"),
-            showIcon: false,
-            size: 'lg',
-            hideRoot: false,
             rootLabel: i18nRuntime.i18n("cc6aeb073ebc3cb29734a49164f8964c"),
             options: pageVariableOptions
-          }, {
-            type: 'input-formula',
+          }), amisEditorCore.getSchemaTpl('formulaControl', {
             name: 'value',
             label: i18nRuntime.i18n("e7af71fb102cc86ab3be6a2fb32b5e3f"),
             variables: '${variables}',
-            evalMode: false,
-            variableMode: 'tabs',
-            inputMode: 'input-group',
             size: 'lg',
             mode: 'horizontal',
             required: true,
             placeholder: i18nRuntime.i18n("85451d2eb59327a23e8f745161066d4a")
-          }]
+          })]
         }])]
       },
       // 内存变量
@@ -1146,32 +1240,17 @@ var ACTION_TYPE_TREE = function (manager) {
         body: [getArgsWrapper([{
           type: 'wrapper',
           className: 'p-none',
-          body: [{
-            type: 'tree-select',
-            name: 'path',
-            label: '内存变量',
-            multiple: false,
-            mode: 'horizontal',
-            required: true,
-            placeholder: i18nRuntime.i18n("844a7a7aacc5be82d0fd6225edc6bf63"),
-            showIcon: false,
-            size: 'lg',
-            hideRoot: false,
-            rootLabel: '内存变量',
+          body: [getCustomNodeTreeSelectSchema({
             options: variableOptions
-          }, {
-            type: 'input-formula',
+          }), amisEditorCore.getSchemaTpl('formulaControl', {
             name: 'value',
             label: i18nRuntime.i18n("e7af71fb102cc86ab3be6a2fb32b5e3f"),
             variables: '${variables}',
-            evalMode: false,
-            variableMode: 'tabs',
-            inputMode: 'input-group',
             size: 'lg',
             mode: 'horizontal',
             required: true,
             placeholder: i18nRuntime.i18n("85451d2eb59327a23e8f745161066d4a")
-          }]
+          })]
         }])]
       }]
     }, {
@@ -1307,7 +1386,7 @@ var ACTION_TYPE_TREE = function (manager) {
           folding: true
         },
         className: 'ae-event-control-action-js-editor',
-        value: "/* \u81EA\u5B9A\u4E49JS\u4F7F\u7528\u8BF4\u660E\uFF1A\n  * 1.\u52A8\u4F5C\u6267\u884C\u51FD\u6570doAction\uFF0C\u53EF\u4EE5\u6267\u884C\u6240\u6709\u7C7B\u578B\u7684\u52A8\u4F5C\n  * 2.\u901A\u8FC7\u4E0A\u4E0B\u6587\u5BF9\u8C61context\u53EF\u4EE5\u83B7\u53D6\u5F53\u524D\u7EC4\u4EF6\u5B9E\u4F8B\uFF0C\u4F8B\u5982context.props\u53EF\u4EE5\u83B7\u53D6\u8BE5\u7EC4\u4EF6\u76F8\u5173\u5C5E\u6027\n  * 3.\u4E8B\u4EF6\u5BF9\u8C61event\uFF0C\u5728doAction\u4E4B\u540E\u6267\u884Cevent.stopPropagation = true;\u53EF\u4EE5\u963B\u6B62\u540E\u7EED\u52A8\u4F5C\u6267\u884C\n*/\nconst myMsg = '\u6211\u662F\u81EA\u5B9A\u4E49JS';\ndoAction({\n  actionType: 'toast',\n  args: {\n    msg: myMsg\n  }\n});\n"
+        value: "/* \u81EA\u5B9A\u4E49JS\u4F7F\u7528\u8BF4\u660E\uFF1A\n  * 1.\u52A8\u4F5C\u6267\u884C\u51FD\u6570doAction\uFF0C\u53EF\u4EE5\u6267\u884C\u6240\u6709\u7C7B\u578B\u7684\u52A8\u4F5C\n  * 2.\u901A\u8FC7\u4E0A\u4E0B\u6587\u5BF9\u8C61context\u53EF\u4EE5\u83B7\u53D6\u5F53\u524D\u7EC4\u4EF6\u5B9E\u4F8B\uFF0C\u4F8B\u5982context.props\u53EF\u4EE5\u83B7\u53D6\u8BE5\u7EC4\u4EF6\u76F8\u5173\u5C5E\u6027\n  * 3.\u4E8B\u4EF6\u5BF9\u8C61event\uFF0C\u5728doAction\u4E4B\u540E\u6267\u884Cevent.stopPropagation();\u53EF\u4EE5\u963B\u6B62\u540E\u7EED\u52A8\u4F5C\u6267\u884C\n*/\nconst myMsg = '\u6211\u662F\u81EA\u5B9A\u4E49JS';\ndoAction({\n  actionType: 'toast',\n  args: {\n    msg: myMsg\n  }\n});\n"
       }
     }
     // {
@@ -1363,7 +1442,8 @@ var renderCmptSelect = function (componentLabel, required, onChange) {
       __rendererLabel: '${label}',
       __rendererName: '${type}',
       __nodeId: '${id}',
-      __nodeSchema: '${schema}'
+      __nodeSchema: '${schema}',
+      __isScopeContainer: '${isScopeContainer}'
     },
     onChange: function (value, oldVal, data, form) {
       return tslib.__awaiter(void 0, void 0, void 0, function () {
@@ -1482,7 +1562,7 @@ var COMMON_ACTION_SCHEMA_MAP = {
           variables: '${variables}',
           placeholder: i18nRuntime.i18n("9a2ee7044ff04234a8892a13583d14b6")
         })],
-        visibleOn: "".concat(IS_DATA_CONTAINER)
+        visibleOn: 'data.__isScopeContainer'
       }, {
         type: 'combo',
         name: 'value',
@@ -1540,7 +1620,7 @@ var COMMON_ACTION_SCHEMA_MAP = {
         label: '变量赋值',
         size: 'lg',
         mode: 'horizontal',
-        visibleOn: `!${IS_DATA_CONTAINER} && data.__rendererName !== 'combo'`,
+        visibleOn: `!data.__isScopeContainer && data.__rendererName !== 'combo'`,
         required: true
       }
       */
@@ -1550,7 +1630,7 @@ var COMMON_ACTION_SCHEMA_MAP = {
         variables: '${variables}',
         size: 'lg',
         mode: 'horizontal',
-        visibleOn: "!".concat(IS_DATA_CONTAINER, " && data.__rendererName !== 'combo' && data.__rendererName !== 'input-table'"),
+        visibleOn: "!data.__isScopeContainer && data.__rendererName !== 'combo' && data.__rendererName !== 'input-table'",
         required: true
       })]
     })
@@ -1722,9 +1802,11 @@ var getOldActionSchema = function (manager, context) {
   var isInDialog = /(?:\/|^)dialog\/.+$/.test(context.path);
   return {
     type: 'tooltip-wrapper',
+    className: 'old-action-tooltip-warpper',
     content: i18nRuntime.i18n("9654916723a8d1d82f5ab9d2911edf93"),
     inline: true,
     tooltipTheme: 'dark',
+    placement: 'bottom',
     body: [{
       type: 'button',
       label: i18nRuntime.i18n("88f7a3aef4888dd507482aedc02bb808"),
@@ -1848,7 +1930,7 @@ var getOldActionSchema = function (manager, context) {
             visibleOn: 'data.actionType == "drawer"',
             name: 'drawer',
             pipeIn: amisEditorCore.defaultValue({
-              title: i18nRuntime.i18n("8a089992349df754f182a5d02de8e8e0"),
+              title: i18nRuntime.i18n("4cb9c4bc5cb960fcd03fceb2d2e62f3a"),
               body: i18nRuntime.i18n("1a9aaf05889002e65708c4950012a652")
             }),
             asFormItem: true,
@@ -2047,17 +2129,18 @@ var getEventControlConfig = function (manager, context) {
       // 内置逻辑
       if (action.supportComponents === 'byComponent') {
         isSupport = hasActionType(actionType, actions);
+        node.scoped = isSupport;
       }
     } else if (Array.isArray(action.supportComponents)) {
       isSupport = action.supportComponents.includes(node.type);
     }
+    node.isScopeContainer = !!manager.dataSchema.getScope("".concat(node.id, "-").concat(node.type));
     if (actionType === 'component' && !(actions === null || actions === void 0 ? void 0 : actions.length)) {
       node.disabled = true;
     }
     if (isSupport) {
       return true;
     } else if (haveChild) {
-      node.disabled = true;
       return true;
     }
     return false;
@@ -2293,6 +2376,12 @@ var getEventControlConfig = function (manager, context) {
           });
         }
       }
+      if (action.actionType === 'toast') {
+        // 配置一个toast组件默认class
+        action.args = tslib.__assign(tslib.__assign({}, action.args), {
+          className: 'theme-toast-action-scope'
+        });
+      }
       // 转换下格式
       if (action.actionType === 'setValue') {
         if ((_d = config.args) === null || _d === void 0 ? void 0 : _d.hasOwnProperty('path')) {
@@ -2359,7 +2448,6 @@ exports.ACTION_TYPE_TREE = ACTION_TYPE_TREE;
 exports.COMMON_ACTION_SCHEMA_MAP = COMMON_ACTION_SCHEMA_MAP;
 exports.DATA_CONTAINER = DATA_CONTAINER;
 exports.FORMITEM_CMPTS = FORMITEM_CMPTS;
-exports.IS_DATA_CONTAINER = IS_DATA_CONTAINER;
 exports.SELECT_PROPS_CONTAINER = SELECT_PROPS_CONTAINER;
 exports.SHOW_SELECT_PROP = SHOW_SELECT_PROP;
 exports.SUPPORT_DISABLED_CMPTS = SUPPORT_DISABLED_CMPTS;

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -111,6 +111,7 @@ var EventControl = /** @class */function (_super) {
     onChange && onChange(onEvent);
   };
   EventControl.prototype.activeEventDialog = function (eventInfo) {
+    eventInfo = cloneDeep__default["default"](eventInfo);
     if (!eventInfo.debounce) {
       // 防抖配置的默认值
       eventInfo.debounce = {
@@ -544,6 +545,7 @@ var EventControl = /** @class */function (_super) {
     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;
+    delete action.__actionSchema;
     if (type === 'add') {
       (_b = this.addAction) === null || _b === void 0 ? void 0 : _b.call(this, config.eventKey, action);
     } else if (type === 'update') {
@@ -579,7 +581,7 @@ var EventControl = /** @class */function (_super) {
       type = _b.type,
       actionData = _b.actionData,
       eventDialogData = _b.eventDialogData;
-    var eventSnapshot = cloneDeep__default["default"](onEvent);
+    var eventSnapshot = tslib.__assign({}, onEvent);
     var showOldEntry = this.props.showOldEntry;
     var eventKeys = Object.keys(eventSnapshot);
     return React__default["default"].createElement("div", {
@@ -805,7 +807,6 @@ exports.ACTION_TYPE_TREE = helper.ACTION_TYPE_TREE;
 exports.COMMON_ACTION_SCHEMA_MAP = helper.COMMON_ACTION_SCHEMA_MAP;
 exports.DATA_CONTAINER = helper.DATA_CONTAINER;
 exports.FORMITEM_CMPTS = helper.FORMITEM_CMPTS;
-exports.IS_DATA_CONTAINER = helper.IS_DATA_CONTAINER;
 exports.SELECT_PROPS_CONTAINER = helper.SELECT_PROPS_CONTAINER;
 exports.SHOW_SELECT_PROP = helper.SHOW_SELECT_PROP;
 exports.SUPPORT_DISABLED_CMPTS = helper.SUPPORT_DISABLED_CMPTS;