amis-editor 5.2.3-beta.16 → 5.2.4-beta.28

package/esm/renderer/TreeOptionControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 
@@ -10,8 +10,8 @@ import cloneDeep from 'lodash/cloneDeep';
 import get from 'lodash/get';
 import set from 'lodash/set';
 import Sortable from 'sortablejs';
-import { toast, Icon, InputBox, Button, Modal, FormItem } from 'amis';
-import { getSchemaTpl, tipedLabel, autobind } from 'amis-editor-core';
+import { toast, Icon, render, InputBox, Button, Modal, FormItem } from 'amis';
+import { getI18nEnabled, getSchemaTpl, tipedLabel, autobind } from 'amis-editor-core';
 import { i18n } from 'i18n-runtime';
 
 /**
@@ -351,7 +351,8 @@ var TreeOptionControl = /** @class */function (_super) {
     writable: true,
     value: function (option, key, indexes) {
       var _this = this;
-      var render = this.props.render;
+      var render$1 = this.props.render;
+      var i18nEnabled = getI18nEnabled();
       var path = indexes.join('-');
       if (option.children && option.children.length) {
         var parent_1 = cloneDeep(option);
@@ -376,15 +377,19 @@ var TreeOptionControl = /** @class */function (_super) {
       }, React__default.createElement(Icon, {
         icon: "drag-bar",
         className: "icon"
-      })), React__default.createElement(InputBox, {
-        className: "ae-TreeOptionControlItem-input-label",
+      })), render({
+        type: i18nEnabled ? 'input-text-i18n' : 'input-text',
+        className: 'ae-TreeOptionControlItem-input-label',
         value: option.label,
-        placeholder: "\u9009\u9879\u540D\u79F0",
+        placeholder: i18n("f69608e93e9728f4fbef583bfa1326c1"),
         clearable: false,
         onBlur: function (event) {
           // 这里使用onBlur替代onChange 减少渲染次数
           _this.handleEditLabelOrValue(event.target.value, path, 'label');
-        }
+        },
+        onI18nChange: i18nEnabled ? function (value) {
+          _this.handleEditLabelOrValue(value, path, 'label');
+        } : undefined
       }), React__default.createElement(InputBox, {
         className: "ae-TreeOptionControlItem-input-value",
         value: option.value,
@@ -395,7 +400,7 @@ var TreeOptionControl = /** @class */function (_super) {
         }
       }), React__default.createElement("div", {
         className: "ae-TreeOptionControlItem-btns"
-      }, render('dropdown', {
+      }, render$1('dropdown', {
         type: 'dropdown-button',
         className: 'ae-TreeOptionControlItem-dropdown fa-sm',
         btnClassName: 'px-2',

package/esm/renderer/ValidationControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/ValidationItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 
@@ -7,8 +7,7 @@ import { __extends, __assign, __decorate, __metadata } from 'tslib';
 import React__default from 'react';
 import cx from 'classnames';
 import { Button, render, Switch } from 'amis';
-import { tipedLabel, autobind } from 'amis-editor-core';
-import { getEnv } from 'mobx-state-tree';
+import { getI18nEnabled, tipedLabel, autobind } from 'amis-editor-core';
 import { i18n } from 'i18n-runtime';
 
 /**
@@ -114,7 +113,7 @@ var ValidationItem = /** @class */function (_super) {
         value = _a.value,
         message = _a.message,
         checked = _a.checked;
-      var i18nEnabled = getEnv(window.editorStore).i18nEnabled;
+      var i18nEnabled = getI18nEnabled();
       var control = [];
       if (!checked) {
         return null;

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 

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

@@ -1,12 +1,12 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 
 import { __spreadArray, __assign, __awaiter, __generator } from 'tslib';
 import React__default from 'react';
 import { defaultValue, getSchemaTpl, tipedLabel } from 'amis-editor-core';
-import { findTree, mapTree, filterTree, DataSchema, normalizeApi } from 'amis-core';
+import { findTree, filterTree, DataSchema, normalizeApi } from 'amis-core';
 import { Button } from 'amis';
 import { i18n } from 'i18n-runtime';
 import without from 'lodash/without';
@@ -1925,32 +1925,13 @@ var comboArrayToObject = function (arr) {
  * 获取事件动作面板所需属性配置
  */
 var getEventControlConfig = function (manager, context) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e;
   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(ACTION_TYPE_TREE(manager)) : ACTION_TYPE_TREE(manager);
-  var allComponents = 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,
-      label: cmptLabel,
-      value: (_c = schema === null || schema === void 0 ? void 0 : schema.id) !== null && _c !== void 0 ? _c : item.id,
-      type: (_d = schema === null || schema === void 0 ? void 0 : schema.type) !== null && _d !== void 0 ? _d : item.type,
-      schema: schema,
-      disabled: !!item.region,
-      children: item === null || item === void 0 ? void 0 : item.children
-    };
-  }, 1, true);
+  var allComponents = (_e = manager === null || manager === void 0 ? void 0 : manager.store) === null || _e === void 0 ? void 0 : _e.getComponentTreeSource();
   var checkComponent = function (node, action) {
     var _a;
     var actionType = action.actionType;
@@ -2006,17 +1987,25 @@ var getEventControlConfig = function (manager, context) {
       });
     },
     getComponents: function (action) {
-      var components = allComponents;
+      var _a;
+      var components = (_a = manager === null || manager === void 0 ? void 0 : manager.store) === null || _a === void 0 ? void 0 : _a.getComponentTreeSource();
+      var finalCmpts = [];
       if (isSubEditor) {
-        var superTree = manager.store.getSuperEditorData;
-        while (superTree) {
-          if (superTree.__superCmptTreeSource) {
-            components = components.concat(superTree.__superCmptTreeSource);
+        var editorData = manager.store.getSuperEditorData;
+        while (components) {
+          if (editorData === null || editorData === void 0 ? void 0 : editorData.__curCmptTreeWrap) {
+            components = [__assign(__assign({}, editorData.__curCmptTreeWrap), {
+              children: components
+            })];
           }
-          superTree = superTree.__super;
+          finalCmpts = __spreadArray(__spreadArray([], finalCmpts, true), components, true);
+          components = editorData === null || editorData === void 0 ? void 0 : editorData.__superCmptTreeSource;
+          editorData = editorData === null || editorData === void 0 ? void 0 : editorData.__super;
         }
+      } else {
+        finalCmpts = components;
       }
-      var result = filterTree(components, function (node) {
+      var result = filterTree(finalCmpts, function (node) {
         return checkComponent(node, action);
       }, 1, true);
       return result;
@@ -2024,9 +2013,9 @@ 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;
-        return __generator(this, function (_s) {
-          switch (_s.label) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+        return __generator(this, function (_u) {
+          switch (_u.label) {
             case 0:
               config = __assign({}, action);
               if (['link', 'url'].includes(action.actionType) && ((_a = action.args) === null || _a === void 0 ? void 0 : _a.params)) {
@@ -2095,6 +2084,12 @@ 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') {
+                config.args = __assign(__assign({}, config.args), {
+                  item: objectToComboArray((_q = action.args) === null || _q === void 0 ? void 0 : _q.item)
+                });
+              }
               // 还原args为可视化配置结构(args + addOnArgs)
               if (config.args) {
                 if (innerArgs) {
@@ -2118,14 +2113,14 @@ var getEventControlConfig = function (manager, context) {
               }
               hasSubActionNode = findSubActionNode(actionTree, action.actionType);
               datasource = [];
-              if (!((_p = action.args) === null || _p === void 0 ? void 0 : _p.componentId)) return [3 /*break*/, 2];
-              schema = (_q = manager === null || manager === void 0 ? void 0 : manager.store) === null || _q === void 0 ? void 0 : _q.getSchema((_r = action.args) === null || _r === void 0 ? void 0 : _r.componentId, 'id');
+              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');
               return [4 /*yield*/, manager.getContextSchemas(schema === null || schema === void 0 ? void 0 : schema.$$id, true)];
             case 1:
-              dataSchema = _s.sent();
+              dataSchema = _u.sent();
               dataSchemaIns = new DataSchema(dataSchema || []);
               datasource = (dataSchemaIns === null || dataSchemaIns === void 0 ? void 0 : dataSchemaIns.getDataPropsAsOptions()) || [];
-              _s.label = 2;
+              _u.label = 2;
             case 2:
               return [2 /*return*/, __assign(__assign({}, config), {
                 actionType: getActionType(action, hasSubActionNode),
@@ -2141,7 +2136,7 @@ var getEventControlConfig = function (manager, context) {
       });
     },
     actionConfigSubmitFormatter: function (config) {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
       var action = __assign(__assign({}, config), {
         groupType: undefined
       });
@@ -2220,6 +2215,11 @@ var getEventControlConfig = function (manager, context) {
           }
         }
       }
+      if (action.actionType === 'addItem' && action.__rendererName === 'combo') {
+        action.args = __assign(__assign({}, action.args), {
+          item: comboArrayToObject((_l = config.args) === null || _l === void 0 ? void 0 : _l.item)
+        });
+      }
       // 转换下格式
       if (['visibility', 'usability'].includes(config.actionType)) {
         action.args = action.actionType !== 'static' ? {

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

@@ -61,6 +61,7 @@ interface EventControlState {
         __setValueDs?: any[];
     } | undefined;
     type: 'update' | 'add';
+    appLocaleState?: number;
 }
 export declare class EventControl extends React.Component<EventControlProps, EventControlState> {
     target: HTMLElement | null;
@@ -68,7 +69,10 @@ export declare class EventControl extends React.Component<EventControlProps, Eve
         [prop: string]: Sortable;
     };
     drag?: HTMLElement | null;
+    unReaction: any;
     constructor(props: EventControlProps);
+    componentDidMount(): void;
+    componentWillUnmount(): void;
     componentDidUpdate(prevProps: EventControlProps, prevState: EventControlState): void;
     generateEmptyDefault(events: RendererPluginEvent[]): ActionEventConfig;
     addEvent(event: RendererPluginEvent, disabled: boolean): void;

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 
@@ -15,6 +15,7 @@ import ActionDialog from './action-config-dialog.js';
 import { getPropOfAcion, findActionNode, findSubActionNode, SELECT_PROPS_CONTAINER, getActionType, getEventStrongDesc, getEventDesc, getEventLabel } from './helper.js';
 export { ACTION_TYPE_TREE, COMMON_ACTION_SCHEMA_MAP, DATA_CONTAINER, FORMITEM_CMPTS, IS_DATA_CONTAINER, SELECT_PROPS_CONTAINER, SHOW_SELECT_PROP, SUPPORT_DISABLED_CMPTS, SUPPORT_STATIC_FORMITEM_CMPTS, findActionNode, findSubActionNode, getActionType, getArgsWrapper, getEventControlConfig, getEventDesc, getEventLabel, getEventStrongDesc, getOldActionSchema, getPropOfAcion, hasActionType, renderCmptActionSelect, renderCmptSelect } from './helper.js';
 import { i18n } from 'i18n-runtime';
+import { reaction } from 'mobx';
 
 var EventControl = /** @class */function (_super) {
   __extends(EventControl, _super);
@@ -38,6 +39,12 @@ var EventControl = /** @class */function (_super) {
       writable: true,
       value: void 0
     });
+    Object.defineProperty(_this, "unReaction", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
     var events = props.events,
       value = props.value,
       data = props.data;
@@ -53,10 +60,36 @@ var EventControl = /** @class */function (_super) {
       showAcionDialog: false,
       showEventDialog: false,
       actionData: undefined,
-      type: 'add'
+      type: 'add',
+      appLocaleState: 0
     };
     return _this;
   }
+  Object.defineProperty(EventControl.prototype, "componentDidMount", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function () {
+      var _this = this;
+      var editorStore = window.editorStore;
+      this.unReaction = reaction(function () {
+        return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
+      }, function () {
+        _this.setState({
+          appLocaleState: editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState
+        });
+      });
+    }
+  });
+  Object.defineProperty(EventControl.prototype, "componentWillUnmount", {
+    enumerable: false,
+    configurable: true,
+    writable: true,
+    value: function () {
+      var _a;
+      (_a = this.unReaction) === null || _a === void 0 ? void 0 : _a.call(this);
+    }
+  });
   Object.defineProperty(EventControl.prototype, "componentDidUpdate", {
     enumerable: false,
     configurable: true,

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 
@@ -252,7 +252,7 @@ var Background = function (props) {
   // 背景图尺寸设置
   function getbsValue() {
     var _a, _b;
-    var backgroundSize = (_a = props.value) === null || _a === void 0 ? void 0 : _a.backgroundSize;
+    var backgroundSize = ((_a = props.value) === null || _a === void 0 ? void 0 : _a.backgroundSize) || 'auto';
     var backgroundRepeat = (_b = props.value) === null || _b === void 0 ? void 0 : _b.backgroundRepeat;
     var returnVal = backgroundSize || '';
     if (backgroundSize === 'auto' && backgroundRepeat) {
@@ -433,6 +433,9 @@ var Background = function (props) {
     placeholder: i18n("737391648d1216a1f84ac9ff52da5aa2"),
     value: getbsValue(),
     options: [{
+      label: i18n("18c63459a2c069022c7790430f761214"),
+      value: 'auto'
+    }, {
       label: i18n("0f1fd39145bad43e18f81337e0144c8c"),
       value: 'cover'
     }, {

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 
@@ -7,8 +7,8 @@ import { __extends, __assign, __decorate } from 'tslib';
 import React__default from 'react';
 import pick from 'lodash/pick';
 import mapValues from 'lodash/mapValues';
+import { isObject, getSchemaTpl, string2CSSUnit } from 'amis-editor-core';
 import { fontFamilyList } from './font-family.js';
-import { isObject, string2CSSUnit } from 'amis-editor-core';
 import { FormItem } from 'amis';
 import { i18n } from 'i18n-runtime';
 
@@ -127,29 +127,10 @@ var Font = function (props) {
       }]
     },
     // TODO: 添加'justify-all', 'start', 'end', 'match-parent'类型
-    {
-      name: 'textAlign',
+    getSchemaTpl('layout:textAlign', {
       label: i18n("d1b490c01d24a1a70e9c83a29ac38fde"),
-      type: 'button-group-select',
-      mode: 'row',
-      options: [{
-        label: '',
-        value: 'left',
-        icon: 'fa fa-align-left'
-      }, {
-        label: '',
-        value: 'center',
-        icon: 'fa fa-align-center'
-      }, {
-        label: '',
-        value: 'right',
-        icon: 'fa fa-align-right'
-      }, {
-        label: '',
-        value: 'justify',
-        icon: 'fa fa-align-justify'
-      }]
-    }, {
+      mode: 'row'
+    }), {
       type: 'group',
       label: i18n("4ae7f423d9ed9ffa48c3e404f96bb51f"),
       body: [{

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/style-control/ThemeClassName.d.ts

@@ -0,0 +1,8 @@
+/**
+ * 类名输入框 + 自定义样式源码编辑器
+ */
+import React from 'react';
+import { FormControlProps } from 'amis-core';
+export declare class BorderRenderer extends React.Component<FormControlProps> {
+    render(): JSX.Element;
+}