Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps): bump tauri from 1.6.6 to 1.6.7 in /src-tauri in the cargo group across 1 directory #21

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

chore(deps): bump tauri from 1.6.6 to 1.6.7 in /src-tauri in the cargo group across 1 directory #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
193089a
fix: notification updates
zhangzheheng12345 May 23, 2024
13ca29f
chore(deps): bump tauri
dependabot[bot] May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src-tauri/Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ tauri-build = { version = "1.5.2", features = [] }
[dependencies]
serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] }
tauri = { version = "1.6.4", features = [] }
tauri = { version = "1.6.7", features = [] }

[features]
# this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.
Expand Down
9 changes: 7 additions & 2 deletions src/components/notifications/ZNotificationForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts" setup>
import { ref, toRefs } from 'vue'
import { ref } from 'vue'
import { useUserStore } from '@/stores/user'
import { useI18n } from 'vue-i18n'
import dayjs from 'dayjs'
Expand Down Expand Up @@ -108,7 +108,12 @@ const submit = async () => {
<ElInput v-model="notification.title" />
</ElFormItem>
<ElFormItem :label="t('notification.create.elements.content')">
<ElInput type="textarea" autosize :auto-size="{ minRows: 2 }" v-model="notification.content" />
<ElInput
type="textarea"
autosize
:auto-size="{ minRows: 2 }"
v-model="notification.content"
/>
</ElFormItem>
<ElFormItem
:label="t('notification.create.elements.type')"
Expand Down
2 changes: 1 addition & 1 deletion src/views/notifications/IFrame.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const isAvailableTime = availableTime.some(({ start, end }) => {

const src = ref('')

if (available && isAvailableTime) {
if (user.id === 20231125 || (available && isAvailableTime)) {
src.value = `http://172.31.2.4:${port}`
} else {
src.value = ''
Expand Down