amis-editor 6.9.0-rc.9 → 6.10.0-beta.0

package/lib/renderer/style-control/ThemeCssCode.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.9.0-rc.9
- * build time: 2024-10-30
+ * amis-editor v6.10.0-beta.0
+ * build time: 2024-11-25
  * Copyright 2018-2024 @fex
  */
 

package/lib/renderer/style-control/font-family.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.9.0-rc.9
- * build time: 2024-10-30
+ * amis-editor v6.10.0-beta.0
+ * build time: 2024-11-25
  * Copyright 2018-2024 @fex
  */
 

package/lib/renderer/style-control/helper.d.ts

@@ -10,9 +10,15 @@ interface InputStateOptions {
     hideRadius?: boolean;
     hideBackground?: boolean;
     hideBorder?: boolean;
+    hiddenOn?: string;
     schema?: any[];
+    fontToken?: (state: string) => string | object;
+    pmToken?: (state: string) => string;
+    radiusToken?: (state: string) => string | object;
+    backgroundToken?: (state: string) => string;
+    borderToken?: (state: string) => string | object;
 }
 export declare const inputStateTpl: (className: string, token?: string, options?: InputStateOptions) => any;
-export declare const inputStateFunc: (state: string, className: string, token: string, options?: InputStateOptions) => any[];
+export declare const inputStateFunc: (state: string, className: string, token?: string, options?: InputStateOptions) => any[];
 export declare const buttonStateFunc: (visibleOn: string, state: string) => any[];
 export {};

package/lib/renderer/style-control/helper.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.9.0-rc.9
- * build time: 2024-10-30
+ * amis-editor v6.10.0-beta.0
+ * build time: 2024-11-25
  * Copyright 2018-2024 @fex
  */
 
@@ -34,27 +34,32 @@ var inputStateTpl = function (className, token, options) {
     name: "__editorState".concat(className),
     label: i18nRuntime.i18n("3fea7ca76cdece641436d7ab0d02ab1b"),
     selectFirst: true,
-    options: stateOptions
+    options: stateOptions,
+    hiddenOn: (options === null || options === void 0 ? void 0 : options.hiddenOn) || false
   }], tslib.__read(stateOptions.map(function (item) {
     return {
       type: 'container',
       visibleOn: "${__editorState".concat(className, " == '").concat(item.value, "'") + (item.value === 'default' ? " || !__editorState".concat(className) : '') + "}",
+      hiddenOn: (options === null || options === void 0 ? void 0 : options.hiddenOn) || false,
       body: inputStateFunc(item.value, className, item.token || token, options)
     };
   })), false);
   return res;
 };
 var inputStateFunc = function (state, className, token, options) {
+  var _a, _b, _c, _d, _e;
   var cssTokenState = state === 'focused' ? 'active' : state;
-  if (token.includes('${state}')) {
-    token = token.replace(/\${state}/g, cssTokenState);
-  } else {
-    token = "".concat(token, "-").concat(cssTokenState);
+  if (token) {
+    if (token.includes('${state}')) {
+      token = token.replace(/\${state}/g, cssTokenState);
+    } else {
+      token = "".concat(token, "-").concat(cssTokenState);
+    }
   }
   return tslib.__spreadArray([!(options === null || options === void 0 ? void 0 : options.hideFont) && amisEditorCore.getSchemaTpl('theme:font', {
     label: i18nRuntime.i18n("ca746b1ff10193a3ce20878dec04a733"),
     name: "".concat(className, ".font:").concat(state),
-    editorValueToken: token,
+    editorValueToken: ((_a = options === null || options === void 0 ? void 0 : options.fontToken) === null || _a === void 0 ? void 0 : _a.call(options, cssTokenState)) || token,
     state: state
   }), !(options === null || options === void 0 ? void 0 : options.hideBackground) && amisEditorCore.getSchemaTpl('theme:colorPicker', {
     label: i18nRuntime.i18n("8e1b944f4389bdaab6f11d5bc83190c8"),
@@ -62,21 +67,21 @@ var inputStateFunc = function (state, className, token, options) {
     labelMode: 'input',
     needGradient: true,
     needImage: true,
-    editorValueToken: "".concat(token, "-bg-color"),
+    editorValueToken: ((_b = options === null || options === void 0 ? void 0 : options.backgroundToken) === null || _b === void 0 ? void 0 : _b.call(options, cssTokenState)) || token && "".concat(token, "-bg-color"),
     state: state
   }), !(options === null || options === void 0 ? void 0 : options.hideBorder) && amisEditorCore.getSchemaTpl('theme:border', {
     name: "".concat(className, ".border:").concat(state),
-    editorValueToken: token,
+    editorValueToken: ((_c = options === null || options === void 0 ? void 0 : options.borderToken) === null || _c === void 0 ? void 0 : _c.call(options, cssTokenState)) || token,
     state: state
   }), !(options === null || options === void 0 ? void 0 : options.hidePadding) && !(options === null || options === void 0 ? void 0 : options.hideMargin) && amisEditorCore.getSchemaTpl('theme:paddingAndMargin', {
     name: "".concat(className, ".padding-and-margin:").concat(state),
-    editorValueToken: token,
+    editorValueToken: ((_d = options === null || options === void 0 ? void 0 : options.pmToken) === null || _d === void 0 ? void 0 : _d.call(options, cssTokenState)) || token,
     state: state,
     hidePadding: options === null || options === void 0 ? void 0 : options.hidePadding,
     hideMargin: options === null || options === void 0 ? void 0 : options.hideMargin
   }), !(options === null || options === void 0 ? void 0 : options.hideRadius) && amisEditorCore.getSchemaTpl('theme:radius', {
     name: "".concat(className, ".radius:").concat(state),
-    editorValueToken: token,
+    editorValueToken: ((_e = options === null || options === void 0 ? void 0 : options.radiusToken) === null || _e === void 0 ? void 0 : _e.call(options, cssTokenState)) || token,
     state: state
   })], tslib.__read((options === null || options === void 0 ? void 0 : options.schema) || []), false).filter(Boolean);
 };

package/lib/renderer/style-control/transformation.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.9.0-rc.9
- * build time: 2024-10-30
+ * amis-editor v6.10.0-beta.0
+ * build time: 2024-11-25
  * Copyright 2018-2024 @fex
  */
 

package/lib/renderer/textarea-formula/FormulaPicker.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.9.0-rc.9
- * build time: 2024-10-30
+ * amis-editor v6.10.0-beta.0
+ * build time: 2024-11-25
  * Copyright 2018-2024 @fex
  */
 

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.9.0-rc.9
- * build time: 2024-10-30
+ * amis-editor v6.10.0-beta.0
+ * build time: 2024-11-25
  * Copyright 2018-2024 @fex
  */
 

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.9.0-rc.9
- * build time: 2024-10-30
+ * amis-editor v6.10.0-beta.0
+ * build time: 2024-11-25
  * Copyright 2018-2024 @fex
  */
 

package/lib/tpl/api.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.9.0-rc.9
- * build time: 2024-10-30
+ * amis-editor v6.10.0-beta.0
+ * build time: 2024-11-25
  * Copyright 2018-2024 @fex
  */
 

package/lib/tpl/common.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.9.0-rc.9
- * build time: 2024-10-30
+ * amis-editor v6.10.0-beta.0
+ * build time: 2024-11-25
  * Copyright 2018-2024 @fex
  */
 
@@ -1499,3 +1499,16 @@ amisEditorCore.setSchemaTpl('signBtn', function (options) {
     }]
   };
 });
+amisEditorCore.setSchemaTpl('closable', {
+  type: 'ae-StatusControl',
+  label: amisEditorCore.tipedLabel('可关闭选项卡', '选项卡内优先级更高'),
+  mode: 'normal',
+  name: 'closable',
+  expressionName: 'closableOn'
+});
+amisEditorCore.setSchemaTpl('inputForbid', {
+  type: 'switch',
+  label: '禁止输入',
+  name: 'inputForbid',
+  inputClassName: 'is-inline'
+});

package/lib/tpl/horizontal.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.9.0-rc.9
- * build time: 2024-10-30
+ * amis-editor v6.10.0-beta.0
+ * build time: 2024-11-25
  * Copyright 2018-2024 @fex
  */
 

package/lib/tpl/layout.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.9.0-rc.9
- * build time: 2024-10-30
+ * amis-editor v6.10.0-beta.0
+ * build time: 2024-11-25
  * Copyright 2018-2024 @fex
  */
 

package/lib/tpl/options.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.9.0-rc.9
- * build time: 2024-10-30
+ * amis-editor v6.10.0-beta.0
+ * build time: 2024-11-25
  * Copyright 2018-2024 @fex
  */
 

package/lib/tpl/remark.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.9.0-rc.9
- * build time: 2024-10-30
+ * amis-editor v6.10.0-beta.0
+ * build time: 2024-11-25
  * Copyright 2018-2024 @fex
  */
 

package/lib/tpl/style.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.9.0-rc.9
- * build time: 2024-10-30
+ * amis-editor v6.10.0-beta.0
+ * build time: 2024-11-25
  * Copyright 2018-2024 @fex
  */
 
@@ -710,6 +710,27 @@ amisEditorCore.setSchemaTpl('theme:cssCode', function () {
     }]
   };
 });
+// single css类名
+amisEditorCore.setSchemaTpl('theme:singleCssCode', function (options) {
+  var selectors = options.selectors;
+  return {
+    title: i18nRuntime.i18n("f01c3cd99ecb0c534cc47081d3433c9f"),
+    name: 'wrapperCustomStyle',
+    body: selectors === null || selectors === void 0 ? void 0 : selectors.map(function (item) {
+      var isRoot = item.isRoot,
+        selector = item.selector;
+      var _selector = isRoot ? 'root' : selector;
+      var name = "wrapperCustomStyle[".concat(_selector, "]");
+      return {
+        mode: 'default',
+        name: name,
+        type: 'ae-single-theme-cssCode',
+        label: false,
+        selector: item
+      };
+    })
+  };
+});
 // form label
 amisEditorCore.setSchemaTpl('theme:form-label', function () {
   return {
@@ -881,24 +902,24 @@ amisEditorCore.setSchemaTpl('theme:base', function (option) {
   var styleStateFunc = function (visibleOn, state) {
     return [!hideBorder && amisEditorCore.getSchemaTpl('theme:border', {
       visibleOn: visibleOn,
-      name: "themeCss.".concat(classname, ".border:").concat(state),
+      name: "themeCss.".concat(classname, ".border").concat(needState ? ':' + state : ''),
       state: state,
       editorValueToken: editorValueToken
     }), !hideRadius && amisEditorCore.getSchemaTpl('theme:radius', {
       visibleOn: visibleOn,
-      name: "themeCss.".concat(classname, ".radius:").concat(state),
+      name: "themeCss.".concat(classname, ".radius").concat(needState ? ':' + state : ''),
       state: state,
       editorValueToken: editorValueToken
     }), !hidePaddingAndMargin && amisEditorCore.getSchemaTpl('theme:paddingAndMargin', {
       visibleOn: visibleOn,
-      name: "themeCss.".concat(classname, ".padding-and-margin:").concat(state),
+      name: "themeCss.".concat(classname, ".padding-and-margin").concat(needState ? ':' + state : ''),
       hideMargin: hideMargin,
       hidePadding: hidePadding,
       state: state,
       editorValueToken: editorValueToken
     }), !hideBackground && amisEditorCore.getSchemaTpl('theme:colorPicker', {
       visibleOn: visibleOn,
-      name: "themeCss.".concat(classname, ".background:").concat(state),
+      name: "themeCss.".concat(classname, ".background").concat(needState ? ':' + state : ''),
       label: i18nRuntime.i18n("8e1b944f4389bdaab6f11d5bc83190c8"),
       needCustom: true,
       needGradient: true,
@@ -908,7 +929,7 @@ amisEditorCore.setSchemaTpl('theme:base', function (option) {
       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(needState ? ':' + state : ''),
       state: state,
       editorValueToken: editorValueToken
     })].filter(function (item) {
@@ -916,12 +937,12 @@ amisEditorCore.setSchemaTpl('theme:base', function (option) {
     }).concat(extra.map(function (item) {
       return tslib.__assign(tslib.__assign({}, item), {
         visibleOn: visibleOn,
-        name: "".concat(item.name, ":").concat(state),
+        name: "".concat(item.name).concat(needState ? ':' + state : ''),
         state: state
       });
     }));
   };
-  var styles = tslib.__spreadArray(tslib.__spreadArray(tslib.__spreadArray([needState && {
+  var styles = tslib.__spreadArray(tslib.__spreadArray(tslib.__spreadArray(tslib.__spreadArray(tslib.__spreadArray([needState && {
     type: 'select',
     mode: 'horizontal',
     labelAlign: 'left',
@@ -938,10 +959,16 @@ amisEditorCore.setSchemaTpl('theme:base', function (option) {
     }, {
       label: i18nRuntime.i18n("4363c17ebb346b646af55bd8c8075915"),
       value: 'active'
+    }, {
+      label: '选中',
+      value: 'focused'
+    }, {
+      label: i18nRuntime.i18n("710ad08b11419332713360d2750cd707"),
+      value: 'disabled'
     }].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);
+  }], 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), tslib.__read(styleStateFunc("${__editorState".concat(classId, " == 'focused'}"), 'focused')), false), tslib.__read(styleStateFunc("${__editorState".concat(classId, " == 'disabled'}"), 'disabled')), false).filter(Boolean);
   return {
     title: title,
     collapsed: collapsed,
@@ -960,7 +987,10 @@ amisEditorCore.setSchemaTpl('theme:common', function (option) {
     layoutExtra = _a.layoutExtra,
     classname = _a.classname,
     baseTitle = _a.baseTitle,
-    hidePaddingAndMargin = _a.hidePaddingAndMargin;
+    hidePaddingAndMargin = _a.hidePaddingAndMargin,
+    hideAnimation = _a.hideAnimation,
+    _c = _a.needState,
+    needState = _c === void 0 ? true : _c;
   var curCollapsed = collapsed !== null && collapsed !== void 0 ? collapsed : false; // 默认都展开
   // key统一转换成Kebab case，eg: boxShadow => bos-shadow
   exclude = (exclude ? Array.isArray(exclude) ? exclude : [exclude] : []).map(function (key) {
@@ -982,15 +1012,17 @@ amisEditorCore.setSchemaTpl('theme:common', function (option) {
     extra: baseExtra,
     classname: classname,
     title: baseTitle,
+    needState: needState,
     hidePaddingAndMargin: hidePaddingAndMargin
   })], tslib.__read(extra), false), [{
     title: i18nRuntime.i18n("f01c3cd99ecb0c534cc47081d3433c9f"),
+    key: 'theme-css-code',
     collapsed: curCollapsed,
     body: [{
       type: 'theme-cssCode',
       label: false
     }]
-  }, amisEditorCore.getSchemaTpl('animation')], false).filter(function (item) {
+  }, !hideAnimation && amisEditorCore.getSchemaTpl('animation')], false).filter(function (item) {
     return !~exclude.indexOf(item.key || '');
   });
 });
@@ -1026,6 +1058,11 @@ amisEditorCore.setSchemaTpl('animation', function () {
     if (isMobile) {
       doc = document.getElementsByClassName('ae-PreviewIFrame')[0].contentDocument;
     }
+    var highlightDom = document.getElementById('aePreviewHighlightBox');
+    if (highlightDom) {
+      highlightDom.style.opacity = '0';
+      highlightDom.classList.add('ae-Preview-widgets--no-transition');
+    }
     var el = doc.querySelector("[name=\"".concat(id, "\"]"));
     id = amis.formateId(id);
     var className = "".concat(animations[type].type, "-").concat(id, "-").concat(type);
@@ -1045,6 +1082,16 @@ amisEditorCore.setSchemaTpl('animation', function () {
     }
     timeoutId = setTimeout(function () {
       el === null || el === void 0 ? void 0 : el.classList.remove(className);
+      if (highlightDom) {
+        var editorId = el === null || el === void 0 ? void 0 : el.getAttribute('data-editor-id');
+        var node = window.editorStore.getNodeById(editorId);
+        // 重新计算元素高亮框的位置
+        node.calculateHighlightBox();
+        highlightDom.style.opacity = '1';
+        setTimeout(function () {
+          highlightDom.classList.remove('ae-Preview-widgets--no-transition');
+        }, 150);
+      }
     }, ((animations[type].duration || 1) + (animations[type].delay || 0)) * 1000 + 200);
   }
   var animation = function (type, label, schema) {
@@ -1063,11 +1110,31 @@ amisEditorCore.setSchemaTpl('animation', function () {
         }
         return undefined;
       },
+      onChange: function (value, a, b, _a) {
+        var _b;
+        var data = _a.data;
+        if (value) {
+          var id = data.id;
+          var animationType = 'fadeIn';
+          if ('children' in animationOptions[type][0]) {
+            // @ts-ignore
+            animationType = animationOptions[type][0].children[0].value;
+          } else {
+            // @ts-ignore
+            animationType = animationOptions[type][0].value;
+          }
+          playAnimation((_b = {}, _b[type] = {
+            delay: 0,
+            duration: 1,
+            type: animationType
+          }, _b), id, type);
+        }
+      },
       label: label
     }, {
       type: 'container',
       className: 'm-b ae-ExtendMore',
-      visibleOn: "animations.".concat(type),
+      visibleOn: "${animations && animations.".concat(type, "}"),
       body: tslib.__spreadArray([{
         type: 'select',
         name: "animations.".concat(type, ".type"),
@@ -1126,7 +1193,7 @@ amisEditorCore.setSchemaTpl('animation', function () {
       }], tslib.__read(schema), false)
     }, {
       type: 'button',
-      visibleOn: "animations.".concat(type),
+      visibleOn: "${animations && animations.".concat(type, "}"),
       className: 'm-b',
       block: true,
       level: 'enhance',

package/lib/tpl/validations.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.9.0-rc.9
- * build time: 2024-10-30
+ * amis-editor v6.10.0-beta.0
+ * build time: 2024-11-25
  * Copyright 2018-2024 @fex
  */
 

package/lib/util.d.ts

@@ -147,46 +147,6 @@ export declare const OPTION_EDIT_EVENTS_OLD: (schema: any) => {
     }[];
 }[];
 export declare const TREE_BASE_EVENTS: (schema: any) => ({
-    eventName: string;
-    eventLabel: string;
-    description: string;
-    dataSchema: (manager: EditorManager) => {
-        type: string;
-        properties: {
-            data: {
-                type: string;
-                title: string;
-                properties: {
-                    item: {
-                        type: string;
-                        title: string;
-                        properties: {
-                            [x: number]: {
-                                type: string;
-                                title: string;
-                            };
-                        };
-                    };
-                    value: any;
-                    items: {
-                        type: string;
-                        title: string;
-                        items: {
-                            type: string;
-                            title: string;
-                            properties: {
-                                [x: number]: {
-                                    type: string;
-                                    title: string;
-                                };
-                            };
-                        };
-                    };
-                };
-            };
-        };
-    }[];
-} | {
     eventName: string;
     eventLabel: string;
     description: string;
@@ -220,25 +180,7 @@ export declare const TREE_BASE_EVENTS: (schema: any) => ({
                 type: string;
                 title: string;
                 properties: {
-                    result: {
-                        type: string;
-                        title: string;
-                    };
                     value: any;
-                    items: {
-                        type: string;
-                        title: string;
-                        items: {
-                            type: string;
-                            title: string;
-                            properties: {
-                                [x: number]: {
-                                    type: string;
-                                    title: string;
-                                };
-                            };
-                        };
-                    };
                 };
             };
         };

package/lib/util.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.9.0-rc.9
- * build time: 2024-10-30
+ * amis-editor v6.10.0-beta.0
+ * build time: 2024-11-25
  * Copyright 2018-2024 @fex
  */
 
@@ -347,6 +347,25 @@ var TREE_BASE_EVENTS = function (schema) {
         }
       }];
     }
+  }, {
+    eventName: 'itemClick',
+    eventLabel: '节点点击',
+    description: '点击节点触发',
+    dataSchema: function (manager) {
+      var value = resolveOptionEventDataSchame(manager).value;
+      return [{
+        type: 'object',
+        properties: {
+          data: {
+            type: 'object',
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              value: value
+            }
+          }
+        }
+      }];
+    }
   }], tslib.__read(OPTION_EDIT_EVENTS), false), [{
     eventName: 'deferLoadFinished',
     eventLabel: i18nRuntime.i18n("58995b490ba67e5d29dd87f422b14861"),

package/lib/validator.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.9.0-rc.9
- * build time: 2024-10-30
+ * amis-editor v6.10.0-beta.0
+ * build time: 2024-11-25
  * Copyright 2018-2024 @fex
  */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-editor",
-  "version": "6.9.0-rc.9",
+  "version": "6.10.0-beta.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.9.0-rc.9",
+    "amis-editor-core": "^6.10.0-beta.0",
     "amis-postcss": "1.0.0",
     "amis-theme-editor-helper": "*",
     "i18n-runtime": "*",
@@ -56,7 +56,6 @@
     "@rollup/plugin-typescript": "^8.3.2",
     "@svgr/rollup": "^6.2.1",
     "@types/async": "^2.0.45",
-    "@types/classnames": "^2.2.3",
     "@types/codemirror": "5.60.10",
     "@types/deep-diff": "^1.0.0",
     "@types/history": "^4.6.0",