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

package/lib/renderer/TreeOptionControl.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/ValidationControl.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/ValidationItem.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/event-control/action-config-dialog.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 
@@ -8,6 +8,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
+var amisEditorCore = require('amis-editor-core');
 var React = require('react');
 var actionConfigPanel = require('./action-config-panel.js');
 var compActionSelect = require('./comp-action-select.js');
@@ -95,10 +96,10 @@ var ActionDialog = /** @class */function (_super) {
           if (value === 'closeDialog' && !['closeDialog', 'closeDrawer'].includes(groupType)) {
             groupType = 'closeDialog';
           }
-          if (value === 'visibility' && !['show', 'hidden'].includes(groupType)) {
+          if (value === 'visibility' && !['show', 'hidden', 'visibility'].includes(groupType)) {
             groupType = 'show';
           }
-          if (value === 'usability' && !['enabled', 'disabled'].includes(groupType)) {
+          if (value === 'usability' && !['enabled', 'disabled', 'usability'].includes(groupType)) {
             groupType = 'enabled';
           }
           var actionNode = helper.findActionNode(actionTree, value);
@@ -231,24 +232,16 @@ var ActionDialog = /** @class */function (_super) {
                   inline: false,
                   className: 'action-panel-title',
                   visibleOn: 'data.actionType'
-                },
-                /*
-                {
-                  name: 'expression',
-                  title: '',
-                  type: 'input-formula',
-                  variableMode: 'tabs',
-                  inputMode: 'input-group',
+                }, {
+                  name: 'stopPropagation',
+                  label: amisEditorCore.tipedLabel('阻断条件', '满足条件时，将会阻断当前事件的后续动作的执行'),
+                  type: 'ae-expressionFormulaControl',
+                  evalMode: true,
                   variables: '${variables}',
-                  className: 'action-exec-on',
-                  label: '执行条件',
                   mode: 'horizontal',
                   size: 'lg',
-                  placeholder: '默认执行该动作',
                   visibleOn: 'data.actionType'
-                },
-                */
-                {
+                }, {
                   name: 'expression',
                   label: i18nRuntime.i18n("da1ed600ce65be863766444e60c2da05"),
                   type: 'ae-expressionFormulaControl',

package/lib/renderer/event-control/action-config-panel.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/event-control/actions.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 
@@ -450,22 +450,16 @@ var ACTION_TYPE_TREE = function (manager) {
         }), {
           name: 'options',
           type: 'combo',
-          label: false,
+          label: amisEditorCore.tipedLabel('静默请求', '开启后，服务请求将以静默模式发送，即不会弹出成功或报错提示。'),
           mode: 'horizontal',
           items: [{
-            type: 'checkbox',
+            type: 'switch',
             name: 'silent',
-            option: i18nRuntime.i18n("c5dec2a8d2308c1c15ec2e5441fd721c"),
-            mode: 'inline',
-            className: 'm-r-none',
-            value: false,
-            remark: {
-              className: 'ae-BaseRemark',
-              icon: 'fa fa-question-circle',
-              shape: 'circle',
-              placement: 'left',
-              content: i18nRuntime.i18n("4abbdba4b6b06ce00702a255bd89c92c")
-            }
+            label: false,
+            onText: i18nRuntime.i18n("cc42dd3170fdf36bdc2b0f58ab23eb84"),
+            offText: i18nRuntime.i18n("b15d91274e9fc68608c609999e0413fa"),
+            mode: 'horizontal',
+            pipeIn: amisEditorCore.defaultValue(false)
           }]
         }], false, {
           className: 'action-apiControl'
@@ -542,17 +536,40 @@ var ACTION_TYPE_TREE = function (manager) {
             className: "variable-left variable-right"
           }, (info === null || info === void 0 ? void 0 : info.rendererLabel) || '-'), "\u7EC4\u4EF6");
         }
+      }, {
+        actionType: 'visibility',
+        descDetail: function (info) {
+          return React__default["default"].createElement("div", null, "\u7EC4\u4EF6", React__default["default"].createElement("span", {
+            className: "variable-left variable-right"
+          }, (info === null || info === void 0 ? void 0 : info.rendererLabel) || '-'), "\u8868\u8FBE\u5F0F\u5DF2\u914D\u7F6E");
+        }
       }],
       supportComponents: '*',
       schema: tslib.__spreadArray(tslib.__spreadArray([], helper.renderCmptSelect(i18nRuntime.i18n("6afde638796d237377b0755506d08ded"), true), true), [{
         type: 'radios',
-        label: i18nRuntime.i18n("edf25860e3d457eb8ca9cb5dca06dfd7"),
+        label: i18nRuntime.i18n("69fbb2e5fc9eb3ba06096cbedbf5a622"),
         name: 'groupType',
         mode: 'horizontal',
+        value: 'static',
+        required: true,
+        inputClassName: 'event-action-radio',
+        options: [{
+          label: i18nRuntime.i18n("8baf21fa26d6d24b4faa872953275d8d"),
+          value: 'static'
+        }, {
+          label: i18nRuntime.i18n("a9400c408441f1f7f6d6954deb05ae9a"),
+          value: 'visibility'
+        }]
+      }, {
+        type: 'radios',
+        label: i18nRuntime.i18n("edf25860e3d457eb8ca9cb5dca06dfd7"),
+        name: '__statusType',
+        mode: 'horizontal',
         value: 'show',
         required: true,
         pipeIn: amisEditorCore.defaultValue('show'),
         inputClassName: 'event-action-radio',
+        visibleOn: "this.groupType === 'static'",
         options: [{
           label: i18nRuntime.i18n("4d775d4cd79e2ed6a2fc66fd1e7139c8"),
           value: 'show'
@@ -560,6 +577,16 @@ var ACTION_TYPE_TREE = function (manager) {
           label: i18nRuntime.i18n("dce5379cb978a8259ecfca8f08f00817"),
           value: 'hidden'
         }]
+      }, {
+        type: 'ae-expressionFormulaControl',
+        mode: 'horizontal',
+        label: i18nRuntime.i18n("a9400c408441f1f7f6d6954deb05ae9a"),
+        required: true,
+        size: 'lg',
+        variables: '${variables}',
+        evalMode: true,
+        name: '__actionExpression',
+        visibleOn: "this.groupType === 'visibility'"
       }], false)
     }, {
       actionLabel: i18nRuntime.i18n("12c8d50c55eeec7059ddd5c303e34f77"),
@@ -579,17 +606,40 @@ var ACTION_TYPE_TREE = function (manager) {
             className: "variable-left variable-right"
           }, (info === null || info === void 0 ? void 0 : info.rendererLabel) || '-'), "\u7EC4\u4EF6");
         }
+      }, {
+        actionType: 'usability',
+        descDetail: function (info) {
+          return React__default["default"].createElement("div", null, "\u7EC4\u4EF6", React__default["default"].createElement("span", {
+            className: "variable-left variable-right"
+          }, (info === null || info === void 0 ? void 0 : info.rendererLabel) || '-'), "\u8868\u8FBE\u5F0F\u5DF2\u914D\u7F6E");
+        }
       }],
       supportComponents: tslib.__spreadArray(tslib.__spreadArray(['form'], helper.FORMITEM_CMPTS, true), helper.SUPPORT_DISABLED_CMPTS, true),
       schema: tslib.__spreadArray(tslib.__spreadArray([], helper.renderCmptSelect(i18nRuntime.i18n("6afde638796d237377b0755506d08ded"), true), true), [{
         type: 'radios',
-        label: i18nRuntime.i18n("d86d5919f595226b7a1e8264635ca23d"),
+        label: i18nRuntime.i18n("69fbb2e5fc9eb3ba06096cbedbf5a622"),
         name: 'groupType',
         mode: 'horizontal',
         inputClassName: 'event-action-radio',
+        value: 'static',
+        required: true,
+        options: [{
+          label: i18nRuntime.i18n("8baf21fa26d6d24b4faa872953275d8d"),
+          value: 'static'
+        }, {
+          label: i18nRuntime.i18n("a9400c408441f1f7f6d6954deb05ae9a"),
+          value: 'usability'
+        }]
+      }, {
+        type: 'radios',
+        label: i18nRuntime.i18n("d86d5919f595226b7a1e8264635ca23d"),
+        name: '__statusType',
+        mode: 'horizontal',
+        inputClassName: 'event-action-radio',
         value: 'enabled',
         required: true,
         pipeIn: amisEditorCore.defaultValue('enabled'),
+        visibleOn: "this.groupType === 'static'",
         options: [{
           label: i18nRuntime.i18n("7854b52a889b3ef0590d9f542efeb4c8"),
           value: 'enabled'
@@ -597,6 +647,15 @@ var ACTION_TYPE_TREE = function (manager) {
           label: i18nRuntime.i18n("710ad08b11419332713360d2750cd707"),
           value: 'disabled'
         }]
+      }, {
+        type: 'ae-expressionFormulaControl',
+        mode: 'horizontal',
+        label: i18nRuntime.i18n("a9400c408441f1f7f6d6954deb05ae9a"),
+        required: true,
+        size: 'lg',
+        evalMode: true,
+        name: '__actionExpression',
+        visibleOn: "this.groupType === 'usability'"
       }], false)
     }, {
       actionLabel: i18nRuntime.i18n("e052287273ad39a1d3fa9fa3decb5fd9"),
@@ -606,14 +665,14 @@ var ACTION_TYPE_TREE = function (manager) {
         actionType: 'static',
         descDetail: function (info) {
           return React__default["default"].createElement("div", null, React__default["default"].createElement("span", {
-            className: "variable-left variable-right"
+            className: "variable-right"
           }, info === null || info === void 0 ? void 0 : info.rendererLabel), "\u7EC4\u4EF6\u5207\u6362\u4E3A\u9759\u6001");
         }
       }, {
         actionType: 'nonstatic',
         descDetail: function (info) {
           return React__default["default"].createElement("div", null, React__default["default"].createElement("span", {
-            className: "variable-left variable-right"
+            className: "variable-right"
           }, info === null || info === void 0 ? void 0 : info.rendererLabel), "\u7EC4\u4EF6\u5207\u6362\u4E3A\u8F93\u5165\u6001");
         }
       }],
@@ -654,14 +713,7 @@ var ACTION_TYPE_TREE = function (manager) {
       }), true), [{
         type: 'switch',
         name: '__resetPage',
-        label: i18nRuntime.i18n("697af73997072e0ce9ee65b15a7b3715"),
-        labelRemark: {
-          className: 'm-l-xs',
-          icon: 'fa fa-question-circle',
-          rootClose: true,
-          content: i18nRuntime.i18n("d7bf42dd6e66f2818f9a232603c4a53b"),
-          placement: 'top'
-        },
+        label: amisEditorCore.tipedLabel(i18nRuntime.i18n("697af73997072e0ce9ee65b15a7b3715"), i18nRuntime.i18n("d7bf42dd6e66f2818f9a232603c4a53b")),
         onText: i18nRuntime.i18n("0a60ac8f02ccd2cf723f927284877851"),
         offText: i18nRuntime.i18n("c9744f45e76d885ae1c74d4f4a934b2e"),
         mode: 'horizontal',
@@ -670,14 +722,7 @@ var ACTION_TYPE_TREE = function (manager) {
       }, {
         type: 'switch',
         name: '__addParam',
-        label: i18nRuntime.i18n("fee99f2bcced486e4753a8f58f511d3f"),
-        labelRemark: {
-          className: 'm-l-xs',
-          icon: 'fa fa-question-circle',
-          rootClose: true,
-          content: "\u5F53\u9009\u62E9\u201C\u662F\u201D\uFF0C\u4E14\u76EE\u6807\u7EC4\u4EF6\u662F\u589E\u5220\u6539\u67E5\u7EC4\u4EF6\u65F6\uFF0C\u6570\u636E\u63A5\u53E3\u8BF7\u6C42\u65F6\u5C06\u5E26\u4E0A\u8FD9\u4E9B\u6570\u636E\uFF0C\u5176\u4ED6\u7C7B\u578B\u7684\u76EE\u6807\u7EC4\u4EF6\u53EA\u6709\u5728\u6570\u636E\u63A5\u53E3\u662Fpost\u8BF7\u6C42\u65F6\u624D\u4F1A\u5E26\u4E0A\u8FD9\u4E9B\u6570\u636E\u3002",
-          placement: 'top'
-        },
+        label: amisEditorCore.tipedLabel(i18nRuntime.i18n("fee99f2bcced486e4753a8f58f511d3f"), i18nRuntime.i18n("0f9803bd27434940d4017007c105a861")),
         onText: i18nRuntime.i18n("0a60ac8f02ccd2cf723f927284877851"),
         offText: i18nRuntime.i18n("c9744f45e76d885ae1c74d4f4a934b2e"),
         mode: 'horizontal',
@@ -686,14 +731,7 @@ var ACTION_TYPE_TREE = function (manager) {
       }, {
         type: 'switch',
         name: '__customData',
-        label: i18nRuntime.i18n("fd951a59a7c635d5330bc1aeec22c813"),
-        labelRemark: {
-          className: 'm-l-xs',
-          icon: 'fa fa-question-circle',
-          rootClose: true,
-          content: "\u6570\u636E\u9ED8\u8BA4\u4E3A\u6E90\u7EC4\u4EF6\u6240\u5728\u6570\u636E\u57DF\uFF0C\u5F00\u542F\u201C\u81EA\u5B9A\u4E49\u201D\u53EF\u4EE5\u5B9A\u5236\u6240\u9700\u6570\u636E",
-          placement: 'top'
-        },
+        label: amisEditorCore.tipedLabel(i18nRuntime.i18n("fd951a59a7c635d5330bc1aeec22c813"), i18nRuntime.i18n("b62ce3df3c0d5772006c525b60d5eeab")),
         onText: i18nRuntime.i18n("0a60ac8f02ccd2cf723f927284877851"),
         offText: i18nRuntime.i18n("c9744f45e76d885ae1c74d4f4a934b2e"),
         mode: 'horizontal',
@@ -786,14 +824,7 @@ var ACTION_TYPE_TREE = function (manager) {
         type: 'radios',
         name: 'dataMergeMode',
         mode: 'horizontal',
-        label: i18nRuntime.i18n("2aecb19ca1655d66fc80fc27a783cc9e"),
-        labelRemark: {
-          className: 'm-l-xs',
-          icon: 'fa fa-question-circle',
-          rootClose: true,
-          content: "\u9009\u62E9\u201C\u5408\u5E76\u201D\u65F6\uFF0C\u4F1A\u5C06\u6570\u636E\u5408\u5E76\u5230\u76EE\u6807\u7EC4\u4EF6\u7684\u6570\u636E\u57DF\u3002<br/>\u9009\u62E9\u201C\u8986\u76D6\u201D\u65F6\uFF0C\u6570\u636E\u4F1A\u76F4\u63A5\u8986\u76D6\u76EE\u6807\u7EC4\u4EF6\u7684\u6570\u636E\u57DF\u3002",
-          placement: 'top'
-        },
+        label: amisEditorCore.tipedLabel(i18nRuntime.i18n("2aecb19ca1655d66fc80fc27a783cc9e"), i18nRuntime.i18n("b67b01a3b9170f1daf78082cfd0df793")),
         pipeIn: amisEditorCore.defaultValue('merge'),
         visibleOn: "data.__addParam && data.actionType === \"reload\" && ".concat(helper.IS_DATA_CONTAINER),
         options: [{

package/lib/renderer/event-control/comp-action-select.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/event-control/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.1-beta.31
+ * amis-editor v5.2.1-beta.33
  * Copyright 2018-2022 @fex
  */
 
@@ -837,9 +837,9 @@ var getEventControlConfig = function (manager, context) {
     actionConfigInitFormatter: function (action, variables) {
       return tslib.__awaiter(void 0, void 0, void 0, function () {
         var config, innerArgs, tmpArgs_1, hasSubActionNode, datasource, schema, dataSchema, dataSchemaIns;
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
-        return tslib.__generator(this, function (_r) {
-          switch (_r.label) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+        return tslib.__generator(this, function (_s) {
+          switch (_s.label) {
             case 0:
               config = tslib.__assign({}, action);
               if (['link', 'url'].includes(action.actionType) && ((_a = action.args) === null || _a === void 0 ? void 0 : _a.params)) {
@@ -872,13 +872,22 @@ var getEventControlConfig = function (manager, context) {
                   (_j = config.args) === null || _j === void 0 ? true : delete _j.value;
                 }
               }
-              if (action.actionType === 'ajax' && typeof ((_k = action === null || action === void 0 ? void 0 : action.args) === null || _k === void 0 ? void 0 : _k.api) === 'string') {
-                action.args.api = amisCore.normalizeApi((_l = action === null || action === void 0 ? void 0 : action.args) === null || _l === void 0 ? void 0 : _l.api);
+              if (['show', 'hidden', 'enabled', 'disabled'].includes(action.actionType)) {
+                // 兼容老逻辑，初始化actionType
+                config.__statusType = action.actionType;
+                config.__actionType = 'static';
+              }
+              if (['usability', 'visibility'].includes(action.actionType)) {
+                // 初始化条件参数
+                config.__actionExpression = (_k = action.args) === null || _k === void 0 ? void 0 : _k.value;
+              }
+              if (action.actionType === 'ajax' && typeof ((_l = action === null || action === void 0 ? void 0 : action.args) === null || _l === void 0 ? void 0 : _l.api) === 'string') {
+                action.args.api = amisCore.normalizeApi((_m = action === null || action === void 0 ? void 0 : action.args) === null || _m === void 0 ? void 0 : _m.api);
               }
               innerArgs = getPropOfAcion(action, 'innerArgs', actionTree, manager.pluginActions, commonActions);
               // 处理刷新组件动作的追加参数
               if (config.actionType === 'reload') {
-                config.__resetPage = (_m = config.args) === null || _m === void 0 ? void 0 : _m.resetPage;
+                config.__resetPage = (_o = config.args) === null || _o === void 0 ? void 0 : _o.resetPage;
                 config.__addParam = config.data === undefined || !!config.data;
                 config.__customData = !!config.data;
                 if (config.data && typeof config.data === 'object' || config.args && !Object.keys(config.args).length && config.data === undefined) {
@@ -922,14 +931,14 @@ var getEventControlConfig = function (manager, context) {
               }
               hasSubActionNode = findSubActionNode(actionTree, action.actionType);
               datasource = [];
-              if (!((_o = action.args) === null || _o === void 0 ? void 0 : _o.componentId)) return [3 /*break*/, 2];
-              schema = (_p = manager === null || manager === void 0 ? void 0 : manager.store) === null || _p === void 0 ? void 0 : _p.getSchema((_q = action.args) === null || _q === void 0 ? void 0 : _q.componentId, 'id');
+              if (!((_p = action.args) === null || _p === void 0 ? void 0 : _p.componentId)) return [3 /*break*/, 2];
+              schema = (_q = manager === null || manager === void 0 ? void 0 : manager.store) === null || _q === void 0 ? void 0 : _q.getSchema((_r = action.args) === null || _r === void 0 ? void 0 : _r.componentId, 'id');
               return [4 /*yield*/, manager.getContextSchemas(schema === null || schema === void 0 ? void 0 : schema.$$id, true)];
             case 1:
-              dataSchema = _r.sent();
+              dataSchema = _s.sent();
               dataSchemaIns = new amisCore.DataSchema(dataSchema || []);
               datasource = (dataSchemaIns === null || dataSchemaIns === void 0 ? void 0 : dataSchemaIns.getDataPropsAsOptions()) || [];
-              _r.label = 2;
+              _s.label = 2;
             case 2:
               return [2 /*return*/, tslib.__assign(tslib.__assign({}, config), {
                 actionType: getActionType(action, hasSubActionNode),
@@ -1024,6 +1033,15 @@ var getEventControlConfig = function (manager, context) {
           }
         }
       }
+      // 转换下格式
+      if (['visibility', 'usability'].includes(config.actionType)) {
+        action.args = action.actionType !== 'static' ? {
+          value: action.__actionExpression
+        } : undefined;
+        action.actionType === 'static' && (action.actionType = config.__statusType);
+        delete action.__actionExpression;
+        delete action.__statusType;
+      }
       delete action.config;
       return action;
     }

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

@@ -25,6 +25,16 @@ interface EventControlProps extends FormControlProps {
     actionConfigSubmitFormatter?: (actionConfig: ActionConfig) => ActionConfig;
     owner?: string;
 }
+interface EventDialogData {
+    eventName: string;
+    eventLabel: string;
+    isBroadcast: boolean;
+    debounceConfig?: {
+        open: boolean;
+        wait?: number;
+    };
+    [propName: string]: any;
+}
 interface EventControlState {
     onEvent: ActionEventConfig;
     events: RendererPluginEvent[];
@@ -32,6 +42,8 @@ interface EventControlState {
         [prop: string]: boolean;
     };
     showAcionDialog: boolean;
+    showEventDialog: boolean;
+    eventDialogData?: EventDialogData;
     actionData: {
         eventKey: string;
         actionIndex?: number;
@@ -60,6 +72,8 @@ export declare class EventControl extends React.Component<EventControlProps, Eve
     componentDidUpdate(prevProps: EventControlProps, prevState: EventControlState): void;
     generateEmptyDefault(events: RendererPluginEvent[]): ActionEventConfig;
     addEvent(event: RendererPluginEvent, disabled: boolean): void;
+    activeEventDialog(eventInfo: EventDialogData): void;
+    eventDialogSubmit(formData: any): void;
     delEvent(event: string): void;
     addAction(event: string, config: any): void;
     updateAction(event: string, index: number, config: any): void;