@wangeditor-next/editor 5.6.35 → 5.6.36

package/dist/css/style.css

@@ -698,7 +698,7 @@ body .w-e-modal * {
   margin: 1px 0px;
 }
 
-.w-e-textarea-video-container{background-image:linear-gradient(45deg,#eee 25%,transparent 0,transparent 75%,#eee 0,#eee),linear-gradient(45deg,#eee 25%,#fff 0,#fff 75%,#eee 0,#eee);background-position:0 0,10px 10px;background-size:20px 20px;border:1px dashed var(--w-e-textarea-border-color);border-radius:5px;margin:10px auto 0;padding:10px 0;text-align:center}
+.w-e-textarea-video-container{background-image:linear-gradient(45deg,#eee 25%,transparent 0,transparent 75%,#eee 0,#eee),linear-gradient(45deg,#eee 25%,#fff 0,#fff 75%,#eee 0,#eee);background-position:0 0,10px 10px;background-size:20px 20px;border:1px dashed var(--w-e-textarea-border-color);border-radius:5px;margin:10px auto 0;overflow:auto;padding:10px 0;text-align:center}
 .w-e-textarea-video-container {
   text-align: center;
   border: 1px dashed var(--w-e-textarea-border-color);
@@ -706,6 +706,7 @@ body .w-e-modal * {
   margin: 0 auto;
   margin-top: 10px;
   border-radius: 5px;
+  overflow: auto;
   background-position: 0px 0px, 10px 10px;
   background-size: 20px 20px;
   background-image: linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee 100%), linear-gradient(45deg, #eee 25%, white 25%, white 75%, #eee 75%, #eee 100%);

package/dist/index.js

@@ -35968,12 +35968,11 @@
   function preParse$3(elem) {
       var $elem = $$1(elem);
       var paddingLeft = getStyleValue$1($elem, 'padding-left');
-      if (/\dem/.test(paddingLeft)) {
+      if (/^[1-9]\d*em$/.test(paddingLeft)) {
           // 如 '2em' ，V4 格式
           $elem.css('text-indent', '2em');
       }
-      if (/\dpx/.test(paddingLeft)) {
-          // px 单位
+      if (/^[1-9]\d*px$/.test(paddingLeft)) {
           var num = parseInt(paddingLeft, 10);
           if (num % 32 === 0) {
               // 如 32px 64px ，V5 早期格式
@@ -41460,6 +41459,11 @@
           if (targetEditor === newEditor) {
               var tableSelection = EDITOR_TO_SELECTION.get(newEditor);
               if (tableSelection && tableSelection.length > 0) {
+                  // 排除合并单元格操作
+                  if ('hidden' in props || 'rowSpan' in props || 'colSpan' in props) {
+                      originalTransforms.setNodes(targetEditor, props, options);
+                      return;
+                  }
                   // 表格批量选择：对所有选中的单元格应用属性
                   tableSelection.forEach(function (row) {
                       row.forEach(function (cell) {