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

feat(web): support more config for subscription #1057

Merged
merged 3 commits into from
Aug 24, 2022
Merged

feat(web): support more config for subscription #1057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1cbe20e
chore(deps): upgrade mqtt from 4.2.1 to 4.3.7
Red-Asuka Aug 23, 2022
13dc0c2
feat(web): support more config for subscription
Red-Asuka Aug 23, 2022
e061b25
chore(deps): add @types/ws
Red-Asuka Aug 23, 2022
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
3 changes: 2 additions & 1 deletion web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"lowdb": "^1.0.0",
"moment": "^2.29.4",
"monaco-editor": "^0.25.2",
"mqtt": "4.2.1",
"mqtt": "4.3.7",
"vue": "~2.6.10",
"vue-class-component": "^7.0.2",
"vue-click-outside": "^1.1.0",
Expand All @@ -41,6 +41,7 @@
"@types/lowdb": "^1.0.9",
"@types/mocha": "^5.2.7",
"@types/node": "14.0.27",
"@types/ws": "^8.5.3",
"@typescript-eslint/eslint-plugin": "^3.8.0",
"@typescript-eslint/parser": "^3.8.0",
"@vue/cli-plugin-babel": "^3.12.1",
Expand Down
8 changes: 6 additions & 2 deletions web/src/components/MyDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
@keyup.enter.native="handleEnterEvent"
>
<slot></slot>

<div slot="footer" class="dialog-footer">
<el-button class="cancel" type="text" size="small" @click="hideDialog">
{{ $t('common.cancel') }}
Expand Down Expand Up @@ -40,11 +39,13 @@ export default class MyDialog extends Vue {
@Prop({ default: false }) public confirmLoading!: boolean
// Confirm button disabled status
@Prop({ default: false }) public btnDisabled!: boolean
// Dialog margin-top value
@Prop({ default: '15vh' }) public top!: string

private showDialog: boolean = this.visible

@Watch('visible')
private onChildChanged(val: boolean, oldVal: boolean) {
private onVisibleChanged(val: boolean) {
this.showDialog = val
}

Expand Down Expand Up @@ -105,6 +106,9 @@ export default class MyDialog extends Vue {
color: var(--color-minor-green);
}
}
.el-button.is-loading:before {
background-color: transparent;
}
}
}
</style>
Loading