wui-components-v2 1.1.58 → 1.1.60

package/components/custom-date-picker/custom-date-picker.vue

@@ -34,13 +34,14 @@ function clear() {
 
 watch(
   () => props.modelValue,
-  (val) => {
+  val => {
     currentValue.value = val
-  },
+  }
 )
 
-watch(currentValue, (val) => {
-  emit('update:modelValue', val)
+watch(currentValue, val => {
+  const newVal = props.type === 'year' ? dayjs(val).format('YYYY') : val
+  emit('update:modelValue', newVal)
 })
 
 const labelText = computed(() => {
@@ -51,13 +52,12 @@ const labelText = computed(() => {
   } = {
     date: 'YYYY-MM-DD',
     datetime: 'YYYY-MM-DD HH:mm',
-    year:'YYYY'
+    year: 'YYYY',
   }
 
   if (['date', 'datetime', 'year'].includes(props.type)) {
     return currentValue.value ? dayjs(currentValue.value).format(formatMap[props.type] as string) : ''
-  }
-  else {
+  } else {
     return currentValue.value || ''
   }
 })
@@ -65,19 +65,13 @@ const labelText = computed(() => {
 
 <template>
   <div class="flex items-center justify-between">
-    <wd-input
-      v-model="labelText"
-      readonly
-      :placeholder="placeholder"
-      class="flex-1"
-      @click="open = true"
-    />
+    <wd-input v-model="labelText" readonly :placeholder="placeholder" class="flex-1" @click="open = true" />
     <wd-icon v-if="labelText" name="close-circle" size="16px" @click="clear" />
     <wd-icon v-else name="right" size="16px" @click="clear" />
   </div>
 
   <wd-calendar
-    v-if="['date', 'datetime',].includes(type)"
+    v-if="['date', 'datetime'].includes(type)"
     v-model="currentValue"
     v-model:visible="open"
     label-key="label"
@@ -100,13 +94,13 @@ const labelText = computed(() => {
 .custom-date-picker {
   width: 100%;
   :deep(.wd-calendar__wrapper) {
-  padding : 0 20px;
-  overflow: auto;
-  scrollbar-width: none;
-  -ms-overflow-style: none;
-}
-:deep(.uni-scroll-view) {
-   scrollbar-width: none;
-}
+    padding: 0 20px;
+    overflow: auto;
+    scrollbar-width: none;
+    -ms-overflow-style: none;
+  }
+  :deep(.uni-scroll-view) {
+    scrollbar-width: none;
+  }
 }
 </style>

package/components/wui-edit-page/wui-edit-page.vue

@@ -301,6 +301,9 @@ async function save() {
       if (editEvent.value)
         uni.$emit(editEvent.value, res.entityCode)
 
+      // ★ 通知 wui-select-popup 刷新列表数据
+      uni.$emit('selectPopup:refresh', sourceId.value)
+
       subLoading.value = false
       router.back()
     }).catch((error: any) => {

package/components/wui-select-popup/wui-select-popup.vue

@@ -1,10 +1,11 @@
 <script setup lang="ts">
-import { computed, nextTick, onUnmounted, ref, watch } from 'vue'
+import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
 import { enums, listData, pageConfig, pageKey } from '../../api/page'
 import foldCard from '../fold-card/fold-card.vue'
 import Search from '../search/search.vue'
 import type { Config, Entities, Enums, FoldCardModel } from '../../type'
 import { useGlobalToast } from '../../composables/useGlobalToast'
+import listTopButtons from '../list-top-buttons/list-top-buttons.vue'
 
 defineOptions({
   name: 'WuiSelectPopup',
@@ -158,6 +159,8 @@ const formatAddress = (value: string) => {
 
 // 标记是否已获取配置
 const isConfigLoaded = ref(false)
+// ★ 防止重复加载
+const isLoading = ref(false)
 
 // ★ 是否已完成默认首项选中
 const hasDefaultSelected = ref(false)
@@ -174,7 +177,6 @@ watch(datas, val => {
       : Object.values(selectData.value)
   emit('update:modelValue', result)
   hasDefaultSelected.value = true
-  console.log('[WuiSelectPopup] ✅ 默认选中首项:', first.code)
 })
 
 // 获取页面配置
@@ -215,6 +217,10 @@ async function getEnums() {
 
 // 查询列表数据（完整流程：config -> key -> data）
 async function queryList(pageNo: number, pageSize: number) {
+  // ★ 首次加载时防重复（分页加载不拦截，pageNo > 1 时放行）
+  if (pageNo === 1 && isLoading.value) return
+  if (pageNo === 1) isLoading.value = true
+
   try {
     // 步骤1：确保配置已加载
     if (!isConfigLoaded.value) {
@@ -261,6 +267,8 @@ async function queryList(pageNo: number, pageSize: number) {
   } catch (error) {
     console.error('[WuiSelectPopup] ❌ 数据加载失败:', error)
     Zpaging.value.complete(false)
+  } finally {
+    if (pageNo === 1) isLoading.value = false
   }
 }
 
@@ -336,6 +344,7 @@ function openPopup(e?: any) {
 watch(show, async val => {
   console.log('[WuiSelectPopup] 📢 show 状态变化:', val)
   if (val) {
+    if (isLoading.value) return // ★ 防重复
     isConfigLoaded.value = false
     await nextTick()
     if (Zpaging.value) {
@@ -350,7 +359,22 @@ watch(show, async val => {
   }
 })
 
+// ★ 监听 edit-page 返回后刷新数据（通过 sourceId 过滤，只响应自己的刷新）
+function handleRefresh(refreshSourceId: string) {
+  if (refreshSourceId !== props.sourceId) return
+  console.log('[WuiSelectPopup] 🔄 收到刷新信号，重新加载数据')
+  if (show.value && Zpaging.value && !isLoading.value) {
+    isConfigLoaded.value = false
+    Zpaging.value.reload()
+  }
+}
+
+onMounted(() => {
+  uni.$on('selectPopup:refresh', handleRefresh)
+})
+
 onUnmounted(() => {
+  uni.$off('selectPopup:refresh', handleRefresh)
   uni.removeStorageSync('paramsData')
 })
 
@@ -430,6 +454,9 @@ defineExpose({
                 :primary-criteria="config.primaryCriteria"
                 @submit="submitSearch"
               />
+              <view>
+                <listTopButtons :buttons="config.buttons" :source-id="sourceId" :page-title="pageTitle" />
+              </view>
               <slot name="top" />
             </template>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wui-components-v2",
-  "version": "1.1.58",
+  "version": "1.1.60",
   "description": "wui 组件库",
   "author": "wgxshh",
   "license": "MIT",

package/pnpm-workspace.yaml

@@ -1,2 +0,0 @@
-allowBuilds:
-  '@parcel/watcher': set this to true or false