@vxe-ui/core 1.0.12 → 4.0.0

package/packages/src/formats.ts

@@ -1,62 +1,62 @@
-import XEUtils from 'xe-utils'
-import { log } from './log'
-
-import { VxeGlobalFormats } from '../../types'
-
-class VXEFormatsStore {
-  private store: any = {}
-
-  mixin (options: any): VXEFormatsStore {
-    XEUtils.each(options, (item, key) => {
-      this.add(key, item)
-    })
-    return this
-  }
-
-  has (name: string): boolean {
-    return !!this.get(name)
-  }
-
-  get (name: string): any {
-    return this.store[name]
-  }
-
-  add (name: string, render: any): VXEFormatsStore {
-    const conf = this.store[name]
-    // 兼容
-    if (XEUtils.isFunction(render)) {
-      if (process.env.VUE_APP_VXE_ENV === 'development') {
-        log.warn('vxe.error.delProp', ['formats -> callback', 'cellFormatMethod'])
-      }
-      render = {
-        cellFormatMethod: render
-      }
-    }
-
-    // 检测是否覆盖
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      const confKeys = XEUtils.keys(conf)
-      XEUtils.each(render, (item, key) => {
-        if (confKeys.includes(key)) {
-          log.warn('vxe.error.coverProp', [name, key])
-        }
-      })
-    }
-    this.store[name] = conf ? XEUtils.merge(conf, render) : render
-    return this
-  }
-
-  delete (name: string): void {
-    delete this.store[name]
-  }
-
-  forEach (callback: any): void {
-    XEUtils.objectEach(this.store, callback)
-  }
-}
-
-export const formats = new VXEFormatsStore() as VxeGlobalFormats
-
-if (process.env.VUE_APP_VXE_ENV === 'development') {
-  Object.assign(formats, { _name: 'Formats' })
-}
+import XEUtils from 'xe-utils'
+import { log } from './log'
+
+import { VxeGlobalFormats } from '../../types'
+
+class VXEFormatsStore {
+  private store: any = {}
+
+  mixin (options: any): VXEFormatsStore {
+    XEUtils.each(options, (item, key) => {
+      this.add(key, item)
+    })
+    return this
+  }
+
+  has (name: string): boolean {
+    return !!this.get(name)
+  }
+
+  get (name: string): any {
+    return this.store[name]
+  }
+
+  add (name: string, render: any): VXEFormatsStore {
+    const conf = this.store[name]
+    // 兼容
+    if (XEUtils.isFunction(render)) {
+      if (process.env.VUE_APP_VXE_ENV === 'development') {
+        log.warn('vxe.error.delProp', ['formats -> callback', 'cellFormatMethod'])
+      }
+      render = {
+        cellFormatMethod: render
+      }
+    }
+
+    // 检测是否覆盖
+    if (process.env.VUE_APP_VXE_ENV === 'development') {
+      const confKeys = XEUtils.keys(conf)
+      XEUtils.each(render, (item, key) => {
+        if (confKeys.includes(key)) {
+          log.warn('vxe.error.coverProp', [name, key])
+        }
+      })
+    }
+    this.store[name] = conf ? XEUtils.merge(conf, render) : render
+    return this
+  }
+
+  delete (name: string): void {
+    delete this.store[name]
+  }
+
+  forEach (callback: any): void {
+    XEUtils.objectEach(this.store, callback)
+  }
+}
+
+export const formats = new VXEFormatsStore() as VxeGlobalFormats
+
+if (process.env.VUE_APP_VXE_ENV === 'development') {
+  Object.assign(formats, { _name: 'Formats' })
+}

package/packages/src/globalStore.ts

@@ -1,8 +1,8 @@
-import { VxeGlobalConfig } from '../../types'
-
-export const globalConfigStore: VxeGlobalConfig = {
-  size: '',
-  version: 1,
-  zIndex: 999,
-  resizeInterval: 500
-}
+import { VxeGlobalConfig } from '../../types'
+
+export const globalConfigStore: VxeGlobalConfig = {
+  size: '',
+  version: 1,
+  zIndex: 999,
+  resizeInterval: 500
+}

package/packages/src/hooks.ts

@@ -1,5 +1,5 @@
-import VXEStore from './store'
-
-import { VxeGlobalHooks } from '../../types'
-
-export const hooks = new VXEStore() as VxeGlobalHooks
+import VXEStore from './store'
+
+import { VxeGlobalHooks } from '../../types'
+
+export const hooks = new VXEStore() as VxeGlobalHooks

package/packages/src/i18n.ts

@@ -1,19 +1,19 @@
-import XEUtils from 'xe-utils'
-import { i18nConfigStore } from './i18nStore'
-
-import { VxeGlobalI18nLocale } from '../../types'
-
-export function getI18n (key: string, args?: any) {
-  const { langMaps, language } = i18nConfigStore
-  return XEUtils.toFormatString(XEUtils.get(langMaps[language], key, key), args)
-}
-
-export function hasLanguage (language: VxeGlobalI18nLocale) {
-  const { langMaps } = i18nConfigStore
-  return !!langMaps[language]
-}
-
-export function getLanguage () {
-  const { language } = i18nConfigStore
-  return language
-}
+import XEUtils from 'xe-utils'
+import { i18nConfigStore } from './i18nStore'
+
+import { VxeGlobalI18nLocale } from '../../types'
+
+export function getI18n (key: string, args?: any) {
+  const { langMaps, language } = i18nConfigStore
+  return XEUtils.toFormatString(XEUtils.get(langMaps[language], key, key), args)
+}
+
+export function hasLanguage (language: VxeGlobalI18nLocale) {
+  const { langMaps } = i18nConfigStore
+  return !!langMaps[language]
+}
+
+export function getLanguage () {
+  const { language } = i18nConfigStore
+  return language
+}

package/packages/src/i18nStore.ts

@@ -1,11 +1,11 @@
-import { reactive } from 'vue'
-
-import { VxeGlobalI18nLocale } from '../../types'
-
-export const i18nConfigStore: {
-  language: VxeGlobalI18nLocale,
-  langMaps: Partial<Record<VxeGlobalI18nLocale, any>>
-} = reactive({
-  language: '',
-  langMaps: {}
-})
+import { reactive } from 'vue'
+
+import { VxeGlobalI18nLocale } from '../../types'
+
+export const i18nConfigStore: {
+  language: VxeGlobalI18nLocale,
+  langMaps: Partial<Record<VxeGlobalI18nLocale, any>>
+} = reactive({
+  language: '',
+  langMaps: {}
+})

package/packages/src/iconStore.ts

@@ -1,3 +1,3 @@
-import { VxeGlobalIcon } from '../../types'
-
-export const iconConfigStore: VxeGlobalIcon = {}
+import { VxeGlobalIcon } from '../../types'
+
+export const iconConfigStore: VxeGlobalIcon = {}

package/packages/src/interceptor.ts

@@ -1,65 +1,65 @@
-import XEUtils from 'xe-utils'
-import { log } from './log'
-
-import { VxeGlobalInterceptor, VxeGlobalInterceptorHandles } from '../../types'
-
-const storeMap: { [type: string]: VxeGlobalInterceptorHandles.InterceptorCallback[] } = {}
-
-export const interceptor: VxeGlobalInterceptor = {
-  mixin (options) {
-    XEUtils.each(options, (render, type) => {
-      interceptor.add(type, render)
-    })
-    return interceptor
-  },
-  get (type) {
-    return storeMap[type] || []
-  },
-  add (type, render) {
-    // 兼容
-    if (XEUtils.isFunction(render)) {
-      // if (process.env.VUE_APP_VXE_ENV === 'development') {
-      //   log.warn('vxe.error.delProp', ['interceptor -> callback', 'tableInterceptorMethod'])
-      // }
-      render = {
-        tableInterceptorMethod: render
-      }
-    }
-    const callback = render.tableInterceptorMethod
-
-    if (callback) {
-      let eList = storeMap[type]
-      if (!eList) {
-        eList = storeMap[type] = []
-      }
-
-      // 检测重复
-      if (process.env.VUE_APP_VXE_ENV === 'development') {
-        if (eList.indexOf(callback) > -1) {
-          log.warn('vxe.error.coverProp', ['Interceptor', type])
-        }
-      }
-
-      eList.push(callback)
-    }
-    return interceptor
-  },
-  delete (type, render) {
-    const eList = storeMap[type]
-    if (eList) {
-      // 兼容
-      if (XEUtils.isFunction(render)) {
-        render = {
-          tableInterceptorMethod: render
-        }
-      }
-      const callback = render ? render.tableInterceptorMethod : null
-
-      if (callback) {
-        XEUtils.remove(eList, fn => fn === callback)
-      } else {
-        delete storeMap[type]
-      }
-    }
-  }
-}
+import XEUtils from 'xe-utils'
+import { log } from './log'
+
+import { VxeGlobalInterceptor, VxeGlobalInterceptorHandles } from '../../types'
+
+const storeMap: { [type: string]: VxeGlobalInterceptorHandles.InterceptorCallback[] } = {}
+
+export const interceptor: VxeGlobalInterceptor = {
+  mixin (options) {
+    XEUtils.each(options, (render, type) => {
+      interceptor.add(type, render)
+    })
+    return interceptor
+  },
+  get (type) {
+    return storeMap[type] || []
+  },
+  add (type, render) {
+    // 兼容
+    if (XEUtils.isFunction(render)) {
+      // if (process.env.VUE_APP_VXE_ENV === 'development') {
+      //   log.warn('vxe.error.delProp', ['interceptor -> callback', 'tableInterceptorMethod'])
+      // }
+      render = {
+        tableInterceptorMethod: render
+      }
+    }
+    const callback = render.tableInterceptorMethod
+
+    if (callback) {
+      let eList = storeMap[type]
+      if (!eList) {
+        eList = storeMap[type] = []
+      }
+
+      // 检测重复
+      if (process.env.VUE_APP_VXE_ENV === 'development') {
+        if (eList.indexOf(callback) > -1) {
+          log.warn('vxe.error.coverProp', ['Interceptor', type])
+        }
+      }
+
+      eList.push(callback)
+    }
+    return interceptor
+  },
+  delete (type, render) {
+    const eList = storeMap[type]
+    if (eList) {
+      // 兼容
+      if (XEUtils.isFunction(render)) {
+        render = {
+          tableInterceptorMethod: render
+        }
+      }
+      const callback = render ? render.tableInterceptorMethod : null
+
+      if (callback) {
+        XEUtils.remove(eList, fn => fn === callback)
+      } else {
+        delete storeMap[type]
+      }
+    }
+  }
+}

package/packages/src/log.ts

@@ -1,19 +1,19 @@
-import { getI18n } from './i18n'
-
-import { VxeGlobalLog } from '../../types'
-
-function createLog (type: 'log' | 'warn' | 'error', name?: string) {
-  return function (key: string, args?: any) {
-    const msg = `[vxe ${name || ''}] ${getI18n(key, args)}`
-    console[type](msg)
-    return msg
-  }
-}
-
-const version = process.env.VUE_APP_VXE_VERSION
-
-export const log: VxeGlobalLog = {
-  create: createLog,
-  warn: createLog('warn', `v${version}`),
-  err: createLog('error', `v${version}`)
-}
+import { getI18n } from './i18n'
+
+import { VxeGlobalLog } from '../../types'
+
+function createLog (type: 'log' | 'warn' | 'error', name?: string) {
+  return function (key: string, args?: any) {
+    const msg = `[vxe ${name || ''}] ${getI18n(key, args)}`
+    console[type](msg)
+    return msg
+  }
+}
+
+const version = process.env.VUE_APP_VXE_VERSION
+
+export const log: VxeGlobalLog = {
+  create: createLog,
+  warn: createLog('warn', `v${version}`),
+  err: createLog('error', `v${version}`)
+}

package/packages/src/menus.ts

@@ -1,62 +1,62 @@
-import XEUtils from 'xe-utils'
-import { log } from './log'
-
-import { VxeGlobalMenus } from '../../types'
-
-class VXEMenusStore {
-  private store: any = {}
-
-  mixin (options: any): VXEMenusStore {
-    XEUtils.each(options, (item, key) => {
-      this.add(key, item)
-    })
-    return this
-  }
-
-  has (name: string): boolean {
-    return !!this.get(name)
-  }
-
-  get (name: string): any {
-    return this.store[name]
-  }
-
-  add (name: string, render: any): VXEMenusStore {
-    const conf = this.store[name]
-    // 兼容
-    if (XEUtils.isFunction(render)) {
-      if (process.env.VUE_APP_VXE_ENV === 'development') {
-        log.warn('vxe.error.delProp', ['menus -> callback', 'menuMethod'])
-      }
-      render = {
-        menuMethod: render
-      }
-    }
-
-    // 检测是否覆盖
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      const confKeys = XEUtils.keys(conf)
-      XEUtils.each(render, (item, key) => {
-        if (confKeys.includes(key)) {
-          log.warn('vxe.error.coverProp', [name, key])
-        }
-      })
-    }
-    this.store[name] = conf ? XEUtils.merge(conf, render) : render
-    return this
-  }
-
-  delete (name: string): void {
-    delete this.store[name]
-  }
-
-  forEach (callback: any): void {
-    XEUtils.objectEach(this.store, callback)
-  }
-}
-
-export const menus = new VXEMenusStore() as VxeGlobalMenus
-
-if (process.env.VUE_APP_VXE_ENV === 'development') {
-  Object.assign(menus, { _name: 'Menus' })
-}
+import XEUtils from 'xe-utils'
+import { log } from './log'
+
+import { VxeGlobalMenus } from '../../types'
+
+class VXEMenusStore {
+  private store: any = {}
+
+  mixin (options: any): VXEMenusStore {
+    XEUtils.each(options, (item, key) => {
+      this.add(key, item)
+    })
+    return this
+  }
+
+  has (name: string): boolean {
+    return !!this.get(name)
+  }
+
+  get (name: string): any {
+    return this.store[name]
+  }
+
+  add (name: string, render: any): VXEMenusStore {
+    const conf = this.store[name]
+    // 兼容
+    if (XEUtils.isFunction(render)) {
+      if (process.env.VUE_APP_VXE_ENV === 'development') {
+        log.warn('vxe.error.delProp', ['menus -> callback', 'menuMethod'])
+      }
+      render = {
+        menuMethod: render
+      }
+    }
+
+    // 检测是否覆盖
+    if (process.env.VUE_APP_VXE_ENV === 'development') {
+      const confKeys = XEUtils.keys(conf)
+      XEUtils.each(render, (item, key) => {
+        if (confKeys.includes(key)) {
+          log.warn('vxe.error.coverProp', [name, key])
+        }
+      })
+    }
+    this.store[name] = conf ? XEUtils.merge(conf, render) : render
+    return this
+  }
+
+  delete (name: string): void {
+    delete this.store[name]
+  }
+
+  forEach (callback: any): void {
+    XEUtils.objectEach(this.store, callback)
+  }
+}
+
+export const menus = new VXEMenusStore() as VxeGlobalMenus
+
+if (process.env.VUE_APP_VXE_ENV === 'development') {
+  Object.assign(menus, { _name: 'Menus' })
+}

package/packages/src/permission.ts

@@ -1,39 +1,61 @@
-import { globalConfigStore } from './globalStore'
-import XEUtils from 'xe-utils'
-
-import type { VxeGlobalPermission, VxeComponentPermissionCodeType, VxeComponentPermissionInfo, VxeComponentPermissionMethod } from '../../types'
-
-export function handleCheckInfo (code?: VxeComponentPermissionCodeType, permissionMethod?: VxeComponentPermissionMethod) {
-  let visible = true
-  let disabled = false
-  const checkMethod = permissionMethod || globalConfigStore.permissionMethod
-  if (code && checkMethod) {
-    const rest = checkMethod({ code })
-    if (XEUtils.isBoolean(rest)) {
-      visible = rest
-    } else if (rest) {
-      visible = !!rest.visible
-      disabled = !!rest.disabled
-    }
-  }
-  const info: VxeComponentPermissionInfo = {
-    code,
-    visible,
-    disabled
-  }
-  return info
-}
-
-export const permission: VxeGlobalPermission = {
-  getCheckInfo (code) {
-    return handleCheckInfo(code)
-  },
-  checkVisible (code) {
-    const permissionInfo = handleCheckInfo(code)
-    return permissionInfo.visible
-  },
-  checkDisable (code) {
-    const permissionInfo = handleCheckInfo(code)
-    return permissionInfo.disabled
-  }
-}
+import { globalConfigStore } from './globalStore'
+import XEUtils from 'xe-utils'
+
+import type { VxeGlobalPermission, VxeComponentPermissionCodeType, VxeComponentPermissionInfo, VxeComponentPermissionMethod } from '../../types'
+
+export function handleCheckInfo (permissionCode?: VxeComponentPermissionCodeType, permissionMethod?: VxeComponentPermissionMethod) {
+  let checkVisible = true
+  let checkDisabled = false
+  const checkMethod = permissionMethod || globalConfigStore.permissionMethod
+  if (permissionCode && checkMethod) {
+    checkVisible = false
+    checkDisabled = true
+    let vDone = false
+    let dDone = false
+    // 或 使用 | 隔开：任意一个为可视，则可视；任意一个禁用，则禁用
+    const codeList = String(permissionCode).split('|')
+    for (let i = 0; i < codeList.length; i++) {
+      const code = codeList[i]
+      let visible = true
+      let disabled = false
+      const rest = checkMethod({ code })
+      if (XEUtils.isBoolean(rest)) {
+        visible = rest
+      } else if (rest) {
+        visible = !!rest.visible
+        disabled = !!rest.disabled
+      }
+      if (!disabled && !dDone) {
+        dDone = true
+        checkDisabled = disabled
+      }
+      if (visible && !vDone) {
+        vDone = true
+        checkVisible = visible
+      }
+      if (vDone && dDone) {
+        break
+      }
+    }
+  }
+  const info: VxeComponentPermissionInfo = {
+    code: permissionCode,
+    visible: checkVisible,
+    disabled: checkDisabled
+  }
+  return info
+}
+
+export const permission: VxeGlobalPermission = {
+  getCheckInfo (code) {
+    return handleCheckInfo(code)
+  },
+  checkVisible (code) {
+    const permissionInfo = handleCheckInfo(code)
+    return permissionInfo.visible
+  },
+  checkDisable (code) {
+    const permissionInfo = handleCheckInfo(code)
+    return permissionInfo.disabled
+  }
+}