amis-editor 6.6.0 → 6.8.0

package/esm/renderer/ValidationControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.8.0
+ * build time: 2024-09-03
  * Copyright 2018-2024 @fex
  */
 
@@ -8,9 +8,10 @@ import { __extends, __awaiter, __generator, __assign, __read, __decorate, __meta
 import React__default from 'react';
 import groupBy from 'lodash/groupBy';
 import remove from 'lodash/remove';
+import omit from 'lodash/omit';
 import cx from 'classnames';
 import { flattenTree, FormItem } from 'amis';
-import { isObjectShallowModified, getConditionVariables, autobind } from 'amis-editor-core';
+import { isObjectShallowModified, getConditionVariables, JSONPipeOut, autobind } from 'amis-editor-core';
 import ValidationItem from './ValidationItem.js';
 import { getValidatorsByTag, getValidator } from '../validator.js';
 import { i18n } from 'i18n-runtime';
@@ -262,6 +263,8 @@ var ValidationControl = /** @class */function (_super) {
   ValidationControl.prototype.renderValidaton = function () {
     var _this = this;
     var _a, _b, _c;
+    var _rendererSchema = ValidationControl.getRendererSchemaFromProps(this.props);
+    var rendererSchema = this.filterCustomRendererProps(_rendererSchema);
     var classPrefix = (_c = (_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.env) === null || _b === void 0 ? void 0 : _b.theme) === null || _c === void 0 ? void 0 : _c.classPrefix;
     var _d = this.state,
       _e = _d.avaliableValids,
@@ -278,6 +281,7 @@ var ValidationControl = /** @class */function (_super) {
         return v.name === validName;
       });
       rules.push(React__default.createElement(ValidationItem, {
+        rendererSchema: rendererSchema,
         fields: fields,
         key: validName,
         validator: defaultValidators[validName],
@@ -296,6 +300,7 @@ var ValidationControl = /** @class */function (_super) {
         return v.name === validName;
       });
       rules.push(React__default.createElement(ValidationItem, {
+        rendererSchema: rendererSchema,
         fields: fields,
         key: validName,
         validator: builtInValidators[validName],
@@ -321,6 +326,7 @@ var ValidationControl = /** @class */function (_super) {
           return;
         }
         rules.push(React__default.createElement(ValidationItem, {
+          rendererSchema: rendererSchema,
           fields: fields,
           key: valid.name,
           data: valid,
@@ -338,6 +344,47 @@ var ValidationControl = /** @class */function (_super) {
       key: "rules"
     }, rules);
   };
+  // 剔除掉一些用不上的属性
+  ValidationControl.prototype.filterCustomRendererProps = function (rendererSchema) {
+    var _a;
+    var _b = this.props,
+      data = _b.data;
+      _b.name;
+      var placeholder = _b.placeholder,
+      _rendererSchema = _b.rendererSchema;
+    var curRendererSchema = rendererSchema;
+    if (rendererSchema && typeof _rendererSchema === 'function') {
+      curRendererSchema = Object.assign({}, rendererSchema, {
+        type: (_a = rendererSchema.type) !== null && _a !== void 0 ? _a : data.type,
+        popOverContainer: function () {
+          return document.body;
+        },
+        name: 'value'
+      });
+      // 默认要剔除的字段
+      var deleteProps = ['id', '$$id', 'className', 'style', 'readOnly', 'horizontal', 'size', 'remark', 'labelRemark', 'static', 'staticOn', 'hidden', 'hiddenOn', 'visible', 'visibleOn', 'disabled', 'disabledOn', 'required', 'requiredOn', 'className', 'labelClassName', 'labelAlign', 'inputClassName', 'description', 'autoUpdate', 'prefix', 'suffix', 'unitOptions', 'keyboard', 'kilobitSeparator', 'value', 'inputControlClassName', 'css', 'validateApi', 'validations', 'themeCss', 'onEvent', 'embed'];
+      curRendererSchema = omit(curRendererSchema, deleteProps);
+      // 设置可清空
+      curRendererSchema.clearable = true;
+      if (placeholder) {
+        curRendererSchema.placeholder = placeholder;
+      }
+    }
+    JSONPipeOut(curRendererSchema);
+    return curRendererSchema;
+  };
+  /**
+   * 获取rendererSchema的值
+   */
+  ValidationControl.getRendererSchemaFromProps = function (props) {
+    var rendererSchema = props.rendererSchema;
+    if (typeof rendererSchema === 'function') {
+      var schema = props.data ? __assign({}, props.data) : undefined;
+      return rendererSchema(schema);
+    } else {
+      return rendererSchema;
+    }
+  };
   ValidationControl.prototype.render = function () {
     var className = this.props.className;
     return React__default.createElement("div", {
@@ -349,6 +396,7 @@ var ValidationControl = /** @class */function (_super) {
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", void 0)], ValidationControl.prototype, "handleEditRule", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", void 0)], ValidationControl.prototype, "handleRemoveRule", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Boolean, Object]), __metadata("design:returntype", void 0)], ValidationControl.prototype, "handleSwitchRule", null);
+  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", void 0)], ValidationControl.prototype, "filterCustomRendererProps", null);
   return ValidationControl;
 }(React__default.Component);
 /** @class */(function (_super) {
@@ -359,10 +407,15 @@ var ValidationControl = /** @class */function (_super) {
   ValidationControlRenderer = __decorate([FormItem({
     type: 'ae-validationControl',
     renderLabel: false,
-    strictMode: false
+    strictMode: false,
+    shouldComponentUpdate: function (props, nextProps) {
+      var rendererSchema = ValidationControl.getRendererSchemaFromProps(props);
+      var newRendererSchema = ValidationControl.getRendererSchemaFromProps(nextProps);
+      return isObjectShallowModified(rendererSchema, newRendererSchema);
+    }
   })], ValidationControlRenderer);
   return ValidationControlRenderer;
 })(ValidationControl);
 
 export { ValidationControl as default };
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.8.0',buildTime:'2024-09-03'};

package/esm/renderer/ValidationItem.d.ts

@@ -3,7 +3,7 @@
  */
 import React from 'react';
 import { Validator } from '../validator';
-import type { ConditionBuilderFields } from 'amis';
+import type { ConditionBuilderFields, Schema } from 'amis';
 export type ValidatorData = {
     name: string;
     value?: any;
@@ -25,6 +25,7 @@ export interface ValidationItemProps {
     isDefault: boolean;
     validator: Validator;
     fields?: ConditionBuilderFields;
+    rendererSchema?: Schema | Schema[];
     onEdit?: (data: ValidatorData) => void;
     onDelete?: (name: string) => void;
     onSwitch?: (checked: boolean, data?: ValidatorData) => void;

package/esm/renderer/ValidationItem.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.8.0
+ * build time: 2024-09-03
  * Copyright 2018-2024 @fex
  */
 
@@ -84,13 +84,24 @@ var ValidationItem = /** @class */function (_super) {
       value = _a.value,
       message = _a.message,
       checked = _a.checked;
-    var fields = this.props.fields;
+    var _b = this.props,
+      fields = _b.fields,
+      rendererSchema = _b.rendererSchema;
     var i18nEnabled = getI18nEnabled();
     var control = [];
     if (!checked) {
       return null;
     }
-    if (this.validator.schema) {
+    if (rendererSchema) {
+      var rendererSchemaArr = Array.isArray(rendererSchema) ? rendererSchema : [rendererSchema];
+      var filteredControl = rendererSchemaArr.filter(function (item) {
+        return item.validateName === _this.validator.name;
+      });
+      if (!filteredControl.length && this.validator.schema) {
+        filteredControl = filteredControl.concat(this.validator.schema);
+      }
+      control = filteredControl;
+    } else if (this.validator.schema) {
       control = control.concat(this.validator.schema);
     }
     if (this.validator.message) {
@@ -98,10 +109,6 @@ var ValidationItem = /** @class */function (_super) {
         name: 'message',
         type: i18nEnabled ? 'input-text-i18n' : 'input-text',
         label: tipedLabel(i18n("d7a169e81b60ee08c82b5d9de473e362"), "\u7CFB\u7EDF\u9ED8\u8BA4\u63D0\u793A\uFF1A".concat(this.validator.message)),
-        pipeIn: function (value, data) {
-          // value中 $1 会被运算，导致无法正确回显$1。此处从this.props.data中获取该校验项的错误提示
-          return _this.props.data.message;
-        },
         placeholder: i18n("5ef6ce89f52b4331b080a0f3019414f3")
       });
     }
@@ -123,15 +130,13 @@ var ValidationItem = /** @class */function (_super) {
       },
       preventEnterSubmit: true,
       submitOnChange: true,
-      body: control,
+      body: control
+    }, {
       data: {
         value: value,
-        message: message
-      }
-    }, {
-      data: __assign(__assign({}, this.props.data), {
+        message: message,
         fields: fields
-      }),
+      },
       onSubmit: this.handleEdit
     })) : null;
   };
@@ -168,4 +173,4 @@ var ValidationItem = /** @class */function (_super) {
 }(React__default.Component);
 
 export { ValidationItem as default };
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.8.0',buildTime:'2024-09-03'};

package/esm/renderer/ValueFormatControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.8.0
+ * build time: 2024-09-03
  * Copyright 2018-2024 @fex
  */
 
@@ -109,4 +109,4 @@ var ValueFormatControl = function (props) {
 FormItem({
   type: 'ae-valueFormat'
 })(ValueFormatControl);
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.8.0',buildTime:'2024-09-03'};

package/esm/renderer/crud2-control/AddColumnModal.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.8.0
+ * build time: 2024-09-03
  * Copyright 2018-2024 @fex
  */
 
@@ -255,4 +255,4 @@ var AddColumnModal = function (props) {
 var AddColumnModal$1 = themeable(AddColumnModal);
 
 export { AddColumnModal$1 as default };
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.8.0',buildTime:'2024-09-03'};

package/esm/renderer/crud2-control/CRUDColumnControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.8.0
+ * build time: 2024-09-03
  * Copyright 2018-2024 @fex
  */
 
@@ -473,4 +473,4 @@ var CRUDColumnControl = /** @class */function (_super) {
 })(CRUDColumnControl);
 
 export { CRUDColumnControl };
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.8.0',buildTime:'2024-09-03'};

package/esm/renderer/crud2-control/CRUDFiltersControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.8.0
+ * build time: 2024-09-03
  * Copyright 2018-2024 @fex
  */
 
@@ -691,4 +691,4 @@ var CRUDFiltersControl = /** @class */function (_super) {
 })(CRUDFiltersControl);
 
 export { CRUDFiltersControl };
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.8.0',buildTime:'2024-09-03'};

package/esm/renderer/crud2-control/CRUDToolbarControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.8.0
+ * build time: 2024-09-03
  * Copyright 2018-2024 @fex
  */
 
@@ -406,4 +406,4 @@ var CRUDToolbarControl = /** @class */function (_super) {
 })(CRUDToolbarControl);
 
 export { CRUDToolbarControl };
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.8.0',buildTime:'2024-09-03'};

package/esm/renderer/event-control/DialogActionPanel.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.8.0
+ * build time: 2024-09-03
  * Copyright 2018-2024 @fex
  */
 
@@ -369,17 +369,21 @@ function DialogActionPanel(_a) {
       }
       var _b = definitions[key],
         $$originId = _b.$$originId,
-        modal = __rest(_b, ["$$originId"]);
+        definition = __rest(_b, ["$$originId"]);
+      // 当前弹窗不需要合并
+      if ($$originId === modal.$$id || definition.$$ref && definition.$$ref === modal.$$ref) {
+        return;
+      }
       var idx = arr.findIndex(function (item) {
         return $$originId ? (item.modal.$$originId || item.modal.$$id) === $$originId : item.modal.$$ref === key;
       });
-      var label = "".concat(((_a = modal.editorSetting) === null || _a === void 0 ? void 0 : _a.displayName) || modal.title || '未命名弹窗');
-      var tip = modal.actionType === 'confirmDialog' ? '确认框' : modal.type === 'drawer' ? '抽屉弹窗' : i18n("6cff4b6d794cc17f5d24dbe0d21e5732");
+      var label = "".concat(((_a = definition.editorSetting) === null || _a === void 0 ? void 0 : _a.displayName) || definition.title || '未命名弹窗');
+      var tip = definition.actionType === 'confirmDialog' ? '确认框' : definition.type === 'drawer' ? '抽屉弹窗' : i18n("6cff4b6d794cc17f5d24dbe0d21e5732");
       if (~idx) {
         arr.splice(idx, 1, __assign(__assign({}, arr[idx]), {
           label: label,
           tip: tip,
-          modal: __assign(__assign({}, modal), {
+          modal: __assign(__assign({}, definition), {
             $$ref: key,
             $$originId: $$originId
           }),
@@ -393,8 +397,8 @@ function DialogActionPanel(_a) {
         arr.push({
           label: label,
           tip: tip,
-          value: modal.$$id,
-          modal: JSONPipeIn(__assign(__assign({}, modal), {
+          value: definition.$$id,
+          modal: JSONPipeIn(__assign(__assign({}, definition), {
             $$ref: key
           })),
           isModified: true
@@ -633,4 +637,4 @@ function DialogActionPanel(_a) {
 var DialogActionPanel$1 = observer(DialogActionPanel);
 
 export { DialogActionPanel$1 as default };
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.8.0',buildTime:'2024-09-03'};

package/esm/renderer/event-control/action-config-dialog.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.8.0
+ * build time: 2024-09-03
  * Copyright 2018-2024 @fex
  */
 
@@ -327,4 +327,4 @@ var ActionDialog = /** @class */function (_super) {
 }(React__default.Component);
 
 export { ActionDialog as default };
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.8.0',buildTime:'2024-09-03'};

package/esm/renderer/event-control/action-config-panel.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.8.0
+ * build time: 2024-09-03
  * Copyright 2018-2024 @fex
  */
 
@@ -55,4 +55,4 @@ var ActionConfigPanel = /** @class */function (_super) {
 }(React__default.Component);
 
 export { ActionConfigPanel as default };
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.8.0',buildTime:'2024-09-03'};

package/esm/renderer/event-control/comp-action-select.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.8.0
+ * build time: 2024-09-03
  * Copyright 2018-2024 @fex
  */
 
@@ -74,4 +74,4 @@ var CmptActionSelect = /** @class */function (_super) {
 }(React__default.Component);
 
 export { BASE_ACTION_PROPS, CmptActionSelect as default };
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.8.0',buildTime:'2024-09-03'};

package/esm/renderer/event-control/helper.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.8.0
+ * build time: 2024-09-03
  * Copyright 2018-2024 @fex
  */
 
@@ -42,7 +42,7 @@ var getRootManager = function (manager) {
   return rootManager;
 };
 // 数据容器范围
-var DATA_CONTAINER = ['form', 'dialog', 'drawer', 'wizard', 'service', 'crud', 'page', 'app', 'chart'];
+var DATA_CONTAINER = ['form', 'dialog', 'drawer', 'wizard', 'service', 'crud', 'page', 'app', 'chart', 'crud2'];
 var MSG_TYPES = {
   info: i18n("02d9819ddaaaeb1b7b22b12608c7e5ca"),
   warning: i18n("900c70fa5f7dbc014e6f762d5e0e885c"),
@@ -56,7 +56,7 @@ var SELECT_PROPS_CONTAINER = ['form'];
 // 是否下拉展示可赋值属性
 var SHOW_SELECT_PROP = "".concat(JSON.stringify(SELECT_PROPS_CONTAINER), ".includes(this.__rendererName)");
 // 表单项组件
-var FORMITEM_CMPTS = ['button-group-select', 'button-toolbar', 'chained-select', 'chart-radios', 'checkbox', 'checkboxes', 'combo', 'input-kv', 'condition-builder', 'diff-editor', 'editor', 'formula', 'hidden', 'icon-picker', 'input-array', 'input-city', 'input-color', 'input-date', 'input-date-range', 'input-datetime-range', 'input-time-range', 'input-excel', 'input-file', 'input-formula', 'input-group', 'input-image', 'input-month-range', 'input-number', 'input-quarter-range', 'input-range', 'input-rating', 'input-repeat', 'input-rich-text', 'input-sub-form', 'input-table', 'input-tag', 'input-text', 'input-password', 'input-email', 'input-url', 'native-date', 'native-time', 'native-number', 'input-tree', 'input-year-range', 'list-select', 'location-picker', 'matrix-checkboxes', 'nested-select', 'cascader-select', 'picker', 'radios', 'select', 'multi-select', 'switch', 'tabs-transfer', 'tabs-transfer-picker', 'textarea', 'transfer', 'transfer-picker', 'tree-select', 'uuid'];
+var FORMITEM_CMPTS = ['button-group-select', 'button-toolbar', 'chained-select', 'chart-radios', 'checkbox', 'checkboxes', 'combo', 'input-kv', 'condition-builder', 'diff-editor', 'editor', 'formula', 'hidden', 'icon-picker', 'input-array', 'input-city', 'input-color', 'input-date', 'input-date-range', 'input-datetime-range', 'input-time-range', 'input-excel', 'input-file', 'input-formula', 'input-group', 'input-image', 'input-month-range', 'input-number', 'input-quarter-range', 'input-range', 'input-rating', 'input-repeat', 'input-rich-text', 'input-sub-form', 'input-table', 'input-tag', 'input-text', 'input-password', 'input-email', 'input-url', 'native-date', 'native-time', 'native-number', 'input-tree', 'input-year-range', 'list-select', 'location-picker', 'matrix-checkboxes', 'nested-select', 'cascader-select', 'picker', 'radios', 'select', 'multi-select', 'switch', 'tabs-transfer', 'tabs-transfer-picker', 'textarea', 'transfer', 'transfer-picker', 'tree-select', 'uuid', 'user-select', 'department-select'];
 var SUPPORT_STATIC_FORMITEM_CMPTS = without.apply(void 0, __spreadArray([FORMITEM_CMPTS], ['button-toolbar', 'condition-builder', 'diff-editor', 'editor', 'formula', 'hidden', 'icon-picker', 'input-excel', 'input-file', 'input-formula', 'input-image', 'input-repeat', 'input-rich-text', 'input-sub-form', 'input-table', 'picker', 'uuid'], false));
 var SUPPORT_DISABLED_CMPTS = ['button-group', 'action', 'button', 'submit', 'reset', 'collapse', 'container', 'dropdown-button', 'flex', 'flex-item', 'grid', 'grid-2d', 'link', 'nav', 'wizard'
 // 'card2'
@@ -2355,7 +2355,7 @@ var getEventControlConfig = function (manager, context) {
             }
             if (['setValue'].includes(action.actionType)) {
               root = getRootManager(manager);
-              schema = JSONGetById(root.store.schema, config.__cmptId, 'id');
+              schema = JSONGetById(root.store.schema, config.__cmptId || action.componentId, 'id');
               if (schema) {
                 __isScopeContainer = DATA_CONTAINER.includes(schema.type);
                 config.__isScopeContainer = __isScopeContainer;
@@ -2570,4 +2570,4 @@ var updateCommonUseActions = function (action) {
 };
 
 export { ACTION_TYPE_TREE, COMMON_ACTION_SCHEMA_MAP, DATA_CONTAINER, FORMITEM_CMPTS, SELECT_PROPS_CONTAINER, SHOW_SELECT_PROP, SUPPORT_DISABLED_CMPTS, SUPPORT_STATIC_FORMITEM_CMPTS, findActionNode, findSubActionNode, getActionType, getArgsWrapper, getEventControlConfig, getEventDesc, getEventLabel, getEventStrongDesc, getOldActionSchema, getPropOfAcion, hasActionType, renderCmptActionSelect, renderCmptIdInput, renderCmptSelect, updateCommonUseActions };
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.8.0',buildTime:'2024-09-03'};

package/esm/renderer/event-control/index.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.8.0
+ * build time: 2024-09-03
  * Copyright 2018-2024 @fex
  */
 
@@ -76,15 +76,14 @@ var EventControl = /** @class */function (_super) {
       });
     }
     if ((data === null || data === void 0 ? void 0 : data.type) !== ((_a = prevProps.data) === null || _a === void 0 ? void 0 : _a.type) || (data === null || data === void 0 ? void 0 : data.onEvent) !== ((_b = prevProps.data) === null || _b === void 0 ? void 0 : _b.onEvent)) {
-      var eventPanelActive_1 = {};
       var tmpEvents = events[rawType || (!data.type || data.type === 'text' ? 'plain' : data.type)] || [];
       var pluginEvents = typeof tmpEvents === 'function' ? tmpEvents(data) : __spreadArray([], __read(tmpEvents), false);
-      pluginEvents.forEach(function (event) {
-        eventPanelActive_1[event.eventName] = true;
-      });
+      // 事件配置面板不自动折叠
+      // pluginEvents.forEach((event: RendererPluginEvent) => {
+      //   eventPanelActive[event.eventName] = true;
+      // });
       this.setState({
-        events: pluginEvents,
-        eventPanelActive: eventPanelActive_1
+        events: pluginEvents
       });
     }
   };
@@ -258,12 +257,11 @@ var EventControl = /** @class */function (_super) {
     if (action.actionType === 'broadcast') {
       typeof removeBroadcast === 'function' && removeBroadcast(action.eventName);
     }
-    onEventConfig[event] = {
+    onEventConfig[event] = __assign(__assign({}, onEventConfig[event]), {
       actions: onEventConfig[event].actions.filter(function (item, actionIndex) {
         return index !== actionIndex;
-      }),
-      weight: onEvent[event].weight
-    };
+      })
+    });
     if (onEventConfig[event].actions.length < 1) {
       activeConfig[event] = false;
       this.setState({
@@ -1054,4 +1052,4 @@ var EventControl = /** @class */function (_super) {
 })(EventControl);
 
 export { EventControl };
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.8.0',buildTime:'2024-09-03'};

package/esm/renderer/style-control/Background.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.8.0
+ * build time: 2024-09-03
  * Copyright 2018-2024 @fex
  */
 
@@ -481,4 +481,4 @@ var Background = function (props) {
 })(React__default.Component);
 
 export { Background as default };
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.8.0',buildTime:'2024-09-03'};

package/esm/renderer/style-control/Border.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.8.0
+ * build time: 2024-09-03
  * Copyright 2018-2024 @fex
  */
 
@@ -216,4 +216,4 @@ observer(BoxBorder);
   })], BorderRenderer);
   return BorderRenderer;
 })(React__default.Component);
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.8.0',buildTime:'2024-09-03'};

package/esm/renderer/style-control/BoxModel.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.8.0
+ * build time: 2024-09-03
  * Copyright 2018-2024 @fex
  */
 
@@ -66,4 +66,4 @@ observer(BoxModel);
     ], BoxModelRenderer);
     return BoxModelRenderer;
 })(React__default.Component));
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.8.0',buildTime:'2024-09-03'};

package/esm/renderer/style-control/BoxShadow.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.6.0
- * build time: 2024-07-01
+ * amis-editor v6.8.0
+ * build time: 2024-09-03
  * Copyright 2018-2024 @fex
  */
 
@@ -113,4 +113,4 @@ function BoxShadow(_a) {
 })(React__default.Component);
 
 export { BoxShadow as default };
-window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};
+window.amisEditorVersionInfo={version:'6.8.0',buildTime:'2024-09-03'};

package/esm/renderer/style-control/ColCount.d.ts

@@ -0,0 +1,5 @@
+import { FormControlProps } from 'amis-core';
+import React from 'react';
+export declare class ColCountRenderer extends React.Component<FormControlProps> {
+    render(): React.JSX.Element;
+}

package/esm/renderer/style-control/ColCount.js

@@ -0,0 +1,54 @@
+/**
+ * amis-editor v6.8.0
+ * build time: 2024-09-03
+ * Copyright 2018-2024 @fex
+ */
+
+import { __extends, __assign, __decorate, __read, __spreadArray } from 'tslib';
+import { FormItem } from 'amis-core';
+import React__default from 'react';
+import cx from 'classnames';
+
+var colCount = [1, 2, 3, 4];
+var ColCount = function (props) {
+    var _a = __read(React__default.useState(props.value), 2), value = _a[0], setValue = _a[1];
+    function handleClick(value) {
+        props.manager.store;
+        var body = __spreadArray([], __read((props.data.body || [])), false);
+        var row = 0;
+        var count = value;
+        for (var i = 0; i < body.length; i++) {
+            // 需要独占一行的组件
+            if (body[i].$$dragMode === 'hv') {
+                count = value;
+                body[i] = __assign(__assign({}, body[i]), { row: ++row });
+                row++;
+            }
+            else {
+                count--;
+                body[i] = __assign(__assign({}, body[i]), { row: row, colSize: value > 1 ? "1/".concat(value) : '1' });
+                if (count === 0) {
+                    row++;
+                    count = value;
+                }
+            }
+        }
+        props.setValue(body, 'body');
+        setValue(value);
+    }
+    return (React__default.createElement("div", { className: "ColCount" }, colCount.map(function (n) { return (React__default.createElement("div", { key: n, className: cx('ColCount-item', value === n && 'is-active'), onClick: function () { return handleClick(n); } }, n)); })));
+};
+/** @class */ ((function (_super) {
+    __extends(ColCountRenderer, _super);
+    function ColCountRenderer() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    ColCountRenderer.prototype.render = function () {
+        return React__default.createElement(ColCount, __assign({}, this.props));
+    };
+    ColCountRenderer = __decorate([
+        FormItem({ type: 'col-count', strictMode: false })
+    ], ColCountRenderer);
+    return ColCountRenderer;
+})(React__default.Component));
+window.amisEditorVersionInfo={version:'6.8.0',buildTime:'2024-09-03'};

package/esm/renderer/style-control/ColSize.d.ts

@@ -0,0 +1,5 @@
+import { FormControlProps } from 'amis-core';
+import React from 'react';
+export declare class ColSizeRenderer extends React.Component<FormControlProps> {
+    render(): React.JSX.Element;
+}