diff --git a/.eslintrc.js b/.eslintrc.js index 74c6bf29..054b0d92 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -14,6 +14,8 @@ module.exports = { 'vue/comment-directive': 'off', 'global-require': 'off', 'import/no-unresolved': 'off', - 'no-restricted-syntax': 'off' + 'no-restricted-syntax': 'off', + 'no-undefined': 'off', + 'vue/valid-template-root': 'off' } }; diff --git a/docs/.vuepress/config.ts b/docs/.vuepress/config.ts index 4308716b..f8ba38bf 100644 --- a/docs/.vuepress/config.ts +++ b/docs/.vuepress/config.ts @@ -24,7 +24,7 @@ const config: UserConfig<DefaultThemeOptions> = { }, themeConfig: { - logo: '/hero.png', + logo: '/logo.png', repo: 'WeBankFinTech/fes.js', diff --git a/docs/.vuepress/public/hero.png b/docs/.vuepress/public/hero.png index ac6beaff..93347c11 100644 Binary files a/docs/.vuepress/public/hero.png and b/docs/.vuepress/public/hero.png differ diff --git a/docs/.vuepress/public/logo.png b/docs/.vuepress/public/logo.png index 60e17006..4958e971 100644 Binary files a/docs/.vuepress/public/logo.png and b/docs/.vuepress/public/logo.png differ diff --git a/docs/zh/README.md b/docs/zh/README.md index f4ed2cc2..f63812a6 100644 --- a/docs/zh/README.md +++ b/docs/zh/README.md @@ -1,7 +1,7 @@ --- home: true title: 首页 -heroImage: /hero.png +heroImage: /logo.png actions: - text: 快速上手 link: /zh/guide/getting-started.html diff --git a/images/banner_ad.png b/images/banner_ad.png deleted file mode 100644 index 5df6a479..00000000 Binary files a/images/banner_ad.png and /dev/null differ diff --git a/images/banner_apply.png b/images/banner_apply.png deleted file mode 100644 index d4fe9b8a..00000000 Binary files a/images/banner_apply.png and /dev/null differ diff --git a/images/banner_tips.png b/images/banner_tips.png deleted file mode 100644 index 74360962..00000000 Binary files a/images/banner_tips.png and /dev/null differ diff --git a/images/fes-core.png b/images/fes-core.png deleted file mode 100644 index 2e799680..00000000 Binary files a/images/fes-core.png and /dev/null differ diff --git a/images/hexo.png b/images/hexo.png new file mode 100644 index 00000000..4958e971 Binary files /dev/null and b/images/hexo.png differ diff --git a/images/icon_notice.png b/images/icon_notice.png deleted file mode 100644 index 8ae70678..00000000 Binary files a/images/icon_notice.png and /dev/null differ diff --git a/images/layout.png b/images/layout.png deleted file mode 100644 index 81207ab6..00000000 Binary files a/images/layout.png and /dev/null differ diff --git a/images/layout2.png b/images/layout2.png deleted file mode 100644 index 2e60b781..00000000 Binary files a/images/layout2.png and /dev/null differ diff --git a/images/list.png b/images/list.png deleted file mode 100644 index ec9f052e..00000000 Binary files a/images/list.png and /dev/null differ diff --git a/images/logo-反白.png b/images/logo-反白.png new file mode 100644 index 00000000..a6b29893 Binary files /dev/null and b/images/logo-反白.png differ diff --git a/images/logo.jpg b/images/logo.jpg deleted file mode 100644 index 47f88319..00000000 Binary files a/images/logo.jpg and /dev/null differ diff --git a/images/logo.png b/images/logo.png new file mode 100644 index 00000000..93347c11 Binary files /dev/null and b/images/logo.png differ diff --git a/images/单独图形-反白.png b/images/单独图形-反白.png new file mode 100644 index 00000000..a5f11e62 Binary files /dev/null and b/images/单独图形-反白.png differ diff --git a/packages/fes-plugin-layout/src/runtime/assets/logo.png b/packages/fes-plugin-layout/src/runtime/assets/logo.png index d8b32345..4958e971 100644 Binary files a/packages/fes-plugin-layout/src/runtime/assets/logo.png and b/packages/fes-plugin-layout/src/runtime/assets/logo.png differ diff --git a/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue b/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue index 2b8ba201..0773a683 100644 --- a/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue +++ b/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue @@ -74,6 +74,7 @@ import Layout from 'ant-design-vue/lib/layout'; import 'ant-design-vue/lib/layout/style'; import Menu from './Menu'; import MultiTabProvider from './MultiTabProvider'; +import defaultLogo from '../assets/logo.png'; export default { components: { @@ -102,7 +103,7 @@ export default { }, logo: { type: String, - default: '' + default: defaultLogo }, theme: { type: String, diff --git a/packages/fes-template/.fes.js b/packages/fes-template/.fes.js index 05a57ed4..328c6dfc 100644 --- a/packages/fes-template/.fes.js +++ b/packages/fes-template/.fes.js @@ -14,7 +14,6 @@ export default { }, layout: { title: "Fes.js", - logo: 'https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg', multiTabs: false, menus: [{ name: 'index'