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

package/lib/renderer/APIControl.d.ts

@@ -168,9 +168,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                             }[];
                             size?: undefined;
                             placeholder?: undefined;
-                            /**
-                             * Picker面板确认
-                             */
                             required?: undefined;
                             description?: undefined;
                             disabled?: undefined;
@@ -208,9 +205,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                             description: string;
                             value?: undefined;
                             options?: undefined;
-                            /**
-                             * Picker面板确认
-                             */
                             required?: undefined;
                             disabled?: undefined;
                             pipeIn?: undefined;
@@ -233,9 +227,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                             disabled: boolean;
                             value?: undefined;
                             placeholder?: undefined;
-                            /**
-                             * Picker面板确认
-                             */
                             required?: undefined;
                             pipeIn?: undefined;
                             pipeOut?: undefined;
@@ -254,9 +245,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                             options?: undefined;
                             size?: undefined;
                             placeholder?: undefined;
-                            /**
-                             * Picker面板确认
-                             */
                             required?: undefined;
                             description?: undefined;
                             disabled?: undefined;
@@ -278,9 +266,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                             value?: undefined;
                             options?: undefined;
                             placeholder?: undefined;
-                            /**
-                             * Picker面板确认
-                             */
                             required?: undefined;
                             disabled?: undefined;
                             pipeOut?: undefined;
@@ -297,9 +282,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                             options?: undefined;
                             size?: undefined;
                             placeholder?: undefined;
-                            /**
-                             * Picker面板确认
-                             */
                             required?: undefined;
                             disabled?: undefined;
                             min?: undefined;
@@ -316,9 +298,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                             options?: undefined;
                             size?: undefined;
                             placeholder?: undefined;
-                            /**
-                             * Picker面板确认
-                             */
                             required?: undefined;
                             disabled?: undefined;
                             pipeIn?: undefined;
@@ -339,9 +318,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                             value?: undefined;
                             options?: undefined;
                             placeholder?: undefined;
-                            /**
-                             * Picker面板确认
-                             */
                             required?: undefined;
                             disabled?: undefined;
                             pipeIn?: undefined;
@@ -359,9 +335,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                             options?: undefined;
                             size?: undefined;
                             placeholder?: undefined;
-                            /**
-                             * Picker面板确认
-                             */
                             required?: undefined;
                             disabled?: undefined;
                             pipeIn?: undefined;
@@ -1179,9 +1152,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                             placeholder: string;
                             value?: undefined;
                             options?: undefined;
-                            /**
-                             * Picker面板确认
-                             */
                             required?: undefined;
                             description?: undefined;
                             disabled?: undefined;
@@ -2033,9 +2003,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                                 placeholder: string;
                                 disabled: boolean;
                                 unique?: undefined;
-                                /**
-                                 * Picker面板确认
-                                 */
                                 required?: undefined;
                                 options?: undefined;
                             })[];
@@ -2889,9 +2856,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                                 type: string;
                                 name: string;
                                 unique?: undefined;
-                                /**
-                                 * Picker面板确认
-                                 */
                                 required?: undefined;
                             })[];
                             label?: undefined;
@@ -2941,9 +2905,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                                 type: string;
                                 name: string;
                                 unique?: undefined;
-                                /**
-                                 * Picker面板确认
-                                 */
                                 required?: undefined;
                             })[];
                             label?: undefined;
@@ -2998,9 +2959,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                     }[];
                     size?: undefined;
                     placeholder?: undefined;
-                    /**
-                     * Picker面板确认
-                     */
                     required?: undefined;
                     description?: undefined;
                     disabled?: undefined;
@@ -3038,9 +2996,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                     description: string;
                     value?: undefined;
                     options?: undefined;
-                    /**
-                     * Picker面板确认
-                     */
                     required?: undefined;
                     disabled?: undefined;
                     pipeIn?: undefined;
@@ -3063,9 +3018,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                     disabled: boolean;
                     value?: undefined;
                     placeholder?: undefined;
-                    /**
-                     * Picker面板确认
-                     */
                     required?: undefined;
                     pipeIn?: undefined;
                     pipeOut?: undefined;
@@ -3084,9 +3036,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                     options?: undefined;
                     size?: undefined;
                     placeholder?: undefined;
-                    /**
-                     * Picker面板确认
-                     */
                     required?: undefined;
                     description?: undefined;
                     disabled?: undefined;
@@ -3108,9 +3057,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                     value?: undefined;
                     options?: undefined;
                     placeholder?: undefined;
-                    /**
-                     * Picker面板确认
-                     */
                     required?: undefined;
                     disabled?: undefined;
                     pipeOut?: undefined;
@@ -3127,9 +3073,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                     options?: undefined;
                     size?: undefined;
                     placeholder?: undefined;
-                    /**
-                     * Picker面板确认
-                     */
                     required?: undefined;
                     disabled?: undefined;
                     min?: undefined;
@@ -3146,9 +3089,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                     options?: undefined;
                     size?: undefined;
                     placeholder?: undefined;
-                    /**
-                     * Picker面板确认
-                     */
                     required?: undefined;
                     disabled?: undefined;
                     pipeIn?: undefined;
@@ -3169,9 +3109,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                     value?: undefined;
                     options?: undefined;
                     placeholder?: undefined;
-                    /**
-                     * Picker面板确认
-                     */
                     required?: undefined;
                     disabled?: undefined;
                     pipeIn?: undefined;
@@ -3189,9 +3126,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                     options?: undefined;
                     size?: undefined;
                     placeholder?: undefined;
-                    /**
-                     * Picker面板确认
-                     */
                     required?: undefined;
                     disabled?: undefined;
                     pipeIn?: undefined;
@@ -4009,9 +3943,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                     placeholder: string;
                     value?: undefined;
                     options?: undefined;
-                    /**
-                     * Picker面板确认
-                     */
                     required?: undefined;
                     description?: undefined;
                     disabled?: undefined;
@@ -4863,9 +4794,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                         placeholder: string;
                         disabled: boolean;
                         unique?: undefined;
-                        /**
-                         * Picker面板确认
-                         */
                         required?: undefined;
                         options?: undefined;
                     })[];
@@ -5719,9 +5647,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                         type: string;
                         name: string;
                         unique?: undefined;
-                        /**
-                         * Picker面板确认
-                         */
                         required?: undefined;
                     })[];
                     label?: undefined;
@@ -5771,9 +5696,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                         type: string;
                         name: string;
                         unique?: undefined;
-                        /**
-                         * Picker面板确认
-                         */
                         required?: undefined;
                     })[];
                     label?: undefined;

package/lib/renderer/APIControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 
@@ -857,6 +857,7 @@ var APIControl = /** @class */function (_super) {
         _c.useMobileUI;
         _c.popOverContainer;
         _c.env;
+        var renderLabel = _c.renderLabel;
       var _g = this.state,
         apiStr = _g.apiStr,
         selectedItem = _g.selectedItem,
@@ -869,7 +870,7 @@ var APIControl = /** @class */function (_super) {
         })
       }, onlyTabs ? render('api-control-tabs', this.renderApiConfigTabs(true), {
         data: amisCore.normalizeApi(value)
-      }) : React__default["default"].createElement(React__default["default"].Fragment, null, this.renderHeader(), React__default["default"].createElement("div", {
+      }) : React__default["default"].createElement(React__default["default"].Fragment, null, !renderLabel && this.renderHeader(), React__default["default"].createElement("div", {
         className: "ae-ApiControl-content",
         key: "content"
       }, React__default["default"].createElement("div", {

package/lib/renderer/BadgeControl.d.ts

@@ -71,12 +71,12 @@ export default class BadgeControl extends React.Component<BadgeControlProps, Bad
             [propName: string]: any;
         } | undefined;
         visibleOn?: string | undefined;
-        text?: string | number | undefined;
         size?: any;
+        text?: string | number | undefined;
+        position?: "top-right" | "top-left" | "bottom-left" | "bottom-right" | undefined;
         mode?: "text" | "dot" | "ribbon" | undefined;
-        animation?: boolean | undefined;
         level?: string | undefined;
-        position?: "top-right" | "top-left" | "bottom-left" | "bottom-right" | undefined;
+        animation?: boolean | undefined;
         overflowCount?: number | undefined;
     } | {
         offset: [number, number];
@@ -84,12 +84,12 @@ export default class BadgeControl extends React.Component<BadgeControlProps, Bad
             [propName: string]: any;
         } | undefined;
         visibleOn?: string | undefined;
-        text?: string | number | undefined;
         size?: any;
+        text?: string | number | undefined;
+        position?: "top-right" | "top-left" | "bottom-left" | "bottom-right" | undefined;
         mode?: "text" | "dot" | "ribbon" | undefined;
-        animation?: boolean | undefined;
         level?: string | undefined;
-        position?: "top-right" | "top-left" | "bottom-left" | "bottom-right" | undefined;
+        animation?: boolean | undefined;
         overflowCount?: number | undefined;
     };
     handleSwitchChange(checked: boolean): void;

package/lib/renderer/BadgeControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 
@@ -118,6 +118,7 @@ var BadgeControl = /** @class */function (_super) {
     value: function () {
       var render = this.props.render;
       var data = this.transformBadgeValue();
+      var i18nEnabled = amisEditorCore.getI18nEnabled();
       return render('badge-form', {
         type: 'form',
         className: 'ae-BadgeControl-form w-full',
@@ -153,7 +154,7 @@ var BadgeControl = /** @class */function (_super) {
         }, {
           label: i18nRuntime.i18n("cbc608353218e1d63e6f47c9db1eae64"),
           name: 'text',
-          type: 'input-text',
+          type: i18nEnabled ? 'input-text-i18n' : 'input-text',
           mode: 'row',
           visibleOn: "data.mode !== 'dot'",
           pipeOut: function (value) {

package/lib/renderer/DataBindingControl.js

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

package/lib/renderer/DataMappingControl.js

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

package/lib/renderer/DataPickerControl.js

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

package/lib/renderer/DateShortCutControl.js

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

package/lib/renderer/ExpressionFormulaControl.d.ts

@@ -30,6 +30,9 @@ interface ExpressionFormulaControlState {
 export default class ExpressionFormulaControl extends React.Component<ExpressionFormulaControlProps, ExpressionFormulaControlState> {
     static defaultProps: Partial<ExpressionFormulaControlProps>;
     isUnmount: boolean;
+    unReaction: any;
+    appLocale: string;
+    appCorpusData: any;
     constructor(props: ExpressionFormulaControlProps);
     componentDidMount(): Promise<void>;
     componentDidUpdate(prevProps: ExpressionFormulaControlProps): Promise<void>;

package/lib/renderer/ExpressionFormulaControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 
@@ -14,6 +14,7 @@ var cx = require('classnames');
 var amis = require('amis');
 var FormulaEditor = require('amis-ui/lib/components/formula/Editor');
 var utils = require('./textarea-formula/utils.js');
+var mobx = require('mobx');
 var i18nRuntime = require('i18n-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -34,6 +35,24 @@ var ExpressionFormulaControl = /** @class */function (_super) {
       writable: true,
       value: void 0
     });
+    Object.defineProperty(_this, "unReaction", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(_this, "appLocale", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(_this, "appCorpusData", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
     _this.state = {
       variables: [],
       formulaPickerValue: ''
@@ -46,11 +65,37 @@ var ExpressionFormulaControl = /** @class */function (_super) {
     writable: true,
     value: function () {
       return tslib.__awaiter(this, void 0, void 0, function () {
-        var variablesArr;
+        var editorStore, variablesArr;
+        var _this = this;
         return tslib.__generator(this, function (_a) {
           switch (_a.label) {
             case 0:
               this.initFormulaPickerValue(this.props.value);
+              editorStore = window.editorStore;
+              this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
+              this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
+              this.unReaction = mobx.reaction(function () {
+                return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
+              }, function () {
+                return tslib.__awaiter(_this, void 0, void 0, function () {
+                  var variablesArr;
+                  return tslib.__generator(this, function (_a) {
+                    switch (_a.label) {
+                      case 0:
+                        this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
+                        this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
+                        return [4 /*yield*/, utils.getVariables(this)];
+                      case 1:
+                        variablesArr = _a.sent();
+                        this.setState({
+                          variables: variablesArr
+                        });
+                        return [2 /*return*/];
+                    }
+                  });
+                });
+              });
+
               return [4 /*yield*/, utils.getVariables(this)];
             case 1:
               variablesArr = _a.sent();
@@ -98,7 +143,9 @@ var ExpressionFormulaControl = /** @class */function (_super) {
     configurable: true,
     writable: true,
     value: function () {
+      var _a;
       this.isUnmount = true;
+      (_a = this.unReaction) === null || _a === void 0 ? void 0 : _a.call(this);
     }
   });
   Object.defineProperty(ExpressionFormulaControl.prototype, "initFormulaPickerValue", {

package/lib/renderer/FeatureControl.js

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

package/lib/renderer/FormulaControl.d.ts

@@ -92,6 +92,9 @@ interface FormulaControlState {
 export default class FormulaControl extends React.Component<FormulaControlProps, FormulaControlState> {
     static defaultProps: Partial<FormulaControlProps>;
     isUnmount: boolean;
+    unReaction: any;
+    appLocale: string;
+    appCorpusData: any;
     constructor(props: FormulaControlProps);
     componentDidMount(): Promise<void>;
     componentDidUpdate(prevProps: FormulaControlProps): Promise<void>;

package/lib/renderer/FormulaControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 
@@ -19,6 +19,7 @@ var cx = require('classnames');
 var amis = require('amis');
 var FormulaEditor = require('amis-ui/lib/components/formula/Editor');
 var amisEditorCore = require('amis-editor-core');
+var mobx = require('mobx');
 var utils = require('./textarea-formula/utils.js');
 var i18nRuntime = require('i18n-runtime');
 
@@ -52,6 +53,24 @@ var FormulaControl = /** @class */function (_super) {
       writable: true,
       value: void 0
     });
+    Object.defineProperty(_this, "unReaction", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(_this, "appLocale", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(_this, "appCorpusData", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
     Object.defineProperty(_this, "handleSimpleInputChange", {
       enumerable: true,
       configurable: true,
@@ -83,10 +102,36 @@ var FormulaControl = /** @class */function (_super) {
     writable: true,
     value: function () {
       return tslib.__awaiter(this, void 0, void 0, function () {
-        var variablesArr;
+        var editorStore, variablesArr;
+        var _this = this;
         return tslib.__generator(this, function (_a) {
           switch (_a.label) {
             case 0:
+              editorStore = window.editorStore;
+              this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
+              this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
+              this.unReaction = mobx.reaction(function () {
+                return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
+              }, function () {
+                return tslib.__awaiter(_this, void 0, void 0, function () {
+                  var variablesArr;
+                  return tslib.__generator(this, function (_a) {
+                    switch (_a.label) {
+                      case 0:
+                        this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
+                        this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
+                        return [4 /*yield*/, utils.getVariables(this)];
+                      case 1:
+                        variablesArr = _a.sent();
+                        this.setState({
+                          variables: variablesArr
+                        });
+                        return [2 /*return*/];
+                    }
+                  });
+                });
+              });
+
               return [4 /*yield*/, utils.getVariables(this)];
             case 1:
               variablesArr = _a.sent();
@@ -131,7 +176,9 @@ var FormulaControl = /** @class */function (_super) {
     configurable: true,
     writable: true,
     value: function () {
+      var _a;
       this.isUnmount = true;
+      (_a = this.unReaction) === null || _a === void 0 ? void 0 : _a.call(this);
     }
   });
   /**
@@ -308,7 +355,7 @@ var FormulaControl = /** @class */function (_super) {
           name: (_c = (_b = rendererSchema.name) !== null && _b !== void 0 ? _b : data.name) !== null && _c !== void 0 ? _c : 'value'
         });
         // 默认要剔除的字段
-        var deleteProps = ['label', 'id', '$$id', 'className', 'style', 'readOnly', 'horizontal', 'size', 'remark', 'labelRemark', 'hidden', 'hiddenOn', 'visible', 'visibleOn', 'disabled', 'disabledOn', 'required', 'requiredOn', 'className', 'labelClassName', 'labelAlign', 'inputClassName', 'description', 'autoUpdate', 'prefix', 'suffix', 'unitOptions', 'keyboard', 'kilobitSeparator', 'value'];
+        var deleteProps = ['label', 'id', '$$id', 'className', 'style', 'readOnly', 'horizontal', 'size', 'remark', 'labelRemark', 'hidden', 'hiddenOn', 'visible', 'visibleOn', 'disabled', 'disabledOn', 'required', 'requiredOn', 'className', 'labelClassName', 'labelAlign', 'inputClassName', 'description', 'autoUpdate', 'prefix', 'suffix', 'unitOptions', 'keyboard', 'kilobitSeparator', 'value', 'inputControlClassName', 'css'];
         // 当前组件要剔除的字段
         if (this.props.needDeleteProps) {
           deleteProps.push.apply(deleteProps, this.props.needDeleteProps);
@@ -336,6 +383,10 @@ var FormulaControl = /** @class */function (_super) {
         // 设置popOverContainer
         curRendererSchema.popOverContainer = window.document.body;
       }
+      // 对 schema 进行国际化翻译
+      if (this.appLocale && this.appCorpusData) {
+        return amisEditorCore.translateSchema(curRendererSchema, this.appCorpusData);
+      }
       return curRendererSchema;
     }
   });

package/lib/renderer/GoConfigControl.js

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