n20-common-lib 2.2.1 → 2.2.3

package/package.json

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

package/src/assets/css/cl-form-item.scss

@@ -690,7 +690,7 @@ $--input-max: 224px;
   &.is-clearable {
     .el-select {
       .el-input__inner {
-        padding-right: 50px;
+        padding-right: 30px;
       }
     }
   }

package/src/components/InputSearch/index.vue

@@ -1,5 +1,13 @@
 <template>
-  <el-input v-if="!select" v-bind="$attrs" :value="value" :clearable="clearable" v-on="$listeners" @change="searchFn">
+  <el-input
+    v-if="!select"
+    class="n20-input-search-1"
+    v-bind="$attrs"
+    :value="value"
+    :clearable="clearable"
+    v-on="$listeners"
+    @change="searchFn"
+  >
     <i
       slot="suffix"
       class="is-search el-input__icon"
@@ -28,12 +36,13 @@
       <slot></slot>
     </el-select>
     <span class="el-input__suffix"
-      ><i class="is-search el-input__icon" :class="suffixIcon || 'el-icon-zoom-in'" @click.stop="searchFn"></i
-      ><i
-        v-if="clearable && isHove && hasVal"
-        class="is-search el-input__icon el-icon-circle-close"
-        @click="closeFn"
-      ></i
+      ><span class="el-input__suffix-inner"
+        ><i class="is-search el-input__icon" :class="suffixIcon || 'el-icon-zoom-in'" @click.stop="searchFn"></i
+        ><i
+          v-if="clearable && isHove && hasVal"
+          class="is-search el-input__icon el-icon-circle-close"
+          @click.stop="closeFn"
+        ></i></span
     ></span>
   </div>
 </template>
@@ -112,3 +121,9 @@ export default {
   }
 }
 </script>
+<style>
+.n20-input-search-1 .el-input__suffix-inner,
+.n20-input-search .el-input__suffix-inner {
+  background: var(--color-white);
+}
+</style>

package/src/components/LoginTemporary/form.vue

@@ -43,7 +43,7 @@
           </el-input>
           不自动填充密码End -->
         </el-form-item>
-        <el-form-item class="m-b" :label="'图形验证码' | $lc" prop="imageCode">
+        <el-form-item v-if="showImageCode" class="m-b" :label="'图形验证码' | $lc" prop="imageCode">
           <br />
           <div class="flex-box">
             <el-input v-model="form.imageCode" class="flex-item m-r-s" :placeholder="'请输入图形验证码' | $lc" />
@@ -186,6 +186,10 @@ export default {
     extraForm: {
       type: Object,
       default: () => ({})
+    },
+    showImageCode: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -256,12 +260,18 @@ export default {
       }
     },
     getImgCode() {
-      if (this.theType === 'account') {
+      if (this.theType === 'account' && this.showImageCode) {
         this.$set(this.form, 'imageCode', '')
         this.imageUrl && URL.revokeObjectURL(this.imageUrl)
-        axios.get('/bems/prod_1.0/uas/api/authorization/captcha/image', null, { responseType: 'blob' }).then((blob) => {
-          this.imageUrl = URL.createObjectURL(blob)
-        })
+        axios
+          .get('/bems/prod_1.0/uas/api/authorization/captcha/image', null, {
+            responseType: 'blob',
+            loading: false,
+            noMsg: true
+          })
+          .then((blob) => {
+            this.imageUrl = URL.createObjectURL(blob)
+          })
       }
     },
     // 发送短信

package/src/components/LoginTemporary/index.vue

@@ -1,12 +1,12 @@
 <template>
-  <div v-if="alV" v-loading="alV" class="login-wrap">
+  <div v-if="alV" v-loading="alV" class="login-wrap" element-loading-custom-class="auto-login-loading">
     <loginForm
       ref="login-form"
+      class="login-form"
       :before-login="beforeLogin"
       :login-types="loginTypes"
       :login-then="loginThen"
       :async-rela-nos="asyncRelaNos"
-      class="login-form"
       style="display: none"
     />
   </div>
@@ -20,11 +20,12 @@
     <div doc="登录页标语" v-html="loginSloganHtml"></div>
     <loginForm
       v-if="operateType === 'login'"
+      class="login-form"
       :before-login="beforeLogin"
       :login-types="loginTypes"
       :login-then="loginThen"
       :async-rela-nos="asyncRelaNos"
-      class="login-form"
+      :show-image-code="showImageCode"
       @changType="getChangetype"
     >
       <div slot="header" class="login-form-header m-b text-c">{{ '欢 迎 登 录' | $lc }}</div>
@@ -84,6 +85,10 @@ export default {
     asyncRelaNos: {
       type: Boolean,
       default: false
+    },
+    showImageCode: {
+      type: Boolean,
+      default: false
     }
   },
   data() {

package/src/components/LoginTemporary/indexN.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="width: 100vw; height: 100vh; overflow: hidden">
-    <div v-if="alV" v-loading="alV" class="login-wrap">
+    <div v-if="alV" v-loading="alV" class="login-wrap" element-loading-custom-class="auto-login-loading">
       <loginForm
         ref="login-form"
         :before-login="beforeLogin"
@@ -87,6 +87,7 @@
         :login-then="loginThenT"
         :async-rela-nos="asyncRelaNos"
         :extra-form="extraForm"
+        :show-image-code="showImageCode"
         @changType="getChangetype"
       >
         <div slot="header" class="login-form-header m-b text-c">{{ '欢 迎 登 录' | $lc }}</div>
@@ -173,6 +174,10 @@ export default {
     asyncRelaNos: {
       type: Boolean,
       default: false
+    },
+    showImageCode: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -531,8 +536,10 @@ export default {
   position: absolute;
   right: 103px;
   top: 50%;
-  transform: translateY(-50%);
+  width: 324px;
+  min-height: 360px;
   padding: 30px 30px 18px !important;
+  transform: translateY(-50%);
   background: #f7f6f6;
 }
 .login-bg-light .login-form {

package/src/utils/axios.js

@@ -111,9 +111,9 @@ function errorFn(status, msg, noMsg, isErr, res) {
   } else if (status === 500 || (isErr && msg.includes('500'))) {
     noMsg || showMsg($lc('500，服务器链接失败！'))
   } else if (status === 'ECONNABORTED' && msg.includes('timeout')) {
-    showMsg($lc('请求超时'))
+    noMsg || showMsg($lc('请求超时'))
   } else if (msg === 'Network Error') {
-    showMsg($lc('请求错误'))
+    noMsg || showMsg($lc('请求错误'))
   } else if (status >= 900 || status === -1) {
     noMsg || showMsg(msg)
   } else {

package/src/utils/toExcel.js

@@ -1,86 +1,120 @@
 import importG from './importGlobal.js'
 
-export default async function toExcel({ columns = [], rows = [], name = 'sheet01' }) {
+const headStyle = {
+  fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FFE1E1E1' } },
+  alignment: { vertical: 'middle', horizontal: 'center' },
+  font: { bold: true }
+}
+const colBorder = {
+  top: { style: 'thin' },
+  left: { style: 'thin' },
+  bottom: { style: 'thin' },
+  right: { style: 'thin' }
+}
+
+export default async function toExcel() {
   let { default: ExcelJS } = await importG('exceljs', () => import(/*webpackChunkName: "exceljs"*/ 'exceljs'))
 
   // 创建工作簿
   const workbook = new ExcelJS.Workbook()
-  // 创建工作表
-  const worksheet = workbook.addWorksheet(name)
-  let cols = []
-  columns.forEach((col) => {
-    if (!col.static) {
-      let _col = {
-        header: col.label,
-        key: col.prop,
-        style: col.style || {}
-      }
 
-      let width = col.width || col.minWidth || col['min-width'] || 0
-      width = Math.max(width / 8, col.label.length * 2.2 + 2)
-      width > 9 && (_col.width = width)
+  for (let I = 0; I < arguments.length; I++) {
+    let { columns = [], rows = [], name = `sheet${I + 1}`, unshiftHead, merges, custom } = arguments[I]
 
-      if (col.numFmt) {
-        _col.style.numFmt = col.numFmt
-      } else if (col.formatter && typeof col.formatter === 'string') {
-        if (/\|\s?money/.test(col.formatter)) {
-          _col.style.numFmt = '#,##0.00'
+    // 创建工作表
+    const worksheet = workbook.addWorksheet(name)
+    let cols = []
+    columns.forEach((col) => {
+      if (!col.static) {
+        let _col = {
+          header: col.label,
+          key: col.prop,
+          style: col.style || {}
         }
-        if (/\|\s?rate/.test(col.formatter)) {
-          _col.style.numFmt = '0.000000'
+
+        let width = col.width || col.minWidth || col['min-width'] || 0
+        width = Math.max(width / 8, col.label.length * 2.2 + 2)
+        width > 9 && (_col.width = width)
+
+        if (col.numFmt) {
+          _col.style.numFmt = col.numFmt
+        } else if (col.formatter && typeof col.formatter === 'string') {
+          if (/\|\s?money/.test(col.formatter)) {
+            _col.style.numFmt = '#,##0.00'
+          }
+          if (/\|\s?rate/.test(col.formatter)) {
+            _col.style.numFmt = '0.000000'
+          }
         }
+
+        cols.push(_col)
       }
+    })
 
-      cols.push(_col)
-    }
-  })
+    let cL = cols.length
+    let rL = rows.length
+    let ySplit = 1
 
-  let cL = cols.length
-  let rL = rows.length
+    worksheet.columns = cols
+    worksheet.addRows(rows)
 
-  worksheet.columns = cols
-  worksheet.addRows(rows)
+    for (let i = 0; i < cL; i++) {
+      worksheet.getCell(1, i + 1).style = headStyle
+    }
 
-  worksheet.views = [
-    {
-      state: 'frozen',
-      // xSplit: 1,
-      ySplit: 1
+    for (let i = 0; i < rL + 1; i++) {
+      for (let j = 0; j < cL; j++) {
+        let cell = worksheet.getCell(i + 1, j + 1)
+        cell.border = colBorder
+        cell.alignment ? (cell.alignment.vertical = 'middle') : (cell.alignment = { vertical: 'middle' })
+      }
     }
-  ]
-
-  for (let i = 0; i < cL; i++) {
-    worksheet.getCell(1, i + 1).style = {
-      fill: {
-        type: 'pattern',
-        pattern: 'solid',
-        fgColor: { argb: 'FFE1E1E1' }
-      },
-      alignment: {
-        vertical: 'middle',
-        horizontal: 'center'
-      },
-      font: {
-        bold: true
+
+    if (unshiftHead) {
+      let headRows = Array.isArray(unshiftHead[0]) ? unshiftHead : [unshiftHead]
+      let headRowsT = []
+      let headRowsM = []
+      for (let i = 0; i < headRows.length; i++) {
+        let rI = i + 1
+        let headRowT = []
+        for (let j = 0; j < headRows[i].length; j++) {
+          let cI = j + 1
+          let col = headRows[i][j]
+          headRowT.push(col && col.label ? col.label : col)
+          if (col && col.merge) {
+            headRowsM.push([rI, cI, rI + col.merge[0] - 1, cI + col.merge[1] - 1])
+          }
+        }
+        headRowsT.push(headRowT)
+        ySplit = ySplit + 1
+      }
+
+      worksheet.spliceRows(1, 0, ...headRowsT)
+      for (let i = 0; i < headRows.length; i++) {
+        let rI = i + 1
+        for (let j = 0; j < headRows[i].length; j++) {
+          let cI = j + 1
+          worksheet.getCell(rI, cI).style = headStyle
+        }
+      }
+
+      for (let i = 0; i < headRowsM.length; i++) {
+        worksheet.mergeCells(...headRowsM[i])
       }
     }
-  }
 
-  for (let i = 0; i < cL; i++) {
-    for (let j = 0; j < rL + 1; j++) {
-      worksheet.getCell(j + 1, i + 1).border = {
-        top: { style: 'thin' },
-        left: { style: 'thin' },
-        bottom: { style: 'thin' },
-        right: { style: 'thin' }
+    worksheet.views = [{ state: 'frozen', ySplit: ySplit }]
+
+    if (merges && Array.isArray(merges)) {
+      for (let i = 0; i < merges.length; i++) {
+        worksheet.mergeCells(merges[i])
       }
     }
+    if (custom) {
+      await custom(worksheet)
+    }
   }
 
-  // worksheet.getColumn(1).numFmt = '#,##0.00"%"'
-  // worksheet.getColumn(1).numFmt = '#,##0.00'
-  // worksheet.getColumn(2).width = 32
-
   return new Promise((resolve, reject) => {
     workbook.xlsx
       .writeBuffer()

package/src/utils/xls2json.js

@@ -26,6 +26,8 @@ export default async function toJson(file, name) {
   return pro.then((workbook) => {
     let sheetName = name || workbook.SheetNames[0]
     let workSheet = workbook.Sheets[sheetName]
+    if (!workSheet) return Promise.reject(`工作表:${name} 不存在`)
+
     let rows = []
     let cols = utils.sheet_to_csv(workSheet, { FS: '†', blankrows: false }).split('\n')[0].replace(/†+$/, '').split('†')
 

package/src/utils/xlsx2json.js

@@ -9,6 +9,8 @@ export default async function toJson(file, name) {
       .load(file)
       .then(() => {
         const worksheet = workbook.getWorksheet(name || 1)
+        if (!worksheet) return reject(`工作表:${name} 不存在`)
+
         let rows = []
         worksheet.eachRow((r) => {
           let row = r.values