n20-common-lib 1.2.18 → 1.2.21

package/src/directives/VHas/index.js

@@ -14,6 +14,20 @@ export function has(vals, clt) {
   }
 }
 
+export function hasG(vals, clt) {
+  let relaNos = []
+  if (clt) {
+    relaNos = getCltRela(clt)
+  } else {
+    relaNos = getRela().relaNosGlobal
+  }
+  if (typeof vals === 'string') {
+    return relaNos.includes(vals)
+  } else if (Array.isArray(vals)) {
+    return vals.some((val) => relaNos.includes(val))
+  }
+}
+
 const directive = {}
 directive.install = (Vue) => {
   Vue.prototype.$has = has
@@ -27,6 +41,18 @@ directive.install = (Vue) => {
       !has(binding.value, binding.arg) && el.parentNode.removeChild(el)
     }
   })
+  // 全局查找
+  Vue.prototype.$hasG = hasG
+
+  Vue.filter('isHasG', hasG)
+
+  Vue.filter('noHasG', (v, arg) => !hasG(v, arg))
+
+  Vue.directive('hasG', {
+    inserted(el, binding) {
+      !hasG(binding.value, binding.arg) && el.parentNode.removeChild(el)
+    }
+  })
 }
 
 export default directive

package/src/index.js

@@ -71,6 +71,7 @@ import { linkPush, linkGo } from './utils/urlToGo'
 import forEachs from './utils/forEachs'
 import list2tree from './utils/list2tree'
 import { has as isHas } from './directives/VHas/index.js'
+import { hasG as isHasG } from './directives/VHas/index.js'
 
 /** 国际化 */
 import i18n from './utils/i18n'
@@ -164,12 +165,21 @@ export default {
 }
 export {
   version,
-  axios,
+  // 方法
   auth,
+  axios,
   getJsonc,
   downloadBlob,
   forEachs,
   list2tree,
+  repairEl,
+  linkPush,
+  linkGo,
+  isHas,
+  isHasG,
+  dayjs,
+  numerify,
+  // 组件
   ContentLoading,
   ContentNull,
   NavMenu,
@@ -215,11 +225,5 @@ export {
   AnchorItem,
   FlowStep,
   CascaderArea,
-  FileExportAsync,
-  repairEl,
-  linkPush,
-  linkGo,
-  isHas,
-  dayjs,
-  numerify
+  FileExportAsync
 }

package/src/utils/i18n/index.js

@@ -1,8 +1,6 @@
 import locale from 'element-ui/lib/locale'
 import langEn from 'element-ui/lib/locale/lang/en'
 import langTw from 'element-ui/lib/locale/lang/zh-TW'
-import langCN from 'element-ui/lib/locale/lang/zh-CN'
-langCN?.el?.pagination?.goto && (langCN.el.pagination.goto = '到第')
 
 import zhHk from './cn2hk.json' // 简体繁体映射
 // 语言枚举
@@ -40,8 +38,6 @@ directive.install = (Vue, map = {}) => {
     locale.use(langEn)
   } else if (pageLang === 'zh-hk') {
     locale.use(langTw)
-  } else {
-    locale.use(langCN)
   }
 
   $i18n_map_root = map

package/src/utils/relaNo.js

@@ -20,6 +20,12 @@ export function setRela(name) {
       relaNos.find((r) => r.appNo === name)
     )
     console.log(relaObj, 'has权限列表')
+
+    let relaNosGlobal = []
+    relaNos.forEach((item) => {
+      relaNosGlobal.push.apply(relaNosGlobal, item.relaNos)
+    })
+    relaObj.relaNosGlobal = relaNosGlobal
     return
   }
   /* 兼容旧门户 */
@@ -31,6 +37,7 @@ export function setRela(name) {
       relaNos.push(item.relaNo)
     })
     relaObj.relaNos = relaNos
+    relaObj.relaNosGlobal = relaNos
   }
 }
 
@@ -61,7 +68,7 @@ export function getCltRela(clt) {
 }
 
 function aandb(a = [], b = []) {
-  if (a.length === 0 || a.length === 0) {
+  if (a.length === 0 || b.length === 0) {
     return []
   } else {
     return a.filter((ai) => b.includes(ai))