@mc-markets/ui 1.1.64 → 1.1.65

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mc-markets/ui",
   "private": false,
-  "version": "1.1.64",
+  "version": "1.1.65",
   "type": "module",
   "author": "chenyu",
   "description": "Vue 3 组件库，基于 Element Plus 的自定义组件",

package/packages/components/DatePicker/DatePicker.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-date-picker ref="datePickerRef" v-bind="mergedAttrs" class="m-datepicker" :popper-class="popperClass" :class="{ 'style-type-solid': styleType === 'solid' }">
+  <el-date-picker ref="datePickerRef" v-bind="mergedAttrs" class="m-datepicker" :popper-class="computedPopperClass" :class="{ 'style-type-solid': styleType === 'solid' }">
     <template v-for="(_, name) in $slots" :key="name" #[name]>
       <slot :name="name" />
     </template>
@@ -7,8 +7,9 @@
 </template>
 
 <script setup>
-import { useClassName } from "@packages/hooks/useClassName.js";
+import { computed, useAttrs } from 'vue'
 import { useExposeRef } from '@packages/hooks/useExposeRef.js'
+import { classNames, excludeAttrs } from '@packages/utils/classNames.js'
 
 defineOptions({
   name: "MDatePicker",
@@ -25,11 +26,19 @@ const props = defineProps({
   },
 });
 
-// 使用类名 Hook，排除 type 和 popperClass 属性
-const { mergedAttrs, className: popperClass } = useClassName(
-  "mc-datepicker-popper",
-  "popperClass"
-);
+// 获取 attrs
+const attrs = useAttrs()
+
+// 计算 popper-class，合并默认类名和外部传入的类名
+const computedPopperClass = computed(() => {
+  const defaultPopperClass = 'mc-datepicker-popper'
+  const externalPopperClass = props.popperClass || attrs.popperClass || ''
+  
+  return classNames(defaultPopperClass, externalPopperClass)
+})
+
+// 合并其他属性（排除 popperClass）
+const mergedAttrs = computed(() => excludeAttrs(attrs, 'popperClass'))
 
 const { innerRef: datePickerRef, exposedProxy } = useExposeRef('datePickerRef')