@vxe-ui/core 1.0.12 → 3.0.0-alpha.0

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2019 xuliangzhan
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2019 xuliangzhan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,31 +1,29 @@
-# vxe-core
-
-简体中文 | [繁體中文](README.zh-TW.md) | [English](README.en.md)  
-
-Vxe UI 核心库.
-
-## 使用
-
-```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
+# vxe-core
+
+Vxe UI v3.x 核心库.
+
+## 使用
+
+```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/core.js

@@ -17,7 +17,7 @@ import { clipboard } from './clipboard';
 import { permission } from './permission';
 import { log } from './log';
 import { hooks } from './hooks';
-import { useFns } from './useFns';
+import { mixins } from './mixins';
 export function setTheme(name) {
     const theme = !name || name === 'default' ? 'light' : name;
     themeConfigStore.theme = theme;
@@ -70,7 +70,7 @@ export function setIcon(options) {
 export function getIcon(key) {
     return arguments.length ? XEUtils.get(iconConfigStore, key) : iconConfigStore;
 }
-export const coreVersion = "1.0.12";
+export const coreVersion = "3.0.0-alpha.0";
 const installedPlugins = [];
 export function use(Plugin, options) {
     if (Plugin && Plugin.install) {
@@ -119,7 +119,7 @@ export const VxeUI = {
     hooks,
     component,
     getComponent,
-    useFns,
+    mixins,
     use
 };
 setTheme();
@@ -134,7 +134,7 @@ export * from './commands';
 export * from './interceptor';
 export * from './clipboard';
 export * from './permission';
-export * from './useFns';
+export * from './mixins';
 export * from './log';
 export * from './hooks';
 export default VxeUI;

package/es/src/i18nStore.js

@@ -1,5 +1,4 @@
-import { reactive } from 'vue';
-export const i18nConfigStore = reactive({
+export const i18nConfigStore = {
     language: '',
     langMaps: {}
-});
+};

package/es/src/log.js

@@ -6,7 +6,7 @@ function createLog(type, name) {
         return msg;
     };
 }
-const version = "1.0.12";
+const version = "3.0.0-alpha.0";
 export const log = {
     create: createLog,
     warn: createLog('warn', `v${version}`),

package/es/src/mixins.js

@@ -0,0 +1,35 @@
+import { handleCheckInfo } from './permission';
+export const sizeMixin = {
+    inject: {
+        $xeSizeInfo: {
+            default: null
+        }
+    },
+    provide() {
+        return {
+            $xeSizeInfo: {
+                size: this.vSize
+            }
+        };
+    },
+    computed: {
+        vSize() {
+            const { $xeSizeInfo, size } = this;
+            return size || ($xeSizeInfo ? $xeSizeInfo.size : null);
+        }
+    }
+};
+export const permissionMixin = {
+    props: {
+        permissionCode: String
+    },
+    computed: {
+        permissionInfo() {
+            return handleCheckInfo(this.permissionCode, this.permissionMethod);
+        }
+    }
+};
+export const mixins = {
+    sizeMixin,
+    permissionMixin
+};

package/es/src/permission.js

@@ -1,23 +1,45 @@
 import { globalConfigStore } from './globalStore';
 import XEUtils from 'xe-utils';
-export function handleCheckInfo(code, permissionMethod) {
-    let visible = true;
-    let disabled = false;
+export function handleCheckInfo(permissionCode, permissionMethod) {
+    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 = {
-        code,
-        visible,
-        disabled
+        code: permissionCode,
+        visible: checkVisible,
+        disabled: checkDisabled
     };
     return info;
 }