Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
vicanso committed May 30, 2024
2 parents 059ff8b + 9e0bf44 commit c68b0d3
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 25 deletions.
19 changes: 18 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,24 @@

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

=======
## [0.1.21] - 2024-05-30

### Bug Fixes

- Fix url input symbols line break
- Fix read text from clipboard no permissions

### Miscellaneous Tasks

- Update dependencies
- Version 0.1.20
- Version 0.1.21

### Refactor

- Set overflow hidden for editor

## [0.1.20] - 2024-04-21

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

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ orm:
-u "sqlite:///~/Library/Application Support/com.bigtree.cyberapi/my_db.db" \
-o src/entities
version:
git cliff --unreleased --tag 0.1.20 --prepend CHANGELOG.md
git cliff --unreleased --tag 0.1.21 --prepend CHANGELOG.md
43 changes: 25 additions & 18 deletions src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cyberapi"
version = "0.1.20"
version = "0.1.21"
description = "API tool based on tauri, it is smaller and faster."
authors = ["[email protected]"]
license = "Apache License 2.0"
Expand Down Expand Up @@ -33,7 +33,7 @@ serde = { version = "1.0.195", features = ["derive"] }
serde_json = "1.0.111"
strum = "0.25.0"
strum_macros = "0.25.1"
tauri = { version = "1.6.1", features = [
tauri = { version = "1.6.7", features = [
"app-hide",
"clipboard-all",
"dialog-all",
Expand Down
8 changes: 5 additions & 3 deletions src/components/APISettingTree/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,17 @@ export default defineComponent({
};

const handleImport = async () => {
let data = "";
try {
const data = (await readTextFromClipboard()) || "";
data = (await readTextFromClipboard()) || "";
} catch (err) {
showError(message, err);
} finally {
newImportDialog({
dialog,
collection,
data,
});
} catch (err) {
showError(message, err);
}
};

Expand Down

0 comments on commit c68b0d3

Please sign in to comment.