n20-common-lib 1.3.33 → 1.3.36

package/nstc-g6/components/NstcWorkBench/NstcWorkBench.vue

@@ -169,8 +169,12 @@ export default {
     }
   }
 }
-/deep/.el-table td,
-.el-table th {
-  padding: 2px;
+.el-table {
+  ::v-deep {
+    td,
+    th {
+      padding: 2px;
+    }
+  }
 }
 </style>

package/package.json

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

package/src/assets/css/el-button.scss

@@ -1,7 +1,8 @@
 .el-button--primary,
 .el-button--default,
 .el-button--default.is-plain,
-.el-button--warning.is-plain {
+.el-button--warning.is-plain,
+.el-button--danger.is-plain {
   min-width: 72px;
 }
 

package/src/components/LoginTemporary/form.vue

@@ -402,7 +402,7 @@ export default {
           }
 
           let { getSign } = await import('../../plugins/Sign')
-          sign = await getSign(username, userDn)
+          sign = await getSign(username + userDn, userDn)
           certDn = userDn
         }
         await this.authorizationCode(username, password, code) // authorizationValue 使用一次后就失效了

package/src/components/LoginTemporary/index.vue

@@ -1,12 +1,14 @@
 <template>
   <div
     class="login-wrap"
-    :style="{ backgroundImage: loginBg && `url(${loginBg})` }"
+    :style="{
+      backgroundImage: BgImage ? `url(${BgImage})` : `url(${loginBg})`
+    }"
   >
     <div class="login-logo-box flex-box flex-v">
       <img
         v-if="loginLogo"
-        :src="loginLogo"
+        :src="LogoImage || loginLogo"
         :style="{ width: loginLogoWidth, height: loginLogoHeight }"
       />
       <span
@@ -14,14 +16,14 @@
         class="login-logo-hr m-l-s m-r-s"
       ></span>
       <h3 class="login-logo-text">
-        {{ loginLogoText }}
+        {{ SYSTEM_NAME || loginLogoText }}
       </h3>
     </div>
     <!-- eslint-disable-next-line vue/no-v-html -->
     <div doc="登录页标语" v-html="sloganHtml"></div>
     <loginForm
       v-if="operateType === 'login'"
-      :login-types="loginTypes"
+      :login-types="LOGIN_MODE || loginTypes"
       :login-then="loginThen"
       class="login-form"
       @changType="getChangetype"
@@ -68,6 +70,11 @@ export default {
   data() {
     return {
       loginTypes: ['account'],
+      LOGIN_MODE: ['account'],
+      MAIN_PAGE_TEXT: '',
+      SYSTEM_NAME: '',
+      BgImage: '',
+      LogoImage: '',
       loginBg: undefined,
       loginLogo: undefined,
       loginLogoWidth: '60px',
@@ -77,11 +84,47 @@ export default {
       operateType: 'login'
     }
   },
-  created() {
+  async created() {
     this.removeStorage()
+    await this.init()
     this.setConfig()
   },
   methods: {
+    async init() {
+      const { data } = await this.$axios.get(`/bems/1.0/sysSetting/list`)
+      if (data) {
+        this.getdata(data)
+        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]))
+    },
+    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
+        }
+      }
+    },
     setConfig() {
       getJsonc('/server-config.jsonc').then(({ _layoutData = {} }) => {
         _layoutData.loginTypes && (this.loginTypes = _layoutData.loginTypes)

package/src/directives/VClickOutside/index.js

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

package/src/directives/VRules/index.js

@@ -0,0 +1,10 @@
+const directive = {}
+directive.install = (Vue) => {
+  Vue.directive('rules', {
+    bind(el, binding, vnode) {},
+    update(el, binding) {},
+    unbind(el, binding) {}
+  })
+}
+
+export default directive

package/src/plugins/Sign/bjca/index.js

@@ -104,21 +104,26 @@ export async function getSign(plain, dn) {
   /**
    * 签名
    */
-  let v_retVal
+  let v_retVal, cert
   let val = s_retVal.filter((v) => v.retVal === dn)
-  let cert = r_retVal.filter((s) => s.certId === val[0].certId)
-  await new Promise((resolve, reject) => {
-    window.SOF_SignData(val[0].certId, plainText + '' + dn, (v) => {
-      if (v.retVal) {
-        v_retVal = v.retVal
-        resolve()
-      } else {
-        errMsg = '签名失败!'
-        Message.error(errMsg)
-        reject(errMsg)
-      }
+  if (val.length > 0) {
+    cert = r_retVal.filter((s) => s.certId === val[0].certId)
+    await new Promise((resolve, reject) => {
+      window.SOF_SignData(val[0].certId, plainText, (v) => {
+        if (v.retVal) {
+          v_retVal = v.retVal
+          resolve()
+        } else {
+          errMsg = '签名失败!'
+          Message.error(errMsg)
+          reject(errMsg)
+        }
+      })
     })
-  })
-
-  return Promise.resolve(v_retVal + '@@@' + cert[0].retVal)
+    return Promise.resolve(v_retVal + '@@@' + cert[0].retVal)
+  } else {
+    errMsg = '参数dn信息不批匹配！'
+    Message.error(errMsg)
+    return Promise.reject(errMsg)
+  }
 }

package/src/utils/repairElementUI.js

@@ -1,6 +1,19 @@
 /* 对ElementUI硬优化 */
 import Popper from 'element-ui/lib/utils/popper.js'
 
+import Vue from 'vue'
+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 (el.classList) {
+    return el.classList.contains(cls)
+  } else {
+    return (' ' + el.className + ' ').indexOf(' ' + cls + ' ') > -1
+  }
+}
+
 function setPropsDefault(component, props) {
   let c_props = component.props
   Object.keys(props).forEach((key) => {
@@ -69,7 +82,7 @@ export default function (ElementUI) {
       default: true
     }
   })
-
+  // 设置表头最小宽度,保证表头不换行
   setMethodsDefault(ElementUI.TableColumn, {
     setColumnWidth(column) {
       if (this.realWidth) {
@@ -92,4 +105,41 @@ export default function (ElementUI) {
       return column
     }
   })
+
+  // 美化表头搜索
+  if (ElementUI.Table.components.TableHeader) {
+    setMethodsDefault(ElementUI.Table.components.TableHeader, {
+      handleFilterClick(event, column) {
+        event.stopPropagation()
+        const target = event.target
+        let cell = target.tagName === 'TH' ? target : target.parentNode
+        if (hasClass(cell, 'noclick')) return
+        cell = cell.querySelector('.el-table__column-filter-trigger') || cell
+        const table = this.$parent
+
+        let filterPanel = this.filterPanels[column.id]
+
+        if (filterPanel && column.filterOpened) {
+          filterPanel.showPopper = false
+          return
+        }
+
+        if (!filterPanel) {
+          filterPanel = new Vue(FilterPanel)
+          this.filterPanels[column.id] = filterPanel
+          if (column.filterPlacement) {
+            filterPanel.placement = column.filterPlacement
+          }
+          filterPanel.table = table
+          filterPanel.cell = cell
+          filterPanel.column = column
+          !this.$isServer && filterPanel.$mount(document.createElement('div'))
+        }
+
+        setTimeout(() => {
+          filterPanel.showPopper = true
+        }, 16)
+      }
+    })
+  }
 }

package/src/utils/tableheaderFilterpanel.vue

@@ -0,0 +1,249 @@
+<template>
+  <transition name="el-zoom-in-top">
+    <div
+      v-if="multiple"
+      v-show="showPopper"
+      v-click-outside:capture="handleOutsideClick"
+      class="el-table-filter p-a m-t"
+    >
+      <el-input
+        v-model="searchVal"
+        class="input-w m-b"
+        placeholder="请输入"
+        clearable
+        suffix-icon="el-icon-search"
+      />
+      <div>
+        <el-scrollbar>
+          <el-checkbox
+            v-model="allCheck"
+            :label="true"
+            :indeterminate="filteredValue.length > 0"
+            @change="allChange"
+            >{{ filters | alltextF }}</el-checkbox
+          >
+          <el-checkbox-group v-model="filteredValue" class="flex-column">
+            <template v-for="filter in filters">
+              <el-checkbox
+                v-if="filter.text.includes(searchVal)"
+                :key="filter.value"
+                class="m-t-s"
+                :label="filter.value"
+                >{{ filter | textF }}</el-checkbox
+              >
+            </template>
+          </el-checkbox-group>
+        </el-scrollbar>
+      </div>
+      <div class="flex-box flex-c m-t-m">
+        <el-button
+          type="primary"
+          size="mini"
+          @click="
+            () => {
+              filteredValue.length ? handleConfirm() : handleReset()
+            }
+          "
+        >
+          确认
+        </el-button>
+        <el-button plain size="mini" @click="handleReset">清空</el-button>
+      </div>
+    </div>
+    <div
+      v-else
+      v-show="showPopper"
+      v-click-outside:capture="handleOutsideClick"
+      class="el-table-filter p-a m-t"
+    >
+      <el-input
+        v-model="searchVal"
+        class="input-w m-b-ss"
+        placeholder="请输入"
+        clearable
+        suffix-icon="el-icon-search"
+      />
+      <ul class="el-table-filter__list">
+        <li
+          class="el-table-filter__list-item"
+          :class="{
+            'is-active': filterValue === undefined || filterValue === null
+          }"
+          @click="handleSelect(null)"
+        >
+          {{ filters | alltextF }}
+        </li>
+        <template v-for="filter in filters">
+          <li
+            v-if="filter.text.includes(searchVal)"
+            :key="filter.value"
+            class="el-table-filter__list-item"
+            :label="filter.value"
+            :class="{ 'is-active': isActive(filter) }"
+            @click="handleSelect(filter.value)"
+          >
+            {{ filter | textF }}
+          </li>
+        </template>
+      </ul>
+    </div>
+  </transition>
+</template>
+
+<script>
+import Popper from 'element-ui/lib/utils/vue-popper.js'
+export default {
+  name: 'ElTableFilterPanelPor',
+  filters: {
+    textF(item) {
+      if (item.count === undefined) {
+        return item.text
+      } else {
+        return item.text + ' (' + item.count + ')'
+      }
+    },
+    alltextF(list = []) {
+      if (list.some((c) => c.count !== undefined)) {
+        let total = 0
+        list.forEach((c) => {
+          if (!isNaN(c.count)) {
+            total = total + Number(c.count)
+          }
+        })
+        return '全部 (' + total + ')'
+      } else {
+        return '全部'
+      }
+    }
+  },
+  mixins: [Popper],
+  props: {
+    placement: {
+      type: String,
+      default: 'bottom-end'
+    }
+  },
+
+  data() {
+    return {
+      table: null,
+      cell: null,
+      column: null,
+      searchVal: '',
+      allCheck: false
+    }
+  },
+
+  computed: {
+    filters() {
+      return this.column && this.column.filters
+    },
+
+    filterValue: {
+      get() {
+        return (this.column.filteredValue || [])[0]
+      },
+      set(value) {
+        if (this.filteredValue) {
+          console.log(this.filteredValue, 567)
+          if (typeof value !== 'undefined' && value !== null) {
+            this.filteredValue.splice(0, 1, value)
+          } else {
+            this.filteredValue.splice(0, 1)
+          }
+        }
+      }
+    },
+
+    filteredValue: {
+      get() {
+        if (this.column) {
+          return this.column.filteredValue || []
+        }
+        return []
+      },
+      set(value) {
+        if (this.column) {
+          this.column.filteredValue = value
+        }
+      }
+    },
+
+    multiple() {
+      if (this.column) {
+        return this.column.filterMultiple
+      }
+      return true
+    }
+  },
+
+  mounted() {
+    this.popperElm = this.$el
+    this.referenceElm = this.cell
+    this.table.bodyWrapper.addEventListener('scroll', () => {
+      this.updatePopper()
+    })
+
+    this.$watch('showPopper', (value) => {
+      if (this.column) this.column.filterOpened = value
+      if (value) this.searchVal = ''
+      // if (value) {
+      //   Dropdown.open(this)
+      // } else {
+      //   Dropdown.close(this)
+      // }
+    })
+  },
+
+  methods: {
+    isActive(filter) {
+      return filter.value === this.filterValue
+    },
+
+    handleOutsideClick() {
+      setTimeout(() => {
+        this.showPopper = false
+      }, 16)
+    },
+
+    handleConfirm() {
+      this.confirmFilter(this.filteredValue)
+      this.handleOutsideClick()
+    },
+
+    handleReset() {
+      this.filteredValue = []
+      this.confirmFilter(this.filteredValue)
+      this.handleOutsideClick()
+    },
+
+    handleSelect(filterValue) {
+      this.filterValue = filterValue
+
+      if (typeof filterValue !== 'undefined' && filterValue !== null) {
+        this.confirmFilter(this.filteredValue)
+      } else {
+        this.confirmFilter([])
+      }
+
+      this.handleOutsideClick()
+    },
+
+    confirmFilter(filteredValue) {
+      this.table.store.commit('filterChange', {
+        column: this.column,
+        values: filteredValue
+      })
+      this.table.store.updateAllSelected()
+    },
+
+    allChange(val) {
+      if (val) {
+        this.filteredValue = this.filters.map((f) => f.value)
+      } else {
+        this.filteredValue = []
+      }
+    }
+  }
+}
+</script>

package/src/utils/toExcel.js

@@ -1,6 +1,10 @@
 import ExcelJS from 'exceljs'
 
-function toExcel({ columns = [], rows = [], name = 'sheet01' }) {
+export default function toExcel({ columns = [], rows = [], name = 'sheet01' }) {
+  // 创建工作簿
+  const workbook = new ExcelJS.Workbook()
+  // 创建工作表
+  const worksheet = workbook.addWorksheet(name)
   let cols = []
   columns.forEach((col) => {
     if (!col.static) {
@@ -32,9 +36,6 @@ function toExcel({ columns = [], rows = [], name = 'sheet01' }) {
   let cL = cols.length
   let rL = rows.length
 
-  const workbook = new ExcelJS.Workbook()
-  const worksheet = workbook.addWorksheet(name)
-
   worksheet.columns = cols
   worksheet.addRows(rows)
 
@@ -89,27 +90,6 @@ function toExcel({ columns = [], rows = [], name = 'sheet01' }) {
       })
   })
 }
-export default toExcel
 
-export function toJson(file, name) {
-  const workbook = new ExcelJS.Workbook()
-  return new Promise((resolve, reject) => {
-    workbook.xlsx
-      .load(file)
-      .then(() => {
-        const worksheet = workbook.getWorksheet(name || 1)
-        let rows = []
-        worksheet.eachRow((r) => {
-          let row = []
-          r.eachCell((c) => {
-            row.push(c.value)
-          })
-          rows.push(row)
-        })
-        resolve(rows)
-      })
-      .catch((err) => {
-        reject(err)
-      })
-  })
-}
+import xlsx2json from './xlsx2json.js'
+export const toJson = xlsx2json

package/src/utils/xls2json.js

@@ -0,0 +1,40 @@
+import { read, utils } from 'xlsx'
+
+export default function toJson(file, name) {
+  let pro = new Promise((resolve, reject) => {
+    if (file instanceof Blob) {
+      file.arrayBuffer().then((array) => {
+        try {
+          const workbook = read(array, { type: 'array', cellDates: true })
+          resolve(workbook)
+        } catch (err) {
+          reject(err)
+        }
+      })
+    } else if (file instanceof ArrayBuffer) {
+      try {
+        const workbook = read(array, { type: 'array', cellDates: true })
+        resolve(workbook)
+      } catch (err) {
+        reject(err)
+      }
+    }
+  })
+
+  return pro.then((workbook) => {
+    let sheetName = workbook.SheetNames[name || 0]
+    let workSheet = workbook.Sheets[sheetName]
+    let rows = []
+    let cols = utils.sheet_to_csv(workSheet).split('\n')[0].split(',')
+    rows.push(cols)
+    let rowsc = utils.sheet_to_json(workSheet)
+    rowsc.forEach((r) => {
+      let row = []
+      cols.forEach((c) => {
+        row.push(r[c])
+      })
+      rows.push(row)
+    })
+    return Promise.resolve(rows)
+  })
+}

package/src/utils/xlsx2json.js

@@ -0,0 +1,24 @@
+import ExcelJS from 'exceljs'
+
+export default function toJson(file, name) {
+  const workbook = new ExcelJS.Workbook()
+  return new Promise((resolve, reject) => {
+    workbook.xlsx
+      .load(file)
+      .then(() => {
+        const worksheet = workbook.getWorksheet(name || 1)
+        let rows = []
+        worksheet.eachRow((r) => {
+          let row = []
+          r.eachCell((c) => {
+            row.push(c.value)
+          })
+          rows.push(row)
+        })
+        resolve(rows)
+      })
+      .catch((err) => {
+        reject(err)
+      })
+  })
+}