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

package/lib/tpl/layout.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 
@@ -120,7 +120,7 @@ amisEditorCore.setSchemaTpl('layout:z-index', function (config) {
   var _a;
   var configSchema = {
     type: 'input-number',
-    label: (config === null || config === void 0 ? void 0 : config.label) || amisEditorCore.tipedLabel(i18nRuntime.i18n("6896da744f8ae9633263d55af0fceae1"), i18nRuntime.i18n("6f649980c839dffca1506f20d534fe3d")),
+    label: (config === null || config === void 0 ? void 0 : config.label) || amisEditorCore.tipedLabel(i18nRuntime.i18n("8e903bee4578f72bbecf9eb62d7b875c"), i18nRuntime.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"',
@@ -452,6 +452,9 @@ amisEditorCore.setSchemaTpl('layout:isFixedWidth', function (config) {
         // 非固定宽度时，剔除宽度数值
         form.setValueByName('style.width', undefined);
       }
+      if (config === null || config === void 0 ? void 0 : config.onChange) {
+        config.onChange(value);
+      }
     }
   };
 });
@@ -603,6 +606,9 @@ amisEditorCore.setSchemaTpl('layout:isFixedHeight', function (config) {
         // 非固定高度时，剔除高度数值
         form.setValueByName('style.height', undefined);
       }
+      if (config === null || config === void 0 ? void 0 : config.onChange) {
+        config.onChange(value);
+      }
     }
   };
 });
@@ -886,3 +892,65 @@ amisEditorCore.setSchemaTpl('layout:stickyPosition', {
     }
   }
 });
+// 默认内边距配置项
+amisEditorCore.setSchemaTpl('layout:padding', function (config) {
+  return {
+    label: (config === null || config === void 0 ? void 0 : config.label) || i18nRuntime.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) || amisEditorCore.defaultValue(''),
+    pipeOut: config === null || config === void 0 ? void 0 : config.pipeOut,
+    options: [{
+      label: i18nRuntime.i18n("18c63459a2c069022c7790430f761214"),
+      value: ''
+    }, {
+      label: i18nRuntime.i18n("23ecf42cada8bf2715792d718544d107"),
+      value: 'xs'
+    }, {
+      label: i18nRuntime.i18n("391b8fa9c747a1799353ab856e666ad5"),
+      value: 'sm'
+    }, {
+      label: i18nRuntime.i18n("aed1dfbc31703955e64806b799b67645"),
+      value: 'md'
+    }, {
+      label: i18nRuntime.i18n("ab18e30c0dc4093ceeda8961fac3d1f4"),
+      value: 'lg'
+    }, {
+      label: i18nRuntime.i18n("d81bb206a889656035b929cd8bb1ef10"),
+      value: 'none'
+    }]
+  };
+});
+// 内部水平对齐方式
+amisEditorCore.setSchemaTpl('layout:textAlign', function (config) {
+  return {
+    label: (config === null || config === void 0 ? void 0 : config.label) || i18nRuntime.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) || amisEditorCore.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/lib/tpl/options.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 
@@ -16,82 +16,85 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var assign__default = /*#__PURE__*/_interopDefaultLegacy(assign);
 var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
 
-amisEditorCore.setSchemaTpl('options', {
-  label: i18nRuntime.i18n("25ae4ca8d4b8a67b273066a97a516327"),
-  name: 'options',
-  type: 'combo',
-  multiple: true,
-  draggable: true,
-  addButtonText: i18nRuntime.i18n("65d76d0590aa6e05d61fe8db4c6a11ca"),
-  scaffold: {
-    label: '',
-    value: ''
-  },
-  items: [{
-    type: 'input-text',
-    name: 'label',
-    placeholder: i18nRuntime.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';
+amisEditorCore.setSchemaTpl('options', function () {
+  var i18nEnabled = amisEditorCore.getI18nEnabled();
+  return {
+    label: i18nRuntime.i18n("25ae4ca8d4b8a67b273066a97a516327"),
+    name: 'options',
+    type: 'combo',
+    multiple: true,
+    draggable: true,
+    addButtonText: i18nRuntime.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: i18nRuntime.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: i18nRuntime.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: i18nRuntime.i18n("97d07614380da93d257f9fbf81aa56fb"),
+        value: 'text'
+      }, {
+        label: i18nRuntime.i18n("55d4790c5d819cd0462cbe89561b0dd4"),
+        value: 'number'
+      }, {
+        label: i18nRuntime.i18n("97b0b6499334ed889b372513290a2a52"),
+        value: 'boolean'
+      }]
+    }, {
+      type: 'input-number',
+      name: 'value',
+      placeholder: i18nRuntime.i18n("fe7509e0ed085b86f07e3e9975cc5b3d"),
+      visibleOn: 'typeof data.value === "number"',
+      unique: true
     }, {
-      label: i18nRuntime.i18n("55d4790c5d819cd0462cbe89561b0dd4"),
-      value: 'number'
+      type: 'switch',
+      name: 'value',
+      placeholder: i18nRuntime.i18n("fe7509e0ed085b86f07e3e9975cc5b3d"),
+      visibleOn: 'typeof data.value === "boolean"',
+      unique: true
     }, {
-      label: i18nRuntime.i18n("97b0b6499334ed889b372513290a2a52"),
-      value: 'boolean'
+      type: 'input-text',
+      name: 'value',
+      placeholder: i18nRuntime.i18n("fe7509e0ed085b86f07e3e9975cc5b3d"),
+      visibleOn: 'typeof data.value === "undefined" || typeof data.value === "string"',
+      unique: true
     }]
-  }, {
-    type: 'input-number',
-    name: 'value',
-    placeholder: i18nRuntime.i18n("fe7509e0ed085b86f07e3e9975cc5b3d"),
-    visibleOn: 'typeof data.value === "number"',
-    unique: true
-  }, {
-    type: 'switch',
-    name: 'value',
-    placeholder: i18nRuntime.i18n("fe7509e0ed085b86f07e3e9975cc5b3d"),
-    visibleOn: 'typeof data.value === "boolean"',
-    unique: true
-  }, {
-    type: 'input-text',
-    name: 'value',
-    placeholder: i18nRuntime.i18n("fe7509e0ed085b86f07e3e9975cc5b3d"),
-    visibleOn: 'typeof data.value === "undefined" || typeof data.value === "string"',
-    unique: true
-  }]
+  };
 });
 amisEditorCore.setSchemaTpl('tree', {
   label: i18nRuntime.i18n("25ae4ca8d4b8a67b273066a97a516327"),
@@ -105,12 +108,7 @@ amisEditorCore.setSchemaTpl('tree', {
     label: '',
     value: ''
   },
-  items: [{
-    type: 'input-text',
-    name: 'label',
-    placeholder: i18nRuntime.i18n("d7ec2d3fea4756bc1642e0f10c180cf5"),
-    required: true
-  }, {
+  items: [amisEditorCore.getSchemaTpl('optionsLabel'), {
     type: 'input-text',
     name: 'value',
     placeholder: i18nRuntime.i18n("fe7509e0ed085b86f07e3e9975cc5b3d"),
@@ -135,6 +133,13 @@ amisEditorCore.setSchemaTpl('multiple', function (schema) {
     }
   });
 });
+amisEditorCore.setSchemaTpl('checkAllLabel', {
+  type: 'input-text',
+  name: 'checkAllLabel',
+  label: i18nRuntime.i18n("cf763c357566be6fdaee886a40ddcca7"),
+  value: i18nRuntime.i18n("66eeacd93a7c1bda93906fe908ad11a0"),
+  mode: 'row'
+});
 amisEditorCore.setSchemaTpl('checkAll', function () {
   return [amisEditorCore.getSchemaTpl('switch', {
     label: i18nRuntime.i18n("9c541222ced2435288c24b34f8ad1fb8"),
@@ -149,13 +154,7 @@ amisEditorCore.setSchemaTpl('checkAll', function () {
       label: i18nRuntime.i18n("05bef457e8350e1a5d8007cad41b70e5"),
       name: 'defaultCheckAll',
       value: false
-    }), {
-      type: 'input-text',
-      name: 'checkAllLabel',
-      label: i18nRuntime.i18n("cf763c357566be6fdaee886a40ddcca7"),
-      value: i18nRuntime.i18n("66eeacd93a7c1bda93906fe908ad11a0"),
-      mode: 'row'
-    }]
+    }), amisEditorCore.getSchemaTpl('checkAllLabel')]
   }];
 });
 amisEditorCore.setSchemaTpl('joinValues', function () {
@@ -286,6 +285,15 @@ amisEditorCore.setSchemaTpl('optionControlV2', {
   type: 'ae-optionControl',
   closeDefaultCheck: true // 关闭默认值设置
 });
+/**
+ * mapping组件映射源
+ */
+amisEditorCore.setSchemaTpl('mapSourceControl', {
+  type: 'ae-mapSourceControl',
+  label: i18nRuntime.i18n("8b139ce9fa196b602bb1ee3bd25b25df"),
+  mode: 'normal',
+  name: 'source'
+});
 /**
  * 时间轴组件选项控件
  */

package/lib/tpl/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 
@@ -358,3 +358,190 @@ amisEditorCore.setSchemaTpl('style:widthHeight', function (option) {
     }]
   }]
 });
+/**
+ * 新版主题
+ */
+// css类名
+amisEditorCore.setSchemaTpl('theme:classNames', function (config) {
+  var _a = config || {},
+    _b = _a.isFormItem,
+    isFormItem = _b === void 0 ? true : _b;
+    _a.unsupportStatic;
+    var _d = _a.schema,
+    schema = _d === void 0 ? [] : _d;
+  return {
+    title: i18nRuntime.i18n("4434b33a8731a73613ba5fa1eb984efb"),
+    body: (isFormItem ? [{
+      type: 'theme-classname',
+      label: 'Label',
+      suffix: 'label',
+      name: 'labelClassName'
+    }, {
+      type: 'theme-classname',
+      label: i18nRuntime.i18n("3bdd08adab6ea90b9164b20a0e4151ac"),
+      suffix: 'description',
+      name: 'descriptionClassName',
+      visibleOn: 'this.description'
+    }] : [{
+      type: 'theme-classname',
+      label: i18nRuntime.i18n("5e5d3f13111593b2710673006d4c8297"),
+      name: 'className'
+    }]).concat(schema)
+  };
+});
+// form label
+amisEditorCore.setSchemaTpl('theme:form-label', function () {
+  return {
+    title: i18nRuntime.i18n("7e8eb474f73b6fd60c9aa5082f75e008"),
+    body: [amisEditorCore.getSchemaTpl('theme:font', {
+      label: i18nRuntime.i18n("ca746b1ff10193a3ce20878dec04a733"),
+      name: 'css.labelClassName.font'
+    }), amisEditorCore.getSchemaTpl('theme:paddingAndMargin', {
+      name: 'css.labelClassName.padding-and-margin'
+    })]
+  };
+});
+// form description
+amisEditorCore.setSchemaTpl('theme:form-description', function () {
+  return {
+    title: i18nRuntime.i18n("ef55ff12fb0d3efa3491236fee4dabc2"),
+    visibleOn: 'this.description',
+    body: [amisEditorCore.getSchemaTpl('theme:font', {
+      label: i18nRuntime.i18n("ca746b1ff10193a3ce20878dec04a733"),
+      name: 'css.descriptionClassName.font'
+    }), amisEditorCore.getSchemaTpl('theme:paddingAndMargin', {
+      name: 'css.descriptionClassName.padding-and-margin'
+    })]
+  };
+});
+// 文字编辑器
+amisEditorCore.setSchemaTpl('theme:font', function (option) {
+  if (option === void 0) {
+    option = {};
+  }
+  return tslib.__assign({
+    mode: 'default',
+    type: 'amis-theme-font-editor',
+    label: i18nRuntime.i18n("ca746b1ff10193a3ce20878dec04a733"),
+    name: "css.className.font",
+    needColorCustom: true
+  }, option);
+});
+// 颜色选择器
+amisEditorCore.setSchemaTpl('theme:colorPicker', function (option) {
+  if (option === void 0) {
+    option = {};
+  }
+  return tslib.__assign({
+    mode: 'default',
+    type: 'amis-theme-color-picker',
+    label: i18nRuntime.i18n("6b36c6f7ec834692ec6c8e3816349fdd"),
+    name: "css.className.color",
+    needCustom: true
+  }, option);
+});
+// 边框选择器
+amisEditorCore.setSchemaTpl('theme:border', function (option) {
+  if (option === void 0) {
+    option = {};
+  }
+  return tslib.__assign({
+    mode: 'default',
+    type: 'amis-theme-border',
+    label: i18nRuntime.i18n("961534b4ea37e4e88aada736b299d063"),
+    name: "css.className.border",
+    needColorCustom: true
+  }, option);
+});
+// 边距选择器
+amisEditorCore.setSchemaTpl('theme:paddingAndMargin', function (option) {
+  if (option === void 0) {
+    option = {};
+  }
+  return tslib.__assign({
+    mode: 'default',
+    type: 'amis-theme-padding-and-margin',
+    label: i18nRuntime.i18n("e8ed49e9fde0bb778e2185876c2d2697"),
+    name: "css.className.padding-and-margin"
+  }, option);
+});
+// 圆角选择器
+amisEditorCore.setSchemaTpl('theme:radius', function (option) {
+  if (option === void 0) {
+    option = {};
+  }
+  return tslib.__assign({
+    mode: 'default',
+    type: 'amis-theme-radius',
+    label: i18nRuntime.i18n("0103eb2d3dca70270d1a74e9ec987ac9"),
+    name: "css.className.radius"
+  }, option);
+});
+// 阴影选择器
+amisEditorCore.setSchemaTpl('theme:shadow', function (option) {
+  if (option === void 0) {
+    option = {};
+  }
+  return tslib.__assign({
+    type: 'amis-theme-shadow-editor',
+    label: false,
+    name: "css.className.boxShadow",
+    hasSenior: true
+  }, option);
+});
+amisEditorCore.setSchemaTpl('theme:common', function (exclude, include) {
+  // key统一转换成Kebab case，eg: boxShadow => bos-shadow
+  exclude = (exclude ? Array.isArray(exclude) ? exclude : [exclude] : []).map(function (key) {
+    return kebabCase__default["default"](key);
+  });
+  include = (include ? Array.isArray(include) ? include : [include] : []).map(function (key) {
+    return kebabCase__default["default"](key);
+  });
+  return [{
+    header: i18nRuntime.i18n("5aefca559c5a41d10078e21e6d616825"),
+    key: 'layout',
+    body: [{
+      type: 'style-display',
+      label: false,
+      name: 'style'
+    }].filter(function (comp) {
+      return !~exclude.indexOf(comp.type.replace(/^style-/i, ''));
+    })
+  }, {
+    header: i18nRuntime.i18n("39003734d1d700d5bd97bf1e7a2fcf73"),
+    key: 'style',
+    body: [amisEditorCore.getSchemaTpl('theme:border', {
+      name: 'style'
+    }), amisEditorCore.getSchemaTpl('theme:radius', {
+      name: 'style.radius'
+    }), amisEditorCore.getSchemaTpl('theme:paddingAndMargin', {
+      name: 'style'
+    }), amisEditorCore.getSchemaTpl('theme:colorPicker', {
+      name: 'style.background',
+      label: i18nRuntime.i18n("8e1b944f4389bdaab6f11d5bc83190c8"),
+      needCustom: true,
+      needGradient: true,
+      labelMode: 'input'
+    }), amisEditorCore.getSchemaTpl('theme:shadow', {
+      name: 'style.boxShadow'
+    })]
+  }, {
+    header: i18nRuntime.i18n("0103eb2d3dca70270d1a74e9ec987ac9"),
+    key: 'radius',
+    body: []
+  }, {
+    header: i18nRuntime.i18n("60bac4c0a381a42b320a703227be59eb"),
+    key: 'box-model',
+    body: []
+  }, {
+    header: i18nRuntime.i18n("8e1b944f4389bdaab6f11d5bc83190c8"),
+    key: 'background',
+    body: []
+  }, {
+    header: i18nRuntime.i18n("803205e38834280d9e6a75993ac00764"),
+    key: 'box-shadow',
+    body: []
+  }].filter(function (item) {
+    return include.length ? ~include.indexOf(item.key) : !~exclude.indexOf(item.key);
+  });
+});

package/lib/tpl/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 
@@ -215,6 +215,7 @@ amisEditorCore.setSchemaTpl('validations', function () {
   };
 });
 amisEditorCore.setSchemaTpl('validationErrors', function () {
+  var i18nEnabled = amisEditorCore.getI18nEnabled();
   var options = [
   // {
   //     label: '必填',
@@ -367,7 +368,7 @@ amisEditorCore.setSchemaTpl('validationErrors', function () {
       options: options,
       columnClassName: 'w-sm'
     }, {
-      type: 'input-text',
+      type: i18nEnabled ? 'input-text-i18n' : 'input-text',
       name: 'msg',
       placeholder: i18nRuntime.i18n("99c74120cc62f4bf31d661e3212b7121")
     }, {

package/lib/util.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/validator.js

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

package/package.json

@@ -1,10 +1,24 @@
 {
   "name": "amis-editor",
-  "version": "5.2.3-beta.16",
+  "version": "5.2.4-beta.28",
   "description": "amis 可视化编辑器",
   "main": "lib/index.js",
   "module": "esm/index.js",
   "types": "lib/index.d.ts",
+  "exports": {
+    ".": {
+      "require": "./lib/index.js",
+      "import": "./esm/index.js"
+    },
+    "./lib/*": {
+      "require": "./lib/*.js",
+      "import": "./esm/*.js"
+    },
+    "./*": {
+      "require": "./lib/*.js",
+      "import": "./esm/*.js"
+    }
+  },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "npm run clean-dist && NODE_ENV=production rollup -c ",
@@ -26,6 +40,8 @@
   "dependencies": {
     "@webcomponents/webcomponentsjs": "^2.6.0",
     "amis-editor-core": "*",
+    "amis-postcss": "1.0.0",
+    "amis-theme-editor": "*",
     "i18n-runtime": "*",
     "lodash": "^4.17.15",
     "mobx-state-tree": "^3.17.3"
@@ -85,6 +101,7 @@
     "amis": "*",
     "amis-core": "*",
     "amis-formula": "*",
+    "amis-theme-editor": "*",
     "amis-ui": "*",
     "i18n-runtime": "*",
     "react": ">=16.8.6",