papayaui 0.2.7 → 0.2.9

package/components/calendar/props.ts

@@ -165,7 +165,7 @@ export const calendarWrapperEmits = {
 export const calendarEmits = {
   ...popupEmits,
   confirm: (value: CalendarValue) => isDate(value) || isArray(value),
-  select: (value: CalendarValue) => isDate(value) || isArray(value),
+  select: (value: Date) => isDate(value),
 }
 
 export type CalendarProps = ExtractPropTypes<typeof calendarProps>

package/components/search/props.ts

@@ -51,7 +51,8 @@ export const searchEmits = {
   'update:modelValue': (value: string) => isString(value),
   change: (value: string) => isString(value),
   confirm: (value: EventDetail<{ value: string }>) => isObject(value),
-  blur: (value: unknown) => isObject(value),
+  focus: (_value: unknown) => true,
+  blur: (_value: unknown) => true,
   clear: () => true,
   'click-input': () => true,
 }

package/components/search/search.vue

@@ -24,6 +24,7 @@
         :clearable="clearable"
         @update:model-value="onUpdate"
         @confirm="emit('confirm', $event)"
+        @focus="emit('focus', $event)"
         @blur="emit('blur', $event)"
         @clear="emit('clear')"
         @click-input="emit('click-input')"

package/components/slider/props.ts

@@ -69,6 +69,12 @@ export const sliderProps = {
     type: Object as PropType<Record<number, string>>,
     default: false,
   },
+  /**
+   * 格式化值
+   */
+  formatter: {
+    type: Function as PropType<(value: number) => number | string>,
+  },
   /**
    * 进度条颜色
    */

package/components/slider/slider.scss

@@ -77,7 +77,7 @@
     height: 100%;
     color: _var(slider-button-tip-font-color, _var(color-black));
     font-size: _var(slider-button-tip-font-size, 12px);
-    transform: translate3d(0, -100%, 0);
+    transform: _var(slider-button-tip-transform, translate3d(0, -100%, 0));
     user-select: none;
   }
 

package/components/slider/slider.vue

@@ -1,6 +1,6 @@
 <template>
   <view :class="ns.b('container')">
-    <text v-if="showRange" :class="ns.e('min')">{{ min }}</text>
+    <text v-if="showRange" :class="ns.e('min')">{{ formatVal(min) }}</text>
     <view
       :class="[ns.b(), ns.is('show-range', showRange), ns.is('disabled', disabled)]"
       :style="ns.style({ backgroundColor: inactiveColor })"
@@ -34,14 +34,14 @@
             <slot v-if="$slots.button" name="button" />
             <view v-else :class="ns.e('button')">
               <text v-if="showTag" :class="ns.e('button-number')">{{
-                Array.isArray(modelValue) ? modelValue[index] : modelValue
+                Array.isArray(modelValue) ? formatVal(modelValue[index]) : formatVal(modelValue)
               }}</text>
             </view>
           </view>
         </template>
       </view>
     </view>
-    <text v-if="showRange" :class="ns.e('max')">{{ max }}</text>
+    <text v-if="showRange" :class="ns.e('max')">{{ formatVal(max) }}</text>
   </view>
 </template>
 
@@ -84,6 +84,10 @@ export default defineComponent({
       return value <= props.modelValue
     }
 
+    const formatVal = (value: number) => {
+      return typeof props.formatter === 'function' ? props.formatter(value) : value
+    }
+
     const updateModelValue = (value: number | number[]) => {
       isDragging = true
       // TODO: wxs的bug，为0时会变成{}, 要特殊处理
@@ -114,6 +118,7 @@ export default defineComponent({
       wxsProps,
       wxsModelValue,
       isWithinRange,
+      formatVal,
       updateModelValue,
       emitChange,
     }
@@ -161,7 +166,8 @@ function touchmove(event, ownInstance) {
   ] : calcValueByOffsetPercent(offset.right, state.min, state.max, state.step)
   state._modelValue = newModelValue
   // 值没有变化不触发事件
-  if (newModelValue.toString() !== state.modelValue.toString()) {
+  if (newModelValue.toString() !== state.__valueStr) {
+    state.__valueStr = newModelValue.toString()
     ownInstance.callMethod('updateModelValue', newModelValue)
   }
   return false
@@ -177,7 +183,8 @@ function touchend(event, ownInstance) {
 function calcOffsetPercent(offsetX, width, step) {
   if (offsetX <= 0) return 0
   var percentage = Math.floor((offsetX / width) * 100)
-  percentage = percentage - (percentage % step)
+  var remain = percentage % step
+  percentage = percentage - remain + (remain >= step / 2 ? step : 0)
   return percentage
 }
 

package/core/useCalendar/index.ts

@@ -89,7 +89,7 @@ export function useCalendar(props: IncludeRefs<UseCalendarProps>) {
     return new Array(date.daysInMonth()).fill(0).map<DayItem>((_, dayIndex) => {
       const day = date.add(dayIndex, 'day').startOf('day')
       const type = getDayType(day)
-      const dayItem = {
+      const dayItem: DayItem = {
         date: day,
         type,
         text: day.date().toString(),
@@ -149,7 +149,7 @@ export function useCalendar(props: IncludeRefs<UseCalendarProps>) {
           // 最多可选天数
           if (
             typeof state.maxRange !== 'undefined' &&
-            Math.abs(selectedItems.value[0].diff(value, 'day')) > state.maxRange
+            Math.abs(selectedItems.value[0].diff(value, 'day')) >= state.maxRange
           ) {
             value = selectedItems.value[0].add(state.maxRange - 1, 'day')
           }
@@ -173,7 +173,7 @@ export function useCalendar(props: IncludeRefs<UseCalendarProps>) {
       const timestamps = Array.isArray(newVal) ? newVal : [newVal]
       onClear()
       timestamps.forEach((timestamp) => {
-        onSelect(dayjs(timestamp))
+        onSelect(dayjs(timestamp).startOf('day'))
       })
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "papayaui",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "适用于uniapp的ui扩展库",
   "packageManager": "pnpm@8.6.0",
   "dependencies": {

package/utils/object.ts

@@ -10,6 +10,18 @@ export const pick = <T extends object, U extends keyof T>(object: T, keys: Array
   }, {} as Pick<T, U>)
 }
 
+/**
+ * @description 反向版 pick，这个方法返回忽略属性之外的自身和继承的可枚举属性
+ */
+export const omit = <T extends object, U extends keyof T>(object: T, keys: Array<U>) => {
+  return (Object.keys(object) as U[]).reduce((newObject, key) => {
+    if (!keys.includes(key)) {
+      newObject[key] = object[key]
+    }
+    return newObject
+  }, {} as Pick<T, U>)
+}
+
 /**
  * @description 递归合并 sources 来源对象自身和继承的可枚举属性到 object 目标对象
  */