n20-common-lib 2.1.24 → 2.1.26

package/package.json

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

package/src/components/InputNumber/index.vue

@@ -16,9 +16,7 @@
       @keydown.native="stepFn"
     >
       <template v-if="type === 'rate'">
-        <span v-if="!isClearable || (valueStr && !isHove && !isFocus)" slot="suffix" class="el-input__icon">{{
-          suffix
-        }}</span>
+        <span v-if="suffixV" slot="suffix" class="el-input__icon">{{ suffix }}</span>
       </template>
     </el-input>
   </div>
@@ -99,6 +97,12 @@ export default {
     }
   },
   computed: {
+    suffixV() {
+      if (!this.isClearable) return true
+      if (!this.valueStr) return true
+      if (!(this.isHove || this.isFocus)) return true
+      return false
+    },
     phd() {
       if (this.placeholder) {
         return this.placeholder

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

@@ -9,6 +9,7 @@
     :background-color="backgroundColor"
     :text-color="textColor"
     :active-text-color="activeTextColor"
+    :unique-opened="true"
   >
     <template v-for="(omenus, o) in menus">
       <template v-for="(itemA, a) in omenus.menu">

package/src/components/Layout/indexN.vue

@@ -106,7 +106,9 @@ export default {
   },
   computed: {
     activeNavC() {
-      return getShowUuid(this.activeNav, this.menuList)
+      let acTab = this.tabList.find((t) => t.uuid === this.activeNav)
+      let acNav = acTab?.query?.startPath || this.activeNav
+      return getShowUuid(acNav, this.menuList)
     }
   },
   watch: {
@@ -406,11 +408,11 @@ export default {
               this.updateK = ''
             })
           } else {
-            window.postMessage({
-              updateActiveCache: true,
-              targetName: '*',
-              originName: 'main'
-            })
+            // window.postMessage({
+            //   updateActiveCache: true,
+            //   targetName: '*',
+            //   originName: 'main'
+            // })
             this.CompatibleUpdateCache(tab.route) // 兼容旧的子模块清除缓存
           }
         }

package/src/index.js

@@ -95,8 +95,8 @@ import auth from './utils/auth.js'
 import { msgPor, msgboxPor } from './utils/msgboxPor.js'
 import getJsonc from './assets/getJsonc.js'
 import downloadBlob from './utils/downloadBlob.js'
-import { linkPush, linkGo } from './utils/urlToGo'
-import { closeTag as linkClose } from './utils/handleTab.js'
+import { setTabs } from './utils/handleTab.js'
+import { linkPush, linkGo, closeTab } from './utils/urlToGo'
 import forEachs from './utils/forEachs'
 import list2tree from './utils/list2tree'
 import { has as isHas } from './directives/VHas/index.js'
@@ -219,6 +219,7 @@ export default {
   version,
   install
 }
+const linkClose = closeTab
 export {
   version,
   // 方法
@@ -230,9 +231,13 @@ export {
   forEachs,
   list2tree,
   repairEl,
+  // 页签/路由
+  setTabs,
+  closeTab,
   linkPush,
   linkGo,
   linkClose,
+  // 权限
   isHas,
   isHasG,
   dayjs,

package/src/utils/numberPor.js

@@ -176,7 +176,9 @@ export function evaluate(evalStr = '', decimal = 10, proceDecimal) {
   }
 }
 /**
- * @param {number}
+ * 将数字或字符串截取为指定的小数位
+ * @param {number|string} n
+ * @param {number} [decimal=10]
  * @return {string}
  */
 export const subFixed = function (n, decimal = 6) {
@@ -185,9 +187,7 @@ export const subFixed = function (n, decimal = 6) {
   let ns = toString(n)
   if (isNaN(ns)) return ''
 
-  let nss = ns.split('.')
-  let intC = nss[0] || '0'
-  let floatC = nss[1] || ''
+  let [intC = '0', floatC = ''] = ns.split('.')
   if (decimal > 0) {
     let floatCn = ''
     for (let i = 0; i < decimal; i++) {
@@ -201,54 +201,58 @@ export const subFixed = function (n, decimal = 6) {
   return res
 }
 /**
- * @param {number}
- * @return {string}
+ * 将数字或字符串格式的数字转换为千位分隔符格式的字符串
+ * @param {number|string} number - 待转换的数字或字符串格式的数字
+ * @returns {string} 转换后的千位分隔符格式的字符串
  */
-export const addThousands = function (n) {
-  let res = ''
-  if (n === undefined || n === null || n === '') {
-    return res
-  }
-
-  let ns = toString(n)
-
-  let intC = ''
-  let floatC = ''
-  let nss = ns.split('.')
-  if (nss.length === 2) {
-    intC = nss[0] || '0'
-    floatC = nss[1] || ''
-  } else {
-    intC = ns
-  }
-
-  let L = intC.length
-  let intT = ''
+export const addThousands = function (number) {
+  if (number === undefined || number === null || number === '') return ''
+  let stringifiedNumber = toString(number)
+  // 分离整数部分和小数部分
+  let [integerPart = '0', decimalPart = ''] = stringifiedNumber.split('.')
+  // 遍历整数部分，每隔三位添加一个逗号
+  let L = integerPart.length
+  let integerPartWithCommas = ''
   for (let i = 1; i <= L; i++) {
-    intT = intC[L - i] + intT
-    if (i % 3 === 0 && i !== L) {
-      intT = ',' + intT
+    if (i > 1 && i % 3 === 1) {
+      integerPartWithCommas = integerPart[L - i] + ',' + integerPartWithCommas
+    } else {
+      integerPartWithCommas = integerPart[L - i] + integerPartWithCommas
     }
   }
-  if (floatC) {
-    res = intT + '.' + floatC
-  } else {
-    res = intT
-  }
-  return res
-}
+  integerPartWithCommas = integerPartWithCommas.replace(/^-,/, '-')
 
-export const toString = function (n) {
-  let ns = n
-  if (typeof n === 'number') {
-    ns = n.toString()
-    if (ns.includes('e+')) {
-      ns = n.toLocaleString().replace(/,/g, '')
+  // 如果存在小数部分，将整数部分和小数部分用小数点连接起来，否则只返回整数部分
+  const formattedNumber = decimalPart ? integerPartWithCommas + '.' + decimalPart : integerPartWithCommas
+  return formattedNumber
+}
+/**
+ * 将数字或科学技术法的数字转换字符串
+ * @param {number|string} notation - 待转换的数字或字符串格式的数字
+ * @returns {string} 转换后的字符串
+ */
+export const toString = function (notation) {
+  let number = notation
+  if (typeof notation === 'string') {
+    // 如果输入是字符串，则去除逗号和空格
+    number = notation.replace(/,/g, '').trim()
+  } else if (typeof notation === 'number' && notation.toString().includes('e')) {
+    // 如果输入是科学计数法表示的数字
+    let [coefficient, exponent] = notation.toString().split('e')
+    let decimalIndex = coefficient.indexOf('.')
+    if (decimalIndex !== -1) exponent -= coefficient.length - 1 - decimalIndex
+    // 找到小数点位置，计算指数大小
+    if (exponent >= 0) {
+      // 如果指数大于等于0，将小数点移动到末尾
+      number = coefficient.replace('.', '') + '0'.repeat(exponent)
+    } else {
+      // 如果指数小于0，将小数点移动到前面
+      const absoluteExponent = Math.abs(exponent) - 1
+      const zeros = '0'.repeat(absoluteExponent)
+      number = (coefficient.indexOf('-') === 0 ? '-0.' : '0.') + zeros + coefficient.replace(/-|\./g, '')
     }
-  } else if (typeof n === 'string') {
-    ns = n.replace(/,/g, '').trim()
   }
-  return ns
+  return number.toString()
 }
 
 function N(val) {

package/src/utils/urlToGo.js

@@ -59,7 +59,7 @@ export function linkPush(url = '', query = {}, $router) {
   query._fromNo = Date.now()
   sessionStorage.setItem(query._fromNo, location.href)
   // 如果提供vue-router
-  if ($router && $router.options && $router.push) {
+  if (process.env.NODE_ENV === 'development' && $router?.push) {
     let base = $router.options.base || ''
     base = base.replace(/\/$/, '')
     base = new RegExp('^' + base)
@@ -89,7 +89,7 @@ export function linkGo(N = -1, $router) {
 
   if (_fromUrl) {
     // 如果提供vue-router
-    if ($router && $router.options && $router.push) {
+    if (process.env.NODE_ENV === 'development' && $router?.push) {
       let base = $router.options.base || ''
       base = base.replace(/\/$/, '')
       base = new RegExp('^' + base)
@@ -107,3 +107,16 @@ export function linkGo(N = -1, $router) {
     window.history.go(N)
   }
 }
+
+import { closeTab as _closeTab } from './handleTab.js'
+export function closeTab(url, $router) {
+  let path = url || window.location.pathname
+  if (process.env.NODE_ENV === 'development' && $router?.options) {
+    let base = $router.options.base || ''
+    base = base.replace(/\/$/, '')
+    base = new RegExp('^' + base)
+    _closeTab({ path: path.replace(base, '') }, '*')
+  } else {
+    _closeTab({ path: path }, '*')
+  }
+}