@wangeditor-next/editor 5.6.38 → 5.6.40

package/dist/core/src/config/interface.d.ts

@@ -98,6 +98,7 @@ interface ICodeLangConfig {
     codeLangs: {
         text: string;
         value: string;
+        selected?: boolean;
     }[];
 }
 export interface IMenuConfig {

package/dist/index.js

@@ -40006,15 +40006,13 @@
           this.iconSvg = FULL_WIDTH_SVG;
           this.tag = 'button';
       }
-      TableFullWidth.prototype.getValue = function (editor) {
-          var tableNode = DomEditor.getSelectedNodeByType(editor, 'table');
-          if (tableNode == null) {
-              return false;
-          }
-          return tableNode.width === '100%';
+      TableFullWidth.prototype.getValue = function (_editor) {
+          // 每次点击都执行调整，不需要状态判断
+          return false;
       };
-      TableFullWidth.prototype.isActive = function (editor) {
-          return !!this.getValue(editor);
+      TableFullWidth.prototype.isActive = function (_editor) {
+          // 每次点击都执行调整，不需要状态判断
+          return false;
       };
       TableFullWidth.prototype.isDisabled = function (editor) {
           var selection = editor.selection;
@@ -40031,14 +40029,63 @@
           }
           return false;
       };
-      TableFullWidth.prototype.exec = function (editor, value) {
+      TableFullWidth.prototype.exec = function (editor, _value) {
           if (this.isDisabled(editor)) {
               return;
           }
-          var props = {
-              width: value ? 'auto' : '100%', // 切换 'auto' 和 '100%'
-          };
-          distExports$1.Transforms.setNodes(editor, props, { mode: 'highest' });
+          var tableNode = DomEditor.getSelectedNodeByType(editor, 'table');
+          if (!tableNode) {
+              return;
+          }
+          var _a = tableNode.columnWidths, columnWidths = _a === void 0 ? [] : _a;
+          // 获取当前选中的表格的DOM元素,再查找table-container容器元素，防止文档多表格时，获取到其他表格的容器元素
+          var tableDom = DomEditor.toDOMNode(editor, tableNode);
+          var containerElement = tableDom.querySelector('.table-container');
+          if (!containerElement || columnWidths.length === 0) {
+              // 如果找不到容器或没有列宽信息，则使用原来的逻辑，先使用auto预留以后实现按比例实现缩放功能
+              var props = {
+                  width: 'auto',
+              };
+              distExports$1.Transforms.setNodes(editor, props, { mode: 'highest' });
+              return;
+          }
+          var containerWidth = containerElement.clientWidth;
+          var currentTotalWidth = columnWidths.reduce(function (a, b) { return a + b; }, 0);
+          // 计算等比例调整后的列宽
+          var adjustedColumnWidths = columnWidths.map(function (width) {
+              var ratio = width / currentTotalWidth;
+              return Math.floor(ratio * containerWidth);
+          });
+          // 确保最小宽度限制（每列至少10px）
+          var minWidth = 10;
+          var adjustedWithMinWidth = adjustedColumnWidths.map(function (width) { return Math.max(minWidth, width); });
+          // 如果调整后的总宽度超过容器宽度，按比例缩小
+          var adjustedTotalWidth = adjustedWithMinWidth.reduce(function (a, b) { return a + b; }, 0);
+          if (adjustedTotalWidth > containerWidth) {
+              var scaleFactor_1 = containerWidth / adjustedTotalWidth;
+              var finalColumnWidths = adjustedWithMinWidth.map(function (width) { return Math.max(minWidth, Math.floor(width * scaleFactor_1)); });
+              // 应用新的列宽和宽度设置
+              var props = {
+                  width: 'auto',
+                  columnWidths: finalColumnWidths,
+              };
+              distExports$1.Transforms.setNodes(editor, props, { mode: 'highest' });
+          }
+          else {
+              // 如果调整后的总宽度小于容器宽度，将剩余宽度加到最后一列
+              var finalColumnWidths = __spreadArray([], __read(adjustedWithMinWidth), false);
+              var remainingWidth = containerWidth - adjustedTotalWidth - 1;
+              if (remainingWidth > 0 && finalColumnWidths.length > 0) {
+                  // 将剩余宽度加到最后一列
+                  finalColumnWidths[finalColumnWidths.length - 1] += remainingWidth;
+              }
+              // 应用新的列宽和宽度设置
+              var props = {
+                  width: 'auto',
+                  columnWidths: finalColumnWidths,
+              };
+              distExports$1.Transforms.setNodes(editor, props, { mode: 'highest' });
+          }
       };
       return TableFullWidth;
   }());
@@ -41551,6 +41598,39 @@
       var hasTable = !!__spreadArray([], __read(tables), false).find(function () { return true; });
       return hasTable;
   }
+  /**
+   * 检查当前选中的节点是否是受保护的节点类型（不应该被删除的节点）
+   * @param editor editor
+   * @returns 是否是受保护的节点
+   */
+  function isProtectedNode(editor) {
+      var e_1, _a;
+      // 检查是否是受保护的节点类型
+      var protectedTypes = [
+          'paragraph',
+          'header1', 'header2', 'header3', 'header4', 'header5', 'header6',
+          'blockquote',
+          'list-item',
+          'todo',
+          'divider',
+      ];
+      try {
+          for (var protectedTypes_1 = __values(protectedTypes), protectedTypes_1_1 = protectedTypes_1.next(); !protectedTypes_1_1.done; protectedTypes_1_1 = protectedTypes_1.next()) {
+              var type = protectedTypes_1_1.value;
+              if (DomEditor.getSelectedNodeByType(editor, type)) {
+                  return true;
+              }
+          }
+      }
+      catch (e_1_1) { e_1 = { error: e_1_1 }; }
+      finally {
+          try {
+              if (protectedTypes_1_1 && !protectedTypes_1_1.done && (_a = protectedTypes_1.return)) _a.call(protectedTypes_1);
+          }
+          finally { if (e_1) throw e_1.error; }
+      }
+      return false;
+  }
   function withTable(editor) {
       var insertBreak = editor.insertBreak, deleteBackward = editor.deleteBackward, deleteForward = editor.deleteForward, deleteFragment = editor.deleteFragment, normalizeNode = editor.normalizeNode, insertData = editor.insertData, handleTab = editor.handleTab, selectAll = editor.selectAll;
       var newEditor = editor;
@@ -41586,7 +41666,8 @@
                   var isTableOnBeforeLocation = isTableLocation(newEditor, before); // before 是否是 table
                   // 如果前面是 table, 当前是 paragraph ，则不执行删除。否则会删除 table 最后一个 cell
                   // 兼容了 table 嵌套 p标签元素 selection数组五层的情况 - issues/342
-                  if (!tableCell && isTableOnBeforeLocation && DomEditor.getSelectedNodeByType(newEditor, 'paragraph')) {
+                  // 如果前面是 table, 当前是受保护的节点类型，则不执行删除
+                  if (!tableCell && isTableOnBeforeLocation && isProtectedNode(newEditor)) {
                       return;
                   }
               }
@@ -41646,7 +41727,8 @@
               if (after) {
                   var isTableOnAfterLocation = isTableLocation(newEditor, after); // after 是否是 table
                   // 如果后面是 table, 当前是 paragraph，则不执行删除
-                  if (!tableCell && isTableOnAfterLocation && DomEditor.getSelectedNodeByType(newEditor, 'paragraph')) {
+                  // 如果后面是 table, 当前是受保护的节点类型，则不执行删除
+                  if (!tableCell && isTableOnAfterLocation && isProtectedNode(newEditor)) {
                       return;
                   }
               }
@@ -41889,7 +41971,13 @@
               if (displayNoneRegex.test(styleAttr)) {
                   $cell.remove();
               }
+              else {
+                  // 删除style属性（保留单元格，只删除样式）
+                  $cell.removeAttr('style');
+              }
           }
+          // 设置width属性为auto
+          $cell.attr('width', 'auto');
       }
       // 处理表格单元格中的 <p> 标签（通常来自Word复制）
       var $cells = $table.find('td, th');