refactor: externalize upload and conflict helpers

rust/crates/mnote-web/browser/document-conflict-panel-runtime.js

@@ -0,0 +1,28 @@
+// MNote document conflict panel 运行时外置模块。
+// 第一刀：纯 DOM 清理 helper clearSessionConflictSurface。
+// 本文件以 type="module" 加载，执行时机可能晚于 inline script。
+// web_shell.rs 的 inline clearSessionConflictSurface 会优先委托到
+// window.__mnoteDocumentConflictPanelRuntime；
+// 模块尚未加载或加载失败时，inline script 保留原地实现兜底。
+
+/**
+ * 清除指定 session 所有视图中冲突面板 DOM。
+ * 只做 DOM 清理，不处理冲突 merge/accept/keep 业务逻辑。
+ * @param {Object} session - document session 对象
+ * @param {Object} deps - 依赖注入，从 inline 上下文传入
+ * @param {Function} deps.sessionViews - session.views 迭代器
+ */
+function clearSessionConflictSurface(session, deps) {
+  var views = deps && typeof deps.sessionViews === 'function'
+    ? deps.sessionViews(session)
+    : [];
+  views.forEach(function(view) {
+    var host = view.runtimeDescriptor.root.closest('.document-pane') || view.runtimeDescriptor.root;
+    if (!(host instanceof HTMLElement)) return;
+    host.querySelectorAll('[data-testid="mnote-editor-conflict-panel"]').forEach(function(node) { node.remove(); });
+  });
+}
+
+window.__mnoteDocumentConflictPanelRuntime = {
+  clearSessionConflictSurface: clearSessionConflictSurface
+};

rust/crates/mnote-web/browser/local-upload-runtime.js

@@ -146,6 +146,43 @@ async function fetchWithTimeout(input, init, timeoutMs, label) {
   }
 }
 
+async function uploadLocalFolderAsset(file, plan, context) {
+  var rootUri = String(context && context.rootUri || '').trim() || currentRootUri();
+  var documentId = String(
+    plan && plan.targetDocumentId
+    || context && context.documentId
+    || ''
+  ).trim();
+  var hasFolderTarget = plan && Object.prototype.hasOwnProperty.call(plan, 'targetRelativePath');
+  var uploadIntent = String(
+    plan && plan.uploadIntent
+    || (hasFolderTarget ? 'filetree.folder.drop' : 'editor.markdown.attach')
+  ).trim();
+  if (!rootUri || !uploadIntent) {
+    throw new Error('本地 Markdown 上传缺少 rootUri 或 documentId');
+  }
+  var localForm = new FormData();
+  localForm.append('file', file);
+  localForm.append('rootUri', rootUri);
+  localForm.append('uploadIntent', uploadIntent);
+  if (documentId) localForm.append('documentId', documentId);
+  if (hasFolderTarget) localForm.append('targetRelativePath', String(plan.targetRelativePath || ''));
+  localForm.append('kind', file && String(file.type || '').indexOf('image/') === 0 ? 'image' : 'attachment');
+  var localResponse = await fetchWithTimeout('/api/local-folder/assets/upload', {
+    method: 'POST',
+    credentials: 'include',
+    body: localForm
+  }, Number(context && context.timeoutMs) || 15000, '本地上传');
+  var localPayload = await localResponse.json().catch(function() { return null; });
+  if (!localResponse.ok || !localPayload || !localPayload.asset) {
+    throw new Error(localPayload && localPayload.error ? localPayload.error : '上传失败');
+  }
+  return {
+    asset: localPayload.asset,
+    documentId: documentId
+  };
+}
+
 function localAssetOpenUrl(asset, download, context) {
   if (!isLocalUploadedAsset(asset)) return '';
   var rootUri = String(context && context.rootUri || asset && (asset.rootUri || asset.root_uri) || '').trim() || currentRootUri();
@@ -275,6 +312,7 @@ window.__mnoteLocalUploadRuntime = {
   editorRootFromUploadOptions: editorRootFromUploadOptions,
   openEditorUploadFilePicker: openEditorUploadFilePicker,
   fetchWithTimeout: fetchWithTimeout,
+  uploadLocalFolderAsset: uploadLocalFolderAsset,
   localAssetOpenUrl: localAssetOpenUrl,
   uploadedAssetType: uploadedAssetType,
   fileTreeIconKindForFileName: fileTreeIconKindForFileName,