wl-design-mobile 0.7.5 → 0.7.6

package/README.md

@@ -1,6 +1,6 @@
-# wl-design-mobile
-
-## Setup
-```
-npm i wl-design-mobile
-```
+# wl-design-mobile
+
+## Setup
+```
+npm i wl-design-mobile
+```

package/doc/img/styles/css/index.css

@@ -1,3 +1,3 @@
-.img-upload-container {
-    padding: 0px 14px 12px 14px;
-}
+.img-upload-container {
+    padding: 0px 14px 12px 14px;
+}

package/edit/list/styles/css/index.css

@@ -1,39 +1,39 @@
-.coll-div {
-    margin-bottom: 8px;
-}
-
-.indicator-title {
-    display: flex;
-    align-items: center;
-    color: var(--scl-blue);
-    font-size: 14px;
-    font-family: 微软雅黑, serif Regular;
-}
-
-.indicator-title .color-line {
-    width: 3px;
-    height: 14px;
-    margin-right: 8px;
-}
-
-.coll-title-icon {
-    justify-content: center;
-    align-items: center;
-    align-content: center;
-}
-
-/* 覆盖折叠面板的标题的padding */
-/deep/ .van-cell {
-    padding: 12px 10px;
-}
-
-/* 覆盖去掉折叠面板的标题下面的线 */
-/deep/ .van-cell::after {
-    border: none;
-}
-
-/* 覆盖折叠面板的内容的padding */
-/deep/ .van-collapse-item__content {
-    padding: 0px 0px 0px 0px;
-}
-
+.coll-div {
+    margin-bottom: 8px;
+}
+
+.indicator-title {
+    display: flex;
+    align-items: center;
+    color: var(--scl-blue);
+    font-size: 14px;
+    font-family: 微软雅黑, serif Regular;
+}
+
+.indicator-title .color-line {
+    width: 3px;
+    height: 14px;
+    margin-right: 8px;
+}
+
+.coll-title-icon {
+    justify-content: center;
+    align-items: center;
+    align-content: center;
+}
+
+/* 覆盖折叠面板的标题的padding */
+/deep/ .van-cell {
+    padding: 12px 10px;
+}
+
+/* 覆盖去掉折叠面板的标题下面的线 */
+/deep/ .van-cell::after {
+    border: none;
+}
+
+/* 覆盖折叠面板的内容的padding */
+/deep/ .van-collapse-item__content {
+    padding: 0px 0px 0px 0px;
+}
+

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.6",
   "description": "",
   "main": "index.js",
   "author": "finch",

package/table/lambo-ag-table.vue

@@ -36,6 +36,7 @@
 <script>
 import 'ag-grid-community/styles/ag-grid.css'
 import 'ag-grid-community/styles/ag-theme-balham.css'
+
 /**
  * 打包时候把这一行放开，下面的一行注释掉
  *
@@ -45,6 +46,8 @@ import {AgGridVue} from 'ag-grid-vue/lib/main.cjs.js'
  * 本地运行的时候，把这一行放开，上面的一行注释掉
  * import {AgGridVue} from 'ag-grid-vue'
  */
+
+
 import {Toast} from "vant"
 import {axios} from "../util/axios"
 

package/util/assist.js

@@ -1,43 +1,43 @@
-// 深拷贝
-export function deepCopy(data) {
-  let i;
-  const t = typeOf(data);
-  let o;
-
-  if (t === 'array') {
-    o = [];
-  } else if (t === 'object') {
-    o = {};
-  } else {
-    return data;
-  }
-
-  if (t === 'array') {
-    for (i = 0; i < data.length; i++) {
-      o.push(deepCopy(data[i]));
-    }
-  } else if (t === 'object') {
-    for (i in data) {
-      o[i] = deepCopy(data[i]);
-    }
-  }
-  return o;
-}
-
-// 判断对象类型
-export function typeOf(obj) {
-  const toString = Object.prototype.toString;
-  const map = {
-    '[object Boolean]': 'boolean',
-    '[object Number]': 'number',
-    '[object String]': 'string',
-    '[object Function]': 'function',
-    '[object Array]': 'array',
-    '[object Date]': 'date',
-    '[object RegExp]': 'regExp',
-    '[object Undefined]': 'undefined',
-    '[object Null]': 'null',
-    '[object Object]': 'object'
-  };
-  return map[toString.call(obj)];
-}
+// 深拷贝
+export function deepCopy(data) {
+  let i;
+  const t = typeOf(data);
+  let o;
+
+  if (t === 'array') {
+    o = [];
+  } else if (t === 'object') {
+    o = {};
+  } else {
+    return data;
+  }
+
+  if (t === 'array') {
+    for (i = 0; i < data.length; i++) {
+      o.push(deepCopy(data[i]));
+    }
+  } else if (t === 'object') {
+    for (i in data) {
+      o[i] = deepCopy(data[i]);
+    }
+  }
+  return o;
+}
+
+// 判断对象类型
+export function typeOf(obj) {
+  const toString = Object.prototype.toString;
+  const map = {
+    '[object Boolean]': 'boolean',
+    '[object Number]': 'number',
+    '[object String]': 'string',
+    '[object Function]': 'function',
+    '[object Array]': 'array',
+    '[object Date]': 'date',
+    '[object RegExp]': 'regExp',
+    '[object Undefined]': 'undefined',
+    '[object Null]': 'null',
+    '[object Object]': 'object'
+  };
+  return map[toString.call(obj)];
+}

package/util/bus.js

@@ -1,4 +1,4 @@
-import Vue from 'vue'
-
-const Bus = new Vue();
-export default Bus;
+import Vue from 'vue'
+
+const Bus = new Vue();
+export default Bus;