amis-editor 5.3.0 → 5.4.0

package/esm/renderer/FlexSettingControl.js

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

package/esm/renderer/FormulaControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 
@@ -253,16 +253,18 @@ var FormulaControl = /** @class */function (_super) {
   };
   // 剔除掉一些用不上的属性
   FormulaControl.prototype.filterCustomRendererProps = function (rendererSchema) {
-    var _a, _b, _c;
-    var _d = this.props,
-      data = _d.data,
-      name = _d.name,
-      placeholder = _d.placeholder;
+    var _a;
+    var _b = this.props,
+      data = _b.data,
+      name = _b.name,
+      placeholder = _b.placeholder;
     var curRendererSchema = null;
     if (rendererSchema) {
-      curRendererSchema = Object.assign({}, rendererSchema, data, {
+      curRendererSchema = Object.assign({}, rendererSchema, {
         type: (_a = rendererSchema.type) !== null && _a !== void 0 ? _a : data.type,
-        name: (_c = (_b = rendererSchema.name) !== null && _b !== void 0 ? _b : data.name) !== null && _c !== void 0 ? _c : 'value'
+        // 目前表单项 wrapControl 还必须依赖一个 name
+        // 所以这里先随便取个名字，这里渲染的时候应该是 value 控制，而不是关联 name
+        name: 'FORMULA_CONTROL_PLACEHOLDER'
       });
       // 默认要剔除的字段
       var deleteProps = ['label', 'id', '$$id', 'className', 'style', 'readOnly', 'horizontal', 'size', 'remark', 'labelRemark', 'static', 'staticOn', 'hidden', 'hiddenOn', 'visible', 'visibleOn', 'disabled', 'disabledOn', 'required', 'requiredOn', 'className', 'labelClassName', 'labelAlign', 'inputClassName', 'description', 'autoUpdate', 'prefix', 'suffix', 'unitOptions', 'keyboard', 'kilobitSeparator', 'value', 'inputControlClassName', 'css', 'validateApi', 'themeCss'];
@@ -314,29 +316,27 @@ var FormulaControl = /** @class */function (_super) {
   FormulaControl.prototype.render = function () {
     var _a;
     var _this = this;
-    var _b, _c, _d;
-    var _e = this.props,
-      className = _e.className;
-      _e.label;
-      var value = _e.value,
-      header = _e.header,
-      placeholder = _e.placeholder,
-      simple = _e.simple,
-      rendererSchema = _e.rendererSchema,
-      rendererWrapper = _e.rendererWrapper,
-      manager = _e.manager,
-      _f = _e.useExternalFormData,
-      useExternalFormData = _f === void 0 ? false : _f,
-      customFormulaPicker = _e.customFormulaPicker;
-      _e.clearable;
-      var render = _e.render,
-      rest = __rest(_e, ["className", "label", "value", "header", "placeholder", "simple", "rendererSchema", "rendererWrapper", "manager", "useExternalFormData", "customFormulaPicker", "clearable", "render"]);
-    var _h = this.state,
-      formulaPickerOpen = _h.formulaPickerOpen,
-      variables = _h.variables,
-      variableMode = _h.variableMode;
-    // 自身字段
-    (_c = (_b = this.props) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.name;
+    var _b;
+    var _c = this.props,
+      className = _c.className;
+      _c.label;
+      var value = _c.value,
+      header = _c.header,
+      placeholder = _c.placeholder,
+      simple = _c.simple,
+      rendererSchema = _c.rendererSchema,
+      rendererWrapper = _c.rendererWrapper,
+      manager = _c.manager,
+      _d = _c.useExternalFormData,
+      useExternalFormData = _d === void 0 ? false : _d,
+      customFormulaPicker = _c.customFormulaPicker;
+      _c.clearable;
+      var render = _c.render,
+      rest = __rest(_c, ["className", "label", "value", "header", "placeholder", "simple", "rendererSchema", "rendererWrapper", "manager", "useExternalFormData", "customFormulaPicker", "clearable", "render"]);
+    var _f = this.state,
+      formulaPickerOpen = _f.formulaPickerOpen,
+      variables = _f.variables,
+      variableMode = _f.variableMode;
     // 判断是否含有公式表达式
     var isExpr = isExpression(value);
     // 判断当前是否有循环引用，备注：非精准识别，待优化
@@ -431,7 +431,7 @@ var FormulaControl = /** @class */function (_super) {
       initable: true,
       header: header,
       variables: variables,
-      variableMode: (_d = rest.variableMode) !== null && _d !== void 0 ? _d : variableMode,
+      variableMode: (_b = rest.variableMode) !== null && _b !== void 0 ? _b : variableMode,
       evalMode: true,
       onClose: this.closeFormulaPicker,
       onConfirm: this.handleConfirm

package/esm/renderer/GoConfigControl.js

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

package/esm/renderer/MapSourceControl.js

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

package/esm/renderer/NavBadgeControl.js

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

package/esm/renderer/NavDefaultActive.js

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

package/esm/renderer/NavSourceControl.js

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

package/esm/renderer/OptionControl.js

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

package/esm/renderer/RangePartsControl.js

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

package/esm/renderer/StatusControl.js

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

package/esm/renderer/SwitchMoreControl.js

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

package/esm/renderer/TimelineItemControl.js

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

package/esm/renderer/TplFormulaControl.js

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

package/esm/renderer/TransferTableControl.js

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

package/esm/renderer/TreeOptionControl.js

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

package/esm/renderer/ValidationControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 
@@ -294,7 +294,7 @@ var ValidationControl = /** @class */function (_super) {
       onBulkChange = _a.onBulkChange,
       render = _a.render;
     return React__default.createElement("div", {
-      className: 'ae-ValidationControl-item'
+      className: "ae-ValidationControl-item"
     }, render('validate-api-control', {
       type: 'form',
       wrapWithPanel: false,

package/esm/renderer/ValidationItem.js

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

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 
@@ -86,11 +86,14 @@ var ActionDialog = /** @class */function (_super) {
           groupType = 'enabled';
         }
         var actionNode = findActionNode(actionTree, value);
-        form.setValues(__assign(__assign({}, removeKeys), {
+        form.setValues(__assign(__assign(__assign(__assign({}, removeKeys), {
           __keywords: form.data.__keywords,
           __resultActionTree: form.data.__resultActionTree,
-          componentId: form.data.componentId ? '' : undefined,
-          args: {},
+          componentId: form.data.componentId ? '' : undefined
+        }), form.data.args ? {
+          args: {}
+        } : {}), {
+          // 切换动作时清空args
           groupType: groupType,
           __actionDesc: actionNode === null || actionNode === void 0 ? void 0 : actionNode.description,
           __actionSchema: actionNode === null || actionNode === void 0 ? void 0 : actionNode.schema,

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

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

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

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

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 
@@ -347,29 +347,41 @@ var ACTION_TYPE_TREE = function (manager) {
           }, i18n('a532be3ad5f3fda70d228b8542e81835'));
         }
       }, {
-        name: 'confirmDialog',
-        type: 'container',
+        name: 'args',
+        label: i18n("507c1d40c5d6b990cf8c832b0a91cadb"),
+        mode: 'horizontal',
+        required: true,
+        pipeIn: defaultValue({
+          title: i18n("8a089992349df754f182a5d02de8e8e0"),
+          confirmText: i18n("e83a256e4f5bb4ff8b3d804b5473217a"),
+          cancelText: i18n("625fb26b4b3340f7872b411f401e754c"),
+          confirmBtnLevel: 'primary',
+          body: i18n("1a9aaf05889002e65708c4950012a652"),
+          dialogType: 'confirm'
+        }),
+        asFormItem: true,
         visibleOn: 'data.groupType === "confirmDialog"',
-        body: [getArgsWrapper({
-          type: 'wrapper',
-          className: 'p-none',
-          body: [{
-            name: 'msg',
-            label: i18n("b87b77561e776367e6756e11ea652217"),
-            type: 'ae-textareaFormulaControl',
-            mode: 'horizontal',
-            variables: '${variables}',
-            size: 'lg',
-            required: true
-          }, {
-            name: 'title',
-            label: i18n("43ab9af06e1e0f0b2a8767b46cf8b1cf"),
-            type: 'ae-textareaFormulaControl',
-            variables: '${variables}',
-            mode: 'horizontal',
-            size: 'lg'
-          }]
-        })]
+        children: function (_a) {
+          var value = _a.value,
+            onChange = _a.onChange;
+            _a.data;
+          return React__default.createElement(Button, {
+            size: "sm",
+            className: "action-btn-width",
+            onClick: function () {
+              return manager.openSubEditor({
+                title: i18n("c3c8422fcecd8c1cc922cba15ab5cbc0"),
+                value: __assign({
+                  type: 'dialog'
+                }, value),
+                onChange: function (value) {
+                  return onChange(value);
+                }
+              });
+            },
+            block: true
+          }, i18n('a532be3ad5f3fda70d228b8542e81835'));
+        }
       }]
     }, {
       actionLabel: i18n("3b02248ca3790e356e47b6900c0e3931"),
@@ -2190,10 +2202,10 @@ var getEventControlConfig = function (manager, context) {
     },
     actionConfigInitFormatter: function (action, variables) {
       return __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, _u, _v;
-        return __generator(this, function (_w) {
-          switch (_w.label) {
+        var config, innerArgs, comboArray, 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, _u, _v, _w;
+        return __generator(this, function (_x) {
+          switch (_x.label) {
             case 0:
               config = __assign({}, action);
               if (['link', 'url'].includes(action.actionType) && ((_a = action.args) === null || _a === void 0 ? void 0 : _a.params)) {
@@ -2265,11 +2277,24 @@ var getEventControlConfig = function (manager, context) {
                 }
               }
               delete config.data;
-              // 处理下 combo - addItem 的初始化
-              if (action.actionType === 'addItem' && typeof ((_r = action.args) === null || _r === void 0 ? void 0 : _r.item) === 'object') {
-                config.args = __assign(__assign({}, config.args), {
-                  item: objectToComboArray((_s = action.args) === null || _s === void 0 ? void 0 : _s.item)
-                });
+              // 处理下 addItem 的初始化
+              if (action.actionType === 'addItem') {
+                if (Array.isArray((_r = action.args) === null || _r === void 0 ? void 0 : _r.item)) {
+                  comboArray = (((_s = action.args) === null || _s === void 0 ? void 0 : _s.item) || []).map(function (raw) {
+                    return objectToComboArray(raw);
+                  });
+                  config.args = __assign(__assign({}, config.args), {
+                    value: comboArray.map(function (combo) {
+                      return {
+                        item: combo
+                      };
+                    })
+                  });
+                } else {
+                  config.args = __assign(__assign({}, config.args), {
+                    item: objectToComboArray((_t = action.args) === null || _t === void 0 ? void 0 : _t.item)
+                  });
+                }
               }
               // 还原args为可视化配置结构(args + addOnArgs)
               if (config.args) {
@@ -2294,14 +2319,14 @@ var getEventControlConfig = function (manager, context) {
               }
               hasSubActionNode = findSubActionNode(actionTree, action.actionType);
               datasource = [];
-              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');
+              if (!((_u = action.args) === null || _u === void 0 ? void 0 : _u.componentId)) return [3 /*break*/, 2];
+              schema = (_v = manager === null || manager === void 0 ? void 0 : manager.store) === null || _v === void 0 ? void 0 : _v.getSchema((_w = action.args) === null || _w === void 0 ? void 0 : _w.componentId, 'id');
               return [4 /*yield*/, manager.getContextSchemas(schema === null || schema === void 0 ? void 0 : schema.$$id, true)];
             case 1:
-              dataSchema = _w.sent();
+              dataSchema = _x.sent();
               dataSchemaIns = new DataSchema(dataSchema || []);
               datasource = (dataSchemaIns === null || dataSchemaIns === void 0 ? void 0 : dataSchemaIns.getDataPropsAsOptions()) || [];
-              _w.label = 2;
+              _x.label = 2;
             case 2:
               return [2 /*return*/, __assign(__assign({}, config), {
                 actionType: getActionType(action, hasSubActionNode),
@@ -2317,7 +2342,7 @@ var getEventControlConfig = function (manager, context) {
       });
     },
     actionConfigSubmitFormatter: function (config) {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
       var action = __assign(__assign({}, config), {
         groupType: undefined
       });
@@ -2420,6 +2445,17 @@ var getEventControlConfig = function (manager, context) {
           item: comboArrayToObject((_s = config.args) === null || _s === void 0 ? void 0 : _s.item)
         });
       }
+      if (action.actionType === 'addItem' && action.__rendererName === 'input-table') {
+        var comboArray = (((_t = config.args) === null || _t === void 0 ? void 0 : _t.value) || []).map(function (combo) {
+          return combo.item || {};
+        });
+        action.args = __assign(__assign({}, action.args), {
+          item: comboArray.map(function (raw) {
+            return comboArrayToObject(raw);
+          })
+        });
+        (_u = action.args) === null || _u === void 0 ? true : delete _u.value;
+      }
       // 转换下格式
       if (['visibility', 'usability'].includes(config.actionType)) {
         action.args = action.actionType !== 'static' ? {

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 
@@ -709,7 +709,7 @@ var EventControl = /** @class */function (_super) {
       })) : null);
     }) : React__default.createElement("div", {
       className: "ae-event-control-placeholder"
-    }, i18n('4db5110d41293fef57f5a1f364187896'))), showEventDialog ? render({
+    }, i18n('快去添加事件，让你的产品动起来吧'))), showEventDialog ? render({
       type: 'dialog',
       title: "".concat(eventDialogData === null || eventDialogData === void 0 ? void 0 : eventDialogData.eventLabel, "-\u4E8B\u4EF6\u914D\u7F6E"),
       showCloseButton: false,

package/esm/renderer/style-control/Background.js

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

package/esm/renderer/style-control/Border.js

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

package/esm/renderer/style-control/BoxModel.js

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

package/esm/renderer/style-control/BoxShadow.js

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

package/esm/renderer/style-control/Display.js

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

package/esm/renderer/style-control/Font.js

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

package/esm/renderer/style-control/InsetBoxModel.js

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

package/esm/renderer/style-control/ThemeCssCode.js

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

package/esm/renderer/style-control/font-family.js

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

package/esm/renderer/style-control/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 
@@ -42,6 +42,7 @@ var inputStateFunc = function (visibleOn, state, className, path, options) {
     name: "".concat(className, ".background:").concat(state),
     labelMode: 'input',
     needGradient: true,
+    needImage: true,
     visibleOn: visibleOn,
     editorThemePath: "".concat(path, ".").concat(state, ".body.bg-color")
   }), getSchemaTpl('theme:border', {

package/esm/renderer/style-control/themeLanguage.js

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

package/esm/renderer/style-control/transformation.js

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

package/esm/renderer/textarea-formula/FormulaPicker.js

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

package/esm/renderer/textarea-formula/TextareaFormulaControl.js

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

package/esm/renderer/textarea-formula/plugin.js

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

package/esm/renderer/textarea-formula/utils.js

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

package/esm/tpl/api.js

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

package/esm/tpl/common.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.3.0
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 
@@ -919,15 +919,6 @@ setSchemaTpl('nav-badge', {
 setSchemaTpl('nav-default-active', {
   type: 'ae-nav-default-active'
 });
-// 暂未使用
-setSchemaTpl('formulaControl', function (schema) {
-  if (schema === void 0) {
-    schema = {};
-  }
-  return __assign({
-    type: 'ae-formulaControl'
-  }, schema);
-});
 /**
  * 日期范围快捷键组件
  */
@@ -936,7 +927,8 @@ setSchemaTpl('dateShortCutControl', function (schema) {
     schema = {};
   }
   return __assign({
-    type: 'ae-DateShortCutControl'
+    type: 'ae-DateShortCutControl',
+    name: 'shortcuts'
   }, schema);
 });
 setSchemaTpl('eventControl', function (schema) {

package/esm/tpl/horizontal.js

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