Skip to content

Commit c68b0d3

Browse files
committed
Merge remote-tracking branch 'origin/main' into release
2 parents 059ff8b + 9e0bf44 commit c68b0d3

File tree

5 files changed

+51
-25
lines changed

5 files changed

+51
-25
lines changed

CHANGELOG.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,24 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
=======
6+
## [0.1.21] - 2024-05-30
7+
8+
### Bug Fixes
9+
10+
- Fix url input symbols line break
11+
- Fix read text from clipboard no permissions
12+
13+
### Miscellaneous Tasks
14+
15+
- Update dependencies
16+
- Version 0.1.20
17+
- Version 0.1.21
18+
19+
### Refactor
20+
21+
- Set overflow hidden for editor
22+
523
## [0.1.20] - 2024-04-21
624

725
### Bug Fixes
@@ -274,4 +292,3 @@ All notable changes to this project will be documented in this file.
274292
- Enhance api item drag function
275293
- Try request error and convert to response
276294
- Set auto focus mirror editor
277-

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ orm:
2121
-u "sqlite:///~/Library/Application Support/com.bigtree.cyberapi/my_db.db" \
2222
-o src/entities
2323
version:
24-
git cliff --unreleased --tag 0.1.20 --prepend CHANGELOG.md
24+
git cliff --unreleased --tag 0.1.21 --prepend CHANGELOG.md

src-tauri/Cargo.lock

Lines changed: 25 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src-tauri/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cyberapi"
3-
version = "0.1.20"
3+
version = "0.1.21"
44
description = "API tool based on tauri, it is smaller and faster."
55
authors = ["tree.xie@outlook.com"]
66
license = "Apache License 2.0"
@@ -33,7 +33,7 @@ serde = { version = "1.0.195", features = ["derive"] }
3333
serde_json = "1.0.111"
3434
strum = "0.25.0"
3535
strum_macros = "0.25.1"
36-
tauri = { version = "1.6.1", features = [
36+
tauri = { version = "1.6.7", features = [
3737
"app-hide",
3838
"clipboard-all",
3939
"dialog-all",

src/components/APISettingTree/header.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,17 @@ export default defineComponent({
116116
};
117117

118118
const handleImport = async () => {
119+
let data = "";
119120
try {
120-
const data = (await readTextFromClipboard()) || "";
121+
data = (await readTextFromClipboard()) || "";
122+
} catch (err) {
123+
showError(message, err);
124+
} finally {
121125
newImportDialog({
122126
dialog,
123127
collection,
124128
data,
125129
});
126-
} catch (err) {
127-
showError(message, err);
128130
}
129131
};
130132

0 commit comments

Comments
 (0)