papayaui 0.2.20 → 0.2.22

package/components/cascader/cascader.vue

@@ -18,7 +18,9 @@
     @closed="emit('closed')"
   >
     <view :class="ns.b('content')">
+      <slot name="before" />
       <Search v-if="showSearch" v-model="searchText" v-bind="searchProps" :class="ns.b('search')" />
+      <slot name="after-search" />
       <view v-if="show" :class="ns.b('tab')">
         <Tabs v-model="tabActive" :tabs="tabList" label-key="name" scrollable shrink />
       </view>
@@ -250,7 +252,18 @@ const onSelectSearch = (item: SearchNode) => {
 }
 
 const onSelectFinish = (item: TreeNode<CascaderOption>) => {
-  if (setSelect(item) && !localState.value.hasConfirm) {
+  // 多选或者开启确认按钮时，只设置选中数据
+  if (localState.value.hasConfirm) {
+    setSelect(item)
+    return
+  }
+  // 单选时，选中已选中的节点时直接关闭弹窗
+  if (isSelected(item[_fieldNames.value.value])) {
+    onClose()
+    return
+  }
+  // 单选时，节点选择成功时修改数据并关闭弹窗
+  if (setSelect(item)) {
     onConfirm()
   }
 }

package/components/picker-popup/picker-popup.vue

@@ -228,7 +228,19 @@ const onCreate = async () => {
 
 const onSelect = async (value: OptionValue, item: Option) => {
   emit('select', value, item)
-  if (_onSelect(value) && !showView.value.confirm) {
+
+  // 多选或者开启确认按钮时，只设置选中数据
+  if (showView.value.confirm) {
+    _onSelect(value)
+    return
+  }
+  // 单选时，选中已选中的节点时直接关闭弹窗
+  if (isSelected(value)) {
+    onClose()
+    return
+  }
+  // 单选时，节点选择成功时修改数据并关闭弹窗
+  if (_onSelect(value)) {
     onOk()
   }
 }

package/package.json

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