0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev

This commit is contained in:
easy 2023-02-16 18:03:53 +08:00
parent d692480d41 184e10d239
commit eb2e68e0ea
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/PermissionButton/index.vue
View File

@ -1,7 +1,7 @@
<template>
<template v-if="isPermission">
<template v-if="popConfirm">
<a-popconfirm v-bind="popConfirm" @confirm="conform" :disabled="!isPermission || props.disabled">
<a-popconfirm v-bind="popConfirm" :disabled="!isPermission || props.disabled">
<a-tooltip v-if="tooltip" v-bind="tooltip">
<slot v-if="noButton"></slot>
<a-button v-else v-bind="_buttonProps" :disabled="_isPermission" >
@ -106,9 +106,9 @@ const _isPermission = computed(() =>
: true
)
const conform = (e: MouseEvent) => {
props.popConfirm?.onConfirm?.(e)
}
// const conform = (e: MouseEvent) => {
// props.popConfirm?.onConfirm?.(e)
// }
</script>
<style scoped lang="less">