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

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.0-beta.2
+ * amis-editor v5.2.1-beta.15
  * Copyright 2018-2022 @fex
  */
 
@@ -14,32 +14,35 @@ var amisCore = require('amis-core');
 var compActionSelect = require('./comp-action-select.js');
 var amis = require('amis');
 var actions = require('./actions.js');
+var without = require('lodash/without');
 var i18nRuntime = require('i18n-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-
-var DATA_CONTAINER = ['form', 'dialog', 'drawer', 'wizard', 'service', 'page', 'app', 'chart']; // 下拉展示可赋值属性范围
-
-var SELECT_PROPS_CONTAINER = ['form']; // 是否数据容器
-
-var IS_DATA_CONTAINER = "".concat(JSON.stringify(DATA_CONTAINER), ".includes(__rendererName)"); // 是否下拉展示可赋值属性
-
-var SHOW_SELECT_PROP = "".concat(JSON.stringify(SELECT_PROPS_CONTAINER), ".includes(__rendererName)"); // 表单项组件
-
+var without__default = /*#__PURE__*/_interopDefaultLegacy(without);
+
+var DATA_CONTAINER = ['form', 'dialog', 'drawer', 'wizard', 'service', 'crud', 'page', 'app', 'chart'];
+// 下拉展示可赋值属性范围
+var SELECT_PROPS_CONTAINER = ['form'];
+// 是否数据容器
+var IS_DATA_CONTAINER = "".concat(JSON.stringify(DATA_CONTAINER), ".includes(data.__rendererName)");
+// 是否下拉展示可赋值属性
+var SHOW_SELECT_PROP = "".concat(JSON.stringify(SELECT_PROPS_CONTAINER), ".includes(data.__rendererName)");
+// 表单项组件
 var FORMITEM_CMPTS = ['button-group-select', 'button-toolbar', 'chained-select', 'chart-radios', 'checkbox', 'checkboxes', 'combo', 'input-kv', 'condition-builder', 'diff-editor', 'editor', 'formula', 'hidden', 'icon-picker', 'input-array', 'input-city', 'input-color', 'input-date', 'input-date-range', 'input-datetime-range', 'input-time-range', 'input-excel', 'input-file', 'input-formula', 'input-group', 'input-image', 'input-month-range', 'input-number', 'input-quarter-range', 'input-range', 'input-rating', 'input-repeat', 'input-rich-text', 'input-sub-form', 'input-table', 'input-tag', 'input-text', 'input-password', 'input-email', 'input-url', 'native-date', 'native-time', 'native-number', 'input-tree', 'input-year-range', 'list-select', 'location-picker', 'matrix-checkboxes', 'nested-select', 'cascader-select', 'picker', 'radios', 'select', 'multi-select', 'switch', 'tabs-transfer', 'tabs-transfer-picker', 'textarea', 'transfer', 'transfer-picker', 'tree-select', 'uuid'];
-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 SUPPORT_STATIC_FORMITEM_CMPTS = without__default["default"].apply(void 0, tslib.__spreadArray([FORMITEM_CMPTS], ['button-toolbar', 'condition-builder', 'diff-editor', 'editor', 'formula', 'hidden', 'icon-picker', 'input-excel', 'input-file', 'input-formula', 'input-image', 'input-repeat', 'input-rich-text', 'input-sub-form', 'input-table', 'picker', 'uuid'], false));
+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 getArgsWrapper = function (items, multiple, patch) {
   if (multiple === void 0) {
     multiple = false;
   }
-
   if (patch === void 0) {
     patch = {};
   }
-
   return tslib.__assign(tslib.__assign({
     type: 'combo',
     name: 'args',
@@ -49,8 +52,8 @@ var getArgsWrapper = function (items, multiple, patch) {
   }, patch), {
     items: Array.isArray(items) ? items : [items]
   });
-}; // 动作配置项schema map
-
+};
+// 动作配置项schema map
 var COMMON_ACTION_SCHEMA_MAP = {
   setValue: {
     innerArgs: ['value'],
@@ -81,16 +84,25 @@ var COMMON_ACTION_SCHEMA_MAP = {
           labelField: 'label',
           valueField: 'value',
           required: true
-        }, {
+        },
+        /*
+        {
           name: 'val',
           type: 'input-formula',
-          placeholder: i18nRuntime.i18n("9a2ee7044ff04234a8892a13583d14b6"),
+          placeholder: '变量值',
           variables: '${variables}',
           evalMode: false,
           variableMode: 'tabs',
           inputMode: 'input-group'
+        }
+        */
+        {
+          name: 'val',
+          type: 'ae-formulaControl',
+          variables: '${variables}',
+          placeholder: i18nRuntime.i18n("9a2ee7044ff04234a8892a13583d14b6")
         }],
-        visibleOn: "data.__rendererName && ".concat(IS_DATA_CONTAINER)
+        visibleOn: "".concat(IS_DATA_CONTAINER)
       }, {
         type: 'combo',
         name: 'value',
@@ -119,27 +131,48 @@ var COMMON_ACTION_SCHEMA_MAP = {
             name: 'key',
             type: 'input-text',
             required: true
-          }, {
+          },
+          /*
+          {
             name: 'val',
             type: 'input-formula',
             variables: '${variables}',
             evalMode: false,
             variableMode: 'tabs',
             inputMode: 'input-group'
+          }
+          */
+          {
+            name: 'val',
+            type: 'ae-formulaControl',
+            variables: '${variables}'
           }]
         }],
-        visibleOn: "data.__rendererName && __rendererName === 'combo'"
-      }, {
+        visibleOn: "data.__rendererName === 'combo'"
+      },
+      /*
+      {
         name: '__valueInput',
         type: 'input-formula',
         variables: '${variables}',
         evalMode: false,
         variableMode: 'tabs',
         inputMode: 'input-group',
+        label: '变量赋值',
+        size: 'lg',
+        mode: 'horizontal',
+        visibleOn: `!${IS_DATA_CONTAINER} && data.__rendererName !== 'combo'`,
+        required: true
+      }
+      */
+      {
+        name: '__valueInput',
         label: i18nRuntime.i18n("e22855f53b7a1ab33e920375c0cd0e3d"),
+        type: 'ae-formulaControl',
+        variables: '${variables}',
         size: 'lg',
         mode: 'horizontal',
-        visibleOn: "data.__rendererName && !".concat(IS_DATA_CONTAINER, " && __rendererName !== 'combo'"),
+        visibleOn: "!".concat(IS_DATA_CONTAINER, " && data.__rendererName !== 'combo'"),
         required: true
       }]
     })
@@ -229,82 +262,74 @@ var COMMON_ACTION_SCHEMA_MAP = {
       return React__default["default"].createElement("div", null, "\u6253\u5F00\u786E\u8BA4\u5BF9\u8BDD\u6846");
     }
   }
-}; // 获取动作树中指定的动作
-
+};
+// 获取动作树中指定的动作
 var findActionNode = function (actions, actionType) {
   return amisCore.findTree(actions, function (node) {
     return node.actionType === actionType;
   });
-}; // 获取包含指定子动作的动作
-
+};
+// 获取包含指定子动作的动作
 var findSubActionNode = function (actions, actionType) {
   return amisCore.findTree(actions, function (node) {
     var _a;
-
     return (_a = node.actions) === null || _a === void 0 ? void 0 : _a.find(function (item) {
       return item.actionType === actionType;
     });
   });
-}; // 获取真实的动作类型
-
+};
+// 获取真实的动作类型
 var getActionType = function (action, hasSubActionNode) {
   return action.groupType === 'component' ? 'component' : hasSubActionNode ? hasSubActionNode.actionType : action.actionType;
-}; // 获取事件Label文案
-
+};
+// 获取事件Label文案
 var getEventLabel = function (events, name) {
   var _a;
-
   return (_a = events.find(function (item) {
     return item.eventName === name;
   })) === null || _a === void 0 ? void 0 : _a.eventLabel;
-}; // 获取事件描述文案
-
+};
+// 获取事件描述文案
 var getEventDesc = function (events, name) {
   var _a;
-
   return (_a = events.find(function (item) {
     return item.eventName === name;
   })) === null || _a === void 0 ? void 0 : _a.description;
 };
 var getEventStrongDesc = function (events, name) {
   var _a;
-
   return (_a = events.find(function (item) {
     return item.eventName === name;
   })) === null || _a === void 0 ? void 0 : _a.strongDesc;
-}; // 判断插件动作中是否存在指定动作
-
+};
+// 判断插件动作中是否存在指定动作
 var hasActionType = function (actionType, actions) {
   if (!Array.isArray(actions)) {
     return false;
   }
-
   return !!(actions === null || actions === void 0 ? void 0 : actions.find(function (item) {
     return [item.actionType, 'component'].includes(actionType);
   }));
-}; // 获取动作配置，主要是为了获取config和desc，schema强制捆绑在动作树节点（动作配置可能在插件动作中 > 树节点 or 子动作）
-
-var getPropOfAcion = function (action, propName, actionTree, pluginActions, commonActions) {
+};
+// 获取动作配置，主要是为了获取config和desc，schema强制捆绑在动作树节点（动作配置可能在插件动作中 > 树节点 or 子动作）
+var getPropOfAcion = function (action, propName, actionTree, pluginActions, commonActions, allComponents) {
   var _a, _b, _c, _d, _e, _f, _g;
-
   var prop = null;
-
   if (action.componentId) {
     // 优先从组件特性动作中找
-    (_b = (_a = pluginActions[action.__rendererName]) === null || _a === void 0 ? void 0 : _a.find(function (item) {
+    var node = amisCore.findTree(allComponents !== null && allComponents !== void 0 ? allComponents : [], function (item) {
+      return item.value === action.componentId;
+    });
+    prop = node && ((_b = (_a = pluginActions[node.type]) === null || _a === void 0 ? void 0 : _a.find(function (item) {
       return item.actionType === action.actionType;
-    })) === null || _b === void 0 ? void 0 : _b[propName];
+    })) === null || _b === void 0 ? void 0 : _b[propName]);
   }
-
   if (!prop) {
     prop = (_c = findActionNode(actionTree, action.actionType)) === null || _c === void 0 ? void 0 : _c[propName];
   }
-
   if (!prop) {
     var commonActionConfig = tslib.__assign(tslib.__assign({}, COMMON_ACTION_SCHEMA_MAP), commonActions);
-
     var hasSubActionNode = findSubActionNode(actionTree, action.actionType);
-
     if (propName === 'actionLabel') {
       prop = hasSubActionNode === null || hasSubActionNode === void 0 ? void 0 : hasSubActionNode.actionLabel;
     } else {
@@ -313,15 +338,14 @@ var getPropOfAcion = function (action, propName, actionTree, pluginActions, comm
       })) === null || _e === void 0 ? void 0 : _e[propName]) !== null && _f !== void 0 ? _f : (_g = commonActionConfig[action.actionType]) === null || _g === void 0 ? void 0 : _g[propName];
     }
   }
-
   return prop;
-}; // 渲染组件选择配置项
-
+};
+// 渲染组件选择配置项
 var renderCmptSelect = function (componentLabel, required, onChange) {
   return [{
     type: 'tree-select',
     name: 'componentId',
-    label: componentLabel,
+    label: componentLabel || i18nRuntime.i18n("d80bc0fcbfb250480320b683e48b1467"),
     showIcon: false,
     searchable: true,
     required: required,
@@ -339,55 +363,44 @@ var renderCmptSelect = function (componentLabel, required, onChange) {
       return tslib.__awaiter(void 0, void 0, void 0, function () {
         return tslib.__generator(this, function (_a) {
           onChange === null || onChange === void 0 ? void 0 : onChange(value, oldVal, data, form);
-          return [2
-          /*return*/
-          ];
+          return [2 /*return*/];
         });
       });
     }
   }];
-}; // 渲染组件特性动作配置项
-
+};
+// 渲染组件特性动作配置项
 var renderCmptActionSelect = function (componentLabel, required, onChange) {
-  return tslib.__spreadArray(tslib.__spreadArray([], renderCmptSelect(i18nRuntime.i18n("d80bc0fcbfb250480320b683e48b1467"), true, function (value, oldVal, data, form) {
+  return tslib.__spreadArray(tslib.__spreadArray([], renderCmptSelect(componentLabel || i18nRuntime.i18n("d80bc0fcbfb250480320b683e48b1467"), true, function (value, oldVal, data, form) {
     return tslib.__awaiter(void 0, void 0, void 0, function () {
       var rendererType, dataSchema, dataSchemaIns, variables;
-
       var _a, _b;
-
       return tslib.__generator(this, function (_c) {
         switch (_c.label) {
           case 0:
             rendererType = form.data.__rendererName;
-            if (!form.data.__nodeId) return [3
-            /*break*/
-            , 2];
-            return [4
-            /*yield*/
-            , (_b = (_a = form.data).getContextSchemas) === null || _b === void 0 ? void 0 : _b.call(_a, form.data.__nodeId, true)];
-
+            if (!form.data.__nodeId) return [3 /*break*/, 2];
+            return [4 /*yield*/, (_b = (_a = form.data).getContextSchemas) === null || _b === void 0 ? void 0 : _b.call(_a, form.data.__nodeId, true)];
           case 1:
             dataSchema = _c.sent();
             dataSchemaIns = new amisCore.DataSchema(dataSchema || []);
             variables = (dataSchemaIns === null || dataSchemaIns === void 0 ? void 0 : dataSchemaIns.getDataPropsAsOptions()) || [];
             form.setValueByName('__cmptDataSchema', dataSchema);
             form.setValueByName('__cmptVariables', variables); // 组件上下文（不含父级）
-
-            form.setValueByName('__cmptVariablesWithSys', tslib.__spreadArray([// 组件上下文+页面+系统
+            form.setValueByName('__cmptVariablesWithSys', tslib.__spreadArray([
+            // 组件上下文+页面+系统
             {
               label: "".concat(form.data.__rendererLabel, "\u53D8\u91CF"),
               children: variables
             }], form.data.rawVariables.filter(function (item) {
               return [i18nRuntime.i18n("cc6aeb073ebc3cb29734a49164f8964c"), i18nRuntime.i18n("979a50681e278dcc0be18f68459e8217")].includes(item.label);
             }), true));
-
             if (form.data.actionType === 'setValue') {
               // todo:这里会闪一下，需要从amis查下问题
               form.setValueByName('args.value', []);
               form.setValueByName('args.__comboType', undefined);
               form.setValueByName('args.__valueInput', undefined);
               form.setValueByName('args.__containerType', undefined);
-
               if (SELECT_PROPS_CONTAINER.includes(rendererType)) {
                 form.setValueByName('__setValueDs', variables.filter(function (item) {
                   return item.value !== '$$id';
@@ -396,15 +409,11 @@ var renderCmptActionSelect = function (componentLabel, required, onChange) {
                 form.setValueByName('__setValueDs', []);
               }
             }
-
             _c.label = 2;
-
           case 2:
             form.setValueByName('groupType', '');
             onChange === null || onChange === void 0 ? void 0 : onChange(value, oldVal, data, form);
-            return [2
-            /*return*/
-            ];
+            return [2 /*return*/];
         }
       });
     });
@@ -525,8 +534,8 @@ var getOldActionSchema = function (manager, context) {
             asFormItem: true,
             children: function (_a) {
               var value = _a.value,
-                  onChange = _a.onChange,
-                  data = _a.data;
+                onChange = _a.onChange,
+                data = _a.data;
               return data.actionType === 'dialog' ? React__default["default"].createElement(amis.Button, {
                 size: "sm",
                 level: "danger",
@@ -555,8 +564,8 @@ var getOldActionSchema = function (manager, context) {
             asFormItem: true,
             children: function (_a) {
               var value = _a.value,
-                  onChange = _a.onChange,
-                  data = _a.data;
+                onChange = _a.onChange,
+                data = _a.data;
               return data.actionType == 'drawer' ? React__default["default"].createElement(amis.Button, {
                 size: "sm",
                 level: "danger",
@@ -587,8 +596,8 @@ var getOldActionSchema = function (manager, context) {
             asFormItem: true,
             children: function (_a) {
               var onChange = _a.onChange,
-                  value = _a.value,
-                  data = _a.data;
+                value = _a.value,
+                data = _a.data;
               return data.actionType == 'ajax' ? React__default["default"].createElement("div", {
                 className: "m-b"
               }, React__default["default"].createElement(amis.Button, {
@@ -698,30 +707,52 @@ var getOldActionSchema = function (manager, context) {
     }]
   };
 };
+/**
+ * 对象转Combo组件对象数组
+ * @param obj
+ * @returns
+ */
+var objectToComboArray = function (obj) {
+  return Object.entries(obj).map(function (_a) {
+    var key = _a[0],
+      val = _a[1];
+    return {
+      key: key,
+      val: val
+    };
+  });
+};
+/**
+ * Combo组件对象数组转对象
+ * @param arr
+ * @returns
+ */
+var comboArrayToObject = function (arr) {
+  var obj = {};
+  arr === null || arr === void 0 ? void 0 : arr.forEach(function (item) {
+    obj[item.key] = item.val;
+  });
+  return obj;
+};
 /**
  * 获取事件动作面板所需属性配置
  */
-
 var getEventControlConfig = function (manager, context) {
   var _a, _b, _c, _d, _e, _f;
-
-  var isSubEditor = manager.store.isSubEditor; // 通用动作配置
-
-  var commonActions = (_b = (_a = manager === null || manager === void 0 ? void 0 : manager.config.actionOptions) === null || _a === void 0 ? void 0 : _a.customActionGetter) === null || _b === void 0 ? void 0 : _b.call(_a, manager); // 动作树
-
+  var isSubEditor = manager.store.isSubEditor;
+  // 通用动作配置
+  var commonActions = (_b = (_a = manager === null || manager === void 0 ? void 0 : manager.config.actionOptions) === null || _a === void 0 ? void 0 : _a.customActionGetter) === null || _b === void 0 ? void 0 : _b.call(_a, manager);
+  // 动作树
   var actionTree = ((_c = manager === null || manager === void 0 ? void 0 : manager.config.actionOptions) === null || _c === void 0 ? void 0 : _c.actionTreeGetter) ? (_d = manager === null || manager === void 0 ? void 0 : manager.config.actionOptions) === null || _d === void 0 ? void 0 : _d.actionTreeGetter(actions["default"](manager)) : actions["default"](manager);
   var allComponents = amisCore.mapTree((_f = (_e = manager === null || manager === void 0 ? void 0 : manager.store) === null || _e === void 0 ? void 0 : _e.outline) !== null && _f !== void 0 ? _f : [], function (item) {
     var _a, _b, _c, _d;
-
     var schema = (_a = manager === null || manager === void 0 ? void 0 : manager.store) === null || _a === void 0 ? void 0 : _a.getSchema(item.id);
     var cmptLabel = '';
-
     if (item === null || item === void 0 ? void 0 : item.region) {
       cmptLabel = item === null || item === void 0 ? void 0 : item.label;
     } else {
       cmptLabel = (_b = schema === null || schema === void 0 ? void 0 : schema.label) !== null && _b !== void 0 ? _b : schema === null || schema === void 0 ? void 0 : schema.title;
     }
-
     cmptLabel = cmptLabel !== null && cmptLabel !== void 0 ? cmptLabel : item.label;
     return {
       id: item.id,
@@ -733,39 +764,32 @@ var getEventControlConfig = function (manager, context) {
       children: item === null || item === void 0 ? void 0 : item.children
     };
   }, 1, true);
-
   var checkComponent = function (node, action) {
     var _a;
-
     var actionType = 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; // 内置逻辑
-
+      isSupport = action.supportComponents === '*' || action.supportComponents === node.type;
+      // 内置逻辑
       if (action.supportComponents === 'byComponent') {
         isSupport = hasActionType(actionType, actions);
       }
     } else if (Array.isArray(action.supportComponents)) {
       isSupport = action.supportComponents.includes(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;
   };
-
   return {
     showOldEntry: !!context.schema.actionType || ['submit', 'reset'].includes(context.schema.type),
     actions: manager === null || manager === void 0 ? void 0 : manager.pluginActions,
@@ -782,41 +806,29 @@ var getEventControlConfig = function (manager, context) {
         return tslib.__generator(this, function (_a) {
           switch (_a.label) {
             case 0:
-              return [4
-              /*yield*/
-              , manager.getContextSchemas(id !== null && id !== void 0 ? id : context.id, withoutSuper)];
-
+              return [4 /*yield*/, manager.getContextSchemas(id !== null && id !== void 0 ? id : context.id, withoutSuper)];
             case 1:
-              dataSchema = _a.sent(); // 存在指定id时，只需要当前层上下文
-
+              dataSchema = _a.sent();
+              // 存在指定id时，只需要当前层上下文
               if (id) {
-                return [2
-                /*return*/
-                , dataSchema];
+                return [2 /*return*/, dataSchema];
               }
-
-              return [2
-              /*return*/
-              , manager.dataSchema];
+              return [2 /*return*/, manager.dataSchema];
           }
         });
       });
     },
     getComponents: function (action) {
       var components = allComponents;
-
       if (isSubEditor) {
         var superTree = manager.store.getSuperEditorData;
-
         while (superTree) {
           if (superTree.__superCmptTreeSource) {
             components = components.concat(superTree.__superCmptTreeSource);
           }
-
           superTree = superTree.__super;
         }
       }
-
       var result = amisCore.filterTree(components, function (node) {
         return checkComponent(node, action);
       }, 1, true);
@@ -824,74 +836,78 @@ var getEventControlConfig = function (manager, context) {
     },
     actionConfigInitFormatter: function (action, variables) {
       return tslib.__awaiter(void 0, void 0, void 0, function () {
-        var config, prop_1, innerArgs, tmpArgs_1, hasSubActionNode, datasource, schema, dataSchema, dataSchemaIns;
-
-        var _a, _b, _c, _d, _e, _f;
-
-        return tslib.__generator(this, function (_g) {
-          switch (_g.label) {
+        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) {
             case 0:
               config = tslib.__assign({}, action);
-
-              if (['setValue', 'url'].includes(action.actionType) && action.args) {
-                prop_1 = action.actionType === 'setValue' ? 'value' : 'params';
+              if (['link', 'url'].includes(action.actionType) && ((_a = action.args) === null || _a === void 0 ? void 0 : _a.params)) {
+                config.args = tslib.__assign(tslib.__assign({}, config.args), {
+                  params: objectToComboArray((_b = action.args) === null || _b === void 0 ? void 0 : _b.params)
+                });
+              }
+              if (['setValue'].includes(action.actionType) && ((_c = action.args) === null || _c === void 0 ? void 0 : _c.value)) {
                 !config.args && (config.args = {});
-
-                if (Array.isArray(action.args[prop_1])) {
-                  config.args[prop_1] = action.args[prop_1].reduce(function (arr, valueItem, index) {
+                if (Array.isArray((_d = action.args) === null || _d === void 0 ? void 0 : _d.value)) {
+                  config.args.value = (_e = action.args) === null || _e === void 0 ? void 0 : _e.value.reduce(function (arr, valueItem, index) {
                     if (!arr[index]) {
                       arr[index] = {};
                     }
-
-                    arr[index].item = Object.entries(valueItem).map(function (_a) {
-                      var key = _a[0],
-                          val = _a[1];
-                      return {
-                        key: key,
-                        val: val
-                      };
-                    });
+                    arr[index].item = objectToComboArray(valueItem);
                     return arr;
-                  }, []); // 目前只有给combo赋值会是数组，所以认为是全量的赋值方式
-
+                  }, []);
+                  // 目前只有给combo赋值会是数组，所以认为是全量的赋值方式
                   config.args['__comboType'] = 'all';
-                } else if (typeof action.args[prop_1] === 'object') {
-                  config.args[prop_1] = Object.keys(action.args[prop_1]).map(function (key) {
-                    var _a;
-
-                    return {
-                      key: key,
-                      val: (_a = action.args) === null || _a === void 0 ? void 0 : _a[prop_1][key]
-                    };
-                  });
-                  config.args['__containerType'] = 'appoint'; // 如果有index，认为是给指定序号的combo赋值，所以认为是指定序号的赋值方式
-
+                } else if (typeof ((_f = action.args) === null || _f === void 0 ? void 0 : _f.value) === 'object') {
+                  config.args.value = objectToComboArray((_g = action.args) === null || _g === void 0 ? void 0 : _g.value);
+                  config.args['__containerType'] = 'appoint';
+                  // 如果有index，认为是给指定序号的combo赋值，所以认为是指定序号的赋值方式
                   if (action.args.index !== undefined) {
                     config.args['__comboType'] = 'appoint';
                   }
-                } else if (action.actionType === 'setValue' && typeof action.args[prop_1] === 'string') {
+                } else if (action.actionType === 'setValue' && typeof ((_h = action.args) === null || _h === void 0 ? void 0 : _h.value) === 'string') {
                   config.args['__containerType'] = 'all';
                   config.args['__valueInput'] = config.args['value'];
-                  (_a = config.args) === null || _a === void 0 ? true : delete _a.value;
+                  (_j = config.args) === null || _j === void 0 ? true : delete _j.value;
                 }
               }
-
-              if (action.actionType === 'ajax' && typeof ((_b = action === null || action === void 0 ? void 0 : action.args) === null || _b === void 0 ? void 0 : _b.api) === 'string') {
-                action.args.api = amisCore.normalizeApi((_c = action === null || action === void 0 ? void 0 : action.args) === null || _c === void 0 ? void 0 : _c.api);
+              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);
               }
-
-              innerArgs = getPropOfAcion(action, 'innerArgs', actionTree, manager.pluginActions, commonActions); // 还原args为可视化配置结构(args + addOnArgs)
-
+              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.__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) {
+                  config.__customData = true;
+                  config.__containerType = 'appoint';
+                  config.dataMergeMode = 'override';
+                }
+                if (config.__addParam && config.__customData && config.data) {
+                  if (typeof config.data === 'string') {
+                    config.__containerType = 'all';
+                    config.__valueInput = config.data;
+                  } else {
+                    config.__containerType = 'appoint';
+                    config.__reloadParams = objectToComboArray(config.data);
+                  }
+                } else if (config.args && !Object.keys(config.args).length && config.data === undefined) {
+                  config.__reloadParams = objectToComboArray(config.args);
+                }
+              }
+              delete config.data;
+              // 还原args为可视化配置结构(args + addOnArgs)
               if (config.args) {
                 if (innerArgs) {
                   tmpArgs_1 = {};
                   config.addOnArgs = [];
                   Object.keys(config.args).forEach(function (key) {
                     var _a;
-
-                    var _b, _c; // 筛选出附加配置参数
-
-
+                    var _b, _c;
+                    // 筛选出附加配置参数
                     if (!innerArgs.includes(key)) {
                       config.addOnArgs = tslib.__spreadArray(tslib.__spreadArray([], config.addOnArgs, true), [{
                         key: key,
@@ -904,31 +920,22 @@ var getEventControlConfig = function (manager, context) {
                   config.args = tmpArgs_1;
                 }
               }
-
               hasSubActionNode = findSubActionNode(actionTree, action.actionType);
               datasource = [];
-              if (!((_d = action.args) === null || _d === void 0 ? void 0 : _d.componentId)) return [3
-              /*break*/
-              , 2];
-              schema = (_e = manager === null || manager === void 0 ? void 0 : manager.store) === null || _e === void 0 ? void 0 : _e.getSchema((_f = action.args) === null || _f === void 0 ? void 0 : _f.componentId, 'id');
-              return [4
-              /*yield*/
-              , manager.getContextSchemas(schema === null || schema === void 0 ? void 0 : schema.$$id, true)];
-
+              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');
+              return [4 /*yield*/, manager.getContextSchemas(schema === null || schema === void 0 ? void 0 : schema.$$id, true)];
             case 1:
-              dataSchema = _g.sent();
+              dataSchema = _r.sent();
               dataSchemaIns = new amisCore.DataSchema(dataSchema || []);
               datasource = (dataSchemaIns === null || dataSchemaIns === void 0 ? void 0 : dataSchemaIns.getDataPropsAsOptions()) || [];
-              _g.label = 2;
-
+              _r.label = 2;
             case 2:
-              return [2
-              /*return*/
-              , tslib.__assign(tslib.__assign({}, config), {
+              return [2 /*return*/, tslib.__assign(tslib.__assign({}, config), {
                 actionType: getActionType(action, hasSubActionNode),
                 args: tslib.__assign(tslib.__assign({}, config.args), {
                   __dataContainerVariables: (datasource === null || datasource === void 0 ? void 0 : datasource.length) ? tslib.__spreadArray(tslib.__spreadArray(tslib.__spreadArray([], variables.eventVariables, true), [{
-                    label: "\u6570\u636E\u6765\u6E90\u53D8\u91CF",
+                    label: i18nRuntime.i18n("c0a8088f2bbc993500c5a01b0f0a1887"),
                     children: datasource
                   }], false), variables.rawVariables, true) : tslib.__spreadArray(tslib.__spreadArray([], variables.eventVariables, true), variables.rawVariables, true)
                 })
@@ -938,82 +945,86 @@ var getEventControlConfig = function (manager, context) {
       });
     },
     actionConfigSubmitFormatter: function (config) {
-      var _a, _b;
-
-      var _c, _d, _e, _f, _g, _h, _j, _k;
-
+      var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
       var action = tslib.__assign(tslib.__assign({}, config), {
         groupType: undefined
       });
-
-      action.__title = (_c = findActionNode(actionTree, config.actionType)) === null || _c === void 0 ? void 0 : _c.actionLabel; // 修正动作名称
-
+      action.__title = (_a = findActionNode(actionTree, config.actionType)) === null || _a === void 0 ? void 0 : _a.actionLabel;
+      // 修正动作名称
       if (config.actionType === 'component') {
-        action.actionType = config.groupType; // 标记一下组件特性动作
-
+        action.actionType = config.groupType;
+        // 标记一下组件特性动作
         action.groupType = config.actionType;
       }
-
       var hasSubActionNode = findSubActionNode(actionTree, config.groupType);
-
       if (hasSubActionNode) {
         // 修正动作
         action.actionType = config.groupType;
-      } // 合并附加的动作参数
-
-
+      }
+      // 合并附加的动作参数
       if (config.addOnArgs) {
         config.addOnArgs.forEach(function (args) {
           var _a;
-
           var _b;
-
           action.args = (_b = action.args) !== null && _b !== void 0 ? _b : {};
           action.args = tslib.__assign(tslib.__assign({}, action.args), (_a = {}, _a[args.key] = args.val, _a));
         });
         delete action.addOnArgs;
-      } // 转换下格式
-
-
-      if (['setValue', 'url'].includes(action.actionType)) {
-        var propName = action.actionType === 'setValue' ? 'value' : 'params';
-
-        if (action.actionType === 'setValue' && ((_d = config.args) === null || _d === void 0 ? void 0 : _d.__valueInput) !== undefined) {
+      }
+      // 刷新组件时，处理是否追加事件变量
+      if (config.actionType === 'reload') {
+        action.data = null;
+        action.dataMergeMode = undefined;
+        action.args = action.__rendererName === 'crud' ? tslib.__assign(tslib.__assign({}, action.args), {
+          resetPage: (_b = config.__resetPage) !== null && _b !== void 0 ? _b : true
+        }) : undefined;
+        if (config.__addParam) {
+          action.dataMergeMode = config.dataMergeMode || 'merge';
+          action.data = undefined;
+          if (config.__customData) {
+            action.data = config.__containerType === 'all' ? config.__valueInput : comboArrayToObject(config.__reloadParams || []);
+          }
+        }
+      }
+      // 转换下格式
+      if (['link', 'url'].includes(action.actionType)) {
+        var params = (_c = config.args) === null || _c === void 0 ? void 0 : _c.params;
+        if (params && params.length) {
+          action.args = tslib.__assign(tslib.__assign({}, action.args), {
+            params: comboArrayToObject(params)
+          });
+        }
+      }
+      // 转换下格式
+      if (action.actionType === 'setValue') {
+        if (((_d = config.args) === null || _d === void 0 ? void 0 : _d.__valueInput) !== undefined) {
           action.args = {
             value: (_e = config.args) === null || _e === void 0 ? void 0 : _e.__valueInput
           };
-        } else if (Array.isArray((_f = config.args) === null || _f === void 0 ? void 0 : _f[propName])) {
+        } else if (Array.isArray((_f = config.args) === null || _f === void 0 ? void 0 : _f.value)) {
           action.args = (_g = action.args) !== null && _g !== void 0 ? _g : {};
-
           if (action.__rendererName === 'combo' && ((_h = action.args) === null || _h === void 0 ? void 0 : _h.index) === undefined) {
             // combo特殊处理
             var tempArr_1 = [];
-            (_j = config.args) === null || _j === void 0 ? void 0 : _j[propName].forEach(function (valueItem, index) {
+            (_j = config.args) === null || _j === void 0 ? void 0 : _j.value.forEach(function (valueItem, index) {
               valueItem.item.forEach(function (item) {
                 if (!tempArr_1[index]) {
                   tempArr_1[index] = {};
                 }
-
                 tempArr_1[index][item.key] = item.val;
               });
             });
-            action.args = tslib.__assign(tslib.__assign({}, action.args), (_a = {}, _a[propName] = tempArr_1, _a));
+            action.args = tslib.__assign(tslib.__assign({}, action.args), {
+              value: tempArr_1
+            });
           } else {
-            var tmpObj_1 = {};
-            (_k = config.args) === null || _k === void 0 ? void 0 : _k[propName].forEach(function (item) {
-              tmpObj_1[item.key] = item.val;
+            action.args = tslib.__assign(tslib.__assign({}, action.args), {
+              value: comboArrayToObject((_k = config.args) === null || _k === void 0 ? void 0 : _k.value)
             });
-            action.args = tslib.__assign(tslib.__assign({}, action.args), (_b = {}, _b[propName] = tmpObj_1, _b));
           }
         }
       }
-
-      delete action.config; // 去掉空参
-
-      if (action.args && !Object.keys(action.args).length) {
-        delete action.args;
-      }
-
+      delete action.config;
       return action;
     }
   };
@@ -1026,6 +1037,7 @@ 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;
+exports.SUPPORT_STATIC_FORMITEM_CMPTS = SUPPORT_STATIC_FORMITEM_CMPTS;
 exports.findActionNode = findActionNode;
 exports.findSubActionNode = findSubActionNode;
 exports.getActionType = getActionType;