xianniu-ui 0.3.20 → 0.3.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xianniu-ui",
-  "version": "0.3.20",
+  "version": "0.3.22",
   "private": false,
   "main": "lib/xianniu-ui.umd.min.js",
   "scripts": {
@@ -21,7 +21,6 @@
     "public"
   ],
   "dependencies": {
-    "axios": "^0.26.0",
     "core-js": "^3.6.5",
     "dayjs": "^1.10.7",
     "decimal.js": "^10.4.2",
@@ -39,6 +38,7 @@
     "@vue/cli-plugin-router": "~4.5.0",
     "@vue/cli-service": "~4.5.0",
     "@vue/component-compiler-utils": "^2.6.0",
+    "axios": "^0.26.1",
     "babel-eslint": "^10.1.0",
     "babel-plugin-component": "^1.1.1",
     "babel-plugin-module-resolver": "^2.7.1",

package/packages/table/main.vue

@@ -121,13 +121,13 @@
         type="index"
       ></el-table-column>
       <slot>
-        <template v-for="(item, idx) in columns">
-          <column
-            :key="idx"
-            v-if="item.checked === true"
-            v-bind="item"
-          ></column>
-        </template>
+          <template v-for="(item, idx) in columns">
+            <column
+              :key="idx"
+              v-if="item.checked === true"
+              v-bind="item"
+            ></column>
+          </template>
       </slot>
       <template #append v-if="$slots.append">
           <slot name="append"></slot>
@@ -199,10 +199,13 @@ export default {
   },
   computed: {},
   created() {
+
+  },
+  updated() {
     !this.$slots.default &&
       this.columns.length &&
       this.columns.forEach((item) => {
-        this.$set(item, "checked", true);
+        if(item.checked !== true) this.$set(item, "checked", true);
       });
   },
   methods: {

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
 }