@mnykj/alleditor-dual 1.1.0 → 1.1.2

package/README.md

@@ -58,10 +58,10 @@ const html = ref('<p>hello</p>')
 ## HTML 协议
 
 ```html
-<div class="alleditor-root" data-alleditor-engine="ue">…</div>
+<div class="alleditor-root" data-alleditor-engine="wang|ue">…</div>
 ```
 
-兼容旧注释 `<!--yunkee-editor:ue-html-->`。
+wang / ue 保存时都会包外层；兼容旧注释 `<!--yunkee-editor:ue-html-->`。
 
 ## 开发（monorepo）
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mnykj/alleditor-dual",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "AllEditor dual-engine (wang + UE HTML) Vue3 components, with bundled UEditor static assets",
   "author": "mnykj",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "peerDependencies": {
-    "@mnykj/alleditor": "^1.1.0",
+    "@mnykj/alleditor": "^1.1.1",
     "@mnykj/alleditor-for-vue": "^1.1.0",
     "vue": "^3.0.5",
     "vite": ">=4",

package/src/DualEditor.vue

@@ -31,8 +31,8 @@ const props = defineProps({
   editorConfig: { type: Object, default: () => ({}) },
   /** wang 占位正文（UE 模式下避免把高保真 HTML 喂进 Slate） */
   wangPlaceholder: { type: String, default: '<p><br></p>' },
-  /** 仅当引擎为 ue 时才写外层 div（推荐；wang 正文保持干净） */
-  wrapOnlyWhenUe: { type: Boolean, default: true },
+  /** 为 true 时仅 ue 写外层 div；默认 false，wang/ue 都包 data-alleditor-engine */
+  wrapOnlyWhenUe: { type: Boolean, default: false },
   toolbarSelector: {
     type: String,
     default: '.alleditor-dual .w-e-toolbar, .alleditor-dual .editor-toolbar',

package/src/UeHtmlEngine.vue

@@ -95,6 +95,29 @@ function syncDisabled() {
   }
 }
 
+/**
+ * 清理公众号/Slate 残留：
+ * - <span leaf=""> 包住的 img 易让 UEditor 图片缩放框错位，挡住正文无法编辑
+ * - 去掉无意义的 leaf 属性
+ */
+function sanitizeUeHtml(html) {
+  return String(html ?? '')
+    .replace(/<span\b[^>]*\bleaf(?:\s*=\s*(?:""|''|[^>\s]+))?\s*[^>]*>\s*(<img\b[^>]*>)\s*<\/span>/gi, '$1')
+    .replace(/\sleaf(?:\s*=\s*(?:""|''|"[^"]*"|'[^']*'|[^\s>]+))?/gi, '')
+}
+
+function hideImageScaleUi(ue) {
+  try {
+    const uiRoot = ue?.ui?.getDom?.()
+    if (!uiRoot) return
+    uiRoot.querySelectorAll('.edui-editor-imagescale, [id$="_imagescale"], [id$="_imagescale_cover"]').forEach((el) => {
+      el.style.display = 'none'
+    })
+  } catch {
+    /* ignore */
+  }
+}
+
 function getContent() {
   const ue = instance.value
   if (!ue || !ready) {
@@ -109,7 +132,7 @@ function getContent() {
 }
 
 function setContent(html) {
-  const next = html || ''
+  const next = sanitizeUeHtml(html || '')
   const ue = instance.value
   if (!ue || !ready) {
     pendingHtml = next
@@ -121,6 +144,7 @@ function setContent(html) {
   } finally {
     applying = false
   }
+  hideImageScaleUi(ue)
   requestAnimationFrame(() => fitEditorHeight(ue))
 }
 
@@ -251,6 +275,10 @@ onMounted(async () => {
       initialFrameHeight: height,
       initialFrameWidth: '100%',
       autoHeightEnabled: false,
+      // 关闭图片八爪缩放框：编辑区在 iframe 内时缩放层常错位/关不掉，正文点不动
+      imageScaleEnabled: false,
+      imagePopup: false,
+      scaleEnabled: false,
       serverUrl: '',
       enableAutoSave: false,
       elementPathEnabled: false,
@@ -269,12 +297,15 @@ onMounted(async () => {
       emit('update:modelValue', html)
       emit('change', html)
     })
+    // 即便外部配置被覆盖，缩放层弹出时立刻隐藏，避免挡住编辑
+    ue.addListener('afterscaleshow', () => hideImageScaleUi(ue))
 
     ue.ready(() => {
       if (destroyed) return
       ready = true
-      const initial =
+      const initial = sanitizeUeHtml(
         pendingHtml !== undefined ? pendingHtml : props.modelValue || ''
+      )
       pendingHtml = undefined
       applying = true
       try {
@@ -283,6 +314,7 @@ onMounted(async () => {
         applying = false
       }
       injectReadableBodyStyle(ue)
+      hideImageScaleUi(ue)
       fitEditorHeight(ue)
       bindResize(ue)
       requestAnimationFrame(() => fitEditorHeight(ue))
@@ -300,7 +332,7 @@ watch(
   () => props.modelValue,
   (html) => {
     if (destroyed) return
-    const next = html || ''
+    const next = sanitizeUeHtml(html || '')
     if (!ready || applying) {
       pendingHtml = next
       return
@@ -382,4 +414,12 @@ defineExpose({
   border: none !important;
   background: #fff !important;
 }
+
+/* 兜底隐藏图片缩放框（错位时会盖住正文） */
+.alleditor-ue-engine :deep(.edui-editor-imagescale),
+.alleditor-ue-engine :deep([id$='_imagescale']),
+.alleditor-ue-engine :deep([id$='_imagescale_cover']) {
+  display: none !important;
+  pointer-events: none !important;
+}
 </style>