@hzab/data-model 1.6.0 → 1.7.0

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# @hzab/data-model@1.7.0
+
+feat: 本地数据支持排序查询列表数据
+
+# @hzab/data-model@1.6.1
+
+fix: array-data-modal getMap getListMap 修复；getListMap、getListResMap 逻辑优化
+
 # @hzab/data-model@1.6.0
 
 fix: 注释；通用函数抽离

package/README.md

@@ -182,6 +182,17 @@ function Demo({ orgId }) {
 | opt.effectParams  | Object | 否   | -      | 动态的 params 数据，包含了 query |
 | opt.effectQuery   | Object | 否   | -      | 动态的 query 数据                |
 
+## array-data-model
+
+- 参数通 DataModel
+
+### query 配置
+
+| 参数                  | 类型                 | 必填 | 默认值 | 说明                                                      |
+| --------------------- | -------------------- | ---- | ------ | --------------------------------------------------------- |
+| sortKey/orderByColumn | string/Array[string] | 否   | -      | 排序字段，支持多维度排序，按照传入的顺序排优先级          |
+| sortType/isAsc        | string/Object        | 否   | -      | 排序规则，支持对象配置各字段排序规则 正序: asc 倒序: desc |
+
 # 组件开发流程
 
 - 在 config/webpack.config.js 中按需修改 library 配置的文件名

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/data-model",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "data model",
   "main": "src",
   "scripts": {

package/src/ArrayUtils.js

@@ -57,8 +57,11 @@ export class ArrayUtils {
    * @param {*} query
    */
   findListByQuery(query) {
-    const { pageNum = 1, pageSize = 10 } = query || {};
-    const { _list } = this;
+    const { pageNum = 1, pageSize = 10, sortKey, sortType, orderByColumn, isAsc } = query || {};
+    // 排序
+    const _list = this.getSortList(sortKey || orderByColumn, sortType || isAsc);
+
+    // 分页
     // 边界检查
     if (pageNum < 1 || pageSize <= 0) {
       return { list: [], pagination: { current: 1, total: 0 } };
@@ -76,6 +79,68 @@ export class ArrayUtils {
     return { list: _list.slice(startIndex, endIndex), pagination: { current: pageNum, total: this.getCount() } };
   }
 
+  /**
+   * 对目标数据进行多维度排序
+   * @param list
+   * @param {*} sortKey 排序的字段 支持 a.b.c 写法
+   * @param {*} sortType 排序方式 正序: asc 倒序: desc
+   * @returns
+   */
+  getSortList(sortKey, sortType) {
+    const _list = _.cloneDeep(this._list);
+    if (!sortKey && !sortType) {
+      return _list;
+    }
+    const keys = Array.isArray(sortKey) ? sortKey : [sortKey];
+    _list.sort((a, b) => {
+      return this.compareData(a, b, { keys, sortType });
+    });
+    return _list;
+  }
+
+  /**
+   * 根据传入的 keys 比较对象目标数据先后顺序
+   * @param dataA
+   * @param dataB
+   * @param opt
+   * @param opt.keys 数据 key 数组
+   * @param opt.keyIdx 当前数据下标
+   * @param opt.sortType 排序规则
+   * @returns
+   */
+  compareData(dataA, dataB, opt = { keys, keyIdx: 0, sortType: "desc" }) {
+    const { keys, keyIdx = 0, sortType = "desc" } = opt;
+    const key = keys[keyIdx];
+
+    let direction = 1;
+    // 兼容 string 及 object 类型
+    let _sortType = sortType;
+    if (typeof _sortType === "object") {
+      _sortType = _sortType[key];
+    }
+    if (_sortType === "asc") {
+      direction = -1;
+    }
+
+    const valueA = _.get(dataA, key);
+    const valueB = _.get(dataB, key);
+    if (valueA < valueB) {
+      return -1 * direction;
+    }
+    if (valueA > valueB) {
+      return 1 * direction;
+    }
+
+    if (keyIdx + 1 >= keys.length) {
+      return 0;
+    }
+
+    if (valueA == valueB) {
+      // 继续使用次选排序规则排序
+      return this.compareData(dataA, dataB, { ...opt, keyIdx: keyIdx + 1 });
+    }
+  }
+
   /**
    * 获取完整列表
    */
@@ -99,6 +164,7 @@ export class ArrayUtils {
     // TODO: id 去重
     const item = _.cloneDeep(data);
     this.setId(item);
+    this.setCreateTime(item);
     this._list.push(item);
     return STATE_CODE.SUC;
   }
@@ -111,6 +177,7 @@ export class ArrayUtils {
     // TODO: id 去重
     const item = _.cloneDeep(data);
     this.setId(item);
+    this.setCreateTime(item);
     this._list.unshift(item);
     return STATE_CODE.SUC;
   }
@@ -131,6 +198,7 @@ export class ArrayUtils {
       return STATE_CODE.NOT_FOUNT;
     }
     _list.splice(idx, 1, data);
+    this.setUpdateTime(data);
     return STATE_CODE.SUC;
   }
 
@@ -152,6 +220,7 @@ export class ArrayUtils {
     Object.keys(data).forEach((key) => {
       item[key] = data[key];
     });
+    this.setUpdateTime(data);
     return STATE_CODE.SUC;
   }
 
@@ -186,6 +255,22 @@ export class ArrayUtils {
     }
     return item;
   }
+
+  /**
+   * 设置创建时间
+   * @param {*} item
+   */
+  setCreateTime(item) {
+    item.createTime = Date.now();
+  }
+
+  /**
+   * 设置更新时间
+   * @param {*} item
+   */
+  setUpdateTime(item) {
+    item.createTime = Date.now();
+  }
 }
 
 export const hasId = (id) => {

package/src/array-data-model.js

@@ -121,6 +121,9 @@ class ArrayDataModel extends ArrayUtils {
 
     return new Promise((resolve, reject) => {
       let res = this.findItem(query);
+      if (this.getMap) {
+        res = this.getMap(res);
+      }
       if (this.getResMap) {
         res = this.getResMap(res);
       }
@@ -144,15 +147,15 @@ class ArrayDataModel extends ArrayUtils {
     let resultList = null;
     if (this.getListFunc) {
       resultList = await this.getListFunc(query);
-      if (this.getListResMap) {
-        resultList = this.getListResMap(resultList);
-      }
     } else {
       const getPro = this.findListByQuery(query);
       resultList = await getPro;
-      if (this.getListResMap) {
-        resultList = this.getListResMap(resultList);
-      }
+    }
+    if (this.getListMap) {
+      resultList.list = resultList.list.map((record) => this.getListMap(record));
+    }
+    if (this.getListResMap) {
+      resultList = this.getListResMap(resultList);
     }
     return resultList;
   }

package/src/data-model.js

@@ -233,9 +233,6 @@ class DataModel {
     let resultList = null;
     if (this.getListFunc) {
       resultList = await this.getListFunc(query);
-      if (this.getListResMap) {
-        resultList = this.getListResMap(resultList);
-      }
     } else {
       const getPro = new Promise((resolve, reject) => {
         const apiUrl = this.getApiUrl(this.getListApi, q, ctx, { from: "getList" });
@@ -251,12 +248,6 @@ class DataModel {
               response,
               (res) => {
                 // data: { list: [], pagination: { current: 0, total: 1 } }
-                if (this.getListMap) {
-                  res.list = res.list.map((record) => this.getListMap(record));
-                }
-                if (this.getListResMap) {
-                  res = this.getListResMap(res);
-                }
                 resolve(res);
               },
               reject,
@@ -266,6 +257,12 @@ class DataModel {
       });
       resultList = await getPro;
     }
+    if (this.getListMap) {
+      resultList.list = resultList.list.map((record) => this.getListMap(record));
+    }
+    if (this.getListResMap) {
+      resultList = this.getListResMap(resultList);
+    }
     return resultList;
   }