n20-common-lib 2.10.18 → 2.10.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.10.18",
+  "version": "2.10.20",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -67,7 +67,6 @@
     "v-viewer": "1.6.4",
     "vue-jsonp": "2.0.0",
     "vuedraggable": "*",
-    "json-bigint": "^1.0.0",
     "webpack-duplicate-relano-plugin": "^0.1.0",
     "xe-utils": "^3.5.11"
   },

package/src/components/ContentLoading/index.vue

@@ -1,42 +1,42 @@
-<template>
-  <div v-loading="loading" :element-loading-text="loadingText"></div>
-</template>
-
-<script>
-import { $lc } from '../../utils/i18n/index'
-export default {
-  name: 'ContentLoading',
-  data() {
-    return {
-      loading: true,
-      loadingText: $lc('加载中'),
-      timeout: 12000
-    }
-  },
-  mounted() {
-    this.setTimeOut()
-  },
-  activated() {
-    this.setTimeOut()
-  },
-  deactivated() {
-    this.clearTimeOut()
-  },
-  beforeDestroy() {
-    this.clearTimeOut()
-  },
-  methods: {
-    setTimeOut() {
-      clearTimeout(this.sT)
-
-      this.sT = setTimeout(() => {
-        this.loadingText = $lc('请求超时，请刷新尝试')
-      }, this.timeout)
-    },
-    clearTimeOut() {
-      this.loadingText = $lc('加载中')
-      clearTimeout(this.sT)
-    }
-  }
-}
-</script>
+<template>
+  <div v-loading="loading" :element-loading-text="loadingText"></div>
+</template>
+
+<script>
+import { $lc } from '../../utils/i18n/index'
+export default {
+  name: 'ContentLoading',
+  data() {
+    return {
+      loading: true,
+      loadingText: $lc('加载中'),
+      timeout: 12000
+    }
+  },
+  mounted() {
+    this.setTimeOut()
+  },
+  activated() {
+    this.setTimeOut()
+  },
+  deactivated() {
+    this.clearTimeOut()
+  },
+  beforeDestroy() {
+    this.clearTimeOut()
+  },
+  methods: {
+    setTimeOut() {
+      clearTimeout(this.sT)
+
+      this.sT = setTimeout(() => {
+        this.loadingText = $lc('请求超时，请刷新尝试')
+      }, this.timeout)
+    },
+    clearTimeOut() {
+      this.loadingText = $lc('加载中')
+      clearTimeout(this.sT)
+    }
+  }
+}
+</script>

package/src/components/TablePro/index.vue

@@ -61,7 +61,7 @@
           :field="item.prop"
         >
           <template slot-scope="scope">
-            <renderer :renderContent="item.render" :scope="scope"></renderer>
+            <renderer :render-content="item.render" :scope="scope" />
           </template>
         </vxe-column>
         <vxe-column
@@ -216,6 +216,11 @@ export default {
       key: 0
     }
   },
+  computed: {
+    _columns() {
+      return this.calcColumnWidth(this.columns)
+    }
+  },
   watch: {
     columns() {
       this.colsKey = this.colsKey + 1
@@ -231,11 +236,6 @@ export default {
       }
     }
   },
-  computed: {
-    _columns() {
-      return this.calcColumnWidth(this.columns)
-    }
-  },
   activated() {
     this.$refs.vxeTable.loadData(this.data)
   },
@@ -336,9 +336,7 @@ export default {
     calcColumnWidth(columns) {
       columns = XEUtils.clone(columns, true)
       const wrapperEl = document.querySelector('div#app')
-      const notHasWidth = columns.filter(
-        (column) => !column.width && !column.minWidth && column.label !== $lc('操作')
-      )
+      const notHasWidth = columns.filter((column) => !column.width && !column.minWidth && column.label !== $lc('操作'))
       if (!wrapperEl || notHasWidth.length > 0) {
         return columns
       }
@@ -349,7 +347,7 @@ export default {
           if (column.static && column.label === $lc('操作') && !column.width && !column.minWidth) {
             column.width = 80
           }
-          if (column.type) {
+          if (column.type === 'checkbox') {
             column.width = 80
           }
           const width = column.minWidth || column.width
@@ -358,6 +356,7 @@ export default {
           column['minWidth'] = undefined
           columnsWidth += column.width
         })
+
         if (columnsWidth >= windowWidth) return columns
         return columns.map((column) => {
           if (!column.type) {
@@ -365,9 +364,11 @@ export default {
             column['width'] = windowWidth * rate
             return column
           }
+
           return column
         })
       }
+
       return calc(columns)
     }
   }

package/src/utils/axios.js

@@ -1,6 +1,5 @@
 import _axios from 'axios'
 import ElementUI from 'element-ui'
-import JSONBig from 'json-bigint'
 import auth from './auth'
 import { $lc } from './i18n/index'
 const _Loading = ElementUI.Loading
@@ -84,19 +83,7 @@ const config = {
   timeout: 120000,
   validateStatus(status) {
     return status === 200
-  },
-  // 处理big数据
-  transformResponse: [
-    function (data) {
-      if (data instanceof Blob) {
-        return data
-      } else {
-        const json = JSONBig({ storeAsString: true })
-        const res = json.parse(data)
-        return res
-      }
-    }
-  ]
+  }
 }
 const axios = _axios.create(config)