n20-common-lib 1.3.37 → 1.3.40-0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.3.37",
+  "version": "1.3.40-0.1",
   "private": false,
   "main": "src/index.js",
   "scripts": {
@@ -12,7 +12,7 @@
     "build:Jenkins_1": "vue-cli-service build --serverConfig ./server-config-jenkins.jsonc",
     "build:gzip": "vue-cli-service build --gzip",
     "build:report": "vue-cli-service build --analy",
-    "build:css": "vue-cli-service build --formats umd-min --target lib src/assets/css/index.scss --name index --dest style",
+    "build:css": "node build_css",
     "build:js": "vue-cli-service build --formats umd-min --target lib src/index.js --name index --dest lib  --analy"
   },
   "files": [
@@ -94,20 +94,6 @@
     "xlsx": "0.14.1",
     "xlsx-style": "^0.8.13"
   },
-  "eslintConfig": {
-    "root": true,
-    "env": {
-      "node": true
-    },
-    "extends": [
-      "plugin:vue/essential",
-      "eslint:recommended"
-    ],
-    "parserOptions": {
-      "parser": "babel-eslint"
-    },
-    "rules": {}
-  },
   "browserslist": [
     "> 1%",
     "last 2 versions",

package/src/assets/css/alert.scss

@@ -4,12 +4,11 @@
 }
 .el-alert {
   width: 616px;
-  padding:10px 16px;
+  padding: 10px 16px;
 }
 
-
 .el-alert--success.is-light {
-  border: 1px solid rgba(72,210,160,0.40);
+  border: 1px solid rgba(72, 210, 160, 0.4);
 }
 
 .el-alert--error.is-light {
@@ -27,5 +26,3 @@
     color: #1677ff;
   }
 }
-
-

package/src/assets/css/normalize.scss

@@ -596,7 +596,7 @@ iframe {
 --------------- */
 .font {
   &-w600 {
-    font-weight: var(--font-weight-primary);
+    font-weight: var(--font-weight-bold);
   }
 }
 

package/src/assets/getJsonc.js

@@ -39,7 +39,10 @@ export default function getJsonc(url, sync) {
               jsoncs[url + '?sync'] = _data
               resolve(_data)
             } catch (error) {
-              throw { error: url + ' illegal file', content: oAjax.responseText }
+              throw {
+                error: url + ' illegal file',
+                content: oAjax.responseText
+              }
             }
           }
         }

package/src/assets/realUrl.js

@@ -1,5 +1,6 @@
 /* 前缀,针对乾坤做了处理 */
-const prefix = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__ || process.env.BASE_URL || '/'
+const prefix =
+  window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__ || process.env.BASE_URL || '/'
 
 export default function realUrl(url) {
   if (/^http(s)?:|\/\//.test(url)) {

package/src/components/Anchor/AnchorItem.vue

@@ -27,4 +27,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/src/components/Button/button-group.vue

@@ -44,9 +44,6 @@ export default {
         })
       }
 
-
-
-
       if (btnt.includes('pass')) {
         btns.push({
           emit: 'pass',
@@ -128,8 +125,6 @@ export default {
         btns.push({ emit: 'information', label: '附件信息', plain: true })
       }
 
-
-
       if (btnt.includes('orderCancel')) {
         btns.push({
           emit: 'orderCancel',
@@ -146,7 +141,6 @@ export default {
         btns.push({ emit: 'back', label: '返回', plain: true })
       }
 
-
       return btns
     }
   }

package/src/components/ECharts/index.vue

@@ -165,4 +165,3 @@ export default {
   }
 }
 </script>
-

package/src/components/EventBubble/demo/a.vue

@@ -26,4 +26,4 @@ export default {
     })
   }
 }
-</script>
+</script>

package/src/components/EventBubble/demo/b.vue

@@ -9,4 +9,4 @@ import cC from './c.vue'
 export default {
   components: { cC }
 }
-</script>
+</script>

package/src/components/EventBubble/demo/c.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flex-box flex-v">
-    <label>标题</label><el-input class="flex-item m-l" v-model="title" />
+    <label>标题</label><el-input v-model="title" class="flex-item m-l" />
     <EventBubble :data-custom="{ title: title }" data-event="demoEv" />
   </div>
 </template>
@@ -15,4 +15,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/src/components/FileImport/index.vue

@@ -1,180 +1,107 @@
 <template>
-  <el-dropdown
-    trigger="click"
-    placement="bottom-start"
-    @command="handleCommand"
-  >
-    <el-button size="mini" type="primary"> 导入 </el-button>
+  <el-dropdown trigger="click" placement="bottom-start" @command="commandFn">
+    <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-item command="import">导入数据</el-dropdown-item>
+      <el-dropdown-item command="down">模板下载</el-dropdown-item>
     </el-dropdown-menu>
+    <div style="display: none">
+      <cl-upload
+        v-if="!uploadHttpRequest"
+        v-bind="uploadProps"
+        :validate-result="validateResult"
+      >
+        <span ref="upload-trigger" slot="trigger">upload</span>
+      </cl-upload>
+      <uploadMsg
+        v-else
+        title="导入文件"
+        :visible.sync="errorV"
+        :validate-result="validateResult"
+        :hide-percent="true"
+      />
+    </div>
   </el-dropdown>
 </template>
 
 <script>
-import XLSX from 'xlsx'
 import axios from '../../utils/axios'
+import downloadBlob from '../../utils/downloadBlob'
+import uploadMsg from '../Upload/uploadMsg.vue'
 export default {
   name: 'FileImport',
+  components: { uploadMsg },
   props: {
     templateUrl: {
       type: String,
       default: ''
     },
-    downConfig: {
+    fileName: {
+      type: String,
+      default: '下载.xlsx'
+    },
+    uploadHttpRequest: {
+      type: Function,
+      default: undefined
+    },
+    validateResult: {
       type: Object,
-      default() {
-        return {
-          isFrontDown: true,
-          fileName: '下载.xlsx'
-        }
-      }
+      default: undefined
+    },
+    validateDialog: {
+      type: Boolean,
+      default: false
     },
-    footerHandlers: {
+    uploadProps: {
       type: Object,
-      default: function () {
-        return {
-          // cancel: {
-          //   text: '取消'
-          // },
-          // confirm: {
-          //   text: '导入'
-          // }
-        }
-      }
+      default: undefined
     },
-    beforeUpload: Function, // eslint-disable-line
-    callback: {
-      type: Function,
-      default: () => {}
+    uploadOn: {
+      type: Object,
+      default: undefined
     }
   },
   data() {
     return {
-      excelData: {
-        tableHeader: [],
-        tableData: []
-      },
-
-      analysisText: 'analysis',
-      fileName: '',
-      statisticsFlag: false,
-      columnsListTemp: [],
-      errorListTemp: [],
-      successFlag: false,
-      confirmDisabledFlag: true
+      errorV: false
+    }
+  },
+  watch: {
+    validateDialog(val) {
+      this.errorV = val
     }
   },
   methods: {
-    handleCommand(val) {
-      if (val === 'a') {
-        this.seletFile()
-      } else if (val === 'b') {
-        this.downloadTemplate()
-      }
+    commandFn(val) {
+      val === 'import' && this.importFn()
+      val === 'down' && this.downFn()
     },
-    seletFile() {
+    importFn() {
+      this.$emit('update:validateResult', undefined)
+
+      if (!this.uploadHttpRequest) {
+        this.$refs['upload-trigger'].click()
+        return
+      }
       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.accept = '.xlsx,.xls,.csv'
+
+      input.addEventListener('change', (event) => {
+        this.uploadHttpRequest && this.uploadHttpRequest(event.target.files[0])
       })
-      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)
+      input.click()
+      this.$nextTick(() => {
+        input = undefined
       })
     },
-    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)
-          }
+    downFn() {
+      axios
+        .get(this.templateUrl, null, { responseType: 'blob' })
+        .then((blob) => {
+          downloadBlob(blob, this.fileName)
         })
-      }
     }
   }
 }

package/src/components/FileUploadTable/index.vue

@@ -397,6 +397,10 @@ export default {
     uploadHttpRequest: {
       type: Function,
       default: undefined
+    },
+    getFileMethod: {
+      type: Function,
+      default: undefined
     }
   },
   data() {
@@ -463,6 +467,10 @@ export default {
     },
 
     async getFileInfo(row) {
+      if (this.getFileMethod) {
+        return this.getFileMethod(row)
+      }
+
       let _url = row[this.keys.url]
       this.seePrefix && (_url = this.seePrefix + _url)
       if (_url) {

package/src/components/Filters/form-item-input.vue

@@ -183,4 +183,3 @@ export default {
   }
 }
 </script>
-

package/src/components/Filters/indexO.vue

@@ -1,19 +1,22 @@
 <template>
   <el-popover
+    v-model="showPop"
     :width="width"
     placement="bottom-end"
     title="筛选"
-    v-model="showPop"
-    @after-leave="
-      showMore = false
-    "
     trigger="manual"
+    @after-leave="showMore = false"
   >
     <span slot="reference">
-      <el-button  @click="clickBtn" icon="n20-icon-iconfontshaixuan" plain onlyicon size="mini"
+      <el-button
+        icon="n20-icon-iconfontshaixuan"
+        plain
+        onlyicon
+        size="mini"
+        @click="clickBtn"
     /></span>
 
-    <div class="n20-filter p-a-s" v-click-outside="clickOut">
+    <div v-click-outside="clickOut" class="n20-filter p-a-s">
       <slot></slot>
       <el-button
         v-if="$slots.more"
@@ -67,7 +70,7 @@ export default {
   data() {
     return {
       showMore: false,
-      showPop:false
+      showPop: false
     }
   },
   mounted() {},
@@ -89,10 +92,10 @@ export default {
     clickOut() {
       let elPoppers = []
       document
-          .querySelectorAll('.el-popper,.el-dialog__wrapper')
-          .forEach((e) => {
-            e.style.display !== 'none' && elPoppers.push(e)
-          })
+        .querySelectorAll('.el-popper,.el-dialog__wrapper')
+        .forEach((e) => {
+          e.style.display !== 'none' && elPoppers.push(e)
+        })
 
       if (elPoppers.length <= 1) {
         this.showPop = false
@@ -101,4 +104,3 @@ export default {
   }
 }
 </script>
-

package/src/components/FlowStep/index.vue

@@ -1,63 +1,86 @@
 <template>
-   <div class="n20-steps-area">
+  <div class="n20-steps-area">
     <div class="n20-steps">
-     <div
-        :class="['n20-steps-item',
-      { 'finished': current > n,
-       'process': current === n && n !== totalSteps,
-       'last-process': current === totalSteps && n === totalSteps,
-       'middle-wait': current < n && n !== totalSteps,
-       'last-wait': current < n && n === totalSteps,
-      }
-     ]"
+      <div
         v-for="n in totalSteps"
         :key="n"
-        @click="onChange(n)">
-      <div class="n20-steps-icon">
-       <span :class="['n20-u-icon',{'n20-icon-danxuankuang-yixuanzhong': current === n && n !== totalSteps||  current === totalSteps && n === totalSteps},]" v-if="current<=n"></span>
-       <span class="n20-u-icon n20-icon-fankui-chenggongkongxin" v-else></span>
-      </div>
-      <div class="n20-steps-content">
-       <div class="n20-steps-title">{{ stepsLabel[n-1] || 'S ' + n }}</div>
-       <div class="n20-steps-description">{{ stepsDesc[n-1] || 'Desc ' + n }}</div>
+        :class="[
+          'n20-steps-item',
+          {
+            finished: current > n,
+            process: current === n && n !== totalSteps,
+            'last-process': current === totalSteps && n === totalSteps,
+            'middle-wait': current < n && n !== totalSteps,
+            'last-wait': current < n && n === totalSteps
+          }
+        ]"
+        @click="onChange(n)"
+      >
+        <div class="n20-steps-icon">
+          <span
+            v-if="current <= n"
+            :class="[
+              'n20-u-icon',
+              {
+                'n20-icon-danxuankuang-yixuanzhong':
+                  (current === n && n !== totalSteps) ||
+                  (current === totalSteps && n === totalSteps)
+              }
+            ]"
+          ></span>
+          <span
+            v-else
+            class="n20-u-icon n20-icon-fankui-chenggongkongxin"
+          ></span>
+        </div>
+        <div class="n20-steps-content">
+          <div class="n20-steps-title">{{ stepsLabel[n - 1] || 'S ' + n }}</div>
+          <div class="n20-steps-description">
+            {{ stepsDesc[n - 1] || 'Desc ' + n }}
+          </div>
+        </div>
       </div>
-     </div>
     </div>
-   </div>
+  </div>
 </template>
 <script>
 export default {
   name: 'FlowStep',
   props: {
-    stepsLabel: { // 步骤title数组
+    stepsLabel: {
+      // 步骤title数组
       type: Array,
       default: () => {
         return []
       }
     },
-    stepsDesc: { // 步骤description数组
+    stepsDesc: {
+      // 步骤description数组
       type: Array,
       default: () => {
         return []
       }
     },
-    totalSteps: { // 总的步骤数
+    totalSteps: {
+      // 总的步骤数
       type: Number,
       default: 3
     },
-    currentStep: { // 当前选中的步骤
+    currentStep: {
+      // 当前选中的步骤
       type: Number,
       default: 1
     }
   },
-  data () {
+  data() {
     return {
       // 若当前选中步骤超过总步骤数，则默认选择步骤1
       current: this.currentStep > this.totalSteps ? 1 : this.currentStep
     }
   },
   methods: {
-    onChange (index) { // 点击切换选择步骤
+    onChange(index) {
+      // 点击切换选择步骤
       console.log('index:', index)
       if (this.current !== index) {
         this.current = index
@@ -66,4 +89,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/src/components/Layout/HeaderWrap/index.vue

@@ -64,13 +64,7 @@
           <div class="flex-column flex-l">
             <span
               v-title="userInfo.companyName"
-              class="
-                flex-item
-                text-ellipsis
-                m-l m-b-ss
-                font-size-small
-                color-primary
-              "
+              class="flex-item text-ellipsis m-l m-b-ss font-size-small color-primary"
               :show-overflow-tooltip="true"
               >{{ userInfo.companyName }}</span
             >

package/src/components/Layout/TabsNav/index.vue

@@ -166,5 +166,4 @@ export default {
 }
 </script>
 
-<style>
-</style>
+<style></style>

package/src/components/Layout/index.vue

@@ -508,7 +508,7 @@ function getShowUuid(uuid, list) {
     return menu.hide ? menu.pid : menu.uuid
   }
 
-  let pid = uuid.replace(/\/[^\/]+\/*$/, '')
+  let pid = uuid.replace(/\/[^/]+\/*$/, '')
   if (pid !== '' && pid !== '/') {
     return getShowUuid(pid, list)
   }

package/src/components/LoginTemporary/retrievePw.vue

@@ -133,14 +133,14 @@ export default {
             )
           )
         } else if (
-          this.dataForm.passwordStrength == 2 &&
+          Number(this.dataForm.passwordStrength) === 2 &&
           !/^(((?=.*[0-9])(?=.*[a-zA-Z])|(?=.*[0-9])(?=.*[^\s0-9a-zA-Z])|(?=.*[a-zA-Z])(?=.*[^\s0-9a-zA-Z]))[^\s]+)$/.test(
             value
           )
         ) {
           callback(new Error(`密码至少包括数字,字母,特殊符号其中两种`))
         } else if (
-          this.dataForm.passwordStrength == 3 &&
+          Number(this.dataForm.passwordStrength) === 3 &&
           !/^(?=.*\d)(?=.*[a-zA-Z])(?=.*[~!@#$%^&*])[\da-zA-Z~!@#$%^&*]{0,}$/.test(
             value
           )
@@ -269,7 +269,10 @@ export default {
             .get(
               `/bems/prod_1.0/uas/api/authorization/captcha/${this.updateForm[type]}/1`,
               null,
-              { loading: false, noMsg: true }
+              {
+                loading: false,
+                noMsg: true
+              }
             )
             .then(() => {
               this.$message.success(

package/src/components/MoreTab/index.vue

@@ -1,7 +1,4 @@
-/**
- * author: zhengwei
- * tiem: 2021-8-31
- */
+/** * author: zhengwei * tiem: 2021-8-31 */
 <template>
   <div class="__common-layout-pageTabs">
     <el-scrollbar>

package/src/components/PageHeader/index.vue

@@ -22,7 +22,10 @@ export default {
         return '返回'
       }
     },
-    content: String,
+    content: {
+      type: String,
+      default: ''
+    },
     disable: {
       type: Boolean,
       default: false
@@ -33,4 +36,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/src/components/SecondaryTab/index.vue

@@ -1,4 +1,3 @@
-
 <template>
   <el-tabs
     :value="init"

package/src/components/SelectLazy/index.vue

@@ -72,5 +72,4 @@ export default {
 }
 </script>
 
-<style>
-</style>
+<style></style>

package/src/components/Sifting/index.vue

@@ -95,5 +95,4 @@ export default {
 }
 </script>
 
-<style scoped>
-</style>
+<style scoped></style>

package/src/components/Step/index.vue

@@ -1,4 +1,3 @@
-
 <template>
   <el-steps
     :direction="direction"

package/src/components/TertiaryTab/index.vue

@@ -1,4 +1,3 @@
-
 <template>
   <el-tabs
     :value="init"

package/src/components/Upload/index.vue

@@ -38,17 +38,23 @@
     <template slot="tip">
       <slot name="tip"></slot>
     </template>
-    <el-dialog :visible.sync="progressV" title="提示" append-to-body>
-      <p v-if="!percentType">系统处理中，请稍等......</p>
-      <p v-else>{{ percentMsg }}</p>
-      <el-progress class="m-b" :percentage="percent" :status="percentType" />
-    </el-dialog>
+    <uploadMsg
+      :visible.sync="progressV"
+      :percent-type="percentType"
+      :percent-msg="percentMsg"
+      :percent="percent"
+      :validate-result="validateResult"
+    />
   </el-upload>
 </template>
 
 <script>
+import uploadMsg from './uploadMsg.vue'
 export default {
   name: 'Upload',
+  components: {
+    uploadMsg
+  },
   props: {
     fileName: {
       type: String,
@@ -127,6 +133,10 @@ export default {
     showClear: {
       type: Boolean,
       default: true
+    },
+    validateResult: {
+      type: Object,
+      default: undefined
     }
   },
   data() {
@@ -168,6 +178,8 @@ export default {
       }
     },
     beforeUploadFn(file) {
+      this.$emit('update:validateResult', undefined)
+
       let size = this.size
       let sizeNum
 

package/src/components/Upload/uploadMsg.vue

@@ -0,0 +1,114 @@
+<template>
+  <el-dialog v-drag :visible.sync="progressV" :title="title" append-to-body>
+    <template v-if="!hidePercent">
+      <p v-if="!percentType">系统处理中，请稍等......</p>
+      <p v-else>{{ percentMsg }}</p>
+      <el-progress class="m-b" :percentage="percent" :status="percentType" />
+    </template>
+    <!-- 错误数据行提示 -->
+    <template v-if="validateResult">
+      <div>
+        <span class="m-r">导入统计</span>
+        <span>共计导入{{ validateResult.totalNum }}条, </span>
+        <span class="m-r-s">
+          其中有效数据
+          <span class="color-primary">{{ validateResult.successNum }}</span
+          >条,
+        </span>
+        <span>
+          无效数据
+          <span class="color-danger">{{ validateResult.errorList.length }}</span
+          >条。
+        </span>
+      </div>
+      <template v-if="validateResult.errorList.length">
+        <div class="m-t m-b">无效数据详情</div>
+        <el-table :data="errorList">
+          <el-table-column
+            v-for="column in columnsList"
+            :key="column.prop"
+            :prop="column.prop"
+            :label="column.label"
+          >
+            <template slot-scope="scope">
+              <!-- eslint-disable-next-line vue/no-v-html -->
+              <span v-html="scope.row[column.prop]"></span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="color-warning m-t-s">
+          上述数据输入有误，请修改导入文件中相关信息！
+        </div>
+      </template>
+      <span slot="footer">
+        <el-button type="primary" @click="progressV = false">确定</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  props: {
+    title: {
+      type: String,
+      default: '提示'
+    },
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    percentType: {
+      type: String,
+      default: undefined
+    },
+    percentMsg: {
+      type: String,
+      default: undefined
+    },
+    percent: {
+      type: Number,
+      default: undefined
+    },
+    validateResult: {
+      type: Object,
+      default: undefined
+    },
+    hidePercent: {
+      type: Boolean,
+      default: false
+    }
+  },
+  computed: {
+    progressV: {
+      get() {
+        return this.visible
+      },
+      set(v) {
+        this.$emit('update:visible', v)
+      }
+    },
+    columnsList() {
+      return (this.validateResult && this.validateResult.columnsList) || []
+    },
+    errorList() {
+      let errorList = this.validateResult && this.validateResult.errorList
+      if (errorList) {
+        let _errorList = []
+        errorList.forEach((item) => {
+          const temp = { ...item }
+          if (item.errorList) {
+            item.errorList.forEach((eK) => {
+              temp[eK] = `<span class="color-danger">${temp[eK]}</span>`
+            })
+          }
+          _errorList.push(temp)
+        })
+        return _errorList
+      } else {
+        return undefined
+      }
+    }
+  }
+}
+</script>

package/src/directives/VClickOutside/index.js

@@ -8,10 +8,18 @@ directive.install = (Vue) => {
           binding.value(event)
         }
       }
-      document.body.addEventListener('click', el.clickOutsideEvent, binding.arg === 'capture')
+      document.body.addEventListener(
+        'click',
+        el.clickOutsideEvent,
+        binding.arg === 'capture'
+      )
     },
     unbind: function (el, binding) {
-      document.body.removeEventListener('click', el.clickOutsideEvent, binding.arg === 'capture')
+      document.body.removeEventListener(
+        'click',
+        el.clickOutsideEvent,
+        binding.arg === 'capture'
+      )
     }
   })
 }

package/src/directives/VDrag/index.js

@@ -6,12 +6,14 @@
 // 封装全局弹窗拖拽指令 v-drag
 function dialogMoveFn(_this) {
   var dialogDom = _this.parentNode
-  dialogDom.style.top = parseFloat(dialogDom.style.top || '0') + _this.pageYc + 'px'
-  dialogDom.style.left = parseFloat(dialogDom.style.left || '0') + _this.pageXc + 'px'
+  dialogDom.style.top =
+    parseFloat(dialogDom.style.top || '0') + _this.pageYc + 'px'
+  dialogDom.style.left =
+    parseFloat(dialogDom.style.left || '0') + _this.pageXc + 'px'
 }
 
 const dialogMove = {
-  install: function(Vue) {
+  install: function (Vue) {
     Vue.directive('drag', {
       update(el, binding) {
         if (el.style.display === 'none') {
@@ -21,14 +23,14 @@ const dialogMove = {
             dialogDom.style.top = ''
           }
         }
-        Vue.nextTick(function() {
+        Vue.nextTick(function () {
           var dialogHeader = el.querySelector('.el-dialog__header')
           if (dialogHeader && !dialogHeader._hasMoveDir) {
             var _this, pvrPageX, pvrPageY
             dialogHeader._hasMoveDir = true
             dialogHeader.style.cursor = 'move'
 
-            dialogHeader.addEventListener('mousedown', function(evt) {
+            dialogHeader.addEventListener('mousedown', function (evt) {
               var ev = evt || event
               this.pageXc = this.pageYc = 0
               _this = this
@@ -38,7 +40,7 @@ const dialogMove = {
               document.addEventListener('mouseup', mouseupThisMove)
             })
 
-            var mousemoveThisMove = function(evt) {
+            var mousemoveThisMove = function (evt) {
               var ev = evt || event
               ev.stopPropagation()
               ev.preventDefault()
@@ -51,14 +53,16 @@ const dialogMove = {
                 _this.pageXc = ev.pageX - pvrPageX
                 _this.pageYc = ev.pageY - pvrPageY
                 if (_this.pageXc !== 0 || _this.pageYc !== 0) {
-                  binding.value ? binding.value(_this, binding.arg) : dialogMoveFn(_this)
+                  binding.value
+                    ? binding.value(_this, binding.arg)
+                    : dialogMoveFn(_this)
                 }
                 pvrPageX = ev.pageX
                 pvrPageY = ev.pageY
               }
             }
 
-            var mouseupThisMove = function() {
+            var mouseupThisMove = function () {
               document.removeEventListener('mousemove', mousemoveThisMove)
               document.removeEventListener('mouseup', mouseupThisMove)
             }

package/src/directives/VMove/index.js

@@ -4,7 +4,7 @@ directive.install = (Vue) => {
   Vue.directive('move', {
     bind(el, binding) {
       var _this, pvrPageX, pvrPageY
-      var mousemoveThisMove = function(evt) {
+      var mousemoveThisMove = function (evt) {
         var ev = evt || event
         ev.stopPropagation()
         ev.preventDefault()
@@ -16,11 +16,11 @@ directive.install = (Vue) => {
         pvrPageX = ev.pageX
         pvrPageY = ev.pageY
       }
-      var mouseupThisMove = function() {
+      var mouseupThisMove = function () {
         document.removeEventListener('mousemove', mousemoveThisMove)
         document.removeEventListener('mouseup', mouseupThisMove)
       }
-      el.addEventListener('mousedown', function(evt) {
+      el.addEventListener('mousedown', function (evt) {
         var ev = evt || event
         this.pageXc = this.pageYc = 0
         _this = this

package/src/directives/VRuleKey/index.js

@@ -21,7 +21,12 @@ function getRules(rules, evType) {
 function validateRoule(rule, value) {
   return new Promise(function (resolve, reject) {
     if (rule.required) {
-      if (value === undefined || value === null || value === '' || (Array.isArray(value) && value.length === 0)) {
+      if (
+        value === undefined ||
+        value === null ||
+        value === '' ||
+        (Array.isArray(value) && value.length === 0)
+      ) {
         reject(rule.message)
         return
       }
@@ -126,7 +131,8 @@ directive.install = (Vue) => {
       let ruleForm = _this.$attrs['rule-form'] || _this.$attrs['ruleForm']
       ruleForm && el.classList.add(ruleForm)
 
-      let rErr = _this.$attrs['rule-error-hide'] || _this.$attrs['ruleErrorHide']
+      let rErr =
+        _this.$attrs['rule-error-hide'] || _this.$attrs['ruleErrorHide']
       rErr = rErr !== 'true' && rErr !== true
 
       el[VD] = (val, type) => {
@@ -167,7 +173,8 @@ function rulesValidateForm(query, fn) {
   if (nodeList.length) {
     let validateList = []
     nodeList.forEach((el) => {
-      typeof el[VD] === 'function' && validateList.push(el[VD](undefined, 'submit'))
+      typeof el[VD] === 'function' &&
+        validateList.push(el[VD](undefined, 'submit'))
     })
     return Promise.all(validateList)
       .then(() => {

package/src/utils/auth.js

@@ -44,7 +44,9 @@ auth.cokenKey = 'Admin-Token'
 let ownLoginPath = '/login'
 function toLogin() {
   let hrefOld = window.location.href
-  let loginHref = window.__POWERED_BY_QIANKUN__ ? window.location.origin + '/login' : ownLoginPath
+  let loginHref = window.__POWERED_BY_QIANKUN__
+    ? window.location.origin + '/login'
+    : ownLoginPath
   if (hrefOld !== loginHref) {
     history.pushState(null, null, loginHref)
     window.location.reload()

package/src/utils/axios.js

@@ -60,7 +60,9 @@ const axios = _axios.create(config)
 axios.interceptors.request.use((opt) => {
   let token = auth.getToken()
   let headers = {
-    Authorization: token ? 'Bearer ' + token : 'Basic TlNUQzpWVkIxVG1sVlVURlNMemxyTkhoc2VtNXdObFJaUVQwOQ==',
+    Authorization: token
+      ? 'Bearer ' + token
+      : 'Basic TlNUQzpWVkIxVG1sVlVURlNMemxyTkhoc2VtNXdObFJaUVQwOQ==',
     OperationDesc: opt.OperationDesc ? encodeURI(opt.OperationDesc) : 'default',
     timestamp: Date.now(),
     requestKey: Date.now()
@@ -93,7 +95,7 @@ function errorFn(status, msg, noMsg) {
     noMsg || showMsg('500，服务器链接失败！')
   } else if (status === 'ECONNABORTED' && msg.includes('timeout')) {
     showMsg('请求超时')
-  } else if (status >= 900) {
+  } else if (status >= 900 || status === -1) {
     noMsg || showMsg(msg)
   } else {
     // noMsg || showMsg(msg)

package/src/utils/repairElementUI.js

@@ -6,7 +6,8 @@ import FilterPanel from './tableheaderFilterpanel.vue'
 
 function hasClass(el, cls) {
   if (!el || !cls) return false
-  if (cls.indexOf(' ') !== -1) throw new Error('className should not contain space.')
+  if (cls.indexOf(' ') !== -1)
+    throw new Error('className should not contain space.')
   if (el.classList) {
     return el.classList.contains(cls)
   } else {
@@ -32,14 +33,29 @@ function repairPopper() {
     Popper.prototype.repairR = true
 
     let __getBoundaries = Popper.prototype._getBoundaries
-    Popper.prototype._getBoundaries = function (data, padding, boundariesElement) {
-      const boundaries = __getBoundaries.call(this, data, padding, boundariesElement)
+    Popper.prototype._getBoundaries = function (
+      data,
+      padding,
+      boundariesElement
+    ) {
+      const boundaries = __getBoundaries.call(
+        this,
+        data,
+        padding,
+        boundariesElement
+      )
 
       if (this._options.boundariesElement === 'viewport') {
         const root = window
         const body = root.document.body
         const html = root.document.documentElement
-        let width = Math.max(body.scrollWidth, body.offsetWidth, html.clientWidth, html.scrollWidth, html.offsetWidth)
+        let width = Math.max(
+          body.scrollWidth,
+          body.offsetWidth,
+          html.clientWidth,
+          html.scrollWidth,
+          html.offsetWidth
+        )
         let height = Math.max(
           body.scrollHeight,
           body.offsetHeight,
@@ -48,8 +64,12 @@ function repairPopper() {
           html.offsetHeight
         )
 
-        boundaries.right = boundaries.right - root.document.documentElement.clientWidth + width
-        boundaries.bottom = boundaries.bottom - root.document.documentElement.clientHeight + height
+        boundaries.right =
+          boundaries.right - root.document.documentElement.clientWidth + width
+        boundaries.bottom =
+          boundaries.bottom -
+          root.document.documentElement.clientHeight +
+          height
       }
       return boundaries
     }
@@ -96,12 +116,16 @@ export default function (ElementUI) {
           let label = column.label || ''
           let sortable = column.sortable ? 24 : 0
           let filters = column.filters ? 16 : 0
-          column.minWidth = Math.max(80, label.length * 14 + 22 + sortable + filters)
+          column.minWidth = Math.max(
+            80,
+            label.length * 14 + 22 + sortable + filters
+          )
         } else {
           column.minWidth = 80
         }
       }
-      column.realWidth = column.width === undefined ? column.minWidth : column.width
+      column.realWidth =
+        column.width === undefined ? column.minWidth : column.width
       return column
     }
   })

package/src/utils/tableheaderFilterpanel.vue

@@ -145,7 +145,6 @@ export default {
       },
       set(value) {
         if (this.filteredValue) {
-          console.log(this.filteredValue, 567)
           if (typeof value !== 'undefined' && value !== null) {
             this.filteredValue.splice(0, 1, value)
           } else {

package/src/utils/xls2json.js

@@ -13,7 +13,7 @@ export default function toJson(file, name) {
       })
     } else if (file instanceof ArrayBuffer) {
       try {
-        const workbook = read(array, { type: 'array', cellDates: true })
+        const workbook = read(file, { type: 'array', cellDates: true })
         resolve(workbook)
       } catch (err) {
         reject(err)

package/src/components/FileImport/_index.vue

@@ -1,9 +0,0 @@
-<template>
-  <div>待完善</div>
-</template>
-
-<script>
-export default {
-  name: 'FileImport'
-}
-</script>