amis-editor 6.4.1 → 6.6.0

package/esm/plugin/SearchBox.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -181,4 +181,4 @@ var SearchBoxPlugin = /** @class */function (_super) {
 registerEditorPlugin(SearchBoxPlugin);
 
 export { SearchBoxPlugin };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/plugin/Service.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -371,4 +371,4 @@ var ServicePlugin = /** @class */function (_super) {
 registerEditorPlugin(ServicePlugin);
 
 export { ServicePlugin };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/plugin/Sparkline.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -69,4 +69,4 @@ var SparklinePlugin = /** @class */function (_super) {
 registerEditorPlugin(SparklinePlugin);
 
 export { SparklinePlugin };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/plugin/Status.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -263,4 +263,4 @@ var StatusPlugin = /** @class */function (_super) {
 registerEditorPlugin(StatusPlugin);
 
 export { StatusPlugin };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/plugin/Steps.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -115,4 +115,4 @@ var StepsPlugin = /** @class */function (_super) {
 registerEditorPlugin(StepsPlugin);
 
 export { StepsPlugin };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/plugin/Submit.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -35,4 +35,4 @@ var SubmitPlugin = /** @class */function (_super) {
 registerEditorPlugin(SubmitPlugin);
 
 export { SubmitPlugin };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/plugin/SwitchContainer.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -207,12 +207,12 @@ var SwitchContainerPlugin = /** @class */function (_super) {
       var isFlexItem = (_a = _this.manager) === null || _a === void 0 ? void 0 : _a.isFlexItem(context === null || context === void 0 ? void 0 : context.id);
       var isFlexColumnItem = (_b = _this.manager) === null || _b === void 0 ? void 0 : _b.isFlexColumnItem(context === null || context === void 0 ? void 0 : context.id);
       var displayTpl = [getSchemaTpl('layout:display'), getSchemaTpl('layout:flex-setting', {
-        visibleOn: 'data.style && (data.style.display === "flex" || data.style.display === "inline-flex")',
+        visibleOn: 'this.style && (this.style.display === "flex" || this.style.display === "inline-flex")',
         direction: curRendererSchema.direction,
         justify: curRendererSchema.justify,
         alignItems: curRendererSchema.alignItems
       }), getSchemaTpl('layout:flex-wrap', {
-        visibleOn: 'data.style && (data.style.display === "flex" || data.style.display === "inline-flex")'
+        visibleOn: 'this.style && (this.style.display === "flex" || this.style.display === "inline-flex")'
       })];
       return getSchemaTpl('tabs', [{
         title: i18n("24d67862f87f439db7ca957aecb77cce"),
@@ -260,17 +260,17 @@ var SwitchContainerPlugin = /** @class */function (_super) {
           })], __read(!isFreeContainer ? displayTpl : []), false), __read(isFlexItem ? [getSchemaTpl('layout:flex', {
             isFlexColumnItem: isFlexColumnItem,
             label: isFlexColumnItem ? i18n("f02f876ee64cc016d97fa4dc498d4857") : i18n("a170a375b264f7fe0c02a7ca8c268784"),
-            visibleOn: 'data.style && (data.style.position === "static" || data.style.position === "relative")'
+            visibleOn: 'this.style && (this.style.position === "static" || this.style.position === "relative")'
           }), getSchemaTpl('layout:flex-grow', {
-            visibleOn: 'data.style && data.style.flex === "1 1 auto" && (data.style.position === "static" || data.style.position === "relative")'
+            visibleOn: 'this.style && this.style.flex === "1 1 auto" && (this.style.position === "static" || this.style.position === "relative")'
           }), getSchemaTpl('layout:flex-basis', {
             label: isFlexColumnItem ? i18n("183f00df0922a6be371fea58cd46a60a") : i18n("f92626f9e56b3e2d0c47495a446acf71"),
-            visibleOn: 'data.style && (data.style.position === "static" || data.style.position === "relative") && data.style.flex === "1 1 auto"'
+            visibleOn: 'this.style && (this.style.position === "static" || this.style.position === "relative") && this.style.flex === "1 1 auto"'
           }), getSchemaTpl('layout:flex-basis', {
             label: isFlexColumnItem ? i18n("c19b79073b676b9bade80613aba2dbfa") : i18n("b591aed69defa2abf0486da6a58dfb5e"),
-            visibleOn: 'data.style && (data.style.position === "static" || data.style.position === "relative") && data.style.flex === "0 0 150px"'
+            visibleOn: 'this.style && (this.style.position === "static" || this.style.position === "relative") && this.style.flex === "0 0 150px"'
           })] : []), false), [getSchemaTpl('layout:overflow-x', {
-            visibleOn: "".concat(isFlexItem && !isFlexColumnItem, " && data.style.flex === '0 0 150px'")
+            visibleOn: "".concat(isFlexItem && !isFlexColumnItem, " && this.style.flex === '0 0 150px'")
           }), getSchemaTpl('layout:isFixedHeight', {
             visibleOn: "".concat(!isFlexItem || !isFlexColumnItem),
             onChange: function (value) {
@@ -283,7 +283,7 @@ var SwitchContainerPlugin = /** @class */function (_super) {
           }), getSchemaTpl('layout:min-height', {
             visibleOn: "".concat(!isFlexItem || !isFlexColumnItem)
           }), getSchemaTpl('layout:overflow-y', {
-            visibleOn: "".concat(!isFlexItem || !isFlexColumnItem, " && (data.isFixedHeight || data.style && data.style.maxHeight) || (").concat(isFlexItem && isFlexColumnItem, " && data.style.flex === '0 0 150px')")
+            visibleOn: "".concat(!isFlexItem || !isFlexColumnItem, " && (this.isFixedHeight || this.style && this.style.maxHeight) || (").concat(isFlexItem && isFlexColumnItem, " && this.style.flex === '0 0 150px')")
           }), getSchemaTpl('layout:isFixedWidth', {
             visibleOn: "".concat(!isFlexItem || isFlexColumnItem),
             onChange: function (value) {
@@ -296,13 +296,13 @@ var SwitchContainerPlugin = /** @class */function (_super) {
           }), getSchemaTpl('layout:min-width', {
             visibleOn: "".concat(!isFlexItem || isFlexColumnItem)
           }), getSchemaTpl('layout:overflow-x', {
-            visibleOn: "".concat(!isFlexItem || isFlexColumnItem, " && (data.isFixedWidth || data.style && data.style.maxWidth)")
+            visibleOn: "".concat(!isFlexItem || isFlexColumnItem, " && (this.isFixedWidth || this.style && this.style.maxWidth)")
           }), !isFlexItem ? getSchemaTpl('layout:margin-center') : null, !isFlexItem && !isFreeContainer ? getSchemaTpl('layout:textAlign', {
             name: 'style.textAlign',
             label: i18n("a3221d2d224767df4afa7a8653ded8fe"),
-            visibleOn: 'data.style && data.style.display !== "flex" && data.style.display !== "inline-flex"'
+            visibleOn: 'this.style && this.style.display !== "flex" && this.style.display !== "inline-flex"'
           }) : null, getSchemaTpl('layout:z-index'), getSchemaTpl('layout:sticky', {
-            visibleOn: 'data.style && (data.style.position !== "fixed" && data.style.position !== "absolute")'
+            visibleOn: 'this.style && (this.style.position !== "fixed" && this.style.position !== "absolute")'
           }), getSchemaTpl('layout:stickyPosition')], false)
         }, {
           title: i18n("f01c3cd99ecb0c534cc47081d3433c9f"),
@@ -360,4 +360,4 @@ var SwitchContainerPlugin = /** @class */function (_super) {
 registerEditorPlugin(SwitchContainerPlugin);
 
 export { SwitchContainerPlugin };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/plugin/Table.d.ts

@@ -26,7 +26,7 @@ export declare class TablePlugin extends BasePlugin {
     dsManager: DSBuilderManager;
     constructor(manager: EditorManager);
     panelBodyCreator: (context: BaseEventContext) => any;
-    filterProps(props: any): any;
+    filterProps(props: any, node: EditorNodeType): any;
     getRendererInfo(context: RendererInfoResolveEventContext): BasicRendererInfo | void;
     beforeInsert(event: PluginEvent<InsertEventContext>): void;
     buildDataSchemas(node: EditorNodeType, region?: EditorNodeType, trigger?: EditorNodeType, parent?: EditorNodeType): Promise<any>;

package/esm/plugin/Table.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -465,7 +465,7 @@ var TablePlugin = /** @class */function (_super) {
             name: 'footable.expand',
             type: 'button-group-select',
             size: 'sm',
-            visibleOn: 'data.footable',
+            visibleOn: 'this.footable',
             label: i18n("df74194830e695efbfce16c0c64223cf"),
             pipeIn: defaultValue('none'),
             options: [{
@@ -487,7 +487,7 @@ var TablePlugin = /** @class */function (_super) {
             name: 'rowClassNameExpr',
             type: 'input-text',
             label: i18n("76b3250fb1e8593fac075b64029300fa"),
-            placeholder: i18n("1fe38acb67e766f7767d9f8e88bfe990")
+            placeholder: "\u652F\u6301\u6A21\u677F\u8BED\u6CD5\uFF0C\u5982 <%= this.id % 2 ? 'bg-success' : '' %>"
           }]
         }, {
           title: i18n("261bba7ad82914e477f4b37f6a83874e"),
@@ -586,25 +586,31 @@ var TablePlugin = /** @class */function (_super) {
     enumerable: false,
     configurable: true
   });
-  TablePlugin.prototype.filterProps = function (props) {
-    var arr = resolveArrayDatasource(props);
-    if (!Array.isArray(arr) || !arr.length) {
-      var mockedData_1 = {};
-      if (Array.isArray(props.columns)) {
-        props.columns.forEach(function (column) {
-          if (column.name) {
-            setVariable(mockedData_1, column.name, mockValue(column));
-          }
+  TablePlugin.prototype.filterProps = function (props, node) {
+    if (!node.state.value) {
+      var arr = resolveArrayDatasource(props);
+      if (!Array.isArray(arr) || !arr.length) {
+        var mockedData_1 = {};
+        if (Array.isArray(props.columns)) {
+          props.columns.forEach(function (column) {
+            if (column.name) {
+              setVariable(mockedData_1, column.name, mockValue(column));
+            }
+          });
+        }
+        node.updateState({
+          value: repeatArray(mockedData_1, 1).map(function (item, index) {
+            return __assign(__assign({}, item), {
+              id: index + 1
+            });
+          })
         });
-      }
-      props.value = repeatArray(mockedData_1, 1).map(function (item, index) {
-        return __assign(__assign({}, item), {
-          id: index + 1
+      } else {
+        // 只取10条预览，否则太多卡顿
+        node.updateState({
+          value: arr.slice(0, 3)
         });
-      });
-    } else {
-      // 只取10条预览，否则太多卡顿
-      props.value = arr.slice(0, 3);
+      }
     }
     // 编辑模式，不允许表格调整宽度
     props.resizable = false;
@@ -857,4 +863,4 @@ var TablePlugin = /** @class */function (_super) {
 registerEditorPlugin(TablePlugin);
 
 export { TablePlugin };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/plugin/Table2.d.ts

@@ -28,7 +28,7 @@ export declare class Table2Plugin extends BasePlugin {
     dsManager: DSBuilderManager;
     constructor(manager: EditorManager);
     getRendererInfo(context: RendererInfoResolveEventContext): BasicRendererInfo | void;
-    filterProps(props: any): any;
+    filterProps(props: any, node: EditorNodeType): any;
     beforeInsert(event: PluginEvent<InsertEventContext>): void;
     buildDataSchemas(node: EditorNodeType, region?: EditorNodeType, trigger?: EditorNodeType, parent?: EditorNodeType): Promise<any>;
     getAvailableContextFields(scopeNode: EditorNodeType, node: EditorNodeType, region?: EditorNodeType): Promise<any>;

package/esm/plugin/Table2.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -373,7 +373,7 @@ var Table2Plugin = /** @class */function (_super) {
       primaryField: function (context) {
         return getSchemaTpl('primaryField', {
           /** CRUD下，该项配置提升到CRUD中 */
-          hiddenOn: "data.type && (data.type === \"crud\" || data.type === \"crud2\")"
+          hiddenOn: "this.type && (this.type === \"crud\" || this.type === \"crud2\")"
         });
       },
       quickSaveApi: function (context) {
@@ -713,7 +713,7 @@ var Table2Plugin = /** @class */function (_super) {
                 }]
               }, getSchemaTpl('formulaControl', {
                 name: 'expandable.expandableOn',
-                visibleOn: 'data.expandable',
+                visibleOn: 'this.expandable',
                 label: i18n("ea7026a83bf0b63ecc31fd8e215766de")
               }), {
                 name: 'expandable',
@@ -793,12 +793,12 @@ var Table2Plugin = /** @class */function (_super) {
             name: 'keepItemSelectionOnPageChange',
             label: tipedLabel(i18n("099cf136d6a4b6ed4646af4a2ed066b2"), i18n("60011314ed92794f3d4f3e874c359279")),
             /** 目前仅支持2种类型，默认是 pagination */
-            visibleOn: '!data.loadType || data.loadType !== "more"'
+            visibleOn: '!this.loadType || this.loadType !== "more"'
           }), {
             name: 'maxKeepItemSelectionLength',
             type: 'input-number',
             label: i18n("76417db4eeb031b0bc15f4cf8178ae46"),
-            visibleOn: 'data.keepItemSelectionOnPageChange'
+            visibleOn: 'this.keepItemSelectionOnPageChange'
           }]
         }, {
           title: i18n("3fea7ca76cdece641436d7ab0d02ab1b"),
@@ -867,7 +867,7 @@ var Table2Plugin = /** @class */function (_super) {
             }]
           }, {
             type: 'input-group',
-            visibleOn: 'data.scroll && data.scroll.y !== null',
+            visibleOn: 'this.scroll && this.scroll.y !== null',
             label: i18n("ee18dc475df8654cb13ad67dd84eec28"),
             body: [{
               type: 'input-number',
@@ -896,7 +896,7 @@ var Table2Plugin = /** @class */function (_super) {
             }]
           }, {
             type: 'input-group',
-            visibleOn: 'data.scroll && data.scroll.x !== null',
+            visibleOn: 'this.scroll && this.scroll.x !== null',
             name: 'scroll.x',
             label: i18n("6e3d35b57c29b1b419569cc55b3a5d33"),
             body: [{
@@ -909,7 +909,7 @@ var Table2Plugin = /** @class */function (_super) {
             }]
           }, {
             name: 'indentSize',
-            visibleOn: 'data.childrenColumnName',
+            visibleOn: 'this.childrenColumnName',
             type: 'input-number',
             unitOptions: [{
               label: 'px',
@@ -918,13 +918,13 @@ var Table2Plugin = /** @class */function (_super) {
             label: tipedLabel(i18n("dd7befc8e7c124f6f4ba9bbf3de9dc53"), i18n("eedd7279409d000114e27194f3c8a5ea"))
           }, {
             name: 'rowSelection.columnWidth',
-            visibleOn: 'data.rowSelection',
+            visibleOn: 'this.rowSelection',
             type: 'input-number',
             label: i18n("6bfd4423d8aebbf0cac7ba4d74f245bd"),
             description: i18n("21922c6479665dcba83106f8e9ffdf68")
           }, {
             name: 'expandable.columnWidth',
-            visibleOn: 'data.expandable',
+            visibleOn: 'this.expandable',
             type: 'input-number',
             label: i18n("31b7c58c2d9a170829b90314ff98b66a"),
             description: i18n("81ccf26d9622d139a13ba2a61bd9fea4")
@@ -939,7 +939,7 @@ var Table2Plugin = /** @class */function (_super) {
             label: i18n("68e9249db7bd12ab17994b1761b049f5")
           }), getSchemaTpl('formulaControl', {
             name: 'expandable.expandedRowClassNameExpr',
-            visibleOn: 'data.expandable',
+            visibleOn: 'this.expandable',
             label: i18n("ef0c5b6fa16497343eedb76171d61d68")
           })]
         })])]
@@ -978,7 +978,7 @@ var Table2Plugin = /** @class */function (_super) {
     }
     return _super.prototype.getRendererInfo.call(this, context);
   };
-  Table2Plugin.prototype.filterProps = function (props) {
+  Table2Plugin.prototype.filterProps = function (props, node) {
     var _a;
     var arr = resolveArrayDatasource(props);
     var getFooterSummary = function (text) {
@@ -1059,6 +1059,14 @@ var Table2Plugin = /** @class */function (_super) {
       props.expandable.keyField = 'id';
       props.expandable.expandedRowKeys = [1];
     }
+    if (props.value) {
+      if (!node.state.value) {
+        node.updateState({
+          value: props.value
+        });
+      }
+      delete props.value;
+    }
     return props;
   };
   // 自动插入 label
@@ -1231,4 +1239,4 @@ var Table2Plugin = /** @class */function (_super) {
 registerEditorPlugin(Table2Plugin);
 
 export { Table2Plugin, Table2RendererAction, Table2RenderereEvent };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/plugin/TableCell2.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -28,7 +28,7 @@ var TableCell2Plugin = /** @class */function (_super) {
         return getSchemaTpl('formItemName', {
           name: 'name',
           label: i18n("4ca07911d10b74cc7c357b510e7cc948"),
-          visibleOn: 'data.name !== undefined || data.key === undefined'
+          visibleOn: 'this.name !== undefined || this.key === undefined'
         });
       },
       /** 字段配置，兼容key */
@@ -36,7 +36,7 @@ var TableCell2Plugin = /** @class */function (_super) {
         return getSchemaTpl('formItemName', {
           name: 'key',
           label: i18n("4ca07911d10b74cc7c357b510e7cc948"),
-          visibleOn: 'data.name === undefined && data.key'
+          visibleOn: 'this.name === undefined && this.key'
         });
       },
       /** 排序配置 */
@@ -58,7 +58,7 @@ var TableCell2Plugin = /** @class */function (_super) {
           }
         }), {
           name: 'searchable',
-          visibleOn: 'data.searchable',
+          visibleOn: 'this.searchable',
           asFormItem: true,
           label: false,
           children: function (_a) {
@@ -452,7 +452,7 @@ var TableCell2Plugin = /** @class */function (_super) {
             form: {
               body: [{
                 name: 'copyable.content',
-                visibleOn: 'data.copyable',
+                visibleOn: 'this.copyable',
                 type: 'ae-formulaControl',
                 label: i18n("6a086902a84969a835423002718e86b4")
               }]
@@ -571,7 +571,7 @@ var TableCell2Plugin = /** @class */function (_super) {
         return !!value;
       }
     }), {
-      visibleOn: 'data.searchable',
+      visibleOn: 'this.searchable',
       name: 'searchable',
       asFormItem: true,
       label: false,
@@ -607,4 +607,4 @@ var TableCell2Plugin = /** @class */function (_super) {
 registerEditorPlugin(TableCell2Plugin);
 
 export { TableCell2Plugin };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/plugin/TableView.d.ts

@@ -2,7 +2,8 @@
  * @file table view 组件的可视化编辑
  */
 import React from 'react';
-import { BaseEventContext, BasePlugin, BasicPanelItem, BasicToolbarItem, BuildPanelEventContext, RegionConfig, VRendererConfig } from 'amis-editor-core';
+import { BaseEventContext, BasePlugin, BasicPanelItem, BasicToolbarItem, BuildPanelEventContext, RegionConfig, VRendererConfig, ContextMenuEventContext, ContextMenuItem } from 'amis-editor-core';
+import type { TableViewSchema } from 'amis';
 export declare class TableViewPlugin extends BasePlugin {
     static id: string;
     rendererName: string;
@@ -102,6 +103,22 @@ export declare class TableViewPlugin extends BasePlugin {
      * 比如在 d 位置的前面插入行，需要将 a 的 rowspan 加一，然后再插入两个单元格
      */
     insertRow(tdId: string, position: 'above' | 'below'): void;
+    /**
+     * 计算最大列数
+     *    +---+---+---+
+     *		| a     | b |
+     *		+       +---+
+     *		|       | c |
+     *		+---+---+---+
+     *		| d | e | f |
+     *		+---+---+---+
+     *  return 3;
+     */
+    calculateCellActualMaxCol(tableData: TableViewSchema): number;
+    /**
+     * 扩展contextmenu,方便操作
+     */
+    buildEditorContextMenu(context: ContextMenuEventContext, menus: Array<ContextMenuItem>): void;
     /**
      * 插入列
      *

package/esm/plugin/TableView.js

@@ -1,10 +1,10 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
-import { __extends, __assign, __spreadArray, __read, __values } from 'tslib';
+import { __extends, __assign, __spreadArray, __read, __values, __rest } from 'tslib';
 import React__default from 'react';
 import { getSchemaTpl, defaultValue, VRenderer, JSONGetById, BasePlugin, registerEditorPlugin } from 'amis-editor-core';
 import { TableViewEditor } from '../component/TableViewEditor.js';
@@ -473,16 +473,15 @@ var TableViewPlugin = /** @class */function (_super) {
     }
     var insertRow = td.$$row;
     if (position === 'below') {
-      insertRow = insertRow + 1;
-    }
-    // 通过第一行来确认表格一共多少列
-    var firstRow = table.trs[0];
-    var firstRowLastTd = firstRow.tds[firstRow.tds.length - 1];
-    if (!firstRowLastTd) {
-      console.warn(i18n("013326241579b9b2735756f2204bf8bc"));
-      return;
+      // 如果有rowspan，则插入行数需要加上 rowspan
+      if (td.rowspan) {
+        insertRow = insertRow + td.rowspan;
+      } else {
+        insertRow = insertRow + 1;
+      }
     }
-    var colSize = firstRowLastTd.$$col + (firstRowLastTd.colspan || 1);
+    // 获取最大的列数
+    var colSize = this.calculateCellActualMaxCol(table);
     var insertIndex = table.trs.length;
     for (var trIndex = 0; trIndex < table.trs.length; trIndex++) {
       try {
@@ -492,7 +491,7 @@ var TableViewPlugin = /** @class */function (_super) {
           var rowspan = td_1.rowspan || 1;
           var colspan = td_1.colspan || 1;
           // 如果覆盖到要插入的行，则增加 rowspan，并在这个插入的行中减去对应
-          if (rowspan > 1) {
+          if (rowspan > 1 && tdRow < insertRow) {
             var isOverlapping = tdRow + rowspan > insertRow;
             if (isOverlapping) {
               td_1.rowspan = rowspan + 1;
@@ -525,6 +524,92 @@ var TableViewPlugin = /** @class */function (_super) {
     });
     this.manager.store.changeValueById(tableId, table);
   };
+  /**
+   * 计算最大列数
+   *    +---+---+---+
+   *		| a     | b |
+   *		+       +---+
+   *		|       | c |
+   *		+---+---+---+
+   *		| d | e | f |
+   *		+---+---+---+
+   *  return 3;
+   */
+  TableViewPlugin.prototype.calculateCellActualMaxCol = function (tableData) {
+    var maxColCount = 0;
+    if (!(tableData === null || tableData === void 0 ? void 0 : tableData.trs)) {
+      return maxColCount;
+    }
+    var rows = tableData.trs; // 获取表格中的行
+    var actualRowColMap = {}; // 用来存储每个单元格的实际行和列以及最大列数
+    // 遍历表格中的行
+    for (var rowIndex = 0; rowIndex < rows.length; rowIndex++) {
+      var row = rows[rowIndex]; // 获取当前行
+      var currentColIndex = 0; // 当前列索引
+      for (var cellIndex = 0; cellIndex < row.tds.length; cellIndex++) {
+        var cell = row.tds[cellIndex];
+        var colspan = cell.colspan || 1; // 获取单元格的跨列数，默认为 1
+        cell.rowspan || 1; // 获取单元格的跨行数，默认为 1
+        // 计算单元格的实际行和列
+        var actualRowIndex = rowIndex;
+        var actualColIndexStart = currentColIndex;
+        // 考虑跨列
+        for (var i = 0; i < colspan; i++) {
+          var key = "".concat(actualRowIndex, "-").concat(actualColIndexStart + i);
+          if (actualRowColMap[key]) {
+            actualColIndexStart++;
+          } else {
+            actualRowColMap[key] = {
+              rowIndex: actualRowIndex,
+              colIndex: actualColIndexStart + i
+            };
+          }
+        }
+        currentColIndex += colspan;
+      }
+    }
+    for (var key in actualRowColMap) {
+      var colIndex = actualRowColMap[key].colIndex;
+      maxColCount = Math.max(maxColCount, colIndex + 1);
+    }
+    return maxColCount;
+  };
+  /**
+   * 扩展contextmenu,方便操作
+   */
+  TableViewPlugin.prototype.buildEditorContextMenu = function (context, menus) {
+    var info = context.info,
+      _a = context.schema,
+      tdId = _a.$$id,
+      resetSchema = __rest(_a, ["$$id"]);
+    var colspan = resetSchema.colspan || 1;
+    var rowspan = resetSchema.rowspan || 1;
+    if (info.schemaPath.endsWith('/td')) {
+      menus.push('|');
+      menus.push({
+        label: i18n("a896691b72032fe21a00b6487381a529"),
+        onSelect: this.insertCol.bind(this, tdId, 'left')
+      });
+      menus.push({
+        label: i18n("24e4bbbf29a8d31e711c8d9366bf1a6f"),
+        onSelect: this.insertRow.bind(this, tdId, 'below')
+      });
+      menus.push({
+        label: i18n("aea2dd682bc9dc2974dd971581148459"),
+        onSelect: this.insertRow.bind(this, tdId, 'above')
+      });
+      menus.push({
+        label: i18n("bac058b86f8fd4e8f5e2ef3807799aea"),
+        onSelect: this.insertCol.bind(this, tdId, 'right')
+      });
+      menus.push('|');
+      menus.push({
+        label: i18n("488d0742c010851e9c6ce3264df9542b"),
+        disabled: !(colspan > 1 || rowspan > 1) || false,
+        onSelect: this.splitCell.bind(this, tdId)
+      });
+    }
+  };
   /**
    * 插入列
    *
@@ -764,4 +849,4 @@ var TableViewPlugin = /** @class */function (_super) {
 registerEditorPlugin(TableViewPlugin);
 
 export { TableViewPlugin };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};