next-element-vue 0.5.0 → 0.5.1

package/dist/index.js

@@ -2,8 +2,8 @@
 /**
  * 作　　者：huangteng
  * 邮　　箱：htengweb@163.com
- * 当前版本：0.5.0 v
- * 发布日期：2024-12-26
+ * 当前版本：0.5.1 v
+ * 发布日期：2024-12-28
  * 地　　址：https://www.npmjs.com/package/next-element-vue
  */
 
@@ -1097,9 +1097,13 @@ const localeLang = {
 }, useLanguage = (locale, lang) => {
     const localeRef = isRef(locale) ? locale : ref(locale), nextLang = localeLang[lang] || localeLang["zh-cn"];
     localeRef.value.name = lang, localeRef.value.next = nextLang.next;
-};
+}, reg_hex = /^#([0-9A-F]{3}|[0-9A-F]{6}|[0-9A-F]{8})$/i, reg_rgba = /^rgba\(\s*\d+\s*,\s*\d+\s*,\s*\d+\s*,\s*(0|1|0?\.\d+)\s*\)$/i;
 
 function useChangeColor() {
+    const rgbaToHex = rgba => {
+        const rgbaValues = rgba.replace(/^rgba?\(|\s+|\)$/g, "").split(",").map((value => parseFloat(value))), [r, g, b] = rgbaValues;
+        return `#${[ r, g, b ].map((value => Math.round(value).toString(16).padStart(2, "0"))).join("")}`.toUpperCase();
+    };
     return {
         hexToRgb: str => {
             let hexs = "";
@@ -1123,17 +1127,24 @@ function useChangeColor() {
             for (let i = 0; i < 3; i++) 1 == hexs[i].length && (hexs[i] = `0${hexs[i]}`);
             return `#${hexs.join("")}`;
         },
+        rgbaToHex: rgbaToHex,
+        rgbaToHexAlpha: rgba => {
+            const rgbaValues = rgba.replace(/^rgba?\(|\s+|\)$/g, "").split(",").map((value => parseFloat(value))), [r, g, b, a] = rgbaValues, alpha = Math.round(255 * a).toString(16).padStart(2, "0");
+            return `#${[ r, g, b ].map((value => Math.round(value).toString(16).padStart(2, "0"))).join("")}${alpha}`.toUpperCase();
+        },
         getDarkColor: (color, level) => {
-            if (!/^\#?[0-9A-Fa-f]{6}$/.test(color)) return ElMessage.warning("输入错误的hex颜色值"), 
+            let _color = color;
+            if (reg_rgba.test(_color) && (_color = rgbaToHex(_color)), !reg_hex.test(_color)) return ElMessage.warning("输入错误的hex颜色值"), 
             "";
-            let rgb = useChangeColor().hexToRgb(color);
+            let rgb = useChangeColor().hexToRgb(_color);
             for (let i = 0; i < 3; i++) rgb[i] = Math.floor(rgb[i] * (1 - level));
             return useChangeColor().rgbToHex(rgb[0], rgb[1], rgb[2]);
         },
         getLightColor: (color, level) => {
-            if (!/^\#?[0-9A-Fa-f]{6}$/.test(color)) return ElMessage.warning("输入错误的hex颜色值"), 
+            let _color = color;
+            if (reg_rgba.test(_color) && (_color = rgbaToHex(_color)), !reg_hex.test(_color)) return ElMessage.warning("输入错误的hex颜色值"), 
             "";
-            let rgb = useChangeColor().hexToRgb(color);
+            let rgb = useChangeColor().hexToRgb(_color);
             for (let i = 0; i < 3; i++) rgb[i] = Math.floor((255 - rgb[i]) * level + rgb[i]);
             return useChangeColor().rgbToHex(rgb[0], rgb[1], rgb[2]);
         }
@@ -1730,6 +1741,7 @@ var warning_default = export_helper_default(warning_vue_vue_type_script_lang_def
                 modelValue: settingConfig.themeColor,
                 "onUpdate:modelValue": $event => settingConfig.themeColor = $event,
                 predefine: [ "#409eff", "#ff4500", "#ff8c00", "#ffd700", "#90ee90", "#00ced1", "#1e90ff", "#c71585", "#FB07A0" ],
+                "show-alpha": !0,
                 onChange: _onChangeThemeColor
             }, null) ]) ]), createVNode("div", {
                 class: _ns.b("config-bar-item")
@@ -1757,6 +1769,7 @@ var warning_default = export_helper_default(warning_vue_vue_type_script_lang_def
                 modelValue: settingConfig.headerBarColor,
                 "onUpdate:modelValue": $event => settingConfig.headerBarColor = $event,
                 predefine: [ "#282c34", "#ff4500", "#ff8c00", "#ffd700", "#90ee90", "#00ced1", "#1e90ff", "#c71585", "#FB07A0" ],
+                "show-alpha": !0,
                 onChange: color => _onChangeColor(color, "headerBarColor", "--next-layout-bg-color")
             }, null) ]) ]), createVNode("div", {
                 class: _ns.b("config-bar-item")
@@ -1768,6 +1781,7 @@ var warning_default = export_helper_default(warning_vue_vue_type_script_lang_def
                 modelValue: settingConfig.headerBarFontColor,
                 "onUpdate:modelValue": $event => settingConfig.headerBarFontColor = $event,
                 predefine: [ "#282c34", "#ff4500", "#ff8c00", "#ffd700", "#90ee90", "#00ced1", "#1e90ff", "#c71585", "#FB07A0" ],
+                "show-alpha": !0,
                 onChange: color => _onChangeColor(color, "headerBarFontColor", "--next-layout-font-color")
             }, null) ]) ]), createVNode("div", {
                 class: _ns.b("config-bar-item")
@@ -3071,15 +3085,16 @@ var classic = defineComponent({
     }
 });
 
-const findParentNode = (path, tree) => {
-    for (const node of tree) {
-        if (node.children?.some((child => child.path === path))) return node;
-        if (node.children) {
-            const parent = findParentNode(path, node.children);
-            if (parent) return parent;
+const findGrandfatherNode = (path, tree) => {
+    let parentNode = null;
+    const loopNodes = (nodes, currentParent) => {
+        for (const node of nodes) {
+            if (node.path === path) return parentNode = currentParent, !0;
+            if (node.children && loopNodes(node.children, currentParent ?? node)) return !0;
         }
-    }
-    return null;
+        return !1;
+    };
+    return loopNodes(tree, null), parentNode;
 }, ns$h = useNamespace("menu");
 
 var MenuTop = defineComponent({
@@ -3099,10 +3114,12 @@ var MenuTop = defineComponent({
     },
     setup(props) {
         provide("ns", ns$h);
-        const updateSubmentTree = inject("updateSubmentTree"), router = getCurrentInstance().appContext.config.globalProperties.$router, currentPath = router.currentRoute?.value.fullPath, parentNode = findParentNode(currentPath, props.menuTree), activeMenuId = ref(parentNode?.id);
-        parentNode?.id && updateSubmentTree(parentNode.children), watch((() => router.currentRoute?.value), (to => {
-            const parentNode = findParentNode(to.fullPath, props.menuTree);
-            activeMenuId.value = parentNode?.id, parentNode?.id && 1 === parentNode.meta?.level && updateSubmentTree(parentNode.children);
+        const updateSubmentTree = inject("updateSubmentTree"), router = getCurrentInstance().appContext.config.globalProperties.$router, currentPath = router.currentRoute?.value.fullPath, parentNode = findGrandfatherNode(currentPath, props.menuTree), activeMenuId = ref(parentNode?.id);
+        parentNode?.id && 1 === parentNode.meta?.level && updateSubmentTree(parentNode.children), 
+        watch((() => router.currentRoute?.value), (to => {
+            const parentNode = findGrandfatherNode(to.fullPath, props.menuTree);
+            if (activeMenuId.value = parentNode?.id, !parentNode) return updateSubmentTree([]);
+            parentNode?.id && 1 === parentNode.meta?.level && updateSubmentTree(parentNode.children);
         }));
         const findTreeFirst = tree => {
             let result = tree[0];
@@ -8525,7 +8542,7 @@ const zoomDialog = app => {
             }));
         }
     });
-}, version = "0.5.0", install = function(app) {
+}, version = "0.5.1", install = function(app) {
     Object.keys(components).forEach((key => {
         const component = components[key];
         app.component(component.name, component);
@@ -8535,7 +8552,7 @@ const zoomDialog = app => {
 };
 
 var index = {
-    version: "0.5.0",
+    version: "0.5.1",
     install: install
 };