Disable some menu items in read-only mode #11733

Zuoqiu-Yingyi · 2024-06-15T14:23:22Z

Please commit to the dev branch
For contributing new features, please supplement and improve the corresponding user guide documents
For bug fixes, please describe the problem and solution via code comments
For text improvements (such as typos and wording adjustments), please submit directly

REL: #11367 #11707

在内核只读模式 & 发布模式下禁用会导致 Forbidden 提示的菜单项

88250 · 2024-06-15T16:10:13Z

提交完了可以 review 的时候说一声，谢谢。

Zuoqiu-Yingyi · 2024-06-15T16:15:24Z

提交完了可以 review 的时候说一声，谢谢。

可以 review 了

Vanessa219

请进行相关修改

Vanessa219 · 2024-06-17T01:33:45Z

app/src/config/editor.ts

-                    fontFamilyHTML += `<option value="${item}"${window.siyuan.config.editor.fontFamily === item ? " selected" : ""}>${item}</option>`;
-                });
-                fontFamilyElement.innerHTML = fontFamilyHTML;
+                if (response.code === 0) {


@88250 修改过后台请求处理，为保持所有请求的一致性处理，这个没有其他情况的话请不要进行修改。

用户在只读模式下打开设置面板后该请求会自动发出并返回异常, 因此需要额外处理一下

Vanessa219 · 2024-06-17T01:37:02Z

app/src/index.ts

@@ -38,6 +38,8 @@ export class App {
        registerServiceWorker(`${Constants.SERVICE_WORKER_PATH}?v=${Constants.SIYUAN_VERSION}`);
        /// #endif
        addBaseURL();
+        addScriptSync(`${Constants.PROTYLE_CDN}/js/lute/lute.min.js?v=${Constants.SIYUAN_VERSION}`, "protyleLuteScript"),


这一块比较复杂，没有必要请不要进行改动。如有必要的话请只修改关联部分即可。

这一块是为了与其他端调用顺序统一, 方便之后进行维护

Vanessa219 · 2024-06-17T01:43:44Z

app/src/menus/commonMenuItem.ts

@@ -507,8 +508,9 @@ export const exportMd = (id: string) => {
                                });
                            });
                            return;
+                        } else if (response.code === 0) {


修改参见第一条

此处更改是为了避免出现异常但仍推送成功消息提示

Vanessa219 · 2024-06-17T01:44:31Z

app/src/mobile/index.ts

@@ -37,9 +37,10 @@ class App {
        if (!window.webkit?.messageHandlers && !window.JSAndroid) {
            registerServiceWorker(`${Constants.SERVICE_WORKER_PATH}?v=${Constants.SIYUAN_VERSION}`);
        }
+        addBaseURL();


请参见第二点进行修改

Vanessa219 · 2024-06-17T01:47:31Z

app/src/protyle/gutter/index.ts

@@ -1676,6 +1677,7 @@ export class Gutter {
                accelerator: window.siyuan.config.keymap.editor.general.quickMakeCard.custom,
                iconHTML: '<svg class="b3-menu__icon" style="color:var(--b3-theme-primary)"><use xlink:href="#iconRiffCard"></use></svg>',
                icon: "iconRiffCard",
+                disabled: window.siyuan.config.readonly,


相关的快捷键和其他菜单中的类似项也需要进行处理，须逐一核对。

如何禁用相关的快捷键?

目前已找到的其他菜单中的类似项已在只读模式下禁用，但不排除还有未找到的菜单项

Vanessa219 · 2024-06-17T01:50:08Z

app/src/protyle/scroll/saveScroll.ts

@@ -45,7 +45,7 @@ export const saveScroll = (protyle: IProtyle, getObject = false) => {

 export const getDocByScroll = (options: {


这个方法就是通过 scrollAttr 打开的，传入如果为空就没有意义了。这种场景是？

场景未知, 该问题是在发现控制台输出异常后定位到的
复现步骤: 只读/发布模式下刷新当前文档

Vanessa219 · 2024-06-17T01:50:37Z

app/src/util/assets.ts

@@ -150,8 +150,10 @@ export const initAssets = () => {
                    return;
                }
            }
-            window.siyuan.config.appearance = response.data.appearance;
-            loadAssets(response.data.appearance);
+            if (response.code === 0) {


参照第一点进行修改

Vanessa219 · 2024-06-17T01:50:51Z

app/src/window/index.ts

@@ -27,9 +27,10 @@ class App {
    public appId: string;

    constructor() {
+        addBaseURL();


参照第二点进行修改

经过测试, 该方案正常工作, 且可以在 Constants.PROTYLE_CDN 变量发生更改时令脚本 /js/lute/lute.min.js 与 /js/protyle-html.js 加载行为与其他地方加载的 /js/viewerjs/viewer.js 等脚本一致, 增强健壮性

TCOTC · 2024-06-20T09:38:12Z

啥时候能合并了发个 dev 版？

Soltus · 2024-06-21T14:32:53Z

在线催更

TCOTC · 2024-06-22T07:07:51Z

@Zuoqiu-Yingyi 更改包含发布服务隐藏微信提醒 #11788 吗？

Zuoqiu-Yingyi · 2024-06-22T09:23:40Z

@Zuoqiu-Yingyi 更改包含发布服务隐藏微信提醒 #11788 吗？

会禁用该菜单项

JHPZ · 2024-06-24T01:49:00Z

我有个疑问，发布模式只能共享整个工作空间吗？假如我是Docker版，只有单个工作空间，它会把我想公布的和不想公布的都公布出去QAQ

Zuoqiu-Yingyi · 2024-06-27T05:14:50Z

@Vanessa219
该 PR 已经挂起 10 天了, 有无新的进展?

Zuoqiu-Yingyi added 20 commits May 12, 2024 23:05

🎨 kernel supports read-only publishing services

ed3afe6

🐛 Fix authentication vulnerabilities

0999115

🎨 Protect secret information

a24f509

🎨 Adjust the permission control

71efa33

🎨 Adjust the permission control

f8cca61

🎨 Fixed the vulnerability that getFile gets file conf.json

b235527

🎨 Add API /api/setting/setPublish

e77faf7

🎨 Add API /api/setting/getPublish

56c565c

Merge branch 'master' into feat/publish

7049f89

🐛 Fixed the issue that PWA-related files could not pass BasicAuth

e33acd5

🎨 Add a settings panel for publishing features

bf5ac0c

Merge branch 'dev' into feat/publish

9a6ee2d

📝 Add guide for Publish Service

0ccc969

Merge branch 'dev' into feat/publish

fb79491

📝 Update Japanese user guide

e242a8f

🎨 Merge fixed static file services

484d3ee

Merge branch 'dev' into feat/publish

717b250

🎨 Disable some menu items in read-only mode

e95a54d

🎨 Disable some menu items in read-only mode

2f2e743

Update router.go

9e79ce7

88250 approved these changes Jun 16, 2024

View reviewed changes

88250 assigned Zuoqiu-Yingyi Jun 16, 2024

88250 added the Enhancement label Jun 16, 2024

88250 added this to the 3.1.0 milestone Jun 16, 2024

Vanessa219 requested changes Jun 17, 2024

View reviewed changes

Zuoqiu-Yingyi requested a review from Vanessa219 June 18, 2024 15:30

TCOTC mentioned this pull request Jun 22, 2024

发布服务隐藏微信提醒 #11788

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Disable some menu items in read-only mode #11733

Disable some menu items in read-only mode #11733

Zuoqiu-Yingyi commented Jun 15, 2024

88250 commented Jun 15, 2024

Zuoqiu-Yingyi commented Jun 15, 2024

Vanessa219 left a comment

Vanessa219 Jun 17, 2024

Zuoqiu-Yingyi Jun 18, 2024

Vanessa219 Jun 17, 2024

Zuoqiu-Yingyi Jun 18, 2024

Vanessa219 Jun 17, 2024

Zuoqiu-Yingyi Jun 18, 2024

Vanessa219 Jun 17, 2024

Vanessa219 Jun 17, 2024

Zuoqiu-Yingyi Jun 18, 2024

Vanessa219 Jun 17, 2024

Zuoqiu-Yingyi Jun 18, 2024

Vanessa219 Jun 17, 2024

Vanessa219 Jun 17, 2024

Zuoqiu-Yingyi Jun 18, 2024

TCOTC commented Jun 20, 2024

Soltus commented Jun 21, 2024

TCOTC commented Jun 22, 2024

Zuoqiu-Yingyi commented Jun 22, 2024

JHPZ commented Jun 24, 2024

Zuoqiu-Yingyi commented Jun 27, 2024

		@@ -45,7 +45,7 @@ export const saveScroll = (protyle: IProtyle, getObject = false) => {

		export const getDocByScroll = (options: {

Disable some menu items in read-only mode #11733

Are you sure you want to change the base?

Disable some menu items in read-only mode #11733

Conversation

Zuoqiu-Yingyi commented Jun 15, 2024

88250 commented Jun 15, 2024

Zuoqiu-Yingyi commented Jun 15, 2024

Vanessa219 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TCOTC commented Jun 20, 2024

Soltus commented Jun 21, 2024

TCOTC commented Jun 22, 2024

Zuoqiu-Yingyi commented Jun 22, 2024

JHPZ commented Jun 24, 2024

Zuoqiu-Yingyi commented Jun 27, 2024