wl-design-mobile 0.7.5 → 0.7.7

package/edit/select/lambo-edit-search-single-select.vue

@@ -27,9 +27,11 @@
             <div class="cell-group-div">
               <van-cell-group>
                 <van-search v-model="searchField" placeholder="请输入筛选名称" clearable @input="search"/>
-                <van-cell v-for="(c, index) in searchData" :key="index" :title="`${c.V}`" clickable @click="radioClick(c)">
+                <van-cell v-for="(c, index) in searchData" :key="index" :title="`${c.V}`" clickable @click.stop="radioClick(c)">
                   <template #right-icon>
-                    <van-radio :name="c.K" checked-color="#0070D2"/>
+                    <div style="pointer-events: none;">
+                      <van-radio :name="c.K" checked-color="#0070D2"/>
+                    </div>
                   </template>
                 </van-cell>
               </van-cell-group>
@@ -123,12 +125,12 @@ export default {
       this.showBottom = false
     },
     onConfirm() {
-      if (this.selectItem && this.selectItem.K) {
+      if (this.selectItem && this.selectItem.K && this.selectItem.K !== '') {
         this.val = this.selectItem.K
         this.valName = this.selectItem.V
         this.$emit('on-ok', this.selectItem)
       } else {
-        console.error('lambo-select -- 条件选择失败，this.selectItem:', this.selectItem)
+        console.log('lambo-select -- 用户取消选择或未选择，清空值')
         this.val = ''
         this.valName = ''
         this.$emit('on-ok', {K: '', V: ''})
@@ -136,7 +138,10 @@ export default {
       this.showBottom = false
     },
     radioClick(data) {
-      if (data && data.K) {
+      if (this.selectItem.K === data.K) {
+        this.selectItem.K = ''
+        this.selectItem.V = ''
+      } else {
         this.selectItem.K = data.K
         this.selectItem.V = data.V
       }

package/list/lambo-list.vue

@@ -62,7 +62,8 @@ export default {
       limit: 10,
       list: [],
       error:false,
-      errorText:''
+      errorText:'',
+      currentRequestId: 0 // 当前请求标识符
     };
   },
   mounted() {
@@ -73,16 +74,17 @@ export default {
       handler: function (val, oldVal) {
         console.log("searchParams -- val,oldVal:", {val, oldVal})
         console.log("searchParams -- val===oldVal:", val === oldVal)
-        //查询时重置页码
+        //查询时重置页码和请求标识符
         this.pageNum = 1
         this.offset = 0
         this.limit = 10
         this.list = []
+        this.currentRequestId = 0 // 重置请求标识符
 
         this.onLoad()
       },
       deep: true
-    }
+    },
   },
   methods: {
     onLoad() {
@@ -91,9 +93,14 @@ export default {
         this.refreshing = false;
       }
       this.loading = true
+      const requestId = ++this.currentRequestId;
       if (this.testMode === true) {
         console.log("lambo-list -- onLoad -- loadData:", this.pageNum)
         setTimeout(() => {
+          // 检查是否是最新的请求
+          if (requestId !== this.currentRequestId) {
+            return;
+          }
           console.log('this.searchParams',this.searchParams)
           let arr = [
             {title: "XX市XXXX酒业商行", time: "2024-01-01", person:"01", dpt: "储配部", note: "XX工作"},
@@ -112,16 +119,22 @@ export default {
           this.loading = false
           this.offset = this.pageNum * 10
           this.pageNum++;
+          // 手动触发list-change事件
+          this.$emit('list-change', this.list);
         }, 1000);  // 暂停1秒
 
       }else{
         let params = {offset: this.offset, limit: this.limit, ...this.searchParams}
         axios.get(this.url, {params}).then(res => {
+          // 检查是否是最新的请求
+          if (requestId !== this.currentRequestId) {
+            return;
+          }
           console.log("lambo-list -- onLoad -- loadData:", res)
           if (res && res.code === 1) {
             let pageData = res.data
-
             if (pageData && pageData.rows.length > 0) {
+
               for (let item of pageData.rows) {
                 if (this.list.length < pageData.total) {
                   this.list.push(item)
@@ -133,8 +146,12 @@ export default {
               this.offset = this.pageNum * 10
               this.pageNum++;
               this.finishedTxt = "没有更多了"
+              // 手动触发list-change事件
+              this.$emit('list-change', this.list);
             } else {
               this.finished = true; // 数据加载完毕
+              // 手动触发list-change事件
+              this.$emit('list-change', this.list);
             }
 
           } else {
@@ -145,6 +162,10 @@ export default {
           }
           this.loading = false; // 加载状态结束
         }).catch(err => {
+          // 检查是否是最新的请求
+          if (requestId !== this.currentRequestId) {
+            return;
+          }
           console.error("lambo-init-list -- onLoad -- 查询[" + this.title + "]异常:", err)
           Toast.fail("查询[" + this.url + "]数据异常")
           this.error = true;
@@ -164,6 +185,7 @@ export default {
       this.pageNum = 1
       this.offset = 0
       this.limit = 10
+      this.currentRequestId = 0 // 重置请求标识符
 
       this.loading = true
       this.onLoad()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wl-design-mobile",
-  "version": "0.7.5",
+  "version": "0.7.7",
   "description": "",
   "main": "index.js",
   "author": "finch",