Эх сурвалжийг харах

fix: BsUi-基础组件tabs组件、列表逻辑修改

hanxiaohui 4 сар өмнө
parent
commit
fc84c48d25

+ 26 - 2
src/components/BsUi/Descriptions/index.vue

@@ -16,11 +16,23 @@
         <a-descriptions-item v-for="(item, index) in items" :key="index" v-bind="item.extraProps">
           <template #label>
             <slot v-if="item.labelSlot" :name="item.labelSlot"></slot>
-            <span v-else class="dsc-label">{{ item.label }}</span>
+
+            <div v-else class="help-config">
+              <a-tooltip placement="top" v-if="item?.helpConfig?.enable">
+                <template #title>
+                  <span>{{ item?.helpConfig.helpTip }}</span>
+                </template>
+                <QuestionCircleOutlined />
+              </a-tooltip>
+              <span class="dsc-label">{{ item.label }}</span>
+            </div>
+
           </template>
 
           <template v-if="item.valueSlot">
-            <slot :name="item.valueSlot"></slot>
+           <div class="value_slot">
+             <slot :name="item.valueSlot"></slot>
+           </div>
           </template>
           <template v-if="!item.valueSlot">
             <div class="dsc-value">
@@ -103,6 +115,11 @@
       color: #000;
       font-weight: 500;
     }
+    .help-config {
+      display: flex;
+      gap: 5px;
+      align-items: center;
+    }
     :deep(.ant-descriptions-item-container) {
       display: flex;
       align-items: flex-start;
@@ -114,8 +131,15 @@
       margin: 0;
       padding: 10px 0 0 0;
     }
+    :deep(.ant-descriptions-item-content) {
+      position: relative;
+    }
     .default_slot {
       padding: 10px 0;
     }
+    .value_slot {
+      position: absolute;
+      top: -5px;
+    }
   }
 </style>

+ 1 - 0
src/components/BsUi/Tabs/index.vue

@@ -37,6 +37,7 @@ watch(
     activeKey,
     (val) => {
       emits('change', val);
+      emits('update:tabActiveKey', val);
     },
     { immediate: true }
 );