amis-editor 5.2.3 → 5.2.4-beta.28

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 
@@ -13,6 +13,7 @@ import { editorFactory, FormulaPlugin } from './plugin.js';
 import FormulaPicker from './FormulaPicker.js';
 import debounce from 'lodash/debounce';
 import { getVariables } from './utils.js';
+import { reaction } from 'mobx';
 import { i18n } from 'i18n-runtime';
 
 /**
@@ -34,6 +35,24 @@ var TextareaFormulaControl = /** @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, "handleOnChange", {
       enumerable: true,
       configurable: true,
@@ -58,10 +77,36 @@ var TextareaFormulaControl = /** @class */function (_super) {
     writable: true,
     value: function () {
       return __awaiter(this, void 0, void 0, function () {
-        var variablesArr;
+        var editorStore, variablesArr;
+        var _this = this;
         return __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 = reaction(function () {
+                return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
+              }, function () {
+                return __awaiter(_this, void 0, void 0, function () {
+                  var variablesArr;
+                  return __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*/, getVariables(this)];
+                      case 1:
+                        variablesArr = _a.sent();
+                        this.setState({
+                          variables: variablesArr
+                        });
+                        return [2 /*return*/];
+                    }
+                  });
+                });
+              });
+
               return [4 /*yield*/, getVariables(this)];
             case 1:
               variablesArr = _a.sent();
@@ -106,7 +151,9 @@ var TextareaFormulaControl = /** @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(TextareaFormulaControl.prototype, "onExpressionClick", {

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

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

package/esm/renderer/textarea-formula/utils.d.ts

@@ -9,4 +9,4 @@ export declare function resolveVariablesFromScope(node: any, manager: any): Prom
  * 整合 props & amis数据域 中的 variables
  * @param that  为组件的实例 this
  **/
-export declare function getVariables(that: any): Promise<any[]>;
+export declare function getVariables(that: any): Promise<any>;

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

@@ -1,10 +1,11 @@
 /**
- * amis-editor v5.2.3
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 
 import { __awaiter, __generator, __assign, __spreadArray } from 'tslib';
 import { isExpression, resolveVariableAndFilter } from 'amis-core';
+import { translateSchema } from 'amis-editor-core';
 
 /**
  * 从amis数据域中取变量数据
@@ -67,6 +68,10 @@ function getVariables(that) {
                             variablesArr = __spreadArray(__spreadArray([], resolveVariableAndFilter(that.props.variables, that.props.data, '| raw'), true), variablesArr, true);
                         }
                     }
+                    // 如果存在应用语言类型，则进行翻译
+                    if (that.appLocale && that.appCorpusData) {
+                        return [2 /*return*/, translateSchema(variablesArr, that.appCorpusData)];
+                    }
                     return [2 /*return*/, variablesArr];
             }
         });

package/esm/tpl/api.js

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

package/esm/tpl/common.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 
@@ -1025,6 +1025,13 @@ setSchemaTpl('tableCellRemark', {
   type: 'input-text',
   description: i18n("45882ddedb42c1a38462949750bc8a84")
 });
+setSchemaTpl('tableCellPlaceholder', {
+  name: 'placeholder',
+  type: 'input-text',
+  label: i18n("4c1cff4d8c05daa6ed9352a241ee628c"),
+  value: '-',
+  description: i18n("ff88d5db9d61f14bce6e3397fd4652a5")
+});
 setSchemaTpl('title', {
   type: 'input-text',
   name: 'title',
@@ -1261,3 +1268,60 @@ setSchemaTpl('switchOption', {
   name: 'option',
   label: i18n("f411d0f1f925d9b48d8c1d451bd809b1")
 });
+setSchemaTpl('addOnLabel', {
+  name: 'label',
+  label: i18n("ca746b1ff10193a3ce20878dec04a733"),
+  type: 'input-text'
+});
+setSchemaTpl('onText', {
+  name: 'onText',
+  type: 'input-text',
+  label: i18n("c580bacf343343f04a1b551e46d02c4f")
+});
+setSchemaTpl('offText', {
+  name: 'offText',
+  type: 'input-text',
+  label: i18n("9ff352ae39cdaeaa4fc54f83575eedc9")
+});
+setSchemaTpl('propertyTitle', {
+  label: i18n("32c65d8d7431e76029678ec7bb73a5ab"),
+  type: 'input-text',
+  name: 'title'
+});
+setSchemaTpl('propertyLabel', {
+  type: 'input-text',
+  mode: 'inline',
+  size: 'sm',
+  label: i18n("ae41a992ccceb36f83024f72531186ec"),
+  name: 'label'
+});
+setSchemaTpl('propertyContent', {
+  type: 'input-text',
+  mode: 'inline',
+  size: 'sm',
+  label: i18n("52dff5b153bb5eaca33a008458ce0209"),
+  name: 'content'
+});
+setSchemaTpl('draggableTip', {
+  type: 'input-text',
+  name: 'draggableTip',
+  label: tipedLabel(i18n("9b14c9051067bef2dd9a15683201dd18"), i18n("f41a714bc8b26dc27a93a07c44e329a8"))
+});
+setSchemaTpl('deleteConfirmText', {
+  label: tipedLabel(i18n("0c15a924dc3bedefb79c958972bef2b9"), i18n("178bf4dd4b8d56370e2fc8275f9dc9e4")),
+  name: 'deleteConfirmText',
+  type: 'input-text',
+  pipeIn: defaultValue(i18n("cb8f7758eb03574f9b8402659c0f02b2"))
+});
+setSchemaTpl('optionsLabel', {
+  type: 'input-text',
+  name: 'label',
+  placeholder: i18n("d7ec2d3fea4756bc1642e0f10c180cf5"),
+  required: true
+});
+setSchemaTpl('anchorNavTitle', {
+  name: 'title',
+  label: i18n("32c65d8d7431e76029678ec7bb73a5ab"),
+  type: 'input-text',
+  required: true
+});

package/esm/tpl/horizontal.js

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

package/esm/tpl/layout.js

@@ -1,10 +1,10 @@
 /**
- * amis-editor v5.2.3
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 
 import { __assign } from 'tslib';
-import { setSchemaTpl, tipedLabel } from 'amis-editor-core';
+import { setSchemaTpl, tipedLabel, defaultValue } from 'amis-editor-core';
 import isNumber from 'lodash/isNumber';
 import isString from 'lodash/isString';
 import { i18n } from 'i18n-runtime';
@@ -113,7 +113,7 @@ setSchemaTpl('layout:z-index', function (config) {
   var _a;
   var configSchema = {
     type: 'input-number',
-    label: (config === null || config === void 0 ? void 0 : config.label) || tipedLabel(i18n("6896da744f8ae9633263d55af0fceae1"), i18n("6f649980c839dffca1506f20d534fe3d")),
+    label: (config === null || config === void 0 ? void 0 : config.label) || tipedLabel(i18n("8e903bee4578f72bbecf9eb62d7b875c"), i18n("6f649980c839dffca1506f20d534fe3d")),
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.zIndex',
     value: (config === null || config === void 0 ? void 0 : config.value) || '0',
     visibleOn: (_a = config === null || config === void 0 ? void 0 : config.visibleOn) !== null && _a !== void 0 ? _a : 'data.style && data.style.position && data.style.position !== "static"',
@@ -445,6 +445,9 @@ setSchemaTpl('layout:isFixedWidth', function (config) {
         // 非固定宽度时，剔除宽度数值
         form.setValueByName('style.width', undefined);
       }
+      if (config === null || config === void 0 ? void 0 : config.onChange) {
+        config.onChange(value);
+      }
     }
   };
 });
@@ -596,6 +599,9 @@ setSchemaTpl('layout:isFixedHeight', function (config) {
         // 非固定高度时，剔除高度数值
         form.setValueByName('style.height', undefined);
       }
+      if (config === null || config === void 0 ? void 0 : config.onChange) {
+        config.onChange(value);
+      }
     }
   };
 });
@@ -879,3 +885,65 @@ setSchemaTpl('layout:stickyPosition', {
     }
   }
 });
+// 默认内边距配置项
+setSchemaTpl('layout:padding', function (config) {
+  return {
+    label: (config === null || config === void 0 ? void 0 : config.label) || i18n("c17fef27ea1d970fc66f4c4c3d442129"),
+    type: 'button-group-select',
+    name: (config === null || config === void 0 ? void 0 : config.name) || 'size',
+    size: 'xs',
+    mode: (config === null || config === void 0 ? void 0 : config.mode) || 'horizontal',
+    visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
+    pipeIn: (config === null || config === void 0 ? void 0 : config.pipeIn) || defaultValue(''),
+    pipeOut: config === null || config === void 0 ? void 0 : config.pipeOut,
+    options: [{
+      label: i18n("18c63459a2c069022c7790430f761214"),
+      value: ''
+    }, {
+      label: i18n("23ecf42cada8bf2715792d718544d107"),
+      value: 'xs'
+    }, {
+      label: i18n("391b8fa9c747a1799353ab856e666ad5"),
+      value: 'sm'
+    }, {
+      label: i18n("aed1dfbc31703955e64806b799b67645"),
+      value: 'md'
+    }, {
+      label: i18n("ab18e30c0dc4093ceeda8961fac3d1f4"),
+      value: 'lg'
+    }, {
+      label: i18n("d81bb206a889656035b929cd8bb1ef10"),
+      value: 'none'
+    }]
+  };
+});
+// 内部水平对齐方式
+setSchemaTpl('layout:textAlign', function (config) {
+  return {
+    label: (config === null || config === void 0 ? void 0 : config.label) || i18n("d5bc35360607472de4525358af126de4"),
+    type: 'button-group-select',
+    name: (config === null || config === void 0 ? void 0 : config.name) || 'textAlign',
+    // size: 'xs',
+    mode: (config === null || config === void 0 ? void 0 : config.mode) || 'horizontal',
+    visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
+    pipeIn: (config === null || config === void 0 ? void 0 : config.pipeIn) || defaultValue(''),
+    pipeOut: config === null || config === void 0 ? void 0 : config.pipeOut,
+    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'
+    }]
+  };
+});

package/esm/tpl/options.js

@@ -1,90 +1,93 @@
 /**
- * amis-editor v5.2.3
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 
 import { __assign, __spreadArray } from 'tslib';
-import { setSchemaTpl, getSchemaTpl, tipedLabel, defaultValue } from 'amis-editor-core';
+import { setSchemaTpl, getI18nEnabled, getSchemaTpl, tipedLabel, defaultValue } from 'amis-editor-core';
 import assign from 'lodash/assign';
 import cloneDeep from 'lodash/cloneDeep';
 import { i18n } from 'i18n-runtime';
 
-setSchemaTpl('options', {
-  label: i18n("25ae4ca8d4b8a67b273066a97a516327"),
-  name: 'options',
-  type: 'combo',
-  multiple: true,
-  draggable: true,
-  addButtonText: i18n("65d76d0590aa6e05d61fe8db4c6a11ca"),
-  scaffold: {
-    label: '',
-    value: ''
-  },
-  items: [{
-    type: 'input-text',
-    name: 'label',
-    placeholder: i18n("d7ec2d3fea4756bc1642e0f10c180cf5"),
-    required: true
-  }, {
-    type: 'select',
-    name: 'value',
-    pipeIn: function (value) {
-      if (typeof value === 'string') {
-        return 'text';
-      }
-      if (typeof value === 'boolean') {
-        return 'boolean';
-      }
-      if (typeof value === 'number') {
-        return 'number';
-      }
-      return 'text';
+setSchemaTpl('options', function () {
+  var i18nEnabled = getI18nEnabled();
+  return {
+    label: i18n("25ae4ca8d4b8a67b273066a97a516327"),
+    name: 'options',
+    type: 'combo',
+    multiple: true,
+    draggable: true,
+    addButtonText: i18n("65d76d0590aa6e05d61fe8db4c6a11ca"),
+    scaffold: {
+      label: '',
+      value: ''
     },
-    pipeOut: function (value, oldValue) {
-      if (value === 'text') {
-        return String(oldValue);
-      }
-      if (value === 'number') {
-        var convertTo = Number(oldValue);
-        if (isNaN(convertTo)) {
-          return 0;
+    items: [{
+      type: i18nEnabled ? 'input-text-i18n' : 'input-text',
+      name: 'label',
+      placeholder: i18n("d7ec2d3fea4756bc1642e0f10c180cf5"),
+      required: true
+    }, {
+      type: 'select',
+      name: 'value',
+      pipeIn: function (value) {
+        if (typeof value === 'string') {
+          return 'text';
         }
-        return convertTo;
-      }
-      if (value === 'boolean') {
-        return Boolean(oldValue);
-      }
-      return '';
-    },
-    options: [{
-      label: i18n("97d07614380da93d257f9fbf81aa56fb"),
-      value: 'text'
+        if (typeof value === 'boolean') {
+          return 'boolean';
+        }
+        if (typeof value === 'number') {
+          return 'number';
+        }
+        return 'text';
+      },
+      pipeOut: function (value, oldValue) {
+        if (value === 'text') {
+          return String(oldValue);
+        }
+        if (value === 'number') {
+          var convertTo = Number(oldValue);
+          if (isNaN(convertTo)) {
+            return 0;
+          }
+          return convertTo;
+        }
+        if (value === 'boolean') {
+          return Boolean(oldValue);
+        }
+        return '';
+      },
+      options: [{
+        label: i18n("97d07614380da93d257f9fbf81aa56fb"),
+        value: 'text'
+      }, {
+        label: i18n("55d4790c5d819cd0462cbe89561b0dd4"),
+        value: 'number'
+      }, {
+        label: i18n("97b0b6499334ed889b372513290a2a52"),
+        value: 'boolean'
+      }]
+    }, {
+      type: 'input-number',
+      name: 'value',
+      placeholder: i18n("fe7509e0ed085b86f07e3e9975cc5b3d"),
+      visibleOn: 'typeof data.value === "number"',
+      unique: true
     }, {
-      label: i18n("55d4790c5d819cd0462cbe89561b0dd4"),
-      value: 'number'
+      type: 'switch',
+      name: 'value',
+      placeholder: i18n("fe7509e0ed085b86f07e3e9975cc5b3d"),
+      visibleOn: 'typeof data.value === "boolean"',
+      unique: true
     }, {
-      label: i18n("97b0b6499334ed889b372513290a2a52"),
-      value: 'boolean'
+      type: 'input-text',
+      name: 'value',
+      placeholder: i18n("fe7509e0ed085b86f07e3e9975cc5b3d"),
+      visibleOn: 'typeof data.value === "undefined" || typeof data.value === "string"',
+      unique: true
     }]
-  }, {
-    type: 'input-number',
-    name: 'value',
-    placeholder: i18n("fe7509e0ed085b86f07e3e9975cc5b3d"),
-    visibleOn: 'typeof data.value === "number"',
-    unique: true
-  }, {
-    type: 'switch',
-    name: 'value',
-    placeholder: i18n("fe7509e0ed085b86f07e3e9975cc5b3d"),
-    visibleOn: 'typeof data.value === "boolean"',
-    unique: true
-  }, {
-    type: 'input-text',
-    name: 'value',
-    placeholder: i18n("fe7509e0ed085b86f07e3e9975cc5b3d"),
-    visibleOn: 'typeof data.value === "undefined" || typeof data.value === "string"',
-    unique: true
-  }]
+  };
 });
 setSchemaTpl('tree', {
   label: i18n("25ae4ca8d4b8a67b273066a97a516327"),
@@ -98,12 +101,7 @@ setSchemaTpl('tree', {
     label: '',
     value: ''
   },
-  items: [{
-    type: 'input-text',
-    name: 'label',
-    placeholder: i18n("d7ec2d3fea4756bc1642e0f10c180cf5"),
-    required: true
-  }, {
+  items: [getSchemaTpl('optionsLabel'), {
     type: 'input-text',
     name: 'value',
     placeholder: i18n("fe7509e0ed085b86f07e3e9975cc5b3d"),
@@ -128,6 +126,13 @@ setSchemaTpl('multiple', function (schema) {
     }
   });
 });
+setSchemaTpl('checkAllLabel', {
+  type: 'input-text',
+  name: 'checkAllLabel',
+  label: i18n("cf763c357566be6fdaee886a40ddcca7"),
+  value: i18n("66eeacd93a7c1bda93906fe908ad11a0"),
+  mode: 'row'
+});
 setSchemaTpl('checkAll', function () {
   return [getSchemaTpl('switch', {
     label: i18n("9c541222ced2435288c24b34f8ad1fb8"),
@@ -142,13 +147,7 @@ setSchemaTpl('checkAll', function () {
       label: i18n("05bef457e8350e1a5d8007cad41b70e5"),
       name: 'defaultCheckAll',
       value: false
-    }), {
-      type: 'input-text',
-      name: 'checkAllLabel',
-      label: i18n("cf763c357566be6fdaee886a40ddcca7"),
-      value: i18n("66eeacd93a7c1bda93906fe908ad11a0"),
-      mode: 'row'
-    }]
+    }), getSchemaTpl('checkAllLabel')]
   }];
 });
 setSchemaTpl('joinValues', function () {

package/esm/tpl/style.js

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

package/esm/tpl/validations.js

@@ -1,10 +1,10 @@
 /**
- * amis-editor v5.2.3
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 
 import { __assign, __spreadArray } from 'tslib';
-import { setSchemaTpl, isObject, defaultValue, getSchemaTpl } from 'amis-editor-core';
+import { setSchemaTpl, isObject, getI18nEnabled, defaultValue, getSchemaTpl } from 'amis-editor-core';
 import { str2rules } from 'amis';
 import find from 'lodash/find';
 import reduce from 'lodash/reduce';
@@ -207,6 +207,7 @@ setSchemaTpl('validations', function () {
   };
 });
 setSchemaTpl('validationErrors', function () {
+  var i18nEnabled = getI18nEnabled();
   var options = [
   // {
   //     label: '必填',
@@ -359,7 +360,7 @@ setSchemaTpl('validationErrors', function () {
       options: options,
       columnClassName: 'w-sm'
     }, {
-      type: 'input-text',
+      type: i18nEnabled ? 'input-text-i18n' : 'input-text',
       name: 'msg',
       placeholder: i18n("99c74120cc62f4bf31d661e3212b7121")
     }, {

package/esm/util.js

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

package/esm/validator.js

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

package/lib/component/BaseControl.d.ts

@@ -947,7 +947,9 @@ export declare function remarkTpl(config: {
                     pipeIn?: undefined;
                     pipeOut?: undefined;
                     visibleOn?: undefined;
-                    mode?: undefined;
+                    mode?: undefined; /**
+                     * 配置项内容
+                     */
                     inputClassName?: undefined;
                 } | {
                     type: string;
@@ -960,7 +962,9 @@ export declare function remarkTpl(config: {
                     pipeIn?: undefined;
                     pipeOut?: undefined;
                     visibleOn?: undefined;
-                    mode?: undefined;
+                    mode?: undefined; /**
+                     * 配置项内容
+                     */
                     inputClassName?: undefined;
                 } | {
                     name: string;
@@ -979,7 +983,9 @@ export declare function remarkTpl(config: {
                     pipeIn?: undefined;
                     pipeOut?: undefined;
                     visibleOn?: undefined;
-                    mode?: undefined;
+                    mode?: undefined; /**
+                     * 配置项内容
+                     */
                     inputClassName?: undefined;
                 } | {
                     name: string;
@@ -1001,7 +1007,9 @@ export declare function remarkTpl(config: {
                     }[];
                     size?: undefined;
                     visibleOn?: undefined;
-                    mode?: undefined;
+                    mode?: undefined; /**
+                     * 配置项内容
+                     */
                     inputClassName?: undefined;
                 } | {
                     name: string;

package/lib/component/BaseControl.js

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

package/lib/component/InputComponentName.js

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

package/lib/component/TableViewEditor.js

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

package/lib/icons/btn/btn-group.svg.js

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

package/lib/icons/btn/btn-select.svg.js

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