amis-editor 6.6.0 → 6.7.0

package/lib/tpl/layout.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.7.0
+ * build time: 2024-08-06
  * Copyright 2018-2024 @fex
  */
 
@@ -1013,4 +1013,4 @@ amisEditorCore.setSchemaTpl('layout:wrapper-contanier', function (config) {
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn
   };
 });
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/lib/tpl/options.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.7.0
+ * build time: 2024-08-06
  * Copyright 2018-2024 @fex
  */
 
@@ -670,4 +670,4 @@ amisEditorCore.setSchemaTpl('optionDeleteControl', function (params) {
     }
   }));
 });
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/lib/tpl/remark.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.7.0
+ * build time: 2024-08-06
  * Copyright 2018-2024 @fex
  */
 
@@ -24,4 +24,4 @@ amisEditorCore.setSchemaTpl('labelRemark', function () {
     labelRemark: i18nRuntime.i18n("7ad83bbe4646a0011ece7fd338d1e189")
   });
 });
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/lib/tpl/style.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.7.0
+ * build time: 2024-08-06
  * Copyright 2018-2024 @fex
  */
 
@@ -26,6 +26,19 @@ amisEditorCore.setSchemaTpl('style:formItem', function (_a) {
     ].concat(schema)
   };
 });
+amisEditorCore.setSchemaTpl('theme:formItem', function (_a) {
+  var _b = _a === void 0 ? {} : _a,
+    schema = _b.schema;
+  return {
+    title: i18nRuntime.i18n("55b45c73ae417c4dead67905b1550e85"),
+    key: 'formItem',
+    body: [amisEditorCore.getSchemaTpl('theme:labelHide'), {
+      type: 'col-size',
+      name: '__size',
+      label: i18nRuntime.i18n("c28479019e24e0e4745f4948e9e97ee7")
+    }].concat(schema)
+  };
+});
 amisEditorCore.setSchemaTpl('style:classNames', function (config) {
   var _a = config || {},
     _b = _a.isFormItem,
@@ -33,13 +46,16 @@ amisEditorCore.setSchemaTpl('style:classNames', function (config) {
     _c = _a.unsupportStatic,
     unsupportStatic = _c === void 0 ? false : _c,
     _d = _a.schema,
-    schema = _d === void 0 ? [] : _d;
+    schema = _d === void 0 ? [] : _d,
+    _e = _a.collapsed,
+    collapsed = _e === void 0 ? true : _e;
   return {
     title: i18nRuntime.i18n("4434b33a8731a73613ba5fa1eb984efb"),
+    collapsed: collapsed,
     body: (isFormItem ? tslib.__spreadArray([amisEditorCore.getSchemaTpl('className', {
       label: i18nRuntime.i18n("55b45c73ae417c4dead67905b1550e85")
     }), amisEditorCore.getSchemaTpl('className', {
-      label: i18nRuntime.i18n("14d342362f66aa86e2aa1c1e11aa1204"),
+      label: i18nRuntime.i18n("32c65d8d7431e76029678ec7bb73a5ab"),
       name: 'labelClassName'
     }), amisEditorCore.getSchemaTpl('className', {
       label: i18nRuntime.i18n("e1b2f870112bd38f8d7e14a0ad589930"),
@@ -375,14 +391,21 @@ amisEditorCore.setSchemaTpl('theme:cssCode', function () {
 // form label
 amisEditorCore.setSchemaTpl('theme:form-label', function () {
   return {
-    title: i18nRuntime.i18n("7e8eb474f73b6fd60c9aa5082f75e008"),
-    body: [amisEditorCore.getSchemaTpl('theme:select', {
+    title: i18nRuntime.i18n("35633d4bcf019258d4a5b927e8644bed"),
+    visibleOn: 'this.label !== false',
+    body: [{
+      type: 'label-align',
+      name: 'labelAlign',
+      label: i18nRuntime.i18n("d4d2a66820d30e07b44c850eb3f116c0")
+    }, amisEditorCore.getSchemaTpl('theme:select', {
       label: i18nRuntime.i18n("c28479019e24e0e4745f4948e9e97ee7"),
-      name: 'labelWidth'
+      name: 'labelWidth',
+      hiddenOn: 'this.labelAlign == "top"'
     }), amisEditorCore.getSchemaTpl('theme:font', {
       label: i18nRuntime.i18n("ca746b1ff10193a3ce20878dec04a733"),
       name: 'themeCss.labelClassName.font:default',
-      editorThemePath: 'form.item.default.label.body.font'
+      hasSenior: false,
+      editorValueToken: '--Form-item'
     }), amisEditorCore.getSchemaTpl('theme:paddingAndMargin', {
       name: 'themeCss.labelClassName.padding-and-margin:default'
     })]
@@ -396,10 +419,14 @@ amisEditorCore.setSchemaTpl('theme:form-description', function () {
     body: [amisEditorCore.getSchemaTpl('theme:font', {
       label: i18nRuntime.i18n("ca746b1ff10193a3ce20878dec04a733"),
       name: 'themeCss.descriptionClassName.font:default',
-      editorThemePath: 'form.item.default.description.body.font'
-    }), amisEditorCore.getSchemaTpl('theme:paddingAndMargin', {
-      name: 'themeCss.descriptionClassName.padding-and-margin:default'
-    })]
+      editorValueToken: '--Form-description'
+    }), {
+      label: '上间距',
+      type: 'amis-theme-select',
+      name: 'themeCss.descriptionClassName.margin-top:default',
+      options: '${sizesOptions}',
+      editorValueToken: '--Form-description-gap'
+    }]
   };
 });
 // 带提示的值输入框
@@ -409,6 +436,7 @@ amisEditorCore.setSchemaTpl('theme:select', function (option) {
   }
   return tslib.__assign({
     mode: 'horizontal',
+    labelAlign: 'left',
     type: 'amis-theme-select',
     label: i18nRuntime.i18n("58f966670529f4753fb3c5a0647606be"),
     name: "themeCss.className.select:default",
@@ -514,41 +542,69 @@ amisEditorCore.setSchemaTpl('theme:base', function (option) {
     _d = option.title,
     title = _d === void 0 ? i18nRuntime.i18n("6f99b6eed37795cb97d5f6370c32113b") : _d,
     hiddenOn = option.hiddenOn,
-    hidePaddingAndMargin = option.hidePaddingAndMargin;
-  var curHidePaddingAndMargin = hidePaddingAndMargin !== null && hidePaddingAndMargin !== void 0 ? hidePaddingAndMargin : false;
+    visibleOn = option.visibleOn,
+    hidePaddingAndMargin = option.hidePaddingAndMargin,
+    hideBorder = option.hideBorder,
+    hideRadius = option.hideRadius,
+    hideBackground = option.hideBackground,
+    hideShadow = option.hideShadow,
+    hideMargin = option.hideMargin,
+    hidePadding = option.hidePadding,
+    _e = option.needState,
+    needState = _e === void 0 ? true : _e,
+    editorValueToken = option.editorValueToken,
+    _f = option.state,
+    state = _f === void 0 ? ['default', 'hover', 'active'] : _f;
+  var classId = classname.replace(/\-/g, '_');
   var styleStateFunc = function (visibleOn, state) {
-    return [!curHidePaddingAndMargin ? amisEditorCore.getSchemaTpl('theme:paddingAndMargin', {
+    return [!hideBorder && amisEditorCore.getSchemaTpl('theme:border', {
       visibleOn: visibleOn,
-      name: "themeCss.".concat(classname, ".padding-and-margin:").concat(state)
-    }) : null, amisEditorCore.getSchemaTpl('theme:border', {
+      name: "themeCss.".concat(classname, ".border:").concat(state),
+      state: state,
+      editorValueToken: editorValueToken
+    }), !hideRadius && amisEditorCore.getSchemaTpl('theme:radius', {
       visibleOn: visibleOn,
-      name: "themeCss.".concat(classname, ".border:").concat(state)
-    }), amisEditorCore.getSchemaTpl('theme:colorPicker', {
+      name: "themeCss.".concat(classname, ".radius:").concat(state),
+      state: state,
+      editorValueToken: editorValueToken
+    }), !hidePaddingAndMargin && amisEditorCore.getSchemaTpl('theme:paddingAndMargin', {
+      visibleOn: visibleOn,
+      name: "themeCss.".concat(classname, ".padding-and-margin:").concat(state),
+      hideMargin: hideMargin,
+      hidePadding: hidePadding,
+      state: state,
+      editorValueToken: editorValueToken
+    }), !hideBackground && amisEditorCore.getSchemaTpl('theme:colorPicker', {
       visibleOn: visibleOn,
       name: "themeCss.".concat(classname, ".background:").concat(state),
       label: i18nRuntime.i18n("8e1b944f4389bdaab6f11d5bc83190c8"),
       needCustom: true,
       needGradient: true,
       needImage: true,
-      labelMode: 'input'
-    }), amisEditorCore.getSchemaTpl('theme:radius', {
-      visibleOn: visibleOn,
-      name: "themeCss.".concat(classname, ".radius:").concat(state)
-    }), amisEditorCore.getSchemaTpl('theme:shadow', {
+      labelMode: 'input',
+      state: state,
+      editorValueToken: editorValueToken ? "".concat(editorValueToken, "-${__editorState").concat(classId, " || 'default'}-bg-color") : undefined
+    }), !hideShadow && amisEditorCore.getSchemaTpl('theme:shadow', {
       visibleOn: visibleOn,
-      name: "themeCss.".concat(classname, ".boxShadow:").concat(state)
+      name: "themeCss.".concat(classname, ".boxShadow:").concat(state),
+      state: state,
+      editorValueToken: editorValueToken
     })].filter(function (item) {
       return item;
     }).concat(extra.map(function (item) {
       return tslib.__assign(tslib.__assign({}, item), {
         visibleOn: visibleOn,
-        name: "".concat(item.name, ":").concat(state)
+        name: "".concat(item.name, ":").concat(state),
+        state: state
       });
     }));
   };
-  var styles = tslib.__spreadArray(tslib.__spreadArray(tslib.__spreadArray([{
+  var styles = tslib.__spreadArray(tslib.__spreadArray(tslib.__spreadArray([needState && {
     type: 'select',
-    name: '__editorState',
+    mode: 'horizontal',
+    labelAlign: 'left',
+    labelWidth: 80,
+    name: "__editorState".concat(classId),
     label: i18nRuntime.i18n("3fea7ca76cdece641436d7ab0d02ab1b"),
     selectFirst: true,
     options: [{
@@ -560,13 +616,16 @@ amisEditorCore.setSchemaTpl('theme:base', function (option) {
     }, {
       label: i18nRuntime.i18n("4363c17ebb346b646af55bd8c8075915"),
       value: 'active'
-    }]
-  }], tslib.__read(styleStateFunc("${__editorState == 'default' || !__editorState}", 'default')), false), tslib.__read(styleStateFunc("${__editorState == 'hover'}", 'hover')), false), tslib.__read(styleStateFunc("${__editorState == 'active'}", 'active')), false);
+    }].filter(function (item) {
+      return state.includes(item.value);
+    })
+  }], tslib.__read(styleStateFunc("${__editorState".concat(classId, " == 'default' || !__editorState").concat(classId, "}"), 'default')), false), tslib.__read(styleStateFunc("${__editorState".concat(classId, " == 'hover'}"), 'hover')), false), tslib.__read(styleStateFunc("${__editorState".concat(classId, " == 'active'}"), 'active')), false).filter(Boolean);
   return {
     title: title,
     collapsed: collapsed,
     body: styles,
-    hiddenOn: hiddenOn
+    hiddenOn: hiddenOn,
+    visibleOn: visibleOn
   };
 });
 amisEditorCore.setSchemaTpl('theme:common', function (option) {
@@ -613,4 +672,28 @@ amisEditorCore.setSchemaTpl('theme:common', function (option) {
     return !~exclude.indexOf(item.key || '');
   });
 });
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+amisEditorCore.setSchemaTpl('theme:icon', function (option) {
+  var _a = option.classname,
+    classname = _a === void 0 ? 'iconControlClassName' : _a,
+    visibleOn = option.visibleOn,
+    _b = option.title,
+    title = _b === void 0 ? '图标样式' : _b;
+  return {
+    title: title,
+    visibleOn: visibleOn,
+    body: [amisEditorCore.getSchemaTpl('theme:select', {
+      label: i18nRuntime.i18n("7893f221dae53be8e3bfe72d2eb8a240"),
+      name: "themeCss.".concat(classname, ".iconSize")
+    }), amisEditorCore.getSchemaTpl('theme:colorPicker', {
+      name: "themeCss.".concat(classname, ".color"),
+      label: i18nRuntime.i18n("988d7b545c09108379a54a1e6060f563"),
+      needCustom: true,
+      needGradient: true,
+      labelMode: 'input'
+    }), amisEditorCore.getSchemaTpl('theme:paddingAndMargin', {
+      label: '图标边距',
+      name: "themeCss.".concat(classname, ".padding-and-margin")
+    })]
+  };
+});
+window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/lib/tpl/validations.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.7.0
+ * build time: 2024-08-06
  * Copyright 2018-2024 @fex
  */
 
@@ -503,4 +503,4 @@ amisEditorCore.setSchemaTpl('validationControl', function (value) {
     value: value
   };
 });
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/lib/util.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.7.0
+ * build time: 2024-08-06
  * Copyright 2018-2024 @fex
  */
 
@@ -455,4 +455,4 @@ exports.resolveOptionEventDataSchame = resolveOptionEventDataSchame;
 exports.resolveOptionType = resolveOptionType;
 exports.schemaArrayFormat = schemaArrayFormat;
 exports.schemaToArray = schemaToArray;
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/lib/validator.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.7.0
+ * build time: 2024-08-06
  * Copyright 2018-2024 @fex
  */
 
@@ -330,4 +330,4 @@ exports.getValidator = getValidator;
 exports.getValidatorsByTag = getValidatorsByTag;
 exports.registerValidator = registerValidator;
 exports.removeAllValidator = removeAllValidator;
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-editor",
-  "version": "6.6.0",
+  "version": "6.7.0",
   "description": "amis 可视化编辑器",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -41,7 +41,7 @@
   ],
   "dependencies": {
     "@webcomponents/webcomponentsjs": "^2.6.0",
-    "amis-editor-core": "^6.6.0",
+    "amis-editor-core": "^6.7.0",
     "amis-postcss": "1.0.0",
     "amis-theme-editor-helper": "*",
     "i18n-runtime": "*",