amis-editor 6.7.0 → 6.9.0-beta.0

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.7.0
- * build time: 2024-08-06
+ * amis-editor v6.9.0-beta.0
+ * build time: 2024-10-22
  * Copyright 2018-2024 @fex
  */
 
@@ -189,4 +189,3 @@ var Font = function (props) {
 })(React__default["default"].Component);
 
 exports["default"] = Font;
-window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.7.0
- * build time: 2024-08-06
+ * amis-editor v6.9.0-beta.0
+ * build time: 2024-10-22
  * Copyright 2018-2024 @fex
  */
 
@@ -71,4 +71,3 @@ mobxReact.observer(InsetBoxModel);
     ], BoxModelRenderer);
     return BoxModelRenderer;
 })(React__default["default"].Component));
-window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.7.0
- * build time: 2024-08-06
+ * amis-editor v6.9.0-beta.0
+ * build time: 2024-10-22
  * Copyright 2018-2024 @fex
  */
 
@@ -73,4 +73,3 @@ var LabelAlign = function (props) {
   })], LabelAlignRenderer);
   return LabelAlignRenderer;
 })(React__default["default"].Component);
-window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.7.0
- * build time: 2024-08-06
+ * amis-editor v6.9.0-beta.0
+ * build time: 2024-10-22
  * Copyright 2018-2024 @fex
  */
 
@@ -205,4 +205,3 @@ function ThemeCssCode(props) {
   })], ThemeCssCodeRenderer);
   return ThemeCssCodeRenderer;
 })(React__default["default"].Component);
-window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.7.0
- * build time: 2024-08-06
+ * amis-editor v6.9.0-beta.0
+ * build time: 2024-10-22
  * Copyright 2018-2024 @fex
  */
 
@@ -147,4 +147,3 @@ fontFamilyList.reduce(function (memo, current) {
 }, {});
 
 exports.fontFamilyList = fontFamilyList;
-window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

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

@@ -1,4 +1,15 @@
 export declare const inputStateTpl: (className: string, token?: string, options?: {
-    state: string[];
-}) => any[];
-export declare const inputStateFunc: (visibleOn: string, state: string, className: string, token: string, options?: any) => any[];
+    state?: {
+        label: string;
+        value: string;
+        token?: string | undefined;
+    }[] | undefined;
+    hideFont?: boolean | undefined;
+    hidePadding?: boolean | undefined;
+    hideMargin?: boolean | undefined;
+    hideRadius?: boolean | undefined;
+    hideBackground?: boolean | undefined;
+    hideBorder?: boolean | undefined;
+} | undefined) => any;
+export declare const inputStateFunc: (state: string, className: string, token: string, options: any) => any[];
+export declare const buttonStateFunc: (visibleOn: string, state: string) => any[];

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.7.0
- * build time: 2024-08-06
+ * amis-editor v6.9.0-beta.0
+ * build time: 2024-10-22
  * Copyright 2018-2024 @fex
  */
 
@@ -16,71 +16,113 @@ var inputStateTpl = function (className, token, options) {
   if (token === void 0) {
     token = '';
   }
-  if (options === void 0) {
-    options = {
-      state: ['default', 'hover', 'focused', 'disabled']
-    };
-  }
-  return tslib.__spreadArray(tslib.__spreadArray(tslib.__spreadArray(tslib.__spreadArray([{
+  var stateOptions = (options === null || options === void 0 ? void 0 : options.state) || [{
+    label: i18nRuntime.i18n("22b777e6fcb613b8ba83ced9594cd07e"),
+    value: 'default'
+  }, {
+    label: i18nRuntime.i18n("062d0b688adb10f3af5ebc2fd2667f1c"),
+    value: 'hover'
+  }, {
+    label: '选中',
+    value: 'focused'
+  }, {
+    label: i18nRuntime.i18n("710ad08b11419332713360d2750cd707"),
+    value: 'disabled'
+  }];
+  var res = tslib.__spreadArray([{
     type: 'select',
     name: "__editorState".concat(className),
     label: i18nRuntime.i18n("3fea7ca76cdece641436d7ab0d02ab1b"),
     selectFirst: true,
-    options: [{
-      label: i18nRuntime.i18n("22b777e6fcb613b8ba83ced9594cd07e"),
-      value: 'default'
-    }, {
-      label: i18nRuntime.i18n("062d0b688adb10f3af5ebc2fd2667f1c"),
-      value: 'hover'
-    }, {
-      label: '选中',
-      value: 'focused'
-    }, {
-      label: i18nRuntime.i18n("710ad08b11419332713360d2750cd707"),
-      value: 'disabled'
-    }].filter(function (item) {
-      return options.state.includes(item.value);
-    })
-  }], tslib.__read(inputStateFunc("${__editorState".concat(className, " == 'default' || !__editorState").concat(className, "}"), 'default', className, token)), false), tslib.__read(inputStateFunc("${__editorState".concat(className, " == 'hover'}"), 'hover', className, token)), false), tslib.__read(inputStateFunc("${__editorState".concat(className, " == 'focused'}"), 'focused', className, token)), false), tslib.__read(inputStateFunc("${__editorState".concat(className, " == 'disabled'}"), 'disabled', className, token)), false);
+    options: stateOptions
+  }], tslib.__read(stateOptions.map(function (item) {
+    return {
+      type: 'container',
+      visibleOn: "${__editorState".concat(className, " == '").concat(item.value, "'") + (item.value === 'default' ? " || !__editorState".concat(className) : '') + "}",
+      body: inputStateFunc(item.value, className, item.token || token, options)
+    };
+  })), false);
+  return res;
 };
-var inputStateFunc = function (visibleOn, state, className, token, options) {
-  if (options === void 0) {
-    options = [];
+var inputStateFunc = function (state, className, token, options) {
+  var cssTokenState = state === 'focused' ? 'active' : state;
+  if (token.includes('${state}')) {
+    token = token.replace(/\${state}/g, cssTokenState);
+  } else {
+    token = "".concat(token, "-").concat(cssTokenState);
   }
-  var cssToken = state === 'focused' ? 'active' : state;
-  return tslib.__spreadArray([amisEditorCore.getSchemaTpl('theme:font', {
+  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,
+    state: state
+  }), !(options === null || options === void 0 ? void 0 : options.hideBackground) && amisEditorCore.getSchemaTpl('theme:colorPicker', {
+    label: i18nRuntime.i18n("8e1b944f4389bdaab6f11d5bc83190c8"),
+    name: "".concat(className, ".background:").concat(state),
+    labelMode: 'input',
+    needGradient: true,
+    needImage: true,
+    editorValueToken: "".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,
+    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,
+    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,
+    state: state
+  })], tslib.__read((options === null || options === void 0 ? void 0 : options.schema) || []), false).filter(Boolean);
+};
+var buttonStateFunc = function (visibleOn, state) {
+  return [amisEditorCore.getSchemaTpl('theme:font', {
+    label: i18nRuntime.i18n("ca746b1ff10193a3ce20878dec04a733"),
+    name: "themeCss.className.font:".concat(state),
     visibleOn: visibleOn,
-    editorValueToken: "".concat(token, "-").concat(cssToken),
+    editorValueToken: {
+      'color': "--button-${level || \"default\"}-".concat(state, "-font-color"),
+      '*': '--button-size-${size || "default"}'
+    },
     state: state
   }), amisEditorCore.getSchemaTpl('theme:colorPicker', {
     label: i18nRuntime.i18n("8e1b944f4389bdaab6f11d5bc83190c8"),
-    name: "".concat(className, ".background:").concat(state),
+    name: "themeCss.className.background:".concat(state),
     labelMode: 'input',
     needGradient: true,
     needImage: true,
     visibleOn: visibleOn,
-    editorValueToken: "".concat(token, "-").concat(cssToken, "-bg-color"),
+    editorValueToken: "--button-${level || \"default\"}-".concat(state, "-bg-color"),
     state: state
   }), amisEditorCore.getSchemaTpl('theme:border', {
-    name: "".concat(className, ".border:").concat(state),
+    name: "themeCss.className.border:".concat(state),
     visibleOn: visibleOn,
-    editorValueToken: "".concat(token, "-").concat(cssToken),
+    editorValueToken: "--button-${level || \"default\"}-".concat(state),
     state: state
   }), amisEditorCore.getSchemaTpl('theme:paddingAndMargin', {
-    name: "".concat(className, ".padding-and-margin:").concat(state),
+    name: "themeCss.className.padding-and-margin:".concat(state),
     visibleOn: visibleOn,
-    editorValueToken: "".concat(token, "-").concat(cssToken),
+    editorValueToken: '--button-size-${size || "default"}',
     state: state
   }), amisEditorCore.getSchemaTpl('theme:radius', {
-    name: "".concat(className, ".radius:").concat(state),
+    name: "themeCss.className.radius:".concat(state),
+    visibleOn: visibleOn,
+    editorValueToken: '--button-size-${size || "default"}',
+    state: state
+  }), amisEditorCore.getSchemaTpl('theme:select', {
+    label: i18nRuntime.i18n("7893f221dae53be8e3bfe72d2eb8a240"),
+    name: "themeCss.iconClassName.iconSize:".concat(state),
     visibleOn: visibleOn,
-    editorValueToken: "".concat(token, "-").concat(cssToken),
+    editorValueToken: '--button-size-${size || "default"}-icon-size',
     state: state
-  })], tslib.__read(options), false);
+  })];
 };
 
+exports.buttonStateFunc = buttonStateFunc;
 exports.inputStateFunc = inputStateFunc;
 exports.inputStateTpl = inputStateTpl;
-window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.7.0
- * build time: 2024-08-06
+ * amis-editor v6.9.0-beta.0
+ * build time: 2024-10-22
  * Copyright 2018-2024 @fex
  */
 
@@ -84,4 +84,3 @@ function normalizeBoxShadow(config) {
 
 exports.normalizeBoxShadow = normalizeBoxShadow;
 exports.parseBoxShadow = parseBoxShadow;
-window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.7.0
- * build time: 2024-08-06
+ * amis-editor v6.9.0-beta.0
+ * build time: 2024-10-22
  * Copyright 2018-2024 @fex
  */
 
@@ -77,4 +77,3 @@ var FormulaPicker = function (props) {
 };
 
 exports["default"] = FormulaPicker;
-window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.7.0
- * build time: 2024-08-06
+ * amis-editor v6.9.0-beta.0
+ * build time: 2024-10-22
  * Copyright 2018-2024 @fex
  */
 
@@ -572,4 +572,3 @@ var TextareaFormulaControl = /** @class */function (_super) {
 })(TextareaFormulaControl);
 
 exports.TextareaFormulaControl = TextareaFormulaControl;
-window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.7.0
- * build time: 2024-08-06
+ * amis-editor v6.9.0-beta.0
+ * build time: 2024-10-22
  * Copyright 2018-2024 @fex
  */
 
@@ -236,4 +236,3 @@ var FormulaPlugin = /** @class */ (function () {
 
 exports.FormulaPlugin = FormulaPlugin;
 exports.editorFactory = editorFactory;
-window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/lib/tpl/api.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.7.0
- * build time: 2024-08-06
+ * amis-editor v6.9.0-beta.0
+ * build time: 2024-10-22
  * Copyright 2018-2024 @fex
  */
 
@@ -552,4 +552,3 @@ amisEditorCore.setSchemaTpl('loadingConfig', function (patch, _a) {
     }
   });
 });
-window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/lib/tpl/common.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.7.0
- * build time: 2024-08-06
+ * amis-editor v6.9.0-beta.0
+ * build time: 2024-10-22
  * Copyright 2018-2024 @fex
  */
 
@@ -1499,4 +1499,3 @@ amisEditorCore.setSchemaTpl('signBtn', function (options) {
     }]
   };
 });
-window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/lib/tpl/horizontal.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.7.0
- * build time: 2024-08-06
+ * amis-editor v6.9.0-beta.0
+ * build time: 2024-10-22
  * Copyright 2018-2024 @fex
  */
 
@@ -259,4 +259,3 @@ amisEditorCore.setSchemaTpl('subFormHorizontal', {
     }
   }]
 });
-window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/lib/tpl/layout.js

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

package/lib/tpl/options.js

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

package/lib/tpl/remark.js

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

package/lib/tpl/style.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.7.0
- * build time: 2024-08-06
+ * amis-editor v6.9.0-beta.0
+ * build time: 2024-10-22
  * Copyright 2018-2024 @fex
  */
 
@@ -27,16 +27,19 @@ amisEditorCore.setSchemaTpl('style:formItem', function (_a) {
   };
 });
 amisEditorCore.setSchemaTpl('theme:formItem', function (_a) {
-  var _b = _a === void 0 ? {} : _a,
-    schema = _b.schema;
+  var _b = _a === void 0 ? {
+      hidSize: false
+    } : _a,
+    schema = _b.schema,
+    hidSize = _b.hidSize;
   return {
     title: i18nRuntime.i18n("55b45c73ae417c4dead67905b1550e85"),
     key: 'formItem',
-    body: [amisEditorCore.getSchemaTpl('theme:labelHide'), {
+    body: [amisEditorCore.getSchemaTpl('theme:labelHide'), !hidSize && {
       type: 'col-size',
       name: '__size',
       label: i18nRuntime.i18n("c28479019e24e0e4745f4948e9e97ee7")
-    }].concat(schema)
+    }].filter(Boolean).concat(schema)
   };
 });
 amisEditorCore.setSchemaTpl('style:classNames', function (config) {
@@ -696,4 +699,3 @@ amisEditorCore.setSchemaTpl('theme:icon', function (option) {
     })]
   };
 });
-window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/lib/tpl/validations.js

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

package/lib/util.d.ts

@@ -259,3 +259,4 @@ export declare function escapeFormula(conf: any, keys?: string[]): any;
  * @returns 如果给定的 schema 是 model 组件则返回 true，否则返回 false
  */
 export declare function _isModelComp(schema: Record<string, any>): boolean;
+export declare const getOwnValue: (obj: any, key: string) => any;

package/lib/util.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.7.0
- * build time: 2024-08-06
+ * amis-editor v6.9.0-beta.0
+ * build time: 2024-10-22
  * Copyright 2018-2024 @fex
  */
 
@@ -442,12 +442,18 @@ function _isModelComp(schema) {
   });
   return extraEvaluation;
 }
+var getOwnValue = function (obj, key) {
+  if (obj && obj.hasOwnProperty(key)) {
+    return obj[key];
+  }
+};
 
 exports.OPTION_EDIT_EVENTS = OPTION_EDIT_EVENTS;
 exports.OPTION_EDIT_EVENTS_OLD = OPTION_EDIT_EVENTS_OLD;
 exports.TREE_BASE_EVENTS = TREE_BASE_EVENTS;
 exports._isModelComp = _isModelComp;
 exports.escapeFormula = escapeFormula;
+exports.getOwnValue = getOwnValue;
 exports.isAuto = isAuto;
 exports.resolveArrayDatasource = resolveArrayDatasource;
 exports.resolveInputTableEventDataSchame = resolveInputTableEventDataSchame;
@@ -455,4 +461,3 @@ exports.resolveOptionEventDataSchame = resolveOptionEventDataSchame;
 exports.resolveOptionType = resolveOptionType;
 exports.schemaArrayFormat = schemaArrayFormat;
 exports.schemaToArray = schemaToArray;
-window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/lib/validator.d.ts

@@ -1,3 +1,4 @@
+import './locale/index';
 /**
  * 校验规则类名
  */

package/lib/validator.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.7.0
- * build time: 2024-08-06
+ * amis-editor v6.9.0-beta.0
+ * build time: 2024-10-22
  * Copyright 2018-2024 @fex
  */
 
@@ -9,6 +9,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
+require('./locale/en-US.js');
+require('./locale/zh-CN.js');
 var i18nRuntime = require('i18n-runtime');
 
 var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
@@ -330,4 +332,3 @@ exports.getValidator = getValidator;
 exports.getValidatorsByTag = getValidatorsByTag;
 exports.registerValidator = registerValidator;
 exports.removeAllValidator = removeAllValidator;
-window.amisEditorVersionInfo={version:'6.7.0',buildTime:'2024-08-06'};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-editor",
-  "version": "6.7.0",
+  "version": "6.9.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.7.0",
+    "amis-editor-core": "^6.9.0-beta.0",
     "amis-postcss": "1.0.0",
     "amis-theme-editor-helper": "*",
     "i18n-runtime": "*",