n20-common-lib 1.3.36 → 1.3.37

package/src/components/FileImport/_index.vue

@@ -1,201 +1,9 @@
 <template>
-  <el-dropdown
-    trigger="click"
-    placement="bottom-start"
-    @command="handleCommand"
-  >
-    <el-button size="mini" type="primary"> 导入 </el-button>
-    <el-dropdown-menu slot="dropdown">
-      <el-dropdown-item command="a">导入数据</el-dropdown-item>
-      <el-dropdown-item command="b">模板下载</el-dropdown-item>
-    </el-dropdown-menu>
-  </el-dropdown>
+  <div>待完善</div>
 </template>
 
 <script>
-import XLSX from 'xlsx'
-import axios from '../../utils/axios'
 export default {
-  name: 'FileImport',
-  props: {
-    title: {
-      type: String,
-      default: function () {
-        return '文件导入'
-      }
-    },
-    tips: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    templateUrl: {
-      type: String,
-      default: ''
-    },
-    downConfig: {
-      type: Object,
-      default() {
-        return {
-          isFrontDown: true,
-          fileName: '下载.xlsx'
-        }
-      }
-    },
-    footerHandlers: {
-      type: Object,
-      default: function () {
-        return {
-          // cancel: {
-          //   text: '取消'
-          // },
-          // confirm: {
-          //   text: '导入'
-          // }
-        }
-      }
-    },
-    beforeUpload: Function, // eslint-disable-line
-    callback: {
-      type: Function,
-      default: () => {}
-    },
-    handleConfirm: {
-      type: Function,
-      default: () => {}
-    },
-    reset: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      excelData: {
-        tableHeader: [],
-        tableData: []
-      },
-
-      analysisText: 'analysis',
-      fileName: '',
-      statisticsFlag: false,
-      columnsListTemp: [],
-      errorListTemp: [],
-      successFlag: false,
-      confirmDisabledFlag: true
-    }
-  },
-  methods: {
-    handleCommand(val) {
-      if (val == 'a') {
-        this.seletFile()
-      } else if (val == 'b') {
-        this.downloadTemplate()
-      }
-    },
-    seletFile() {
-      let input = document.createElement('input')
-      let self = this
-      input.type = 'file'
-      input.accept = '.xlsx, .xls, .csv'
-      input.addEventListener('change', function (event) {
-        const files = event.target.files
-        const rawFile = files[0] // only use files[0]
-        console.log('导入的文件:', rawFile)
-        self.fileName = rawFile.name
-        if (!rawFile) return
-        self.upload(rawFile)
-        this.value = null // fix can't select the same excel
-      })
-      input.click()
-    },
-    /* 上传文件  */
-    upload(rawFile) {
-      if (!this.beforeUpload) {
-        this.readerData(rawFile)
-        return
-      }
-      const before = this.beforeUpload(rawFile)
-      if (before) {
-        this.readerData(rawFile)
-      }
-    },
-    /*解析传入的表格 */
-    readerData(rawFile) {
-      return new Promise((resolve) => {
-        const reader = new FileReader()
-        reader.onload = (e) => {
-          const data = e.target.result
-          const workbook = XLSX.read(data, {
-            type: 'array',
-            cellDates: true
-          })
-          const firstSheetName = workbook.SheetNames[0]
-          const worksheet = workbook.Sheets[firstSheetName]
-          const header = this.getHeaderRow(worksheet)
-          const results = XLSX.utils.sheet_to_json(worksheet)
-
-          this.generateData({ header, results })
-          resolve()
-        }
-        reader.readAsArrayBuffer(rawFile)
-      })
-    },
-    generateData({ header, results }) {
-      this.excelData.tableHeader = header
-      this.excelData.tableData = results
-      this.callback && this.callback(this.excelData)
-    },
-    getHeaderRow(sheet) {
-      console.log(sheet)
-      const headers = []
-      const range = XLSX.utils.decode_range(sheet['!ref'])
-      let C
-      const R = range.s.r
-      /* start in the first row */
-      for (C = range.s.c; C <= range.e.c; ++C) {
-        /* walk every column in the range */
-        const cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })]
-        /* find the cell in the first row */
-        let hdr = 'UNKNOWN ' + C // <-- replace with your desired default
-        if (cell && cell.t) hdr = XLSX.utils.format_cell(cell)
-        headers.push(hdr)
-      }
-      return headers
-    },
-    // 下载文件
-    downloadTemplate() {
-      // 前端下载
-      if (this.downConfig.isFrontDown) {
-        const aEl = document.createElement('a')
-        aEl.setAttribute('href', this.templateUrl)
-        aEl.target = '_blank'
-        // aEl.download = this.templateUrl
-        aEl.click()
-      } else {
-        axios({
-          url: this.templateUrl,
-          method: 'get',
-          responseType: 'blob'
-        }).then((res) => {
-          const content = res
-          const blob = new Blob([content])
-          if ('download' in document.createElement('a')) {
-            const link = document.createElement('a')
-            link.download = this.downConfig.fileName
-            link.style.display = 'none'
-            link.href = URL.createObjectURL(blob)
-            document.body.appendChild(link)
-            link.click()
-            URL.revokeObjectURL(link.href)
-            document.body.removeChild(link)
-          } else {
-            navigator.msSaveBlob(blob, this.downConfig.fileName)
-          }
-        })
-      }
-    }
-  }
+  name: 'FileImport'
 }
 </script>

package/src/components/FileImport/index.vue

@@ -1,9 +1,181 @@
 <template>
-  <div>待完善</div>
+  <el-dropdown
+    trigger="click"
+    placement="bottom-start"
+    @command="handleCommand"
+  >
+    <el-button size="mini" type="primary"> 导入 </el-button>
+    <el-dropdown-menu slot="dropdown">
+      <el-dropdown-item command="a">导入数据</el-dropdown-item>
+      <el-dropdown-item command="b">模板下载</el-dropdown-item>
+    </el-dropdown-menu>
+  </el-dropdown>
 </template>
 
 <script>
+import XLSX from 'xlsx'
+import axios from '../../utils/axios'
 export default {
-  name: 'FileImport'
+  name: 'FileImport',
+  props: {
+    templateUrl: {
+      type: String,
+      default: ''
+    },
+    downConfig: {
+      type: Object,
+      default() {
+        return {
+          isFrontDown: true,
+          fileName: '下载.xlsx'
+        }
+      }
+    },
+    footerHandlers: {
+      type: Object,
+      default: function () {
+        return {
+          // cancel: {
+          //   text: '取消'
+          // },
+          // confirm: {
+          //   text: '导入'
+          // }
+        }
+      }
+    },
+    beforeUpload: Function, // eslint-disable-line
+    callback: {
+      type: Function,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      excelData: {
+        tableHeader: [],
+        tableData: []
+      },
+
+      analysisText: 'analysis',
+      fileName: '',
+      statisticsFlag: false,
+      columnsListTemp: [],
+      errorListTemp: [],
+      successFlag: false,
+      confirmDisabledFlag: true
+    }
+  },
+  methods: {
+    handleCommand(val) {
+      if (val === 'a') {
+        this.seletFile()
+      } else if (val === 'b') {
+        this.downloadTemplate()
+      }
+    },
+    seletFile() {
+      let input = document.createElement('input')
+      let self = this
+      input.type = 'file'
+      input.accept = '.xlsx, .xls, .csv'
+      input.addEventListener('change', function (event) {
+        const files = event.target.files
+        const rawFile = files[0] // only use files[0]
+        console.log('导入的文件:', rawFile)
+        self.fileName = rawFile.name
+        if (!rawFile) return
+        self.upload(rawFile)
+        this.value = null // fix can't select the same excel
+      })
+      input.click()
+    },
+    /* 上传文件  */
+    upload(rawFile) {
+      if (!this.beforeUpload) {
+        this.readerData(rawFile)
+        return
+      }
+      const before = this.beforeUpload(rawFile)
+      if (before) {
+        this.readerData(rawFile)
+      }
+    },
+    /*解析传入的表格 */
+    readerData(rawFile) {
+      return new Promise((resolve) => {
+        const reader = new FileReader()
+        reader.onload = (e) => {
+          const data = e.target.result
+          const workbook = XLSX.read(data, {
+            type: 'array',
+            cellDates: true
+          })
+          const firstSheetName = workbook.SheetNames[0]
+          const worksheet = workbook.Sheets[firstSheetName]
+          const header = this.getHeaderRow(worksheet)
+          const results = XLSX.utils.sheet_to_json(worksheet)
+
+          this.generateData({ header, results })
+          resolve()
+        }
+        reader.readAsArrayBuffer(rawFile)
+      })
+    },
+    generateData({ header, results }) {
+      this.excelData.tableHeader = header
+      this.excelData.tableData = results
+      this.callback && this.callback(this.excelData)
+    },
+    getHeaderRow(sheet) {
+      console.log(sheet)
+      const headers = []
+      const range = XLSX.utils.decode_range(sheet['!ref'])
+      let C
+      const R = range.s.r
+      /* start in the first row */
+      for (C = range.s.c; C <= range.e.c; ++C) {
+        /* walk every column in the range */
+        const cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })]
+        /* find the cell in the first row */
+        let hdr = 'UNKNOWN ' + C // <-- replace with your desired default
+        if (cell && cell.t) hdr = XLSX.utils.format_cell(cell)
+        headers.push(hdr)
+      }
+      return headers
+    },
+    // 下载文件
+    downloadTemplate() {
+      // 前端下载
+      if (this.downConfig.isFrontDown) {
+        const aEl = document.createElement('a')
+        aEl.setAttribute('href', this.templateUrl)
+        aEl.target = '_blank'
+        // aEl.download = this.templateUrl
+        aEl.click()
+      } else {
+        axios({
+          url: this.templateUrl,
+          method: 'get',
+          responseType: 'blob'
+        }).then((res) => {
+          const content = res
+          const blob = new Blob([content])
+          if ('download' in document.createElement('a')) {
+            const link = document.createElement('a')
+            link.download = this.downConfig.fileName
+            link.style.display = 'none'
+            link.href = URL.createObjectURL(blob)
+            document.body.appendChild(link)
+            link.click()
+            URL.revokeObjectURL(link.href)
+            document.body.removeChild(link)
+          } else {
+            navigator.msSaveBlob(blob, this.downConfig.fileName)
+          }
+        })
+      }
+    }
+  }
 }
 </script>

package/src/components/InputNumber/index.vue

@@ -129,10 +129,13 @@ export default {
     },
     blurFn() {
       this.showStr = true
+      this.$emit('blur', this.value)
     },
     changeFn(val) {
       if (!val && val !== 0) {
-        return this.$emit('input', val)
+        this.$emit('input', val)
+        this.$emit('change', val)
+        return
       }
 
       switch (this.type) {
@@ -148,6 +151,7 @@ export default {
             this.$nextTick(() => {
               this.valueNum = nVar
               this.$emit('input', nVar)
+              this.$emit('change', nVar)
             })
           }
           break
@@ -162,6 +166,7 @@ export default {
             this.$nextTick(() => {
               this.valueNum = nVar
               this.$emit('input', nVar)
+              this.$emit('change', nVar)
             })
           }
           break

package/src/components/InputNumber/numberRange.vue

@@ -6,7 +6,8 @@
       :max="endValue || endValue === 0 ? endValue : $attrs.max"
       :type="type"
       style="width: calc(50% - 8px)"
-      @input="(val) => $emit('update:start-value', val)"
+      @input="startChange"
+      @blur="blurFn"
     />
     <span class="numbre-range text-c" style="display: inline-block; width: 16px"
       >-</span
@@ -17,7 +18,8 @@
       :min="startValue || startValue === 0 ? startValue : $attrs.min"
       :type="type"
       style="width: calc(50% - 8px)"
-      @input="(val) => $emit('update:end-value', val)"
+      @input="endChange"
+      @blur="blurFn"
     />
   </div>
 </template>
@@ -42,6 +44,19 @@ export default {
       type: String,
       default: 'money'
     }
+  },
+  methods: {
+    startChange(val) {
+      this.$emit('update:start-value', val)
+      this.$emit('change', [this.startValue, this.endValue])
+    },
+    endChange(val) {
+      this.$emit('update:end-value', val)
+      this.$emit('change', [this.startValue, this.endValue])
+    },
+    blurFn() {
+      this.$emit('blur', [this.startValue, this.endValue])
+    }
   }
 }
 </script>

package/src/components/LoginTemporary/index.vue

@@ -52,6 +52,7 @@
 <script>
 import getJsonc from '../../assets/getJsonc'
 import realUrl from '../../assets/realUrl'
+import axios from '../../utils/axios'
 
 import loginForm from './form.vue'
 import retrievePw from './retrievePw.vue'
@@ -84,46 +85,56 @@ export default {
       operateType: 'login'
     }
   },
-  async created() {
+  created() {
     this.removeStorage()
-    await this.init()
-    this.setConfig()
+    this.init()
   },
   methods: {
-    async init() {
-      const { data } = await this.$axios.get(`/bems/1.0/sysSetting/list`)
-      if (data) {
-        this.getdata(data)
-        this.getLogoImag()
-      }
+    init() {
+      axios
+        .get(`/bems/1.0/sysSetting/list`, null, {
+          loading: false,
+          noMsg: true
+        })
+        .then(({ data }) => {
+          this.getdata(data)
+        })
+        .finally(() => {
+          this.setConfig()
+        })
+
+      this.getLogoImag()
     },
     async getLogoImag() {
-      const login = await this.$axios.get(
-        `/bems/1.0/attach/LOGIN_BACKGROUND_IMAGE`,
-        {},
-        { config: { responseType: 'arraybuffer' } }
-      )
-      this.BgImage = window.URL.createObjectURL(new Blob([login]))
-      const company = await this.$axios.get(
-        `/bems/1.0/attach/COMPANY_LOGOE`,
-        {},
-        {
-          config: { responseType: 'arraybuffer' }
-        }
-      )
-      this.LogoImage = window.URL.createObjectURL(new Blob([company]))
+      axios
+        .get(`/bems/1.0/attach/LOGIN_BACKGROUND_IMAGE`, null, {
+          responseType: 'blob',
+          loading: false,
+          noMsg: true
+        })
+        .then((blob) => {
+          this.BgImage = window.URL.createObjectURL(blob)
+        })
+      axios
+        .get(`/bems/1.0/attach/COMPANY_LOGOE`, null, {
+          responseType: 'blob',
+          loading: false,
+          noMsg: true
+        })
+        .then((blob) => {
+          this.LogoImage = window.URL.createObjectURL(blob)
+        })
     },
     getdata(list) {
-      for (const i of list) {
-        if (i.pmName == 'LOGIN_MODE') {
-          this.LOGIN_MODE = i.pmValue.split(',')
-          console.log(this.LOGIN_MODE)
-        } else if (i.pmName == 'MAIN_PAGE_TEXT') {
-          this.MAIN_PAGE_TEXT = i.pmValue
-        } else if (i.pmName == 'SYSTEM_NAME') {
-          this.SYSTEM_NAME = i.pmValue
+      list.forEach((item) => {
+        if (item.pmName === 'LOGIN_MODE') {
+          this.LOGIN_MODE = item.pmValue.split(',')
+        } else if (item.pmName === 'MAIN_PAGE_TEXT') {
+          this.MAIN_PAGE_TEXT = item.pmValue
+        } else if (item.pmName === 'SYSTEM_NAME') {
+          this.SYSTEM_NAME = item.pmValue
         }
-      }
+      })
     },
     setConfig() {
       getJsonc('/server-config.jsonc').then(({ _layoutData = {} }) => {

package/src/components/SelectLazy/index.vue

@@ -63,6 +63,7 @@ export default {
   methods: {
     change(val) {
       this.$emit('input', val)
+      this.$emit('change', val)
     },
     lazyGet() {
       this.$emit('scroll-bottom')

package/src/directives/VClickOutside/index.js

@@ -5,7 +5,7 @@ directive.install = (Vue) => {
     bind: function (el, binding, node) {
       el.clickOutsideEvent = function (event) {
         if (!(el === event.target || el.contains(event.target))) {
-          node.context[binding.expression](event)
+          binding.value(event)
         }
       }
       document.body.addEventListener('click', el.clickOutsideEvent, binding.arg === 'capture')