n20-common-lib 1.3.137 → 1.3.139

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.3.137",
+  "version": "1.3.139",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/Anchor/AnchorItem.vue

@@ -19,10 +19,14 @@ export default {
       default: ''
     }
   },
+  inject: ['init'],
   data() {
     return {
       show: true
     }
+  },
+  mounted() {
+    this.init()
   }
 }
 </script>

package/src/components/Anchor/index.vue

@@ -31,7 +31,6 @@
 
 <script>
 import { getScrollContainer, vueDebounce } from '../../utils/getScrollContainer.js'
-
 export default {
   name: 'Anchor',
   props: {
@@ -49,6 +48,11 @@ export default {
       default: ''
     }
   },
+  provide() {
+    return {
+      init: this.init
+    }
+  },
   data() {
     return {
       AnchorNavList: [], // 按钮数据
@@ -88,8 +92,9 @@ export default {
     this.scrollWrap.removeEventListener('scroll', this.scrollFunDebounce)
   },
   methods: {
+    init: vueDebounce('initAs', 500),
     // 初始化，获取电梯按钮数据，获取楼层高度映射
-    init() {
+    initAs() {
       let parentTop = this.$refs.Anchor.getBoundingClientRect().top - this.scrollWrap.getBoundingClientRect().top
       let list = this.$children[0].$children.map((item) => {
         let rect = item.$el.getBoundingClientRect()

package/src/components/DateSelect/index.vue

@@ -97,20 +97,21 @@ export default {
   },
   mounted() {
     switch (this.selectType) {
-      case 1:
-        this.day = this.value
+      case '日':
+        this.day = [this.value.startDate, this.value.endDate]
         break
-      case 2:
-        this.week = this.value
+      case '周':
+        this.week = this.value.startDate
         break
-      case 3:
-        this.month = this.value
+      case '月':
+        this.month = dayjs(this.value.startDate).format('YYYY-MM')
+        console.log(this.month)
         break
-      case 4:
+      case '季':
         this.quarter = this.value
         break
-      case 5:
-        this.year = this.value
+      case '年':
+        this.year = dayjs(this.value.startDate).format('YYYY')
         break
     }
   },
@@ -127,6 +128,7 @@ export default {
     },
 
     dayChange(val) {
+      console.log(val)
       this.$emit('input', val)
       this.$emit('change', { startDate: val[0], endDate: val[1] })
     },
@@ -138,6 +140,7 @@ export default {
       return Y + M + D
     },
     weekChange(val) {
+      console.log(val)
       let todayDay = val ? new Date(val) : new Date()
       let todayOfWeek = todayDay.getDay()
       let spendDay = 1
@@ -158,6 +161,7 @@ export default {
       this.$emit('change', weekTime)
     },
     monthChange(val) {
+      console.log(val)
       let IMonth = {
         startDate: dayjs(val).startOf('month').format('YYYY-MM-DD'),
         endDate: dayjs(val).endOf('month').format('YYYY-MM-DD')

package/src/utils/xlsx2json.js

@@ -11,9 +11,9 @@ export default async function toJson(file, name) {
         const worksheet = workbook.getWorksheet(name || 1)
         let rows = []
         worksheet.eachRow((r) => {
-          let row = []
-          r.eachCell((c) => {
-            row.push(c.value)
+          let row = new Array(r.cellCount).fill(null)
+          r.eachCell((c, i) => {
+            row[i - 1] = c.value
           })
           rows.push(row)
         })