@vxe-ui/core 1.0.13 → 3.0.0

package/packages/src/i18nStore.ts

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

package/packages/src/mixins.ts

@@ -0,0 +1,39 @@
+import Vue from 'vue'
+import { handleCheckInfo } from './permission'
+
+import { VxeComponentSizeType } from '../../types'
+
+export const sizeMixin = Vue.extend({
+  inject: {
+    $xeSizeInfo: {
+      default: null
+    }
+  },
+  provide (this: any) {
+    return {
+      $xeSizeInfo: {
+        size: this.computeSize
+      }
+    }
+  },
+  computed: {
+    computeSize (this: any): VxeComponentSizeType {
+      const { size } = this
+      const $xeSizeInfo = this.$xeSizeInfo
+      return size || ($xeSizeInfo ? $xeSizeInfo.size : null)
+    }
+  }
+})
+
+export const permissionMixin = Vue.extend({
+  computed: {
+    computePermissionInfo (this: any) {
+      return handleCheckInfo(this.permissionCode, this.permissionMethod)
+    }
+  }
+})
+
+export const globalMixins = {
+  sizeMixin,
+  permissionMixin
+}

package/packages/src/permission.ts

@@ -3,23 +3,45 @@ 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
+export function handleCheckInfo (permissionCode?: VxeComponentPermissionCodeType, permissionMethod?: VxeComponentPermissionMethod) {
+  let checkVisible = true
+  let checkDisabled = 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
+  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,
-    visible,
-    disabled
+    code: permissionCode,
+    visible: checkVisible,
+    disabled: checkDisabled
   }
   return info
 }

package/types/core/global-event.d.ts

@@ -1,4 +1,5 @@
-import { VxeComponentBaseOptions, VxeComponentEvent } from '../tool'
+import { CombinedVueInstance } from 'vue/types/vue'
+import { VxeComponentEvent, VxeComponentBaseOptions } from '../tool'
 
 export type VxeGlobalEventType = 'copy' | 'cut' | 'paste' | 'keydown' | 'contextmenu' | 'mousedown' | 'blur' | 'resize' | 'mousewheel'
 
@@ -33,7 +34,7 @@ export type VxeGlobalCreateEventMethod = (evnt: Event | null, params1: any, para
 export const createEvent: VxeGlobalCreateEventMethod
 
 export interface VxeGlobalEvents {
-  on (comp: VxeComponentBaseOptions, type: VxeGlobalEventType, cb: (evnt: any) => void): void
-  off (comp: VxeComponentBaseOptions, type: VxeGlobalEventType): void
+  on (_vm: CombinedVueInstance<VxeComponentBaseOptions, object, object, object, object>, type: VxeGlobalEventType, cb: (evnt: any) => void): void
+  off (_vm: CombinedVueInstance<VxeComponentBaseOptions, object, object, object, object>, type: VxeGlobalEventType): void
   hasKey(evnt: KeyboardEvent, targetKey: string): boolean,
 }

package/types/core/global-lang.d.ts

@@ -1 +1,14 @@
-export type VxeGlobalI18nLocale= '' | 'zh-CN' | 'zh-TC' | 'zh-HK' | 'zh-MO' | 'zh-TW' | 'en-US' | 'ja-JP' | 'es-ES' | 'pt-BR'
+export type VxeGlobalI18nLocale = '' |
+'zh-CN' |
+'zh-TC' |
+'zh-HK' |
+'zh-MO' |
+'zh-TW' |
+'en-US' |
+'ja-JP' |
+'es-ES' |
+'pt-BR' |
+'vi-VN' |
+'ru-RU' |
+'ko-KR' |
+'hu-HU'

package/types/core/index.d.ts

@@ -1,3 +1,5 @@
+import Vue, { VNode } from 'vue'
+import { CombinedVueInstance } from 'vue/types/vue'
 import { VxeGlobalConfig } from './global-config'
 import { VxeGlobalIcon } from './global-icon'
 import { VxeGlobalThemeName } from './global-theme'
@@ -13,7 +15,7 @@ import { VxeGlobalInterceptor } from './interceptor'
 import { VxeGlobalClipboard } from './clipboard'
 import { VxeGlobalPermission } from './permission'
 import { VxeGlobalComponentMethod, VxeGlobalGetComponentMethod } from './components'
-import { VxeGlobalUseFns } from './useFn'
+import { VxeGlobalUseMixins } from './mixins'
 import { VxeGlobalHooks } from './hooks'
 import { VxeGlobalLog } from './log'
 
@@ -42,6 +44,8 @@ export const getComponent: VxeGlobalGetComponentMethod
 
 export const coreVersion: string
 
+export function renderEmptyElement(_vm: CombinedVueInstance<Vue, object, object, object, object>): VNode
+
 export const renderer: VxeGlobalRenderer
 
 export const validators: VxeGlobalValidators
@@ -64,7 +68,7 @@ export const globalResize: VxeGlobalResize
 
 export const log: VxeGlobalLog
 
-export const useFns: VxeGlobalUseFns
+export const globalMixins: VxeGlobalUseMixins
 
 export const hooks: VxeGlobalHooks
 
@@ -75,11 +79,18 @@ export interface VxeUIPluginObject {
 
 export function use (plugin: VxeUIPluginObject, ...options: any[]): VxeUIExport
 
+/**
+ * Vxe UI core library
+ */
 export interface VxeUIExport {
   /**
    * 版本号
    */
   coreVersion: string
+  /**
+   * 渲染一个空元素
+   */
+  renderEmptyElement: typeof renderEmptyElement
   /**
    * 设置全局主题
    */
@@ -101,7 +112,7 @@ export interface VxeUIExport {
    */
   setIcon: typeof setIcon
   /**
-   * 判断是否支持该语言，安装语言包后返回 true
+   * 判断是否已经安装了该语言包，如果已安装则返回 true
    */
   hasLanguage: typeof hasLanguage
   /**
@@ -188,9 +199,9 @@ export interface VxeUIExport {
   hooks: VxeGlobalHooks
 
   /**
-   * 通用 Use API 函数
+   * 通用 Mixins
    */
-  useFns: VxeGlobalUseFns
+  globalMixins: VxeGlobalUseMixins
 
   /**
    * 安装插件
@@ -198,6 +209,9 @@ export interface VxeUIExport {
   use: (plugin: VxeUIPluginObject, ...options: any[]) => VxeUIExport
 }
 
+/**
+ * Vxe UI core library
+ */
 export const VxeUI: VxeUIExport
 
 export * from './global-config'
@@ -218,7 +232,7 @@ export * from './permission'
 export * from './log'
 
 export * from './components'
-export * from './useFn'
+export * from './mixins'
 export * from './hooks'
 
 export default VxeUI

package/types/core/mixins.d.ts

@@ -0,0 +1,21 @@
+import { Vue, ExtendedVue } from 'vue/types/vue'
+import { VxeComponentSizeType, VxeComponentPermissionInfo } from '../tool'
+
+/* eslint-disable @typescript-eslint/ban-types */
+
+/**
+ * 通用方法
+ */
+export interface VxeGlobalUseMixins {
+  sizeMixin: ExtendedVue<Vue, {}, {}, {
+    computeSize: VxeComponentSizeType
+  }, Record<string, any>>
+  permissionMixin: ExtendedVue<Vue, {}, {}, {
+    computePermissionInfo: VxeComponentPermissionInfo
+  }, Record<string, any>>
+}
+
+export interface VxeBaseMixinsComputed {
+  computeSize: VxeComponentSizeType
+  computePermissionInfo: VxeComponentPermissionInfo
+}

package/types/index.d.ts

@@ -2,6 +2,9 @@ import { VxeUIExport } from './core'
 
 declare global {
   interface Window {
+    /**
+     * Vxe UI core library
+     */
     VxeUI: VxeUIExport;
   }
 }

package/types/tool/common.d.ts

@@ -1,21 +1,27 @@
-import { App, VNode } from 'vue'
+import Vue, { VueConstructor, VNode } from 'vue'
+import { ExtendedVue } from 'vue/types/vue'
+
+/* eslint-disable no-use-before-define,@typescript-eslint/ban-types */
 
 /**
  * 定义组件
  */
-export type defineVxeComponent<
-  P = { [key: string]: any },
+export type DefineVxeComponentApp<
+  P extends Vue = any,
   E = { [key: string]: any },
   S = { [key: string]: (...args: any[]) => any }
 > = ({
-  new (): {
-    $props: P & E,
+  new (): P & E & {
     $slots: S
   }
 } & {
-  install(app: App): void
+  install(app: VueConstructor): void
 })
 
+export type DefineVxeComponentOptions<P, M> = ExtendedVue<Vue, P, M, object, object>
+
+export type DefineVxeComponentInstance<P, M> = P & M
+
 /**
  * 组件通用的基础参数
  */

package/README.en.md

@@ -1,31 +0,0 @@
-# vxe-core
-
-[简体中文](README.md) | [繁體中文](README.zh-TW.md) | English  
-
-Vxe UI core library.
-
-## Install
-
-```shell
-npm install @vxe-ui/core
-```
-
-```javascript
-// ...
-import VxeCore from '@vxe-ui/core'
-// ...
-
-VxeCore.setConfig({
-  // ...
-})
-```
-
-## Contributors
-
-Thank you to everyone who contributed to this project.
-
-[![vxe-core](https://contrib.rocks/image?repo=x-extends/vxe-core)](https://github.com/x-extends/vxe-core/graphs/contributors)
-
-## License
-
-[MIT](LICENSE) © 2019-present, Xu Liangzhan

package/README.zh-TW.md

@@ -1,31 +0,0 @@
-# vxe-core
-
-[简体中文](README.md) | 繁體中文 | [English](README.en.md)  
-
-Vxe UI core library.
-
-## 使用
-
-```shell
-npm install @vxe-ui/core
-```
-
-```javascript
-// ...
-import VxeCore from '@vxe-ui/core'
-// ...
-
-VxeCore.setConfig({
-  // ...
-})
-```
-
-## Contributors
-
-Thank you to everyone who contributed to this project.
-
-[![vxe-core](https://contrib.rocks/image?repo=x-extends/vxe-core)](https://github.com/x-extends/vxe-core/graphs/contributors)
-
-## License
-
-[MIT](LICENSE) © 2019-present, Xu Liangzhan

package/es/src/useFns.js

@@ -1,23 +0,0 @@
-import { computed, inject, provide } from 'vue';
-import { handleCheckInfo } from './permission';
-export function useSize(props) {
-    // 组件尺寸上下文
-    const xeSizeInfo = inject('xeSizeInfo', null);
-    const computeSize = computed(() => {
-        return props.size || (xeSizeInfo ? xeSizeInfo.value : null);
-    });
-    provide('xeSizeInfo', computeSize);
-    return { computeSize };
-}
-export function usePermission(props) {
-    const computePermissionInfo = computed(() => {
-        return handleCheckInfo(props.permissionCode, props.permissionMethod);
-    });
-    return {
-        computePermissionInfo
-    };
-}
-export const useFns = {
-    useSize,
-    usePermission
-};

package/lib/src/useFns.js

@@ -1,33 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.useFns = void 0;
-exports.usePermission = usePermission;
-exports.useSize = useSize;
-var _vue = require("vue");
-var _permission = require("./permission");
-function useSize(props) {
-  // 组件尺寸上下文
-  const xeSizeInfo = (0, _vue.inject)('xeSizeInfo', null);
-  const computeSize = (0, _vue.computed)(() => {
-    return props.size || (xeSizeInfo ? xeSizeInfo.value : null);
-  });
-  (0, _vue.provide)('xeSizeInfo', computeSize);
-  return {
-    computeSize
-  };
-}
-function usePermission(props) {
-  const computePermissionInfo = (0, _vue.computed)(() => {
-    return (0, _permission.handleCheckInfo)(props.permissionCode, props.permissionMethod);
-  });
-  return {
-    computePermissionInfo
-  };
-}
-const useFns = exports.useFns = {
-  useSize,
-  usePermission
-};

package/lib/src/useFns.min.js

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.useFns=void 0,exports.usePermission=usePermission,exports.useSize=useSize;var _vue=require("vue"),_permission=require("./permission");function useSize(e){const s=(0,_vue.inject)("xeSizeInfo",null);var i=(0,_vue.computed)(()=>e.size||(s?s.value:null));return(0,_vue.provide)("xeSizeInfo",i),{computeSize:i}}function usePermission(e){return{computePermissionInfo:(0,_vue.computed)(()=>(0,_permission.handleCheckInfo)(e.permissionCode,e.permissionMethod))}}const useFns=exports.useFns={useSize:useSize,usePermission:usePermission};

package/packages/src/useFns.ts

@@ -1,34 +0,0 @@
-import { computed, inject, provide, ComputedRef } from 'vue'
-import { handleCheckInfo } from './permission'
-
-import type { VxeComponentSizeType, VxeComponentPermissionCodeType, VxeComponentPermissionMethod } from '../../types'
-
-export function useSize (props: {
-  size?: VxeComponentSizeType
-}) {
-  // 组件尺寸上下文
-  const xeSizeInfo = inject('xeSizeInfo', null as ComputedRef<VxeComponentSizeType> | null)
-  const computeSize = computed(() => {
-    return props.size || (xeSizeInfo ? xeSizeInfo.value : null)
-  })
-  provide('xeSizeInfo', computeSize)
-
-  return { computeSize }
-}
-
-export function usePermission (props: {
-  permissionCode?: VxeComponentPermissionCodeType
-  permissionMethod?: VxeComponentPermissionMethod
-}) {
-  const computePermissionInfo = computed(() => {
-    return handleCheckInfo(props.permissionCode, props.permissionMethod)
-  })
-  return {
-    computePermissionInfo
-  }
-}
-
-export const useFns = {
-  useSize,
-  usePermission
-}

package/types/core/useFn.d.ts

@@ -1,27 +0,0 @@
-import { ComputedRef } from 'vue'
-import { VxeComponentSizeType, VxeComponentPermissionCodeType, VxeComponentPermissionMethod, VxeComponentPermissionInfo } from '../tool'
-
-export type VxeUseFnUseSize = (props: {
-  size?: VxeComponentSizeType;
-}) => {
-  computeSize: ComputedRef<VxeComponentSizeType>;
-}
-
-export const useSize: VxeUseFnUseSize
-
-export type VxeUsePermission = (props: {
-  permissionCode?: VxeComponentPermissionCodeType
-  permissionMethod?: VxeComponentPermissionMethod
-}) => {
-  computePermissionInfo: ComputedRef<VxeComponentPermissionInfo>;
-}
-
-export const usePermission: VxeUsePermission
-
-/**
- * 全局剪贴板
- */
-export interface VxeGlobalUseFns {
-  useSize: VxeUseFnUseSize
-  usePermission: VxeUsePermission
-}