Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-21 09:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 fix https://github.com/siyuan-note/siyuan/issues/11302

Browse source
This commit is contained in:
Vanessa 2024-05-08 10:39:26 +08:00
parent ab3550d44d
commit 523d8d762b
4 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/constants.ts
View file

@ -93,6 +93,7 @@ export abstract class Constants {
public static readonly CB_GET_ROOTSCROLL = "cb-get-rootscroll"; // 如果为 rootID 就滚动到指定位置，必有 rootID public static readonly CB_GET_ROOTSCROLL = "cb-get-rootscroll"; // 如果为 rootID 就滚动到指定位置，必有 rootID
public static readonly CB_GET_HTML = "cb-get-html"; // 直接渲染，不需要再 /api/block/getDocInfo，否则搜索表格无法定位 public static readonly CB_GET_HTML = "cb-get-html"; // 直接渲染，不需要再 /api/block/getDocInfo，否则搜索表格无法定位
public static readonly CB_GET_HISTORY = "cb-get-history"; // 历史渲染 public static readonly CB_GET_HISTORY = "cb-get-history"; // 历史渲染
public static readonly CB_GET_OPENNEW = "cb-get-opennew"; // 编辑器只读后新建文件需为临时解锁状态
// localstorage // localstorage
public static readonly LOCAL_ZOOM = "local-zoom"; public static readonly LOCAL_ZOOM = "local-zoom";

4
app/src/protyle/hint/index.ts
View file

@ -624,12 +624,12 @@ ${genHintItemHTML(item)}
}, () => { }, () => {
insertHTML(`<span data-type="block-ref" data-id="${newSubDocId}" data-subtype="d">Untitled</span>`, protyle); insertHTML(`<span data-type="block-ref" data-id="${newSubDocId}" data-subtype="d">Untitled</span>`, protyle);
/// #if MOBILE /// #if MOBILE
openMobileFileById(protyle.app, newSubDocId, [Constants.CB_GET_HL, Constants.CB_GET_CONTEXT]); openMobileFileById(protyle.app, newSubDocId, [Constants.CB_GET_CONTEXT, Constants.CB_GET_OPENNEW]);
/// #else /// #else
openFileById({ openFileById({
app: protyle.app, app: protyle.app,
id: newSubDocId, id: newSubDocId,
action: [Constants.CB_GET_HL, Constants.CB_GET_CONTEXT] action: [Constants.CB_GET_CONTEXT, Constants.CB_GET_OPENNEW]
}); });
/// #endif /// #endif
}); });

4
app/src/protyle/util/onGet.ts
View file

@ -18,6 +18,7 @@ import {showMessage} from "../../dialog/message";
import {avRender} from "../render/av/render"; import {avRender} from "../render/av/render";
import {hideTooltip} from "../../dialog/tooltip"; import {hideTooltip} from "../../dialog/tooltip";
import {stickyRow} from "../render/av/row"; import {stickyRow} from "../render/av/row";
import {updateReadonly as updateReadonlyMethod} from "../breadcrumb/action";
export const onGet = (options: { export const onGet = (options: {
data: IWebSocketData, data: IWebSocketData,
@ -206,6 +207,9 @@ const setHTML = (options: {
} }
protyle.element.removeAttribute("disabled-forever"); protyle.element.removeAttribute("disabled-forever");
setReadonlyByConfig(protyle, updateReadonly); setReadonlyByConfig(protyle, updateReadonly);
if (options.action.includes(Constants.CB_GET_OPENNEW)) {
updateReadonlyMethod(protyle.breadcrumb.element.parentElement.querySelector('.block__icon[data-type="readonly"]'), protyle);
}
} }
focusElementById(protyle, options.action, options.scrollAttr); focusElementById(protyle, options.action, options.scrollAttr);

16
app/src/util/newFile.ts
View file

@ -107,10 +107,10 @@ export const newFile = (optios: {
openFileById({ openFileById({
app: optios.app, app: optios.app,
id: response.data, id: response.data,
action: [Constants.CB_GET_CONTEXT] action: [Constants.CB_GET_CONTEXT, Constants.CB_GET_OPENNEW]
}); });
/// #else /// #else
openMobileFileById(optios.app, response.data, [Constants.CB_GET_CONTEXT]); openMobileFileById(optios.app, response.data, [Constants.CB_GET_CONTEXT, Constants.CB_GET_OPENNEW]);
/// #endif /// #endif
}); });
} else { } else {
@ -128,10 +128,10 @@ export const newFile = (optios: {
openFileById({ openFileById({
app: optios.app, app: optios.app,
id: response.data, id: response.data,
action: [Constants.CB_GET_CONTEXT] action: [Constants.CB_GET_CONTEXT, Constants.CB_GET_OPENNEW]
}); });
/// #else /// #else
openMobileFileById(optios.app, response.data, [Constants.CB_GET_CONTEXT]); openMobileFileById(optios.app, response.data, [Constants.CB_GET_CONTEXT, Constants.CB_GET_OPENNEW]);
/// #endif /// #endif
}); });
}); });
@ -151,10 +151,10 @@ export const newFile = (optios: {
openFileById({ openFileById({
app: optios.app, app: optios.app,
id: response.data, id: response.data,
action: [Constants.CB_GET_CONTEXT] action: [Constants.CB_GET_CONTEXT, Constants.CB_GET_OPENNEW]
}); });
/// #else /// #else
openMobileFileById(optios.app, response.data, [Constants.CB_GET_CONTEXT]); openMobileFileById(optios.app, response.data, [Constants.CB_GET_CONTEXT, Constants.CB_GET_OPENNEW]);
/// #endif /// #endif
}); });
return; return;
@ -173,9 +173,9 @@ export const newFile = (optios: {
sorts: optios.paths sorts: optios.paths
}, () => { }, () => {
/// #if !MOBILE /// #if !MOBILE
openFileById({app: optios.app, id, action: [Constants.CB_GET_CONTEXT]}); openFileById({app: optios.app, id, action: [Constants.CB_GET_CONTEXT, Constants.CB_GET_OPENNEW]});
/// #else /// #else
openMobileFileById(optios.app, id, [Constants.CB_GET_CONTEXT]); openMobileFileById(optios.app, id, [Constants.CB_GET_CONTEXT, Constants.CB_GET_OPENNEW]);
/// #endif /// #endif
}); });
} }