fix: 修复tabs组件展开内容被遮盖，multi-slect返回值增加value (#36)

Author: TC-twwang

src/multi-select/index.js

@@ -52,26 +52,26 @@ export const handleClick = ({ api, props, state }) => (value) => {
 
 export const confirm = ({ state, emit }) => () => {
   const wheelLevelItems = getWheelLevelItems(state.wheelData, state.defaultSelectedIndexs)
-  const wheelLevelText = getWheelLevelText(wheelLevelItems, state.defaultSelectedIndexs)
-  state.headerInfo[state.headerIndex] = { isSelected: true, title: wheelLevelText, isUP: false }
+  const { selectedLabels, selectedItems } = getSelected(wheelLevelItems, state.defaultSelectedIndexs)
+  state.headerInfo[state.headerIndex] = { isSelected: true, title: selectedLabels, isUP: false }
   state.defaultSelectedArray[state.headerIndex] = state.defaultSelectedIndexs
-  emit('confirm', state.defaultSelectedIndexs, wheelLevelText)
+  emit('confirm', selectedItems, state.headerIndex, state.defaultSelectedIndexs)
   state.showWheel = false
 }
 
 export const reset = ({ api, props, state, emit }) => () => {
   state.headerInfo[state.headerIndex] = { isSelected: false, title: '', isUP: false }
   state.defaultSelectedIndexs = props.defaultSelectedArray[state.headerIndex] ?? api.loadDefault(state.headerIndex)
   state.defaultSelectedArray[state.headerIndex] = state.defaultSelectedIndexs
-  emit('reset', state.headerIndex)
+  emit('reset', [], state.headerIndex, state.defaultSelectedIndexs)
   state.showWheel = false
 }
 
 export const wheelChange = (state) => (indexs) => {
   state.defaultSelectedIndexs = indexs
 }
 
-export const clickWheelItem = ({ state, emit }) => (indexs, text) => {
+export const clickWheelItem = ({ state, emit }) => (indexs, text, item) => {
   if (indexs.length === 0) {
 
     // 反选
@@ -82,12 +82,12 @@ export const clickWheelItem = ({ state, emit }) => (indexs, text) => {
     state.headerInfo[state.headerIndex] = { isSelected: true, title: text, isUP: false }
   }
   state.defaultSelectedArray[state.headerIndex] = state.defaultSelectedIndexs
-  emit('confirm', indexs, text)
+  emit('confirm', item, state.headerIndex, indexs)
   state.showWheel = false
 }
 
 export const getWheelLevelItems = (wheelData, newIndexs) => {
-  const level_1 = wheelData.map(({ label }) => ({ label }))
+  const level_1 = wheelData
   const level_n = getNextLevel([], wheelData, newIndexs, 0)
   let wheelLevelItems = []
   if (level_n.length === 0) {
@@ -112,15 +112,16 @@ export const getNextLevel = (levelItems, children, nextIndexs, start) => {
   }
 }
 
-export const getWheelLevelText = (wheelLevelItems, selectedIndexs) => {
-  const selectedLabels = []
+export const getSelected = (wheelLevelItems, selectedIndexs) => {
+  const selectedItems = []
   wheelLevelItems.forEach((levelItem, i) => {
     const index = selectedIndexs[i]
-    if (levelItem[index]?.label) {
-      selectedLabels.push(levelItem[index]?.label)
+    if (levelItem[index]) {
+      selectedItems.push(levelItem[index])
     }
   });
-  return selectedLabels.join(' ')
+  const selectedLabels = selectedItems.map(item => item?.label).join(' ')
+  return { selectedLabels, selectedItems }
 }
 
 export const loadDefault = ({ props, state }) => (value) => {

src/pull-refresh/index.js

@@ -37,15 +37,20 @@ export const onTouchstart = (state) => (event) => {
   state.draggposition = event.touches[0].clientY
 }
 
-export const onTouchmove = (state) => (event) => {
+export const onTouchmove = ({ props, state }) => (event) => {
 
   if (event.touches[0].clientY < state.draggposition) {
 
     // 上拉刷新
     if (!state.pullUp.pullUpDisabled) {
-      state.translate3d = (event.touches[0].clientY - state.draggposition) / 2
-      state.pullUpReplaces = Math.abs(state.translate3d) >  state.pullUp.footHeight ? state.loosingText : state.pullUp.pullingUpText
-      state.pullDownReplaces =''
+
+      // 没有更多了
+      if (props.hasMore) {
+
+        state.translate3d = (event.touches[0].clientY - state.draggposition) / 2
+        state.pullUpReplaces = Math.abs(state.translate3d) >  state.pullUp.footHeight ? state.loosingText : state.pullUp.pullingUpText
+        state.pullDownReplaces = ''
+      }
     }
 
   } else {

src/pull-refresh/vue.js

@@ -14,7 +14,7 @@ import { mountedHandler, beforeUnmountHandler, handlerModelValue, onTouchstart,
 
 export const api = ['state']
 
-export const renderless = (props, { computed, onMounted, reactive, onBeforeUnmount }, { t, refs }) => {
+export const renderless = (props, { watch, onMounted, reactive, onBeforeUnmount }, { t, refs }) => {
   const api = {}
   const state = reactive({
     pullUpReplaces: '',
@@ -27,6 +27,7 @@ export const renderless = (props, { computed, onMounted, reactive, onBeforeUnmou
     loosingText: '',
     successText: '',
     failedText: '',
+    noMoreText: '',
     pullUp: null,
     pullDown: null,
     successDuration: props.successDuration,
@@ -36,7 +37,7 @@ export const renderless = (props, { computed, onMounted, reactive, onBeforeUnmou
   Object.assign(api, {
     state,
     onTouchstart: onTouchstart(state),
-    onTouchmove: onTouchmove(state),
+    onTouchmove: onTouchmove({ props, state }),
     onTouchend: onTouchend({ api, props, state }),
     mountedHandler: mountedHandler({ api, refs }),
     beforeUnmountHandler: beforeUnmountHandler({ api, refs }),
@@ -45,6 +46,18 @@ export const renderless = (props, { computed, onMounted, reactive, onBeforeUnmou
     clearPullRefresh: clearPullRefresh(state),
   })
 
+  watch(
+    () => props.hasMore,
+    (value) => {
+      if (!value) {
+
+        // 没有更多了
+        state.noMoreText = t('ui.pullRefresh.noMore')
+        api.clearPullRefresh()
+      }
+    },
+  )
+
   onMounted(()=> {
     api.mountedHandler({ api, refs, state })
     api.initPullRefresh({ t, props, state })

src/wheel/index.js

@@ -24,7 +24,7 @@ export const created = (api) => () => {
 export const loadPickerData = ({ props, state }) => () => {
   state.dataSource = cloneDeep(props.dataSource)
   state.defaultSelectedIndexs = cloneDeep(props.defaultSelectedIndexs)
-  const level_1 = state.dataSource.map(({ label }) => ({ label }))
+  const level_1 = state.dataSource
   const level_n = getNextLevel([], state.dataSource, state.defaultSelectedIndexs, 0)
   if (level_n.length === 0) {
 
@@ -110,7 +110,7 @@ export const refreshWheel = (nextTick) => (wheel) => {
   })
 }
 
-export const loadWheels = ({ api, props, state, nextTick, refs }) => (wheel) => {
+export const loadWheels = ({ api, props, state, nextTick, refs }) => () => {
   if (state.wheels.length === 0) {
     nextTick(() => {
       state.wheels = []
@@ -149,14 +149,7 @@ export const createWheelHasFooter = ({ api, state, emit, BScroll }) => (wheelWra
       ]
       api.wheelChanged(currentSelectedIndexs, state.prevSelectedIndexs)
       state.prevSelectedIndexs = currentSelectedIndexs
-      const selectedLabels = []
-      state.pickerData.forEach((data, i) => {
-        const index = currentSelectedIndexs[i]
-        if (data[index]?.label) {
-          selectedLabels.push(data[index]?.label)
-        }
-      })
-      emit('change', currentSelectedIndexs, selectedLabels.join(' '))
+      emit('change', currentSelectedIndexs)
     })
     api.wheelsTo(state.defaultSelectedIndexs)
     api.changeWheelItemStyle(state.pickerData, state.defaultSelectedIndexs)
@@ -205,11 +198,11 @@ export const clickWheelItem = ({ api, state, emit }) => (index) => {
   const rItem = state.pickerData[0][index]
   if (state.defaultSelectedIndexs[0] !== index) {
     const selectedLabel = rItem?.label
-    emit('clickWheelItem', [index], selectedLabel)
+    emit('clickWheelItem', [index], selectedLabel, rItem)
   } else {
 
     // 反选
-    emit('clickWheelItem', [], '')
+    emit('clickWheelItem', [], '', [])
   }
 }