xianniu-ui 0.3.19 → 0.3.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xianniu-ui",
-  "version": "0.3.19",
+  "version": "0.3.21",
   "private": false,
   "main": "lib/xianniu-ui.umd.min.js",
   "scripts": {

package/packages/table/main.vue

@@ -140,6 +140,7 @@
         :pageNum.sync="page.pageNum"
         :pageSize.sync="page.pageSize"
         @pagination="getList"
+        v-bind="$attrs"
         layout="total, prev, pager, next, jumper"
       ></xn-page>
     </template>
@@ -198,7 +199,6 @@ export default {
   },
   computed: {},
   created() {
-    console.log(this.$slots);
     !this.$slots.default &&
       this.columns.length &&
       this.columns.forEach((item) => {

package/src/utils/utils.js

@@ -70,7 +70,7 @@ const download = (params = { name: '', url: '' }) => {
   x.open('GET', url, true)
   // x.responseType = 'blob'
   // x.responseType = 'blob'
-  x.onprogress = function(){
+  x.onprogress = function () {
   }
   x.onload = function () {
     var _url = ''
@@ -87,10 +87,43 @@ const download = (params = { name: '', url: '' }) => {
   }
   x.send()
 }
+/**
+ * 根据某个key 对数组去重合并
+ * @param {array} arr 需要合并的数组
+ * @param {string} key 传入要合并的key
+ * @return {array} result
+ */
+const arrMerge = (arr = [], key = '') => {
+  if (!key) {
+    throw new Error('error arguments: key is required')
+  }
+  if(!arr.length) return
+  var map = {}; var result = []
 
+  for (var i = 0; i < arr.length; i++) {
+    var ai = arr[i]
+    if (!map[ai[key]]) {
+      result.push({
+        [key]: ai[key],
+        children: [ai]
+      })
+      map[ai[key]] = ai
+    } else {
+      for (var j = 0; j < result.length; j++) {
+        var dj = result[j]
+        if (dj[key] === ai[key]) {
+          dj.children.push(ai)
+          break
+        }
+      }
+    }
+  }
+  return result
+}
 export default {
   isEmpty,
   isImg,
   deepClone,
-  download
+  download,
+  arrMerge
 }