diff --git a/src/api/login/types.ts b/src/api/login/types.ts index 0584f6e..6c26ed6 100644 --- a/src/api/login/types.ts +++ b/src/api/login/types.ts @@ -2,7 +2,6 @@ export type UserLoginType = { username: string - password: string } export type UserType = { diff --git a/src/assets/imgs/brand-mark.png b/src/assets/imgs/brand-mark.png new file mode 100644 index 0000000..d6f5dc1 Binary files /dev/null and b/src/assets/imgs/brand-mark.png differ diff --git a/src/components/AppIcon/index.ts b/src/components/AppIcon/index.ts new file mode 100644 index 0000000..dca3e15 --- /dev/null +++ b/src/components/AppIcon/index.ts @@ -0,0 +1,5 @@ +// Author: fruit.com.cn + +import AppIcon from './src/AppIcon.vue' + +export { AppIcon } diff --git a/src/components/AppIcon/src/AppIcon.vue b/src/components/AppIcon/src/AppIcon.vue new file mode 100644 index 0000000..9b67c80 --- /dev/null +++ b/src/components/AppIcon/src/AppIcon.vue @@ -0,0 +1,40 @@ + + + + + + + diff --git a/src/components/Breadcrumb/src/Breadcrumb.vue b/src/components/Breadcrumb/src/Breadcrumb.vue index 307574b..fe2f78a 100644 --- a/src/components/Breadcrumb/src/Breadcrumb.vue +++ b/src/components/Breadcrumb/src/Breadcrumb.vue @@ -9,7 +9,7 @@ import { filterBreadcrumb } from './helper' import { filter, treeToList } from '@/utils/tree' import type { RouteLocationNormalizedLoaded, RouteMeta } from 'vue-router' import { useI18n } from '@/hooks/web/useI18n' -import { Icon } from '@/components/Icon' +import { AppIcon } from '@/components/AppIcon' import { useAppStore } from '@/store/modules/app' import { useDesign } from '@/hooks/web/useDesign' @@ -54,7 +54,7 @@ export default defineComponent({ {meta?.icon && breadcrumbIcon.value ? ( <> - {t(v?.meta?.title)} + {t(v?.meta?.title)} ) : ( t(v?.meta?.title) @@ -117,10 +117,10 @@ export default defineComponent({ :deep(&__item):last-child { .@{prefix-cls}__inner { - color: var(--el-text-color-placeholder); + color: var(--el-text-color-regular); &:hover { - color: var(--el-text-color-placeholder); + color: var(--el-color-primary); } } } diff --git a/src/components/Collapse/src/Collapse.vue b/src/components/Collapse/src/Collapse.vue index a07a348..3f655ea 100644 --- a/src/components/Collapse/src/Collapse.vue +++ b/src/components/Collapse/src/Collapse.vue @@ -5,6 +5,7 @@ import { computed, unref } from 'vue' import { useAppStore } from '@/store/modules/app' import { propTypes } from '@/utils/propTypes' import { useDesign } from '@/hooks/web/useDesign' +import { AppIcons } from '@/constants/icons' const { getPrefixCls } = useDesign() @@ -26,9 +27,9 @@ const toggleCollapse = () => { diff --git a/src/components/ContextMenu/src/ContextMenu.vue b/src/components/ContextMenu/src/ContextMenu.vue index 144f8f6..c40e137 100644 --- a/src/components/ContextMenu/src/ContextMenu.vue +++ b/src/components/ContextMenu/src/ContextMenu.vue @@ -66,7 +66,7 @@ defineExpose({ :disabled="item.disabled" :command="item" > - {{ t(item.label) }} + {{ t(item.label) }} diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue index 33bc95d..e1d3c83 100644 --- a/src/components/Descriptions/src/Descriptions.vue +++ b/src/components/Descriptions/src/Descriptions.vue @@ -7,8 +7,9 @@ import { propTypes } from '@/utils/propTypes' import { ref, unref, PropType, computed, defineComponent } from 'vue' import { useAppStore } from '@/store/modules/app' import { DescriptionsSchema } from './types' -import { Icon } from '@/components/Icon' +import { AppIcon } from '@/components/AppIcon' import { get } from 'lodash-es' +import { AppIcons } from '@/constants/icons' const appStore = useAppStore() @@ -94,12 +95,14 @@ export default defineComponent({ {props.title} {props.message ? ( - + ) : null} - {props.collapse ? : null} + {props.collapse ? ( + + ) : null} ) : null} diff --git a/src/components/Dialog/src/Dialog.vue b/src/components/Dialog/src/Dialog.vue index 0de4ca9..5d5c7ba 100644 --- a/src/components/Dialog/src/Dialog.vue +++ b/src/components/Dialog/src/Dialog.vue @@ -5,6 +5,7 @@ import { ElDialog, ElScrollbar } from 'element-plus' import { propTypes } from '@/utils/propTypes' import { computed, useAttrs, ref, unref, useSlots, watch, nextTick } from 'vue' import { isNumber } from '@/utils/is' +import { AppIcons } from '@/constants/icons' const slots = useSlots() @@ -77,17 +78,17 @@ const dialogStyle = computed(() => {
- - props.icon.startsWith('svg-icon:')) +const normalizedIcon = computed(() => normalizeAppIcon(props.icon)) const symbolId = computed(() => { - return unref(isLocal) ? `#icon-${props.icon.split('svg-icon:')[1]}` : props.icon + return unref(isLocal) ? `#icon-${props.icon.split('svg-icon:')[1]}` : unref(normalizedIcon) }) // 是否使用在线图标 @@ -48,8 +50,8 @@ const getIconifyStyle = computed(() => { diff --git a/src/components/LocaleDropdown/src/LocaleDropdown.vue b/src/components/LocaleDropdown/src/LocaleDropdown.vue index b64d649..a219e4c 100644 --- a/src/components/LocaleDropdown/src/LocaleDropdown.vue +++ b/src/components/LocaleDropdown/src/LocaleDropdown.vue @@ -7,6 +7,7 @@ import { useLocaleStore } from '@/store/modules/locale' import { useLocale } from '@/hooks/web/useLocale' import { propTypes } from '@/utils/propTypes' import { useDesign } from '@/hooks/web/useDesign' +import { AppIcons } from '@/constants/icons' const { getPrefixCls } = useDesign() @@ -36,9 +37,9 @@ const setLang = (lang: LocaleType) => {