n20-common-lib 2.1.21 → 2.1.22

package/package.json

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

package/src/components/CascaderArea/index.vue

@@ -6,12 +6,7 @@
     :options="areaTree"
     :filterable="filterable"
     :clearable="clearable"
-    :props="{
-      value: 'regionNo',
-      label: 'regionName',
-      children: 'children',
-      expandTrigger: 'hover'
-    }"
+    :props="propsAs"
     v-on="$listeners"
   />
 </template>
@@ -44,6 +39,10 @@ export default {
     countryId: {
       type: String,
       default: 'CHN'
+    },
+    props: {
+      type: Object,
+      default: undefined
     }
   },
   data() {
@@ -52,6 +51,15 @@ export default {
     }
   },
   computed: {
+    propsAs() {
+      let _prop = {
+        value: 'regionNo',
+        label: 'regionName',
+        children: 'children',
+        expandTrigger: 'hover'
+      }
+      return Object.assign(_prop, this.props)
+    },
     areaKey() {
       return this.countryId === 'CHN' ? '_china_area_tree_' : `_${this.countryId}_area_tree_`
     },

package/src/components/Filters/indexO.vue

@@ -27,10 +27,10 @@
     </div>
     <div class="text-c m-t m-b">
       <slot name="actions">
-        <el-button size="mini" type="primary" style="width: 76px" @click="filter">
+        <el-button type="primary" @click="filter">
           {{ filterText }}
         </el-button>
-        <el-button size="mini" plain style="width: 76px" @click="clear">
+        <el-button plain @click="clear">
           {{ clearText }}
         </el-button>
       </slot>

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

@@ -155,7 +155,7 @@
     </dialogWrap>
     <!-- 消息/通知 -->
     <el-popover ref="noticePop" trigger="click" width="400" @after-enter="$refs.noticeContent.show()">
-      <noticePop ref="noticeContent" :num.sync="noticeNum" />
+      <noticePop ref="noticeContent" />
     </el-popover>
     <el-dialog :visible.sync="scV" :title="'切换用户' | $lc" append-to-body width="600px">
       <switchUser :visible.sync="scV" :user-no="userNo" />
@@ -270,6 +270,10 @@ export default {
         this.show = true
       }
     })
+
+    this.getNNum()
+    document.addEventListener('visibilitychange', this.getNNum)
+    window.addEventListener('message', this.updateNotice)
   },
   mounted() {
     let userInfo = JSON.parse(sessionStorage.getItem('userInfo') || '{}')
@@ -281,6 +285,10 @@ export default {
     }
     this.rolesList = userInfo.roles || []
   },
+  beforeDestroy() {
+    document.removeEventListener('visibilitychange', this.getNNum)
+    window.removeEventListener('message', this.updateNotice)
+  },
   methods: {
     // 跳转打主数据人员页面
     goMdmUser() {
@@ -422,6 +430,29 @@ export default {
       })
 
       this.underway = !!res.data
+    },
+    // 更新消息条数
+    updateNotice(ev) {
+      if (ev.data === 'NstcUpdateNotice') {
+        this.getNNum()
+      }
+    },
+    // 获取消息条数
+    getNNum() {
+      clearTimeout(this.getNNumTimeOut)
+      if (!document.hidden) {
+        Promise.all([
+          axios.get('/bems/wkb/messageCenter/getUnReadTotal/' + this.username, null, { loading: false, noMsg: true }),
+          axios.get('/bems/1.0/notice/notReadCount', null, {
+            loading: false,
+            noMsg: true
+          })
+        ]).then(([res_1, res_2]) => {
+          this.noticeNum = (res_1.data.data || 0) + (res_2.data || 0)
+        })
+
+        this.getNNumTimeOut = setTimeout(this.loopGetNNum, 1000 * 60 * 3)
+      }
     }
   }
 }

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

@@ -74,7 +74,8 @@
     </el-tooltip>
 
     <el-badge :hidden="noticeNum === 0" :value="noticeNum">
-      <span v-popover:noticePop class="news-btn iconfont icon-xiaoxi header-color"></span>
+      <span v-if="!noticeDrw" v-popover:noticePop class="news-btn iconfont icon-xiaoxi header-color"></span>
+      <span v-else class="news-btn iconfont icon-xiaoxi header-color" @click="customOpt.noticeDrawer"></span>
     </el-badge>
 
     <el-popover ref="by_popover" v-model="byV" placement="bottom-start" trigger="manual" popper-class="uby-w">
@@ -121,8 +122,11 @@
           <div class="uif-gs text-ellipsis">{{ userInfo.companyName }}</div>
           <div class="uif-js text-ellipsis">{{ rolesList.map((el) => el.name).join('/') }}</div>
           <div class="uif-by">
-            <span>{{ byLabel }}</span>
-            <span class="_edit el-icon-edit" @click="editByLabel"></span>
+            <template v-if="!byEV">
+              <span>{{ byLabel }}</span>
+              <span class="_edit el-icon-edit" @click="byEShow"></span>
+            </template>
+            <el-input v-else v-model="byLabel" size="mini" style="width: 92%" @blur="editByLabel" />
           </div>
         </div>
         <el-dropdown-item command="changePassword">
@@ -212,8 +216,8 @@
       <changePwd :visible.sync="cpwdV" />
     </dialogWrap>
     <!-- 消息/通知 -->
-    <el-popover ref="noticePop" trigger="click" width="400" @after-enter="$refs.noticeContent.show()">
-      <noticePop ref="noticeContent" :num.sync="noticeNum" />
+    <el-popover v-if="!noticeDrw" ref="noticePop" trigger="click" width="400" @after-enter="$refs.noticeContent.show()">
+      <noticePop ref="noticeContent" />
     </el-popover>
     <el-dialog :visible.sync="scV" :title="'切换用户' | $lc" append-to-body width="600px">
       <switchUser :visible.sync="scV" :user-no="userNo" />
@@ -303,10 +307,16 @@ export default {
       /*  */
       byV: false,
       byLabel: '',
+      byEV: false,
       headerUserInfoBg: realUrl('/server-assets/userInfoBg.png'),
       inBack: window.localStorage.getItem('pageInType') === 'inBack'
     }
   },
+  computed: {
+    noticeDrw() {
+      return !!this.customOpt.noticeDrawer
+    }
+  },
   created() {
     getJsonc('/server-config.jsonc').then(({ _layoutData = {}, loginSetting }) => {
       let _loginSetting = loginSetting || _layoutData.loginSetting
@@ -343,6 +353,10 @@ export default {
         }, 6000)
       })
     })
+
+    this.getNNum()
+    document.addEventListener('visibilitychange', this.getNNum)
+    window.addEventListener('message', this.updateNotice)
   },
   mounted() {
     let userInfo = JSON.parse(sessionStorage.getItem('userInfo') || '{}')
@@ -354,6 +368,10 @@ export default {
     }
     this.rolesList = userInfo.roles || []
   },
+  beforeDestroy() {
+    document.removeEventListener('visibilitychange', this.getNNum)
+    window.removeEventListener('message', this.updateNotice)
+  },
   methods: {
     // 跳转打主数据人员页面
     goMdmUser() {
@@ -377,6 +395,10 @@ export default {
     },
     // 打开帮助文档
     openHelp() {
+      if (this.customOpt.openHelp) {
+        this.customOpt.openHelp()
+        return false
+      }
       axios
         .get(`/bems/1.0/userManual`, {}, { responseType: 'blob' })
         .then((res) => {
@@ -454,7 +476,10 @@ export default {
       window.location.reload()
     },
     dowApp() {
-      // alert('客户端下载')
+      if (this.customOpt.dowApp) {
+        this.customOpt.dowApp()
+        return false
+      }
       let name = 'download.exe'
       let aDom = document.createElement('a')
       aDom.href = `${prefix}server-assets/${name}`
@@ -537,21 +562,56 @@ export default {
           this.headerUserUrl = window.URL.createObjectURL(login)
         })
     },
-    async editByLabel() {
-      let { value } = await this.$prompt($lc('请输入欢迎语'), $lc('修改'), {
-        confirmButtonText: $lc('确定'),
-        cancelButtonText: $lc('取消'),
-        inputValue: this.byLabel
-      })
-      await this.$axios.get(`/bems/portal/portalUserIndexConfig/saveConfigSign/${value}`)
+    byEShow() {
+      this.byLabelO = this.byLabel
+      this.byEV = true
+    },
+    editByLabel() {
+      // let { value } = await this.$prompt($lc('请输入欢迎语'), $lc('修改'), {
+      //   confirmButtonText: $lc('确定'),
+      //   cancelButtonText: $lc('取消'),
+      //   inputValue: this.byLabel
+      // })
+      // await this.$axios.get(`/bems/portal/portalUserIndexConfig/saveConfigSign/${value}`)
+      // this.byLabel = value
 
-      this.byLabel = value
+      this.$axios
+        .get(`/bems/portal/portalUserIndexConfig/saveConfigSign/${this.byLabel}`)
+        .then(() => {
+          this.byEV = false
+        })
+        .catch(() => {
+          this.byLabel = this.byLabelO
+        })
     },
     getByLabel() {
       return this.$axios.get(`/bems/portal/portalUserIndexConfig/getConfigByUno`).then((res) => {
         let data = res.data || {}
-        this.byLabel = data.signature ?? this.byLabel
+        data.signature && (this.byLabel = data.signature)
       })
+    },
+    // 更新消息条数
+    updateNotice(ev) {
+      if (ev.data === 'NstcUpdateNotice') {
+        this.getNNum()
+      }
+    },
+    // 获取消息条数
+    getNNum() {
+      clearTimeout(this.getNNumTimeOut)
+      if (!document.hidden) {
+        Promise.all([
+          axios.get('/bems/wkb/messageCenter/getUnReadTotal/' + this.username, null, { loading: false, noMsg: true }),
+          axios.get('/bems/1.0/notice/notReadCount', null, {
+            loading: false,
+            noMsg: true
+          })
+        ]).then(([res_1, res_2]) => {
+          this.noticeNum = (res_1.data.data || 0) + (res_2.data || 0)
+        })
+
+        this.getNNumTimeOut = setTimeout(this.loopGetNNum, 1000 * 60 * 3)
+      }
     }
   }
 }

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

@@ -81,12 +81,6 @@ export default {
       return `【${msgT}】${item.title}`
     }
   },
-  props: {
-    num: {
-      type: Number,
-      default: 0
-    }
-  },
   data() {
     return {
       showKey: 0,
@@ -102,25 +96,6 @@ export default {
       afficheTotal: 0
     }
   },
-  computed: {
-    numC: {
-      get() {
-        return this.num
-      },
-      set(n) {
-        this.$emit('update:num', n)
-      }
-    }
-  },
-  created() {
-    this.getNNum()
-    document.addEventListener('visibilitychange', this.getNNum)
-    window.addEventListener('message', this.updateNotice)
-  },
-  beforeDestroy() {
-    document.removeEventListener('visibilitychange', this.getNNum)
-    window.removeEventListener('message', this.updateNotice)
-  },
   methods: {
     show() {
       this.showKey = this.showKey + 1
@@ -128,30 +103,6 @@ export default {
       this.getMsgList()
       this.getAfficheList()
     },
-    updateNotice(ev) {
-      if (ev.data === 'NstcUpdateNotice') {
-        this.getNNum()
-      }
-    },
-    getNNum() {
-      clearTimeout(this.getNNumTimeOut)
-      if (!document.hidden) {
-        Promise.all([
-          axios.get('/bems/wkb/messageCenter/getUnReadTotal/' + this.username, null, { loading: false, noMsg: true }),
-          axios.get('/bems/1.0/notice/notReadCount', null, {
-            loading: false,
-            noMsg: true
-          })
-        ]).then(([res_1, res_2]) => {
-          this.noticeNum = res_1.data.data
-          this.afficheNum = res_2.data
-
-          this.numC = this.noticeNum + this.afficheNum
-        })
-
-        this.getNNumTimeOut = setTimeout(this.loopGetNNum, 1000 * 60 * 5)
-      }
-    },
     getMsgList() {
       this.nLd = true
       axios
@@ -221,25 +172,18 @@ export default {
           .then(() => {
             item.readState = '1'
             this.noticeNum = this.noticeNum - 1
-            this.numC = this.numC - 1
+            window.postMessage('NstcUpdateNotice')
           })
       }
     },
     seeDetailsAffiche(item) {
-      if (this.$route.path === '/notice/views') {
-        this.$router.push('/loading')
-        setTimeout(() => {
-          this.$router.push({
-            path: `/notice/views`,
-            query: { ntId: item.ntId, status: '1' }
-          })
-        }, 500)
-      } else {
-        this.$router.push({
-          path: `/notice/views`,
-          query: { ntId: item.ntId, status: '1' }
-        })
-      }
+      this.$router.push({
+        path: `/notice/views`,
+        query: { ntId: item.ntId, status: '1' }
+      })
+      setTimeout(function () {
+        window.postMessage('NstcUpdateNotice')
+      }, 3000)
     },
     readAll() {
       this.$msgboxPor({

package/src/index.js

@@ -1,5 +1,6 @@
-import './utils/importGlobal.js' // 联合加载组件保存位置
+import importG from './utils/importGlobal.js' // 联合加载组件保存位置
 import './utils/storagePro.js' // 扩展Storage
+import './utils/numberPor.js' // 扩展Number
 /** 提供组件给外部使用的入口 */
 import ContentLoading from './components/ContentLoading/index.vue'
 import ContentNull from './components/ContentNull/index.vue'
@@ -221,6 +222,7 @@ export {
   auth,
   axios,
   getJsonc,
+  importG,
   downloadBlob,
   forEachs,
   list2tree,

package/src/utils/numberPor.js

@@ -0,0 +1,168 @@
+/* eslint-disable no-extend-native */
+if (!Number.add) {
+  let i = 1
+
+  const add = function (n, decimal = 10) {
+    let rN = this + n
+    return decimal ? Number(rN.toFixed(decimal)) : rN
+  }
+  const sub = function (n, decimal = 10) {
+    let rN = this - n
+    return decimal ? Number(rN.toFixed(decimal)) : rN
+  }
+  const mul = function (n, decimal = 10) {
+    let rN = this * n
+    return decimal ? Number(rN.toFixed(decimal)) : rN
+  }
+  const div = function (n, decimal = 10) {
+    let rN = this / n
+    return decimal ? Number(rN.toFixed(decimal)) : rN
+  }
+
+  // 去括号
+  const splitPts = function (obj) {
+    let mc = obj.mEl.match(/\([^()]+\)/g)
+    if (mc) {
+      mc.forEach((m) => {
+        let vk = 'El' + i++
+        obj.Els[vk] = m.replace(/\(|\)/g, '')
+        obj.mEl = obj.mEl.replace(m, vk)
+      })
+
+      return splitPts(obj)
+    } else {
+      return obj
+    }
+  }
+  // 负数转括号
+  const negToPts = function (Els, k) {
+    if (/\+-/.test(Els[k])) {
+      Els[k] = Els[k].replace(/\+-/, '-')
+    }
+
+    if (/--/.test(Els[k])) {
+      Els[k] = Els[k].replace(/--/, '+')
+    }
+
+    if (/\*-/.test(Els[k])) {
+      let mc = Els[k].match(/\*-[^+|-|*|/]+/g)
+      if (mc) {
+        mc.forEach((m) => {
+          let vk = 'El' + i++
+          Els[vk] = m.replace('*', '0')
+          Els[k] = Els[k].replace(m, '*' + vk)
+        })
+      }
+    }
+
+    if (/\/-/.test(Els[k])) {
+      let mc = Els[k].match(/\/-[^+|-|*|/]+/g)
+      if (mc) {
+        mc.forEach((m) => {
+          let vk = 'El' + i++
+          Els[vk] = m.replace('/', '0')
+          Els[k] = Els[k].replace(m, '/' + vk)
+        })
+      }
+    }
+  }
+  // 乘除转括号
+  const muldivToPts = function (Els, k) {
+    if (/\*|\//.test(Els[k]) && /\+|-/.test(Els[k])) {
+      let mc = Els[k].match(/[^+|-]*[*|/][^+|-]*/g)
+      if (mc) {
+        mc.forEach((m) => {
+          let vk = 'El' + i++
+          Els[vk] = m.replace(/\(|\)/g, '')
+          Els[k] = Els[k].replace(m, vk)
+        })
+      }
+    }
+  }
+  // 符号切割运算
+  const splitSmb = function (Els) {
+    for (let k in Els) {
+      Els[k + 'O'] = Els[k]
+      Els[k] = Els[k].replace(/\+|-|\*|\//g, (v) => ',' + v + ',')
+      Els[k] = Els[k].split(',')
+    }
+  }
+
+  const compute = function (Els, k, fc) {
+    let El = Els[k]
+    El.forEach((e, i) => {
+      if (/^El/.test(e)) {
+        El[i] = compute(Els, e, fc)
+      }
+    })
+
+    let L = El.length
+    let Val = Number(El[0])
+    for (let i = 1; i < L; i) {
+      if (['+', '-', '*', '/'].includes(El[i])) {
+        switch (El[i]) {
+          case '+':
+            Val = Val.add(Number(El[i + 1]), fc)
+            break
+          case '-':
+            Val = Val.sub(Number(El[i + 1]), fc)
+            break
+          case '*':
+            Val = Val.mul(Number(El[i + 1]), fc)
+            break
+          case '/':
+            Val = Val.div(Number(El[i + 1]), fc)
+            break
+        }
+        i += 2
+      }
+    }
+    return Val
+  }
+  const evaluate = function (evalStr = '', decimal = 10, proceDecimal) {
+    if (decimal) {
+      i = 1
+      let obj = { mEl: evalStr.replace(/\s/g, ''), Els: {} }
+
+      splitPts(obj)
+
+      let Els = obj.Els
+      Els['Elm'] = obj.mEl
+      obj = undefined
+
+      negToPts(Els, 'Elm')
+      for (let k in Els) {
+        k !== 'Elm' && negToPts(Els, k)
+      }
+
+      muldivToPts(Els, 'Elm')
+      for (let k in Els) {
+        k !== 'Elm' && muldivToPts(Els, k)
+      }
+
+      splitSmb(Els)
+
+      let RES = compute(Els, 'Elm', proceDecimal || decimal)
+      RES = RES.add(0, decimal)
+      return RES
+    } else {
+      // eslint-disable-next-line no-eval
+      eval('window._number_eval_res=' + evalStr)
+      let RES = window._number_eval_res
+      delete window._number_eval_res
+      return RES
+    }
+  }
+
+  Number.prototype.add = add
+  Number.prototype.sub = sub
+  Number.prototype.mul = mul
+  Number.prototype.div = div
+  /**
+   * @param {string} [evalStr='']
+   * @param {number} [decimal=10]
+   * @param {number} proceDecimal
+   * @return {number}
+   */
+  Number.eval = evaluate
+}