Merge branch '1.1.x' into dev

continew-admin-ui/src/components/menu/index.vue

@@ -95,7 +95,10 @@
             _route.forEach((element) => {
               // This is demo, modify nodes as needed
               const icon = element?.meta?.icon
-                ? () => h(compile(`<icon-${element?.meta?.icon}/>`))
+                ? () =>
+                    h(
+                      compile(`<svg-icon icon-class="${element?.meta?.icon}"/>`)
+                    )
                 : null;
               const node =
                 element?.children && element?.children.length !== 0 ? (

continew-admin-ui/src/components/svg-icon/index.vue

@@ -25,9 +25,9 @@
   const iconName = computed(() => `#icon-${props.iconClass}`);
   const svgClass = computed(() => {
     if (props.className) {
-      return `svg-icon ${props.className}`;
+      return `arco-icon ${props.className}`;
     }
-    return 'svg-icon';
+    return 'arco-icon';
   });
 </script>
 
@@ -37,19 +37,4 @@
   };
 </script>
 
-<style scoped lang="less">
-  .sub-el-icon,
-  .nav-icon {
-    display: inline-block;
-    font-size: 15px;
-    margin-right: 12px;
-    position: relative;
-  }
-  .svg-icon {
-    width: 1em;
-    height: 1em;
-    position: relative;
-    fill: currentColor;
-    vertical-align: -2px;
-  }
-</style>
+<style scoped lang="less"></style>