n20-common-lib 1.3.32 → 1.3.35

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.32",
+  "version": "1.3.35",
   "private": false,
   "main": "src/index.js",
   "scripts": {

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

@@ -0,0 +1,29 @@
+<template>
+  <div>
+    <div ref="ad">
+      <el-card class="box-card" :header="header">
+        <cB />
+        <p>这里的传值，是只依赖DOM结构，利用自定义事件/事件冒泡实现值得传递</p>
+      </el-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import cB from './b.vue'
+export default {
+  components: { cB },
+  data() {
+    return {
+      header: ''
+    }
+  },
+  mounted() {
+    this.$refs['ad'].addEventListener('demoEv', (event) => {
+      event.stopPropagation()
+      const cD = event.target.customData
+      this.header = cD.title
+    })
+  }
+}
+</script>

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

@@ -0,0 +1,12 @@
+<template>
+  <div>
+    <cC />
+  </div>
+</template>
+
+<script>
+import cC from './c.vue'
+export default {
+  components: { cC }
+}
+</script>

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

@@ -0,0 +1,18 @@
+<template>
+  <div class="flex-box flex-v">
+    <label>标题</label><el-input class="flex-item m-l" v-model="title" />
+    <EventBubble :data-custom="{ title: title }" data-event="demoEv" />
+  </div>
+</template>
+
+<script>
+import EventBubble from '../index.vue'
+export default {
+  components: { EventBubble },
+  data() {
+    return {
+      title: '默认标题'
+    }
+  }
+}
+</script>

package/src/components/EventBubble/index.vue

@@ -4,8 +4,8 @@
 
 <script>
 // 触发自定义冒泡事假
-// XXX:还差iframe的处理
 export default {
+  name: 'EventBubble',
   props: {
     dataCustom: {
       type: Object,
@@ -25,7 +25,9 @@ export default {
     }
   },
   mounted() {
-    this.setData(this.dataCustom)
+    this.$nextTick(() => {
+      this.setData(this.dataCustom)
+    })
   },
   methods: {
     setData(obj) {
@@ -42,11 +44,14 @@ function dispatchEvent(el, type) {
   var evEvent = undefined
 
   if (!window[evName]) {
-    evEvent = document.createEvent('Event')
-    evEvent.initEvent(type, true, false)
+    evEvent = new CustomEvent(type, { bubbles: true, cancelable: false })
     window[evName] = evEvent
   }
 
   el.dispatchEvent(window[evName])
+  // iframe is not target
+  // if (el.nodeName !== 'IFRAME' && window.frameElement) {
+  //   dispatchEvent(window.frameElement, type)
+  // }
 }
 </script>

package/src/components/InputNumber/index.vue

@@ -168,7 +168,7 @@ export default {
       }
     },
     inputFn({ target }) {
-      if (isNaN(target.value)) {
+      if (target.value !== '-' && isNaN(target.value)) {
         target.value = this.preValue
       } else {
         this.preValue = target.value

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

@@ -179,6 +179,7 @@
 </template>
 
 <script>
+import Cookies from 'js-cookie'
 import { themeList } from '../../../utils/theme.config.js'
 
 import dialogWrap from '../../Dialog/index.vue'
@@ -229,7 +230,7 @@ const i18n = {
     en: ':'
   },
   秒: {
-    en: ':'
+    en: ''
   },
   '确定退出,将清除未提交的临时操作，是否继续？': {
     en: 'Are you sure to exit? Uncommitted temporary operations will be cleared. Do you want to continue?'
@@ -299,23 +300,35 @@ export default {
     },
     setUserVisible(v) {
       if (v) {
-        let loginTime = sessionStorage.getItem('loginTime')
-        if (loginTime) {
-          this.durationTime = dayjs.duration(Date.now() - loginTime).format(
-            `HH${this.$l('小时', this.i18n)}
-              mm${this.$l('分', this.i18n)}
-              ss${this.$l('秒', this.i18n)}`
-          )
-        }
-
         let userInfo = JSON.parse(sessionStorage.getItem('userInfo') || '{}')
         this.userInfo = {
           userName: userInfo.uname,
           companyName: userInfo.cltName
         }
         this.rolesList = userInfo.roles || []
+
+        let loginTime = sessionStorage.getItem('loginTime')
+        if (loginTime) {
+          this.setDurationTime(loginTime)
+          this.durationTime_timeout = setInterval(
+            () => this.setDurationTime(loginTime),
+            500
+          )
+        }
+      } else {
+        clearInterval(this.durationTime_timeout)
       }
     },
+    setDurationTime(loginTime) {
+      this.durationTime = dayjs
+        .duration(Date.now() - loginTime)
+        .format(
+          `HH${this.$l('小时', this.i18n)}mm${this.$l(
+            '分',
+            this.i18n
+          )}ss${this.$l('秒', this.i18n)}`
+        )
+    },
     // 打开帮助文档
     openHelp() {
       axios
@@ -357,6 +370,10 @@ export default {
     setLang() {
       this.langV = false
       window.localStorage.setItem('pageLang', this.langVal)
+      Cookies.set(
+        'language',
+        ['zh-cn', 'zh-hk'].includes(this.langVal) ? 'zh' : this.langVal
+      )
       window.location.reload()
     },
     setTheme({ value }) {

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/components/PageHeader/style.scss

@@ -1,8 +1,9 @@
-.page-header {
+.n20-page-header {
   display: flex;
   line-height: 20px;
   padding-bottom: 2px;
   border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+
   .page-header__left {
     display: flex;
     align-items: center;
@@ -10,12 +11,15 @@
     margin-right: 16px;
     position: relative;
   }
+
   .page-header__left:hover {
     color: var(--color-primary);
+
     .page-header__title {
       color: var(--color-primary);
     }
   }
+
   .page-header__left:after {
     content: '';
     position: absolute;
@@ -26,14 +30,16 @@
     transform: translateY(-50%);
     background-color: #dcdfe6;
   }
+
   .page-header__title {
     font-size: 14px;
     line-height: 20px;
     color: #3d4a57;
   }
+
   .page-header__content {
     font-size: 14px;
     line-height: 20px;
     color: #3d4a57;
   }
-}
+}

package/src/index.js

@@ -48,10 +48,11 @@ import FlowStep from './components/FlowStep/index.vue'
 import CascaderArea from './components/CascaderArea/index.vue'
 import FileExportAsync from './components/FileExportAsync/index.vue'
 import FlowDialog from './components/ApprovalRecord/flowDialog.vue'
-import ChildRange from './components/ChildRange/index'
-import FileImport from './components/FileImport/index'
-import PageHeader from './components/PageHeader/index'
-import Descriptions from './components/Descriptions'
+import ChildRange from './components/ChildRange/index.vue'
+import FileImport from './components/FileImport/index.vue'
+import PageHeader from './components/PageHeader/index.vue'
+import Descriptions from './components/Descriptions/index.vue'
+import EventBubble from './components/EventBubble/index.vue'
 // ECharts 不要打包进来
 // import Search from './components/Search/index.vue'
 import Stamp from './components/Stamp/index.vue'
@@ -142,6 +143,7 @@ const components = [
   FileImport,
   PageHeader,
   Descriptions,
+  EventBubble,
   // Search,
   approvalImg,
   Stamp,
@@ -154,6 +156,8 @@ const components = [
 const install = function (Vue, opts = { prefix: 'Cl', i18nConfig: {} }) {
   components.forEach((component) => {
     let name = component.name
+    if (!name) return console.error('Component name is required:', component)
+
     name = opts.prefix + name.replace(name[0], name[0].toUpperCase())
     Vue.component(name, component)
   })
@@ -251,6 +255,7 @@ export {
   FileImport,
   PageHeader,
   Descriptions,
+  EventBubble,
   // Search,
   approvalImg,
   Stamp

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/auth.js

@@ -29,6 +29,7 @@ const auth = {
   },
   setLoginPath(router) {
     let { base = '/', mode = 'history' } = router.options
+    ;/\/$/.test(base) || (base += '/')
     if (mode === 'hash') {
       ownLoginPath = window.location.origin + base + '#/login'
     } else {

package/src/utils/i18n/index.js

@@ -17,7 +17,7 @@ export function $l(zh, map = {}) {
   } else {
     let key = pageLang
     let valMap = map[zh] || $i18n_map_root[zh] || {}
-    let val = valMap[key] || zh
+    let val = valMap[key] !== undefined ? valMap[key] : zh
 
     return val
   }

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,4 +90,6 @@ function toExcel({ columns = [], rows = [], name = 'sheet01' }) {
       })
   })
 }
-export default toExcel
+
+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)
+      })
+  })
+}