From e4036842dec695ec61f853bb4fe927ad1106617f Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 12 Nov 2022 17:32:13 +0800 Subject: [PATCH] 【修复】自定义 ICON 不生效的问题 --- yudao-ui-admin/src/assets/icons/svg/rich-text.svg | 1 + yudao-ui-admin/src/icons/index.js | 9 --------- yudao-ui-admin/src/icons/svg/button.svg | 1 - yudao-ui-admin/src/icons/svg/cascader.svg | 1 - yudao-ui-admin/src/icons/svg/checkbox.svg | 1 - yudao-ui-admin/src/icons/svg/color.svg | 1 - yudao-ui-admin/src/icons/svg/component.svg | 1 - yudao-ui-admin/src/icons/svg/date-range.svg | 1 - yudao-ui-admin/src/icons/svg/date.svg | 1 - yudao-ui-admin/src/icons/svg/input.svg | 1 - yudao-ui-admin/src/icons/svg/number.svg | 1 - yudao-ui-admin/src/icons/svg/password.svg | 1 - yudao-ui-admin/src/icons/svg/radio.svg | 1 - yudao-ui-admin/src/icons/svg/rate.svg | 1 - yudao-ui-admin/src/icons/svg/rich-text.svg | 1 - yudao-ui-admin/src/icons/svg/row.svg | 1 - yudao-ui-admin/src/icons/svg/select.svg | 1 - yudao-ui-admin/src/icons/svg/slider.svg | 1 - yudao-ui-admin/src/icons/svg/switch.svg | 1 - yudao-ui-admin/src/icons/svg/table.svg | 1 - yudao-ui-admin/src/icons/svg/textarea.svg | 1 - yudao-ui-admin/src/icons/svg/time-range.svg | 1 - yudao-ui-admin/src/icons/svg/time.svg | 1 - yudao-ui-admin/src/icons/svg/upload.svg | 1 - yudao-ui-admin/src/main.js | 2 +- yudao-ui-admin/src/views/infra/build/main.js | 2 +- 26 files changed, 3 insertions(+), 33 deletions(-) create mode 100644 yudao-ui-admin/src/assets/icons/svg/rich-text.svg delete mode 100644 yudao-ui-admin/src/icons/index.js delete mode 100644 yudao-ui-admin/src/icons/svg/button.svg delete mode 100644 yudao-ui-admin/src/icons/svg/cascader.svg delete mode 100644 yudao-ui-admin/src/icons/svg/checkbox.svg delete mode 100644 yudao-ui-admin/src/icons/svg/color.svg delete mode 100644 yudao-ui-admin/src/icons/svg/component.svg delete mode 100644 yudao-ui-admin/src/icons/svg/date-range.svg delete mode 100644 yudao-ui-admin/src/icons/svg/date.svg delete mode 100644 yudao-ui-admin/src/icons/svg/input.svg delete mode 100644 yudao-ui-admin/src/icons/svg/number.svg delete mode 100644 yudao-ui-admin/src/icons/svg/password.svg delete mode 100644 yudao-ui-admin/src/icons/svg/radio.svg delete mode 100644 yudao-ui-admin/src/icons/svg/rate.svg delete mode 100644 yudao-ui-admin/src/icons/svg/rich-text.svg delete mode 100644 yudao-ui-admin/src/icons/svg/row.svg delete mode 100644 yudao-ui-admin/src/icons/svg/select.svg delete mode 100644 yudao-ui-admin/src/icons/svg/slider.svg delete mode 100644 yudao-ui-admin/src/icons/svg/switch.svg delete mode 100644 yudao-ui-admin/src/icons/svg/table.svg delete mode 100644 yudao-ui-admin/src/icons/svg/textarea.svg delete mode 100644 yudao-ui-admin/src/icons/svg/time-range.svg delete mode 100644 yudao-ui-admin/src/icons/svg/time.svg delete mode 100644 yudao-ui-admin/src/icons/svg/upload.svg diff --git a/yudao-ui-admin/src/assets/icons/svg/rich-text.svg b/yudao-ui-admin/src/assets/icons/svg/rich-text.svg new file mode 100644 index 0000000..76c45bf --- /dev/null +++ b/yudao-ui-admin/src/assets/icons/svg/rich-text.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/yudao-ui-admin/src/icons/index.js b/yudao-ui-admin/src/icons/index.js deleted file mode 100644 index 2c6b309..0000000 --- a/yudao-ui-admin/src/icons/index.js +++ /dev/null @@ -1,9 +0,0 @@ -import Vue from 'vue' -import SvgIcon from '@/components/SvgIcon'// svg component - -// register globally -Vue.component('svg-icon', SvgIcon) - -const req = require.context('./svg', false, /\.svg$/) -const requireAll = requireContext => requireContext.keys().map(requireContext) -requireAll(req) diff --git a/yudao-ui-admin/src/icons/svg/button.svg b/yudao-ui-admin/src/icons/svg/button.svg deleted file mode 100644 index 904fddc..0000000 --- a/yudao-ui-admin/src/icons/svg/button.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/yudao-ui-admin/src/icons/svg/cascader.svg b/yudao-ui-admin/src/icons/svg/cascader.svg deleted file mode 100644 index e256024..0000000 --- a/yudao-ui-admin/src/icons/svg/cascader.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/yudao-ui-admin/src/icons/svg/checkbox.svg b/yudao-ui-admin/src/icons/svg/checkbox.svg deleted file mode 100644 index 013fd3a..0000000 --- a/yudao-ui-admin/src/icons/svg/checkbox.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/yudao-ui-admin/src/icons/svg/color.svg b/yudao-ui-admin/src/icons/svg/color.svg deleted file mode 100644 index 44a81aa..0000000 --- a/yudao-ui-admin/src/icons/svg/color.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/yudao-ui-admin/src/icons/svg/component.svg b/yudao-ui-admin/src/icons/svg/component.svg deleted file mode 100644 index 29c3458..0000000 --- a/yudao-ui-admin/src/icons/svg/component.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/yudao-ui-admin/src/icons/svg/date-range.svg b/yudao-ui-admin/src/icons/svg/date-range.svg deleted file mode 100644 index fda571e..0000000 --- a/yudao-ui-admin/src/icons/svg/date-range.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/yudao-ui-admin/src/icons/svg/date.svg b/yudao-ui-admin/src/icons/svg/date.svg deleted file mode 100644 index 52dc73e..0000000 --- a/yudao-ui-admin/src/icons/svg/date.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/yudao-ui-admin/src/icons/svg/input.svg b/yudao-ui-admin/src/icons/svg/input.svg deleted file mode 100644 index ab91381..0000000 --- a/yudao-ui-admin/src/icons/svg/input.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/yudao-ui-admin/src/icons/svg/number.svg b/yudao-ui-admin/src/icons/svg/number.svg deleted file mode 100644 index ad5ce9a..0000000 --- a/yudao-ui-admin/src/icons/svg/number.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/yudao-ui-admin/src/icons/svg/password.svg b/yudao-ui-admin/src/icons/svg/password.svg deleted file mode 100644 index 6c64def..0000000 --- a/yudao-ui-admin/src/icons/svg/password.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/yudao-ui-admin/src/icons/svg/radio.svg b/yudao-ui-admin/src/icons/svg/radio.svg deleted file mode 100644 index 0cde345..0000000 --- a/yudao-ui-admin/src/icons/svg/radio.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/yudao-ui-admin/src/icons/svg/rate.svg b/yudao-ui-admin/src/icons/svg/rate.svg deleted file mode 100644 index aa3b14d..0000000 --- a/yudao-ui-admin/src/icons/svg/rate.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/yudao-ui-admin/src/icons/svg/rich-text.svg b/yudao-ui-admin/src/icons/svg/rich-text.svg deleted file mode 100644 index 76c45bf..0000000 --- a/yudao-ui-admin/src/icons/svg/rich-text.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/yudao-ui-admin/src/icons/svg/row.svg b/yudao-ui-admin/src/icons/svg/row.svg deleted file mode 100644 index 0780992..0000000 --- a/yudao-ui-admin/src/icons/svg/row.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/yudao-ui-admin/src/icons/svg/select.svg b/yudao-ui-admin/src/icons/svg/select.svg deleted file mode 100644 index d628382..0000000 --- a/yudao-ui-admin/src/icons/svg/select.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/yudao-ui-admin/src/icons/svg/slider.svg b/yudao-ui-admin/src/icons/svg/slider.svg deleted file mode 100644 index fbe4f39..0000000 --- a/yudao-ui-admin/src/icons/svg/slider.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/yudao-ui-admin/src/icons/svg/switch.svg b/yudao-ui-admin/src/icons/svg/switch.svg deleted file mode 100644 index 0ba61e3..0000000 --- a/yudao-ui-admin/src/icons/svg/switch.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/yudao-ui-admin/src/icons/svg/table.svg b/yudao-ui-admin/src/icons/svg/table.svg deleted file mode 100644 index e806845..0000000 --- a/yudao-ui-admin/src/icons/svg/table.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/yudao-ui-admin/src/icons/svg/textarea.svg b/yudao-ui-admin/src/icons/svg/textarea.svg deleted file mode 100644 index 2709f29..0000000 --- a/yudao-ui-admin/src/icons/svg/textarea.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/yudao-ui-admin/src/icons/svg/time-range.svg b/yudao-ui-admin/src/icons/svg/time-range.svg deleted file mode 100644 index 13c1202..0000000 --- a/yudao-ui-admin/src/icons/svg/time-range.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/yudao-ui-admin/src/icons/svg/time.svg b/yudao-ui-admin/src/icons/svg/time.svg deleted file mode 100644 index b376e32..0000000 --- a/yudao-ui-admin/src/icons/svg/time.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/yudao-ui-admin/src/icons/svg/upload.svg b/yudao-ui-admin/src/icons/svg/upload.svg deleted file mode 100644 index bae49c0..0000000 --- a/yudao-ui-admin/src/icons/svg/upload.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/yudao-ui-admin/src/main.js b/yudao-ui-admin/src/main.js index 622f889..2061757 100644 --- a/yudao-ui-admin/src/main.js +++ b/yudao-ui-admin/src/main.js @@ -66,7 +66,7 @@ import "bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css"; // Form Generator 组件需要使用到 tinymce import Tinymce from '@/components/tinymce/index.vue' Vue.component('tinymce', Tinymce) -import '@/icons' +import '@/assets/icons' import request from "@/utils/request" // 实现 form generator 使用自己定义的 axios request 对象 console.log(request) Vue.prototype.$axios = request diff --git a/yudao-ui-admin/src/views/infra/build/main.js b/yudao-ui-admin/src/views/infra/build/main.js index e9cc393..9ced717 100644 --- a/yudao-ui-admin/src/views/infra/build/main.js +++ b/yudao-ui-admin/src/views/infra/build/main.js @@ -2,7 +2,7 @@ import Vue from 'vue' import App from './App.vue' import router from '@/router' import '@/styles/index.scss' -import '@/icons' +import '@/assets/icons' import axios from 'axios' import Tinymce from '@/components/tinymce/index.vue' -- libgit2 0.21.4