amis-editor 5.2.0-beta.2 → 5.2.1-beta.15

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.0-beta.2
+ * amis-editor v5.2.1-beta.15
  * Copyright 2018-2022 @fex
  */
 
@@ -21,12 +21,8 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 /**
  * 动作配置面板
  */
-
-var ActionDialog =
-/** @class */
-function (_super) {
+var ActionDialog = /** @class */function (_super) {
   tslib.__extends(ActionDialog, _super);
-
   function ActionDialog() {
     return _super !== null && _super.apply(this, arguments) || this;
   }
@@ -36,28 +32,28 @@ function (_super) {
    * @param keywords
    * @returns
    */
-
-
-  ActionDialog.prototype.getTreeSearchList = function (tree, keywords) {
-    if (!keywords) {
-      return tree;
+  Object.defineProperty(ActionDialog.prototype, "getTreeSearchList", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (tree, keywords) {
+      if (!keywords) {
+        return tree;
+      }
+      var result = [];
+      var getSearchList = function (result, array, keywords) {
+        array.forEach(function (node) {
+          if (node.children) {
+            getSearchList(result, node.children, keywords);
+          } else if (node.actionLabel.includes(keywords)) {
+            result.push(tslib.__assign({}, node));
+          }
+        });
+      };
+      getSearchList(result, tree, keywords);
+      return result;
     }
-
-    var result = [];
-
-    var getSearchList = function (result, array, keywords) {
-      array.forEach(function (node) {
-        if (node.children) {
-          getSearchList(result, node.children, keywords);
-        } else if (node.actionLabel.includes(keywords)) {
-          result.push(tslib.__assign({}, node));
-        }
-      });
-    };
-
-    getSearchList(result, tree, keywords);
-    return result;
-  };
+  });
   /**
    * 获取组件树配置schema
    * @param isSearch 是否是搜索
@@ -65,83 +61,80 @@ function (_super) {
    * @param getComponents
    * @returns
    */
-
-
-  ActionDialog.prototype.getInputTreeSchema = function (isSearch, actionTree, getComponents) {
-    var inputTreeSchema = {
-      type: 'input-tree',
-      name: 'actionType',
-      visibleOn: isSearch ? '__keywords' : '!__keywords',
-      disabled: false,
-      onlyLeaf: true,
-      showIcon: false,
-      className: 'action-tree',
-      mode: 'normal',
-      labelField: 'actionLabel',
-      valueField: 'actionType',
-      inputClassName: 'no-border action-tree-control',
-      placeholder: i18nRuntime.i18n("db1cac8e2f6206e8f179b1ff47a676df"),
-      onChange: function (value, oldVal, data, form) {
-        var _a; // 因为不知道动作都有哪些字段，这里只保留基础配置
-
-
-        var removeKeys = {};
-        var groupType = '';
-        Object.keys(form.data).forEach(function (key) {
-          if (!compActionSelect.BASE_ACTION_PROPS.includes(key)) {
-            removeKeys[key] = undefined;
+  Object.defineProperty(ActionDialog.prototype, "getInputTreeSchema", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function (isSearch, actionTree, getComponents) {
+      var inputTreeSchema = {
+        type: 'input-tree',
+        name: 'actionType',
+        visibleOn: isSearch ? '__keywords' : '!__keywords',
+        disabled: false,
+        onlyLeaf: true,
+        showIcon: false,
+        className: 'action-tree',
+        mode: 'normal',
+        labelField: 'actionLabel',
+        valueField: 'actionType',
+        inputClassName: 'no-border action-tree-control',
+        placeholder: i18nRuntime.i18n("db1cac8e2f6206e8f179b1ff47a676df"),
+        onChange: function (value, oldVal, data, form) {
+          var _a;
+          // 因为不知道动作都有哪些字段，这里只保留基础配置
+          var removeKeys = {};
+          var groupType = '';
+          Object.keys(form.data).forEach(function (key) {
+            if (!compActionSelect.BASE_ACTION_PROPS.includes(key)) {
+              removeKeys[key] = undefined;
+            }
+          });
+          if (value === 'openDialog' && !['dialog', 'drawer'].includes(groupType)) {
+            groupType = 'dialog';
           }
-        });
-
-        if (value === 'openDialog' && !['dialog', 'drawer'].includes(groupType)) {
-          groupType = 'dialog';
-        }
-
-        if (value === 'closeDialog' && !['closeDialog', 'closeDrawer'].includes(groupType)) {
-          groupType = 'closeDialog';
-        }
-
-        if (value === 'visibility' && !['show', 'hidden'].includes(groupType)) {
-          groupType = 'show';
-        }
-
-        if (value === 'usability' && !['enabled', 'disabled'].includes(groupType)) {
-          groupType = 'enabled';
+          if (value === 'closeDialog' && !['closeDialog', 'closeDrawer'].includes(groupType)) {
+            groupType = 'closeDialog';
+          }
+          if (value === 'visibility' && !['show', 'hidden'].includes(groupType)) {
+            groupType = 'show';
+          }
+          if (value === 'usability' && !['enabled', 'disabled'].includes(groupType)) {
+            groupType = 'enabled';
+          }
+          var actionNode = helper.findActionNode(actionTree, value);
+          form.setValues(tslib.__assign(tslib.__assign({}, removeKeys), {
+            __keywords: form.data.__keywords,
+            __resultActionTree: form.data.__resultActionTree,
+            componentId: form.data.componentId ? '' : undefined,
+            args: {},
+            groupType: groupType,
+            __actionDesc: actionNode === null || actionNode === void 0 ? void 0 : actionNode.description,
+            __actionSchema: actionNode === null || actionNode === void 0 ? void 0 : actionNode.schema,
+            __subActions: actionNode === null || actionNode === void 0 ? void 0 : actionNode.actions,
+            __cmptTreeSource: (actionNode === null || actionNode === void 0 ? void 0 : actionNode.supportComponents) ? (_a = getComponents === null || getComponents === void 0 ? void 0 : getComponents(actionNode)) !== null && _a !== void 0 ? _a : [] : []
+          }));
         }
-
-        var actionNode = helper.findActionNode(actionTree, value);
-        form.setValues(tslib.__assign(tslib.__assign({}, removeKeys), {
-          __keywords: form.data.__keywords,
-          __resultActionTree: form.data.__resultActionTree,
-          componentId: form.data.componentId ? '' : undefined,
-          args: {},
-          groupType: groupType,
-          __actionDesc: actionNode === null || actionNode === void 0 ? void 0 : actionNode.description,
-          __actionSchema: actionNode === null || actionNode === void 0 ? void 0 : actionNode.schema,
-          __subActions: actionNode === null || actionNode === void 0 ? void 0 : actionNode.actions,
-          __cmptTreeSource: (actionNode === null || actionNode === void 0 ? void 0 : actionNode.supportComponents) ? (_a = getComponents === null || getComponents === void 0 ? void 0 : getComponents(actionNode)) !== null && _a !== void 0 ? _a : [] : []
-        }));
+      };
+      if (isSearch) {
+        return tslib.__assign(tslib.__assign({}, inputTreeSchema), {
+          source: '${__resultActionTree}',
+          highlightTxt: '${__keywords}'
+        });
+      } else {
+        return tslib.__assign(tslib.__assign({}, inputTreeSchema), {
+          options: actionTree
+        });
       }
-    };
-
-    if (isSearch) {
-      return tslib.__assign(tslib.__assign({}, inputTreeSchema), {
-        source: '${__resultActionTree}',
-        highlightTxt: '${__keywords}'
-      });
-    } else {
-      return tslib.__assign(tslib.__assign({}, inputTreeSchema), {
-        options: actionTree
-      });
     }
-  };
-
-  ActionDialog.prototype.render = function () {
-    var _this = this;
-
-    var _a;
-
-    var _b = this.props,
+  });
+  Object.defineProperty(ActionDialog.prototype, "render", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function () {
+      var _this = this;
+      var _a;
+      var _b = this.props,
         data = _b.data,
         show = _b.show,
         type = _b.type,
@@ -151,122 +144,136 @@ function (_super) {
         commonActions = _b.commonActions,
         onClose = _b.onClose,
         render = _b.render;
-    return render('inner', {
-      type: 'dialog',
-      title: i18nRuntime.i18n("e9908cdf79e965f6907ce9f291cdfcf8"),
-      headerClassName: 'font-bold',
-      className: 'action-config-dialog',
-      bodyClassName: 'action-config-dialog-body',
-      closeOnEsc: true,
-      closeOnOutside: false,
-      show: show,
-      showCloseButton: true,
-      size: 'md',
-      body: [{
-        type: 'form',
-        title: '',
-        mode: 'normal',
-        wrapperComponent: 'div',
-        submitText: i18nRuntime.i18n("be5fbbe34ce9979bfb6576d9eddc5612"),
-        autoFocus: true,
-        data: {
-          __keywords: '',
-          __resultActionTree: []
-        },
-        preventEnterSubmit: true,
-        // debug: true,
-        onSubmit: (_a = this.props.onSubmit) === null || _a === void 0 ? void 0 : _a.bind(this, type),
+      return render('inner', {
+        type: 'dialog',
+        title: i18nRuntime.i18n("e9908cdf79e965f6907ce9f291cdfcf8"),
+        headerClassName: 'font-bold',
+        className: 'action-config-dialog',
+        bodyClassName: 'action-config-dialog-body',
+        closeOnEsc: true,
+        closeOnOutside: false,
+        show: show,
+        showCloseButton: true,
+        size: 'md',
         body: [{
-          type: 'grid',
-          className: 'h-full',
-          columns: [{
-            body: [{
-              type: 'tpl',
-              tpl: i18nRuntime.i18n("d1d9049139d870edd490215530d90458"),
-              className: 'action-panel-title',
-              inline: false
-            }, {
-              type: 'input-text',
-              name: '__keywords',
-              className: 'action-tree-search',
-              inputClassName: 'action-tree-search-input',
-              placeholder: i18nRuntime.i18n("9eac7e07ca0a3181766e5ecc70d20727"),
-              clearable: true,
-              onChange: function (value, oldVal, data, form) {
-                if (value) {
-                  var list = _this.getTreeSearchList(actionTree, value);
-
-                  form.setValueByName('__resultActionTree', list);
-                } else {
-                  form.setValueByName('__resultActionTree', actionTree);
+          type: 'form',
+          title: '',
+          mode: 'normal',
+          wrapperComponent: 'div',
+          submitText: i18nRuntime.i18n("be5fbbe34ce9979bfb6576d9eddc5612"),
+          autoFocus: true,
+          data: {
+            __keywords: '',
+            __resultActionTree: []
+          },
+          preventEnterSubmit: true,
+          // debug: true,
+          onSubmit: (_a = this.props.onSubmit) === null || _a === void 0 ? void 0 : _a.bind(this, type),
+          body: [{
+            type: 'grid',
+            className: 'h-full',
+            columns: [{
+              body: [{
+                type: 'tpl',
+                tpl: i18nRuntime.i18n("d1d9049139d870edd490215530d90458"),
+                className: 'action-panel-title',
+                inline: false
+              }, {
+                type: 'input-text',
+                name: '__keywords',
+                className: 'action-tree-search',
+                inputClassName: 'action-tree-search-input',
+                placeholder: i18nRuntime.i18n("9eac7e07ca0a3181766e5ecc70d20727"),
+                clearable: true,
+                onChange: function (value, oldVal, data, form) {
+                  if (value) {
+                    var list = _this.getTreeSearchList(actionTree, value);
+                    form.setValueByName('__resultActionTree', list);
+                  } else {
+                    form.setValueByName('__resultActionTree', actionTree);
+                  }
                 }
-              }
-            }, // actionTree中包含function及class类型的属性，直接传入form的data中解析会报错
-            // 故采用两棵树分别使用静态及动态选项组
-            this.getInputTreeSchema(false, actionTree, getComponents), this.getInputTreeSchema(true, actionTree, getComponents)],
-            md: 3,
-            columnClassName: 'left-panel'
-          }, {
-            body: [{
-              type: 'tpl',
-              tpl: i18nRuntime.i18n("0174bdde9517fa331bf7d716a553e023"),
-              className: 'action-panel-title',
-              visibleOn: 'data.actionType',
-              inline: false
-            }, {
-              type: 'tpl',
-              className: 'action-desc',
-              tpl: '${__actionDesc}',
-              visibleOn: 'data.actionType'
-            }, {
-              type: 'tpl',
-              tpl: i18nRuntime.i18n("0aeca07a02601a8e701a46d1a8b5ce43"),
-              className: 'action-panel-title',
-              visibleOn: 'data.actionType',
-              inline: false
+              },
+              // actionTree中包含function及class类型的属性，直接传入form的data中解析会报错
+              // 故采用两棵树分别使用静态及动态选项组
+              this.getInputTreeSchema(false, actionTree, getComponents), this.getInputTreeSchema(true, actionTree, getComponents)],
+              md: 3,
+              columnClassName: 'left-panel'
             }, {
-              type: 'container',
-              className: 'right-panel-container',
               body: [{
-                asFormItem: true,
-                component: actionConfigPanel["default"],
-                pluginActions: pluginActions,
-                commonActions: commonActions
-              }, {
                 type: 'tpl',
-                tpl: i18nRuntime.i18n("e370757f933a8ecd87bf0255c3ce45d0"),
-                inline: false,
+                tpl: i18nRuntime.i18n("0174bdde9517fa331bf7d716a553e023"),
                 className: 'action-panel-title',
-                visibleOn: 'data.actionType'
+                visibleOn: 'data.actionType',
+                inline: false
               }, {
-                name: 'expression',
-                title: '',
-                type: 'input-formula',
-                variableMode: 'tabs',
-                inputMode: 'input-group',
-                variables: '${variables}',
-                className: 'action-exec-on',
-                label: i18nRuntime.i18n("da1ed600ce65be863766444e60c2da05"),
-                mode: 'horizontal',
-                size: 'lg',
-                placeholder: i18nRuntime.i18n("13b2de1073f76444c49d2c6a21e46e26"),
+                type: 'tpl',
+                className: 'action-desc',
+                tpl: '${__actionDesc}',
                 visibleOn: 'data.actionType'
-              }]
-            }],
-            columnClassName: 'right-panel'
-          }]
+              }, {
+                type: 'tpl',
+                tpl: i18nRuntime.i18n("0aeca07a02601a8e701a46d1a8b5ce43"),
+                className: 'action-panel-title',
+                visibleOn: 'data.actionType',
+                inline: false
+              }, {
+                type: 'container',
+                className: 'right-panel-container',
+                body: [{
+                  asFormItem: true,
+                  component: actionConfigPanel["default"],
+                  pluginActions: pluginActions,
+                  commonActions: commonActions
+                }, {
+                  type: 'tpl',
+                  tpl: i18nRuntime.i18n("e370757f933a8ecd87bf0255c3ce45d0"),
+                  inline: false,
+                  className: 'action-panel-title',
+                  visibleOn: 'data.actionType'
+                },
+                /*
+                {
+                  name: 'expression',
+                  title: '',
+                  type: 'input-formula',
+                  variableMode: 'tabs',
+                  inputMode: 'input-group',
+                  variables: '${variables}',
+                  className: 'action-exec-on',
+                  label: '执行条件',
+                  mode: 'horizontal',
+                  size: 'lg',
+                  placeholder: '默认执行该动作',
+                  visibleOn: 'data.actionType'
+                },
+                */
+                {
+                  name: 'expression',
+                  label: i18nRuntime.i18n("da1ed600ce65be863766444e60c2da05"),
+                  type: 'ae-expressionFormulaControl',
+                  variables: '${variables}',
+                  mode: 'horizontal',
+                  size: 'lg',
+                  placeholder: i18nRuntime.i18n("13b2de1073f76444c49d2c6a21e46e26"),
+                  visibleOn: 'data.actionType'
+                }]
+              }],
+              columnClassName: 'right-panel'
+            }]
+          }],
+          style: {
+            borderStyle: 'solid'
+          },
+          className: 'action-config-panel'
         }],
-        style: {
-          borderStyle: 'solid'
-        },
-        className: 'action-config-panel'
-      }],
-      onClose: onClose
-    }, {
-      data: data // 必须这样，不然变量会被当作数据映射处理掉
-
-    }); //   : null;
-  };
+        onClose: onClose
+      }, {
+        data: data // 必须这样，不然变量会被当作数据映射处理掉
+      });
+      //   : null;
+    }
+  });
 
   return ActionDialog;
 }(React__default["default"].Component);

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.0-beta.2
+ * amis-editor v5.2.1-beta.15
  * Copyright 2018-2022 @fex
  */
 
@@ -21,59 +21,52 @@ var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 /**
  * 动作配置面板
  */
-
-var ActionConfigPanel =
-/** @class */
-function (_super) {
+var ActionConfigPanel = /** @class */function (_super) {
   tslib.__extends(ActionConfigPanel, _super);
-
   function ActionConfigPanel() {
     return _super !== null && _super.apply(this, arguments) || this;
   }
-
-  ActionConfigPanel.prototype.render = function () {
-    var _a, _b, _c, _d;
-
-    var _e = this.props,
+  Object.defineProperty(ActionConfigPanel.prototype, "render", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function () {
+      var _a, _b, _c, _d;
+      var _e = this.props,
         data = _e.data,
         onBulkChange = _e.onBulkChange,
         render = _e.render,
         pluginActions = _e.pluginActions,
         actionConfigItemsMap = _e.actionConfigItemsMap;
-    var actionType = data.__subActions ? data.groupType : data.actionType;
-
-    var commonActionConfig = tslib.__assign(tslib.__assign({}, helper.COMMON_ACTION_SCHEMA_MAP), actionConfigItemsMap);
-
-    var schema = null;
-
-    if (data.actionType === 'component') {
-      // 获取组件动作配置
-      var subActionSchema = (_c = (_b = (_a = pluginActions === null || pluginActions === void 0 ? void 0 : pluginActions[data.__rendererName]) === null || _a === void 0 ? void 0 : _a.find(function (item) {
-        return item.actionType === data.groupType;
-      })) === null || _b === void 0 ? void 0 : _b.schema) !== null && _c !== void 0 ? _c : (_d = commonActionConfig[data.groupType]) === null || _d === void 0 ? void 0 : _d.schema;
-      var baseSchema = helper.renderCmptActionSelect(i18nRuntime.i18n("d80bc0fcbfb250480320b683e48b1467")); // 追加到基础配置
-
-      schema = tslib.__spreadArray(tslib.__spreadArray([], Array.isArray(baseSchema) ? baseSchema : [baseSchema], true), Array.isArray(subActionSchema) ? subActionSchema : [subActionSchema], true);
-    } else {
-      schema = data.__actionSchema;
-    }
-
-    return schema ? render('inner', schema, {
-      data: data,
-      onChange: function (value, field) {
-        var _a;
-
-        onBulkChange((_a = {}, _a[field] = value, _a));
+      var actionType = data.__subActions ? data.groupType : data.actionType;
+      var commonActionConfig = tslib.__assign(tslib.__assign({}, helper.COMMON_ACTION_SCHEMA_MAP), actionConfigItemsMap);
+      var schema = null;
+      if (data.actionType === 'component') {
+        // 获取组件动作配置
+        var subActionSchema = (_c = (_b = (_a = pluginActions === null || pluginActions === void 0 ? void 0 : pluginActions[data.__rendererName]) === null || _a === void 0 ? void 0 : _a.find(function (item) {
+          return item.actionType === data.groupType;
+        })) === null || _b === void 0 ? void 0 : _b.schema) !== null && _c !== void 0 ? _c : (_d = commonActionConfig[data.groupType]) === null || _d === void 0 ? void 0 : _d.schema;
+        var baseSchema = helper.renderCmptActionSelect(i18nRuntime.i18n("d80bc0fcbfb250480320b683e48b1467"));
+        // 追加到基础配置
+        schema = tslib.__spreadArray(tslib.__spreadArray([], Array.isArray(baseSchema) ? baseSchema : [baseSchema], true), Array.isArray(subActionSchema) ? subActionSchema : [subActionSchema], true);
+      } else {
+        schema = data.__actionSchema;
       }
-    }) : 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
-      })
-    }, React__default["default"].createElement("div", {
-      className: "ae-event-control-action-placeholder-img"
-    }), React__default["default"].createElement("span", null, actionType ? i18nRuntime.i18n("07682f1424e400c467accdb556d59e1c") : i18nRuntime.i18n("2e3ca80a58643bc28e87cc3b17bc9d80")));
-  };
-
+      return schema ? render('inner', schema, {
+        data: data,
+        onChange: function (value, field) {
+          var _a;
+          onBulkChange((_a = {}, _a[field] = value, _a));
+        }
+      }) : 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
+        })
+      }, React__default["default"].createElement("div", {
+        className: "ae-event-control-action-placeholder-img"
+      }), React__default["default"].createElement("span", null, actionType ? i18nRuntime.i18n("07682f1424e400c467accdb556d59e1c") : i18nRuntime.i18n("2e3ca80a58643bc28e87cc3b17bc9d80")));
+    }
+  });
   return ActionConfigPanel;
 }(React__default["default"].Component);