amis-editor 5.2.4-beta.31 → 5.2.5-beta.3

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.4-beta.30
+ * amis-editor v5.2.5-beta.3
  * Copyright 2018-2023 @fex
  */
 
@@ -60,6 +60,10 @@ var SUPPORT_DISABLED_CMPTS = ['button-group', 'action', 'button', 'submit', 'res
 ];
 
 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();
   return [{
     actionLabel: i18nRuntime.i18n("59ceff465ad16932d8972191ad815dfb"),
     actionType: 'page',
@@ -209,7 +213,7 @@ var ACTION_TYPE_TREE = function (manager) {
         required: true,
         pipeIn: amisEditorCore.defaultValue({
           title: i18nRuntime.i18n("8a089992349df754f182a5d02de8e8e0"),
-          body: i18nRuntime.i18n("b680997c50ca749acd4e6075cdca244e"),
+          body: i18nRuntime.i18n("1a9aaf05889002e65708c4950012a652"),
           showCloseButton: true,
           showErrorMsg: true,
           showLoading: true
@@ -245,7 +249,7 @@ var ACTION_TYPE_TREE = function (manager) {
         required: true,
         pipeIn: amisEditorCore.defaultValue({
           title: i18nRuntime.i18n("8a089992349df754f182a5d02de8e8e0"),
-          body: i18nRuntime.i18n("b680997c50ca749acd4e6075cdca244e")
+          body: i18nRuntime.i18n("1a9aaf05889002e65708c4950012a652")
         }),
         asFormItem: true,
         visibleOn: 'data.groupType === "drawer"',
@@ -870,147 +874,131 @@ var ACTION_TYPE_TREE = function (manager) {
         }]
       }], false)
     }, {
-      actionLabel: i18nRuntime.i18n("fa644cb20c66f7530d8a376d4fa6a36e"),
+      actionLabel: i18nRuntime.i18n("e22855f53b7a1ab33e920375c0cd0e3d"),
       actionType: 'setValue',
-      description: i18nRuntime.i18n("7d9260bd45b2e85a09398f218c25f220"),
-      innerArgs: ['value', 'index', '__valueInput', '__comboType', '__containerType'],
+      description: i18nRuntime.i18n("2464e9d13bfc84169eb8333b6996203c"),
+      innerArgs: ['path', 'value', 'index', 'fromPage', 'fromApp', '__valueInput', '__comboType', '__containerType'],
       descDetail: function (info) {
-        return React__default["default"].createElement("div", null, "\u8BBE\u7F6E", React__default["default"].createElement("span", {
+        var _a;
+        return React__default["default"].createElement("div", null, typeof ((_a = info === null || info === void 0 ? void 0 : info.args) === null || _a === void 0 ? void 0 : _a.path) === 'string' && !(info === null || info === void 0 ? void 0 : info.componentId) ? React__default["default"].createElement(React__default["default"].Fragment, null, "\u8BBE\u7F6E\u53D8\u91CF\u300C", React__default["default"].createElement("span", {
           className: "variable-left variable-right"
-        }, (info === null || info === void 0 ? void 0 : info.rendererLabel) || '-'), "\u7684\u6570\u636E");
+        }, variableManager.getNameByPath(info.args.path)), "\u300D\u7684\u6570\u636E") : React__default["default"].createElement(React__default["default"].Fragment, null, "\u8BBE\u7F6E\u7EC4\u4EF6\u300C", React__default["default"].createElement("span", {
+          className: "variable-left variable-right"
+        }, (info === null || info === void 0 ? void 0 : info.rendererLabel) || '-'), "\u300D\u7684\u6570\u636E"));
       },
       supportComponents: 'byComponent',
-      schema: tslib.__spreadArray(tslib.__spreadArray([], renderCmptActionSelect(i18nRuntime.i18n("6afde638796d237377b0755506d08ded"), true, function (value, oldVal, data, form) {
-        form.setValueByName('args.__containerType', 'all');
-        form.setValueByName('args.__comboType', 'all');
-      }), true), [getArgsWrapper({
-        type: 'wrapper',
-        className: 'p-none',
-        body: [{
-          type: 'radios',
-          name: '__containerType',
-          mode: 'horizontal',
-          label: i18nRuntime.i18n("e7af71fb102cc86ab3be6a2fb32b5e3f"),
-          pipeIn: amisEditorCore.defaultValue('all'),
-          visibleOn: "".concat(IS_DATA_CONTAINER),
-          options: [{
-            label: i18nRuntime.i18n("77b1081c177fa3334cc93c99f0ecee75"),
-            value: 'all'
-          }, {
-            label: i18nRuntime.i18n("f5c5e3d69daee06ea1606378ef466765"),
-            value: 'appoint'
-          }],
-          onChange: function (value, oldVal, data, form) {
-            form.setValueByName('value', []);
-            form.setValueByName('__valueInput', undefined);
-          }
-        }, {
-          type: 'radios',
-          name: '__comboType',
-          inputClassName: 'event-action-radio',
-          mode: 'horizontal',
-          label: i18nRuntime.i18n("e7af71fb102cc86ab3be6a2fb32b5e3f"),
-          pipeIn: amisEditorCore.defaultValue('all'),
-          visibleOn: "data.__rendererName === 'combo'",
-          options: [{
-            label: i18nRuntime.i18n("c60ad696dee4e1eeff6f0f2c2e9b9fc0"),
-            value: 'all'
-          }, {
-            label: i18nRuntime.i18n("139294edcce271bf483dda437c421c29"),
-            value: 'appoint'
-          }],
-          onChange: function (value, oldVal, data, form) {
-            form.setValueByName('index', undefined);
-            form.setValueByName('value', []);
-            form.setValueByName('__valueInput', undefined);
-          }
+      schema: [{
+        name: '__actionSubType',
+        type: 'radios',
+        label: i18nRuntime.i18n("6c6e12c54723170f214527bedaf81f7d"),
+        mode: 'horizontal',
+        options: [{
+          label: i18nRuntime.i18n("1b7e6b2dbf3b7f4b1baf2c42e49a995d"),
+          value: 'cmpt'
         }, {
-          type: 'input-number',
-          required: true,
-          name: 'index',
-          mode: 'horizontal',
-          label: i18nRuntime.i18n("a7b0b80a7bea1e5e973967c179866ef0"),
-          size: 'lg',
-          placeholder: i18nRuntime.i18n("e887792fbbd65d21e43e832a5cd63aac"),
-          visibleOn: "data.__comboType === 'appoint' && data.__rendererName === 'combo'"
+          label: i18nRuntime.i18n("cc6aeb073ebc3cb29734a49164f8964c"),
+          value: 'page'
         }, {
-          type: 'combo',
-          name: 'value',
-          label: '',
-          multiple: true,
-          removable: true,
-          required: true,
-          addable: true,
-          strictMode: false,
-          canAccessSuperData: true,
-          size: 'lg',
-          mode: 'horizontal',
-          items: [{
-            name: 'key',
-            type: 'input-text',
-            placeholder: i18nRuntime.i18n("a25657422b40023f2731619587940bc7"),
-            source: '${__setValueDs}',
-            labelField: 'label',
-            valueField: 'value',
-            required: true
-          },
-          /*
-          {
-            name: 'val',
-            type: 'input-formula',
-            placeholder: '字段值',
-            variables: '${variables}',
-            evalMode: false,
-            variableMode: 'tabs',
-            inputMode: 'input-group'
+          label: '内存变量',
+          value: 'app'
+        }],
+        value: '${args.fromApp ? "app" : args.fromPage ? "page" : "cmpt"}',
+        onChange: function (value, oldVal, data, form) {
+          form.setValueByName('__valueInput', undefined);
+          form.setValueByName('args.value', undefined);
+          form.deleteValueByName('args.path');
+          if (value === 'page') {
+            form.deleteValueByName('args.fromApp');
+            form.setValueByName('args.fromPage', true);
+          } else if (value === 'app') {
+            form.deleteValueByName('args.fromPage');
+            form.setValueByName('args.fromApp', true);
           }
-          */
-          {
-            name: 'val',
-            type: 'ae-formulaControl',
-            variables: '${variables}',
-            placeholder: i18nRuntime.i18n("a33903526e8fb3d1ac3066da70e7941e")
-          }],
-          visibleOn: "".concat(IS_DATA_CONTAINER, " && data.__containerType === 'appoint' || data.__comboType === 'appoint'")
-        }, {
-          type: 'combo',
-          name: 'value',
-          label: '',
-          multiple: true,
-          removable: true,
-          required: true,
-          addable: true,
-          strictMode: false,
-          canAccessSuperData: true,
-          mode: 'horizontal',
-          size: 'lg',
-          items: [{
+        }
+      },
+      // 组件变量
+      {
+        type: 'container',
+        visibleOn: '__actionSubType === "cmpt"',
+        body: tslib.__spreadArray(tslib.__spreadArray([], renderCmptActionSelect(i18nRuntime.i18n("6afde638796d237377b0755506d08ded"), true, function (value, oldVal, data, form) {
+          form.setValueByName('args.__containerType', 'all');
+          form.setValueByName('args.__comboType', 'all');
+        }), true), [getArgsWrapper({
+          type: 'wrapper',
+          className: 'p-none',
+          body: [{
+            type: 'radios',
+            name: '__containerType',
+            mode: 'horizontal',
+            label: i18nRuntime.i18n("e7af71fb102cc86ab3be6a2fb32b5e3f"),
+            pipeIn: amisEditorCore.defaultValue('all'),
+            visibleOn: "".concat(IS_DATA_CONTAINER),
+            options: [{
+              label: i18nRuntime.i18n("77b1081c177fa3334cc93c99f0ecee75"),
+              value: 'all'
+            }, {
+              label: i18nRuntime.i18n("f5c5e3d69daee06ea1606378ef466765"),
+              value: 'appoint'
+            }],
+            onChange: function (value, oldVal, data, form) {
+              form.setValueByName('value', []);
+              form.setValueByName('__valueInput', undefined);
+            }
+          }, {
+            type: 'radios',
+            name: '__comboType',
+            inputClassName: 'event-action-radio',
+            mode: 'horizontal',
+            label: i18nRuntime.i18n("e7af71fb102cc86ab3be6a2fb32b5e3f"),
+            pipeIn: amisEditorCore.defaultValue('all'),
+            visibleOn: "data.__rendererName === 'combo' || data.__rendererName === 'input-table'",
+            options: [{
+              label: i18nRuntime.i18n("c60ad696dee4e1eeff6f0f2c2e9b9fc0"),
+              value: 'all'
+            }, {
+              label: i18nRuntime.i18n("139294edcce271bf483dda437c421c29"),
+              value: 'appoint'
+            }],
+            onChange: function (value, oldVal, data, form) {
+              form.setValueByName('index', undefined);
+              form.setValueByName('value', []);
+              form.setValueByName('__valueInput', undefined);
+            }
+          }, {
+            type: 'input-number',
+            required: true,
+            name: 'index',
+            mode: 'horizontal',
+            label: i18nRuntime.i18n("a7b0b80a7bea1e5e973967c179866ef0"),
+            size: 'lg',
+            placeholder: i18nRuntime.i18n("e887792fbbd65d21e43e832a5cd63aac"),
+            visibleOn: "(data.__rendererName === 'input-table' || data.__rendererName === 'combo')\n                      && data.__comboType === 'appoint'"
+          }, {
             type: 'combo',
-            name: 'item',
-            label: false,
-            renderLabel: false,
+            name: 'value',
+            label: '',
             multiple: true,
             removable: true,
             required: true,
             addable: true,
             strictMode: false,
             canAccessSuperData: true,
-            className: 'm-l',
             size: 'lg',
             mode: 'horizontal',
             items: [{
               name: 'key',
               type: 'input-text',
+              placeholder: i18nRuntime.i18n("a25657422b40023f2731619587940bc7"),
               source: '${__setValueDs}',
               labelField: 'label',
               valueField: 'value',
-              required: true,
-              visibleOn: "data.__rendererName"
+              required: true
             },
             /*
             {
               name: 'val',
               type: 'input-formula',
+              placeholder: '字段值',
               variables: '${variables}',
               evalMode: false,
               variableMode: 'tabs',
@@ -1020,62 +1008,185 @@ var ACTION_TYPE_TREE = function (manager) {
             {
               name: 'val',
               type: 'ae-formulaControl',
-              variables: '${variables}'
-            }]
-          }],
-          visibleOn: "data.__rendererName === 'combo' && data.__comboType === 'all'"
-        },
-        /*
-        {
-          name: '__valueInput',
-          type: 'input-formula',
-          variables: '${variables}',
-          evalMode: false,
-          variableMode: 'tabs',
-          inputMode: 'input-group',
-          label: '',
-          size: 'lg',
-          mode: 'horizontal',
-          visibleOn: `(${IS_DATA_CONTAINER} || ${SHOW_SELECT_PROP}) && data.__containerType === 'all'`,
-          required: true
-        },
-        */
-        {
-          name: '__valueInput',
-          label: '',
-          type: 'ae-formulaControl',
-          variables: '${variables}',
-          size: 'lg',
-          mode: 'horizontal',
-          visibleOn: "(".concat(IS_DATA_CONTAINER, " || ").concat(SHOW_SELECT_PROP, ") && data.__containerType === 'all'"),
-          required: true
-        },,
-        /*
-        {
-          name: '__valueInput',
-          type: 'input-formula',
-          variables: '${variables}',
-          evalMode: false,
-          variableMode: 'tabs',
-          inputMode: 'input-group',
-          label: '数据设置',
-          size: 'lg',
-          mode: 'horizontal',
-          visibleOn: `data.__rendererName && !${IS_DATA_CONTAINER} && data.__rendererName !== 'combo'`,
-          required: true
-        }
-        */
-        {
-          name: '__valueInput',
-          label: i18nRuntime.i18n("e7af71fb102cc86ab3be6a2fb32b5e3f"),
-          type: 'ae-formulaControl',
-          variables: '${variables}',
-          size: 'lg',
-          mode: 'horizontal',
-          visibleOn: "data.__rendererName && !".concat(IS_DATA_CONTAINER, " && data.__rendererName !== 'combo'"),
-          required: true
-        }]
-      })], false)
+              variables: '${variables}',
+              placeholder: i18nRuntime.i18n("a33903526e8fb3d1ac3066da70e7941e")
+            }],
+            visibleOn: "".concat(IS_DATA_CONTAINER, " && data.__containerType === 'appoint' || data.__comboType === 'appoint'")
+          }, {
+            type: 'combo',
+            name: 'value',
+            label: '',
+            multiple: true,
+            removable: true,
+            required: true,
+            addable: true,
+            strictMode: false,
+            canAccessSuperData: true,
+            mode: 'horizontal',
+            size: 'lg',
+            items: [{
+              type: 'combo',
+              name: 'item',
+              label: false,
+              renderLabel: false,
+              multiple: true,
+              removable: true,
+              required: true,
+              addable: true,
+              strictMode: false,
+              canAccessSuperData: true,
+              className: 'm-l',
+              size: 'lg',
+              mode: 'horizontal',
+              items: [{
+                name: 'key',
+                type: 'input-text',
+                source: '${__setValueDs}',
+                labelField: 'label',
+                valueField: 'value',
+                required: true,
+                visibleOn: "data.__rendererName"
+              },
+              /*
+              {
+                name: 'val',
+                type: 'input-formula',
+                variables: '${variables}',
+                evalMode: false,
+                variableMode: 'tabs',
+                inputMode: 'input-group'
+              }
+              */
+              {
+                name: 'val',
+                type: 'ae-formulaControl',
+                variables: '${variables}'
+              }]
+            }],
+            visibleOn: "(data.__rendererName === 'combo' || data.__rendererName === 'input-table')\n                      && data.__comboType === 'all'"
+          },
+          /*
+          {
+            name: '__valueInput',
+            type: 'input-formula',
+            variables: '${variables}',
+            evalMode: false,
+            variableMode: 'tabs',
+            inputMode: 'input-group',
+            label: '',
+            size: 'lg',
+            mode: 'horizontal',
+            visibleOn: `(${IS_DATA_CONTAINER} || ${SHOW_SELECT_PROP}) && data.__containerType === 'all'`,
+            required: true
+          },
+          */
+          {
+            name: '__valueInput',
+            label: '',
+            type: 'ae-formulaControl',
+            variables: '${variables}',
+            size: 'lg',
+            mode: 'horizontal',
+            visibleOn: "(".concat(IS_DATA_CONTAINER, " || ").concat(SHOW_SELECT_PROP, ") && data.__containerType === 'all'"),
+            required: true
+          },,
+          /*
+          {
+            name: '__valueInput',
+            type: 'input-formula',
+            variables: '${variables}',
+            evalMode: false,
+            variableMode: 'tabs',
+            inputMode: 'input-group',
+            label: '数据设置',
+            size: 'lg',
+            mode: 'horizontal',
+            visibleOn: `data.__rendererName && !${IS_DATA_CONTAINER} && data.__rendererName !== 'combo'`,
+            required: true
+          }
+          */
+          {
+            name: '__valueInput',
+            label: i18nRuntime.i18n("e7af71fb102cc86ab3be6a2fb32b5e3f"),
+            type: 'ae-formulaControl',
+            variables: '${variables}',
+            size: 'lg',
+            mode: 'horizontal',
+            visibleOn: "data.__rendererName && !".concat(IS_DATA_CONTAINER, " && data.__rendererName !== 'combo' && data.__rendererName !== 'input-table'"),
+            required: true
+          }]
+        })], false)
+      },
+      // 页面变量
+      {
+        type: 'container',
+        visibleOn: '__actionSubType === "page"',
+        body: [getArgsWrapper([{
+          type: 'wrapper',
+          className: 'p-none',
+          body: [{
+            type: 'tree-select',
+            name: 'path',
+            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',
+            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")
+          }]
+        }])]
+      },
+      // 内存变量
+      {
+        type: 'container',
+        visibleOn: '__actionSubType === "app"',
+        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: '内存变量',
+            options: variableOptions
+          }, {
+            type: 'input-formula',
+            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")
+          }]
+        }])]
+      }]
     }, {
       actionLabel: i18nRuntime.i18n("4e34003861eee3de1e0c9c1222249bbb"),
       actionType: 'submit',
@@ -1432,7 +1543,7 @@ var COMMON_ACTION_SCHEMA_MAP = {
             variables: '${variables}'
           }]
         }],
-        visibleOn: "data.__rendererName === 'combo'"
+        visibleOn: "data.__rendererName === 'combo' || data.__rendererName === 'input-table'"
       },
       /*
       {
@@ -1456,7 +1567,7 @@ var COMMON_ACTION_SCHEMA_MAP = {
         variables: '${variables}',
         size: 'lg',
         mode: 'horizontal',
-        visibleOn: "!".concat(IS_DATA_CONTAINER, " && data.__rendererName !== 'combo'"),
+        visibleOn: "!".concat(IS_DATA_CONTAINER, " && data.__rendererName !== 'combo' && data.__rendererName !== 'input-table'"),
         required: true
       }]
     })
@@ -1722,7 +1833,7 @@ var getOldActionSchema = function (manager, context) {
             name: 'dialog',
             pipeIn: amisEditorCore.defaultValue({
               title: i18nRuntime.i18n("8a089992349df754f182a5d02de8e8e0"),
-              body: i18nRuntime.i18n("b680997c50ca749acd4e6075cdca244e"),
+              body: i18nRuntime.i18n("1a9aaf05889002e65708c4950012a652"),
               showCloseButton: true,
               showErrorMsg: true,
               showLoading: true
@@ -1755,7 +1866,7 @@ var getOldActionSchema = function (manager, context) {
             name: 'drawer',
             pipeIn: amisEditorCore.defaultValue({
               title: i18nRuntime.i18n("8a089992349df754f182a5d02de8e8e0"),
-              body: i18nRuntime.i18n("b680997c50ca749acd4e6075cdca244e")
+              body: i18nRuntime.i18n("1a9aaf05889002e65708c4950012a652")
             }),
             asFormItem: true,
             children: function (_a) {
@@ -1787,7 +1898,7 @@ var getOldActionSchema = function (manager, context) {
             name: 'feedback',
             pipeIn: amisEditorCore.defaultValue({
               title: i18nRuntime.i18n("8a089992349df754f182a5d02de8e8e0"),
-              body: i18nRuntime.i18n("84d38979bed546b93c4b3a399844419e")
+              body: i18nRuntime.i18n("2d711b09bd0db0ad240cc83b30dd8014")
             }),
             asFormItem: true,
             children: function (_a) {
@@ -2022,9 +2133,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, _r, _s, _t;
-        return tslib.__generator(this, function (_u) {
-          switch (_u.label) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+        return tslib.__generator(this, function (_w) {
+          switch (_w.label) {
             case 0:
               config = tslib.__assign({}, action);
               if (['link', 'url'].includes(action.actionType) && ((_a = action.args) === null || _a === void 0 ? void 0 : _a.params)) {
@@ -2051,10 +2162,13 @@ var getEventControlConfig = function (manager, context) {
                   if (action.args.index !== undefined) {
                     config.args['__comboType'] = 'appoint';
                   }
-                } else if (action.actionType === 'setValue' && typeof ((_h = action.args) === null || _h === void 0 ? void 0 : _h.value) === 'string') {
+                } else if (action.actionType === 'setValue' && typeof ((_h = action.args) === null || _h === void 0 ? void 0 : _h.path) === 'string' && typeof ((_j = action.args) === null || _j === void 0 ? void 0 : _j.value) === 'string') {
+                  /** 应用变量赋值 */
+                  config.args['__containerType'] = 'all';
+                } else if (action.actionType === 'setValue' && typeof ((_k = action.args) === null || _k === void 0 ? void 0 : _k.value) === 'string') {
                   config.args['__containerType'] = 'all';
                   config.args['__valueInput'] = config.args['value'];
-                  (_j = config.args) === null || _j === void 0 ? true : delete _j.value;
+                  (_l = config.args) === null || _l === void 0 ? true : delete _l.value;
                 }
               }
               if (['show', 'hidden', 'enabled', 'disabled'].includes(action.actionType)) {
@@ -2064,15 +2178,15 @@ var getEventControlConfig = function (manager, context) {
               }
               if (['usability', 'visibility'].includes(action.actionType)) {
                 // 初始化条件参数
-                config.__actionExpression = (_k = action.args) === null || _k === void 0 ? void 0 : _k.value;
+                config.__actionExpression = (_m = action.args) === null || _m === void 0 ? void 0 : _m.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);
+              if (action.actionType === 'ajax' && typeof ((_o = action === null || action === void 0 ? void 0 : action.args) === null || _o === void 0 ? void 0 : _o.api) === 'string') {
+                action.args.api = amisCore.normalizeApi((_p = action === null || action === void 0 ? void 0 : action.args) === null || _p === void 0 ? void 0 : _p.api);
               }
               innerArgs = getPropOfAcion(action, 'innerArgs', actionTree, manager.pluginActions, commonActions);
               // 处理刷新组件动作的追加参数
               if (config.actionType === 'reload') {
-                config.__resetPage = (_o = config.args) === null || _o === void 0 ? void 0 : _o.resetPage;
+                config.__resetPage = (_q = config.args) === null || _q === void 0 ? void 0 : _q.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) {
@@ -2094,9 +2208,9 @@ var getEventControlConfig = function (manager, context) {
               }
               delete config.data;
               // 处理下 combo - addItem 的初始化
-              if (action.actionType === 'addItem' && typeof ((_p = action.args) === null || _p === void 0 ? void 0 : _p.item) === 'object') {
+              if (action.actionType === 'addItem' && typeof ((_r = action.args) === null || _r === void 0 ? void 0 : _r.item) === 'object') {
                 config.args = tslib.__assign(tslib.__assign({}, config.args), {
-                  item: objectToComboArray((_q = action.args) === null || _q === void 0 ? void 0 : _q.item)
+                  item: objectToComboArray((_s = action.args) === null || _s === void 0 ? void 0 : _s.item)
                 });
               }
               // 还原args为可视化配置结构(args + addOnArgs)
@@ -2122,14 +2236,14 @@ var getEventControlConfig = function (manager, context) {
               }
               hasSubActionNode = findSubActionNode(actionTree, action.actionType);
               datasource = [];
-              if (!((_r = action.args) === null || _r === void 0 ? void 0 : _r.componentId)) return [3 /*break*/, 2];
-              schema = (_s = manager === null || manager === void 0 ? void 0 : manager.store) === null || _s === void 0 ? void 0 : _s.getSchema((_t = action.args) === null || _t === void 0 ? void 0 : _t.componentId, 'id');
+              if (!((_t = action.args) === null || _t === void 0 ? void 0 : _t.componentId)) return [3 /*break*/, 2];
+              schema = (_u = manager === null || manager === void 0 ? void 0 : manager.store) === null || _u === void 0 ? void 0 : _u.getSchema((_v = action.args) === null || _v === void 0 ? void 0 : _v.componentId, 'id');
               return [4 /*yield*/, manager.getContextSchemas(schema === null || schema === void 0 ? void 0 : schema.$$id, true)];
             case 1:
-              dataSchema = _u.sent();
+              dataSchema = _w.sent();
               dataSchemaIns = new amisCore.DataSchema(dataSchema || []);
               datasource = (dataSchemaIns === null || dataSchemaIns === void 0 ? void 0 : dataSchemaIns.getDataPropsAsOptions()) || [];
-              _u.label = 2;
+              _w.label = 2;
             case 2:
               return [2 /*return*/, tslib.__assign(tslib.__assign({}, config), {
                 actionType: getActionType(action, hasSubActionNode),
@@ -2145,7 +2259,7 @@ var getEventControlConfig = function (manager, context) {
       });
     },
     actionConfigSubmitFormatter: function (config) {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
       var action = tslib.__assign(tslib.__assign({}, config), {
         groupType: undefined
       });
@@ -2197,36 +2311,49 @@ var getEventControlConfig = function (manager, context) {
       }
       // 转换下格式
       if (action.actionType === 'setValue') {
-        if (((_d = config.args) === null || _d === void 0 ? void 0 : _d.__valueInput) !== undefined) {
+        if ((_d = config.args) === null || _d === void 0 ? void 0 : _d.hasOwnProperty('path')) {
+          /** 应用变量赋值 */
           action.args = {
-            value: (_e = config.args) === null || _e === void 0 ? void 0 : _e.__valueInput
+            path: config.args.path,
+            value: (_f = (_e = config.args) === null || _e === void 0 ? void 0 : _e.value) !== null && _f !== void 0 ? _f : '',
+            fromPage: (_g = action.args) === null || _g === void 0 ? void 0 : _g.fromPage,
+            fromApp: (_h = action.args) === null || _h === void 0 ? void 0 : _h.fromApp
           };
-        } 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.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.hasOwnProperty('componentId') && delete action.componentId;
+          return action;
+        } else {
+          ((_j = action === null || action === void 0 ? void 0 : action.args) === null || _j === void 0 ? void 0 : _j.hasOwnProperty('path')) && delete action.args.path;
+          if (((_k = config.args) === null || _k === void 0 ? void 0 : _k.__valueInput) !== undefined) {
+            action.args = {
+              value: (_l = config.args) === null || _l === void 0 ? void 0 : _l.__valueInput
+            };
+          } else if (Array.isArray((_m = config.args) === null || _m === void 0 ? void 0 : _m.value)) {
+            action.args = (_o = action.args) !== null && _o !== void 0 ? _o : {};
+            if ((action.__rendererName === 'combo' || action.__rendererName === 'input-table') && ((_p = action.args) === null || _p === void 0 ? void 0 : _p.index) === undefined) {
+              // combo、input-table特殊处理
+              var tempArr_1 = [];
+              (_q = config.args) === null || _q === void 0 ? void 0 : _q.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), {
-              value: tempArr_1
-            });
-          } else {
-            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), {
+                value: tempArr_1
+              });
+            } else {
+              action.args = tslib.__assign(tslib.__assign({}, action.args), {
+                value: comboArrayToObject((_r = config.args) === null || _r === void 0 ? void 0 : _r.value)
+              });
+            }
           }
         }
       }
       if (action.actionType === 'addItem' && action.__rendererName === 'combo') {
         action.args = tslib.__assign(tslib.__assign({}, action.args), {
-          item: comboArrayToObject((_l = config.args) === null || _l === void 0 ? void 0 : _l.item)
+          item: comboArrayToObject((_s = config.args) === null || _s === void 0 ? void 0 : _s.item)
         });
       }
       // 转换下格式