ZaiZai 1 жил өмнө
parent
commit
011a5ee8b4

+ 7 - 6
src/global/components/hc-tooltip/index.vue

@@ -1,10 +1,11 @@
 <template>
-    <el-tooltip v-if="btn_Info" :content="btn_Info.textInfo" placement="top" :disabled="!isBubble || !btn_Info.textInfo">
+    <el-tooltip v-if="btn_Info" :content="btn_Info.textInfo || ''" placement="top" :disabled="!isBubble || !btn_Info.textInfo">
         <slot />
     </el-tooltip>
 </template>
 
 <script setup>
+import { getObjValue } from 'js-fast-way'
 import { onMounted, ref, watch } from 'vue'
 import { useAppStore } from '~src/store'
 
@@ -24,18 +25,18 @@ const btn_key = ref(props.keys)
 const isBubble = ref(useAppState.getBubble)
 
 //监听
-watch(() => [
-    props.keys, useAppState.getBubble, useAppState.getButtons,
-], ([keys, bubble]) => {
+watch(() => [props.keys, useAppState.getBubble, useAppState.getButtons], ([keys, bubble]) => {
     btn_key.value = keys
     isBubble.value = bubble
-    btn_Info.value = getButtonsVal(keys)
+    const obj = getButtonsVal(keys)
+    btn_Info.value = getObjValue(obj)
 })
 
 //渲染完成
 onMounted(() => {
     if (props.keys) {
-        btn_Info.value = getButtonsVal(props.keys)
+        const obj = getButtonsVal(props.keys)
+        btn_Info.value = getObjValue(obj)
     }
 })
 

+ 2 - 2
src/global/components/hc-tooltip/item.vue

@@ -23,12 +23,12 @@ const props = defineProps({
 const useAppState = useAppStore()
 
 //变量
-const content_tip = ref(props.content)
+const content_tip = ref(props.content || '')
 const isBubble = ref(useAppState.getBubble)
 
 //监听
 watch(() => [props.content, useAppState.getBubble], ([tip, bubble]) => {
-    content_tip.value = tip
+    content_tip.value = tip || ''
     isBubble.value = bubble
 })
 </script>