From 9e90d3d410e8fdd77eefc02bac16bcaafcf5fb1c Mon Sep 17 00:00:00 2001
From: "WANGFAN\\wangf" <15871339963@163.com>
Date: Mon, 7 Apr 2025 14:49:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BE=E6=A0=87=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components.d.ts                           |  33 ++---
 src/components/select-icon/index.vue          | 130 ++++++++++++------
 .../component/icon-selector/icon-selector.vue |  56 +++-----
 3 files changed, 123 insertions(+), 96 deletions(-)

diff --git a/src/components.d.ts b/src/components.d.ts
index bd1b241..57ff816 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -5,22 +5,23 @@
 // Read more: https://github.com/vuejs/core/pull/3399
 export {}
 
-declare module 'vue' {
+declare module "vue" {
   export interface GlobalComponents {
-    BarcodeDraw: typeof import('./components/barcode-draw/index.vue')['default']
-    CodeView: typeof import('./components/code-view/index.vue')['default']
-    ExternalLinkPage: typeof import('./components/external-link-page/index.vue')['default']
-    FillPage: typeof import('./components/fill-page/index.vue')['default']
-    InternalLinkPage: typeof import('./components/internal-link-page/index.vue')['default']
-    LangProvider: typeof import('./components/lang-provider/index.vue')['default']
-    MainTransition: typeof import('./components/main-transition/index.vue')['default']
-    PinyinPro: typeof import('./components/pinyin-pro/index.vue')['default']
-    QrcodeDraw: typeof import('./components/qrcode-draw/index.vue')['default']
-    RouterLink: typeof import('vue-router')['RouterLink']
-    RouterView: typeof import('vue-router')['RouterView']
-    SelectIcon: typeof import('./components/select-icon/index.vue')['default']
-    SvgAndIcon: typeof import('./components/svg-and-icon/index.vue')['default']
-    SvgIcon: typeof import('./components/svg-icon/index.vue')['default']
-    VerifyCode: typeof import('./components/verify-code/index.vue')['default']
+    BarcodeDraw: (typeof import("./components/barcode-draw/index.vue"))["default"];
+    CodeView: (typeof import("./components/code-view/index.vue"))["default"];
+    ExternalLinkPage: (typeof import("./components/external-link-page/index.vue"))["default"];
+    FillPage: (typeof import("./components/fill-page/index.vue"))["default"];
+    InternalLinkPage: (typeof import("./components/internal-link-page/index.vue"))["default"];
+    LangProvider: (typeof import("./components/lang-provider/index.vue"))["default"];
+    MainTransition: (typeof import("./components/main-transition/index.vue"))["default"];
+    PinyinPro: (typeof import("./components/pinyin-pro/index.vue"))["default"];
+    QrcodeDraw: (typeof import("./components/qrcode-draw/index.vue"))["default"];
+    RouterLink: (typeof import("vue-router"))["RouterLink"];
+    RouterView: (typeof import("vue-router"))["RouterView"];
+    SelectIcon: (typeof import("./components/select-icon/index.vue"))["default"];
+    SelectSvg: (typeof import("./components/select-svg/index.vue"))["default"];
+    SvgAndIcon: (typeof import("./components/svg-and-icon/index.vue"))["default"];
+    SvgIcon: (typeof import("./components/svg-icon/index.vue"))["default"];
+    VerifyCode: (typeof import("./components/verify-code/index.vue"))["default"];
   }
 }
diff --git a/src/components/select-icon/index.vue b/src/components/select-icon/index.vue
index 5b9ee77..46ade42 100644
--- a/src/components/select-icon/index.vue
+++ b/src/components/select-icon/index.vue
@@ -1,48 +1,95 @@
 <template>
-  <a-modal v-model:visible="visible" width="70vw" :top="'50px'" :align-center="false" :footer="false">
-    <template #title> 请选择图标 </template>
-    <a-input
-      :style="{
-        width: '100%',
-        marginBottom: '14px'
-      }"
-      placeholder="请输入关键词搜索"
-      allow-clear
-      v-model="searchName"
-    >
-      <template #prefix>
-        <icon-search />
+  <div>
+    <a-input ref="inputRef" :style="{ width: '100%' }" placeholder="请选择图标" v-model="iconName" @focus="onFocus">
+      <template #suffix v-if="iconName">
+        <SvgIcon v-if="type == 'svg'" :name="iconName" :size="size" />
+        <component v-else :is="iconName" :size="size"></component>
+      </template>
+      <template #append>
+        <span class="icon-reset" @click="reset">重置</span>
       </template>
     </a-input>
-    <div class="over-scroll">
-      <div class="icon-grid">
-        <div v-for="item in iconList" :key="item" class="grid-item" @click="onIcon(item)">
-          <component :is="item" :size="30"></component>
-          <span>{{ item }}</span>
+    <a-modal v-model:visible="visible" :unmount-on-close="true" width="70vw" :top="'50px'" :align-center="false" :footer="false">
+      <template #title> 请选择图标 </template>
+      <a-input
+        :style="{
+          width: '100%',
+          marginBottom: '14px'
+        }"
+        placeholder="请输入关键词搜索"
+        allow-clear
+        v-model="searchName"
+      >
+        <template #prefix>
+          <icon-search />
+        </template>
+      </a-input>
+      <div class="over-scroll">
+        <div class="icon-grid">
+          <div v-for="item in iconList" :key="item" class="grid-item" @click="onIcon(item)">
+            <SvgIcon v-if="type == 'svg'" :name="item" :size="25" />
+            <component v-else :is="item" :size="25"></component>
+            <span>{{ item }}</span>
+          </div>
+        </div>
+        <div v-if="iconList.length === 0" class="empty-row">
+          <a-empty>
+            <template #image>
+              <icon-exclamation-circle-fill />
+            </template>
+            <span>未查询到您要找的图标</span>
+          </a-empty>
         </div>
       </div>
-      <div v-if="iconList.length === 0" class="empty-row">
-        <a-empty>
-          <template #image>
-            <icon-exclamation-circle-fill />
-          </template>
-          <span>未查询到您要找的图标</span>
-        </a-empty>
-      </div>
-    </div>
-  </a-modal>
+    </a-modal>
+  </div>
 </template>
 
 <script setup lang="ts">
 import * as ArcoIcons from "@arco-design/web-vue/es/icon";
-const emit = defineEmits(["select"]);
+interface Props {
+  type?: string;
+  size?: number;
+}
+const props = withDefaults(defineProps<Props>(), {
+  type: "arco", // 图标库类型，arco 或 svg
+  size: 25 // 图标大小-默认25px
+});
 
+const { type, size } = toRefs(props);
+
+const emit = defineEmits(["update:modelValue"]);
+
+const visible = ref<boolean>(false);
+const iconName = ref<string>("");
+
+const reset = () => {
+  iconName.value = "";
+  emit("update:modelValue", "");
+};
+
+const onFocus = () => {
+  searchName.value = "";
+  visible.value = true;
+};
+
+// svg模块-assets/svgs文件夹下的所有svg图标
+const SvgIconModules = import.meta.glob("@assets/svgs/*.svg");
+// 搜索关键字
 const searchName = ref<string>("");
+// icon列表
 const iconList = computed(() => {
-  if (!ArcoIcons) return [];
   let icons: string[] = [];
-  for (let key in ArcoIcons) {
-    if (key != "default") icons.push(key);
+  if (type.value === "arco") {
+    if (!ArcoIcons) return [];
+    for (let key in ArcoIcons) {
+      if (key != "default") icons.push(key);
+    }
+  } else {
+    if (!SvgIconModules) return [];
+    for (let path in SvgIconModules) {
+      icons.push(path.replace("/src/assets/svgs/", "").split(".svg")[0]);
+    }
   }
   // 若按照关键字搜索，则返回搜索结果
   if (searchName.value) {
@@ -52,20 +99,12 @@ const iconList = computed(() => {
   return icons;
 });
 
-const onIcon = (iconName: string) => {
+// 选择图标
+const onIcon = (name: string) => {
   visible.value = false;
-  emit("select", iconName);
+  iconName.value = name;
+  emit("update:modelValue", name);
 };
-
-const visible = ref<boolean>(false);
-const open = () => {
-  searchName.value = "";
-  visible.value = true;
-};
-
-defineExpose({
-  open
-});
 </script>
 
 <style lang="scss" scoped>
@@ -98,4 +137,7 @@ defineExpose({
   width: 100%;
   height: 300px;
 }
+.icon-reset {
+  cursor: pointer;
+}
 </style>
diff --git a/src/views/component/icon-selector/icon-selector.vue b/src/views/component/icon-selector/icon-selector.vue
index bee49fa..e58ac84 100644
--- a/src/views/component/icon-selector/icon-selector.vue
+++ b/src/views/component/icon-selector/icon-selector.vue
@@ -1,51 +1,35 @@
 <template>
   <div class="snow-page">
     <div class="snow-inner">
-      <div class="title">图标选择器</div>
-      <a-input ref="inputRef" :style="{ width: '400px' }" placeholder="请选择图标" v-model="iconName" @focus="onFocus">
-        <template #suffix v-if="iconName">
-          <component :is="iconName"></component>
-        </template>
-        <template #append>
-          <span class="icon-reset" @click="reset">重置</span>
-        </template>
-      </a-input>
-      <a-divider />
-      <div class="target-title">当前选择的图标：</div>
-      <component v-if="iconName" :is="iconName" size="50"></component>
-      <a-empty v-else />
-      <SelectIcon ref="SelectIconRef" @select="select" />
+      <a-row class="grid-demo" :gutter="24">
+        <a-col :span="12">
+          <a-card title="图标选择器" :style="{ width: '100%' }">
+            <SelectIcon type="arco" v-model="iconName" />
+            <div class="target-title">当前选择的图标：</div>
+            <component v-if="iconName" :is="iconName" :size="50"></component>
+            <a-empty v-else />
+          </a-card>
+        </a-col>
+        <a-col :span="12">
+          <a-card title="SVG选择器" :style="{ width: '100%' }">
+            <SelectIcon type="svg" v-model="svgName" />
+            <div class="target-title">当前选择的图标：</div>
+            <SvgIcon v-if="svgName" :name="svgName" :size="50" />
+            <a-empty v-else />
+          </a-card>
+        </a-col>
+      </a-row>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
 const iconName = ref<string>("");
-const SelectIconRef = ref();
-
-const onFocus = () => {
-  SelectIconRef.value.open();
-};
-
-const reset = () => {
-  iconName.value = "";
-};
-
-const select = (icon: string) => {
-  iconName.value = icon;
-};
+const svgName = ref<string>("");
 </script>
 
 <style lang="scss" scoped>
-.title {
-  margin-bottom: $margin;
-  font-size: $font-size-title-1;
-  color: $color-text-1;
-}
 .target-title {
-  margin-bottom: $margin;
-}
-.icon-reset {
-  cursor: pointer;
+  margin: $margin 0;
 }
 </style>