Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
frostime committed Nov 19, 2023
2 parents 5f59ffe + 962f879 commit b31102d
Show file tree
Hide file tree
Showing 8 changed files with 59 additions and 13 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
# Changelog

## 0.2.7 2023-10
## 0.2.8 2023-11-15

* [`resize` cannot be triggered after dragging to unpin the dock](https://github.com/siyuan-note/siyuan/issues/9640)

## 0.2.7 2023-10-31

* [Export `Constants` to plugin](https://github.com/siyuan-note/siyuan/issues/9555)
* [Add plugin `app.appId`](https://github.com/siyuan-note/siyuan/issues/9538)
* [Add plugin event bus `switch-protyle`](https://github.com/siyuan-note/siyuan/issues/9454)

## 0.2.6 2023-10-24

Expand Down
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

[中文版](./README_zh_CN.md)

> Consistent with [siyuan/plugin-sample](https://github.com/siyuan-note/plugin-sample) [v0.2.6](https://github.com/siyuan-note/plugin-sample/tree/v0.2.6)
> Consistent with [siyuan/plugin-sample](https://github.com/siyuan-note/plugin-sample) [v0.2.8](https://github.com/siyuan-note/plugin-sample/tree/v0.2.8)


Expand Down Expand Up @@ -98,7 +98,10 @@ conveniently.
"custom": [
"https://ld246.com/sponsor"
]
}
},
"keywords": [
"sample", "示例"
]
}
```
Expand Down Expand Up @@ -137,6 +140,7 @@ conveniently.
* `patreon`: Patreon name
* `github`: GitHub login name
* `custom`: Custom sponsorship link list
* `keywords`: Search keyword list, used for marketplace search function
## Package
Expand Down
8 changes: 6 additions & 2 deletions README_zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[English](./README.md)


> 本例和 [siyuan/plugin-sample](https://github.com/siyuan-note/plugin-sample) [v0.2.6](https://github.com/siyuan-note/plugin-sample/tree/v0.2.6)
> 本例同 [siyuan/plugin-sample](https://github.com/siyuan-note/plugin-sample) [v0.2.8](https://github.com/siyuan-note/plugin-sample/tree/v0.2.8)
1. 使用 vite 打包
2. 使用符号链接、而不是把项目放到插件目录下的模式进行开发
Expand Down Expand Up @@ -95,7 +95,10 @@
"custom": [
"https://ld246.com/sponsor"
]
}
},
"keywords": [
"sample", "示例"
]
}
```
Expand Down Expand Up @@ -133,6 +136,7 @@
* `patreon`:Patreon 名称
* `github`:GitHub 登录名
* `custom`:自定义赞助链接列表
* `keywords`:搜索关键字列表,用于集市搜索功能
## 打包
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"minimist": "^1.2.8",
"rollup-plugin-livereload": "^2.0.5",
"sass": "^1.62.1",
"siyuan": "0.8.7",
"siyuan": "0.8.8",
"svelte": "^3.57.0",
"ts-node": "^10.9.1",
"typescript": "^5.0.4",
Expand Down
4 changes: 2 additions & 2 deletions plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "plugin-sample-vite-svelte",
"author": "frostime",
"url": "https://github.com/siyuan-note/plugin-sample-vite-svelte",
"version": "0.2.6",
"minAppVersion": "2.10.12",
"version": "0.2.8",
"minAppVersion": "2.10.14",
"backends": [
"windows",
"linux",
Expand Down
11 changes: 10 additions & 1 deletion src/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* API 文档见 [API_zh_CN.md](https://github.com/siyuan-note/siyuan/blob/master/API_zh_CN.md)
*/

import { time } from "console";
import { fetchSyncPost, IWebSocketData } from "siyuan";


Expand Down Expand Up @@ -132,6 +131,16 @@ export async function getHPathByID(id: BlockId): Promise<string> {
return request(url, data);
}


export async function getIDsByHPath(notebook: NotebookId, path: string): Promise<BlockId[]> {
let data = {
notebook: notebook,
path: path
};
let url = '/api/filetree/getIDsByHPath';
return request(url, data);
}

// **************************************** Asset Files ****************************************

export async function upload(assetsDirPath: string, files: any[]): Promise<IResUpload> {
Expand Down
5 changes: 5 additions & 0 deletions src/hello.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@
</script>

<div class="b3-dialog__content">
<div>appId:</div>
<div class="fn__hr"></div>
<div class="plugin-sample__time">${app?.appId}</div>
<div class="fn__hr"></div>
<div class="fn__hr"></div>
<div>API demo:</div>
<div class="fn__hr" />
<div class="plugin-sample__time">
Expand Down
24 changes: 20 additions & 4 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ import {
getFrontend,
getBackend,
IModel,
Setting,
fetchPost,
Protyle, openWindow, IOperation
Protyle,
openWindow,
IOperation,
Constants
} from "siyuan";
import "@/index.scss";

Expand Down Expand Up @@ -120,6 +121,9 @@ export default class PluginSample extends Plugin {
text: "This is my custom dock"
},
type: DOCK_TYPE,
resize() {
console.log(DOCK_TYPE + " resize");
},
init() {
this.element.innerHTML = `<div class="fn__flex-1 fn__flex-column">
<div class="block__icons">
Expand Down Expand Up @@ -308,7 +312,7 @@ export default class PluginSample extends Plugin {

private showDialog() {
let dialog = new Dialog({
title: "Hello World",
title: `SiYuan ${Constants.SIYUAN_VERSION}`,
content: `<div id="helloPanel" class="b3-dialog__content"></div>`,
width: this.isMobile ? "92vw" : "720px",
destroyCallback(options) {
Expand Down Expand Up @@ -528,6 +532,18 @@ export default class PluginSample extends Plugin {
click: () => {
this.eventBus.off("loaded-protyle-dynamic", this.eventBusLog);
}
}, {
icon: "iconSelect",
label: "On switch-protyle",
click: () => {
this.eventBus.on("switch-protyle", this.eventBusLog);
}
}, {
icon: "iconClose",
label: "Off switch-protyle",
click: () => {
this.eventBus.off("switch-protyle", this.eventBusLog);
}
}, {
icon: "iconSelect",
label: "On destroy-protyle",
Expand Down

0 comments on commit b31102d

Please sign in to comment.