From 5edc5ef33488a208590037a30a360320d2332df9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com>
Date: Sun, 27 Feb 2022 12:58:16 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20Element=20Plus=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96@element-plus/icons=E8=BF=87=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E4=B8=BA@element-plus/icons-vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/RightPanel/index.vue              | 13 ++++++++-----
 src/layout/components/Navbar.vue                 |  3 +++
 src/layout/components/TagsView/index.vue         |  2 +-
 src/layout/index.vue                             |  2 +-
 src/views/oms/order/index.vue                    |  2 +-
 src/views/pms/brand/index.vue                    |  2 +-
 src/views/pms/category/components/Attribute.vue  |  2 +-
 src/views/pms/category/components/Category.vue   |  2 +-
 .../pms/goods/components/GoodsAttribute.vue      |  2 +-
 src/views/pms/goods/components/GoodsStock.vue    |  2 +-
 src/views/pms/goods/index.vue                    |  2 +-
 src/views/sms/advert/index.vue                   |  2 +-
 src/views/system/client/index.vue                |  2 +-
 src/views/system/dept/index.vue                  |  2 +-
 src/views/system/dict/components/Dict.vue        |  2 +-
 src/views/system/dict/components/DictItem.vue    |  2 +-
 src/views/system/menu/components/Menu.vue        |  2 +-
 src/views/system/menu/components/Perm.vue        |  2 +-
 src/views/system/role/components/Menu.vue        |  2 +-
 src/views/system/role/components/Perm.vue        |  2 +-
 src/views/system/role/components/Role.vue        |  2 +-
 src/views/system/user/index.vue                  | 16 ++++++++--------
 src/views/ums/member/index.vue                   |  2 +-
 23 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/src/components/RightPanel/index.vue b/src/components/RightPanel/index.vue
index 19bca0b6..cda221ff 100644
--- a/src/components/RightPanel/index.vue
+++ b/src/components/RightPanel/index.vue
@@ -3,8 +3,8 @@
     <div class="rightPanel-background"/>
     <div class="rightPanel">
        <div class="handle-button" :style="{'top':buttonTop+'px','background-color':theme}" @click="show=!show">
-          <Close v-show="show"/>
-          <Setting v-show="!show"/>
+          <Close style="width: 1em; height: 1em;vertical-align: middle " v-show="show"/>
+          <Setting style="width:1em; height:1em;vertical-align: middle " v-show="!show"/>
         </div>
         <div class="rightPanel-items">
           <slot/>
@@ -14,10 +14,13 @@
 </template>
 
 <script setup lang="ts">
-import {addClass, removeClass} from '@/utils/index'
 import {computed, onBeforeUnmount, onMounted, ref, watchEffect} from "vue";
+
+import {addClass, removeClass} from '@/utils/index'
 import {useSettingStoreHook} from "@/store/modules/settings";
-import {Close, Setting} from '@element-plus/icons'
+
+// 图标依赖
+import {Close, Setting} from '@element-plus/icons-vue'
 
 const props = defineProps({
   clickNotClose: {
@@ -30,7 +33,7 @@ const props = defineProps({
   }
 })
 
-const theme =  ""
+const theme = computed(() => useSettingStoreHook().theme)
 
 const show = ref(false)
 
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 72d503c3..8a785dc3 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -64,6 +64,9 @@ import SizeSelect from '@/components/SizeSelect/index.vue'
 import LangSelect from '@/components/LangSelect/index.vue'
 import SvgIcon from '@/components/SvgIcon/index.vue'
 
+// 图标依赖
+import {CaretBottom} from '@element-plus/icons-vue'
+
 const route = useRoute()
 const router = useRouter()
 
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 75b55a17..dba45188 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -62,7 +62,7 @@ import {RouteRecordRaw, useRoute, useRouter} from 'vue-router'
 import {TagView} from "@/store/interface";
 
 import ScrollPane from './ScrollPane.vue'
-import {Close} from '@element-plus/icons'
+import {Close,RefreshRight,CircleClose,Back,Right} from '@element-plus/icons-vue'
 import { generateTitle } from '@/utils/i18n'
 
 const {ctx} = getCurrentInstance() as any
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 480b35e5..8f76168f 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -58,7 +58,7 @@ function handleClickOutside() {
 
 <style lang="scss" scoped>
 @import "@/styles/mixin.scss";
-@import "@/styles/variables.scss";
+@import "@/styles/variables.module.scss";
 
 .app-wrapper {
   @include clearfix;
diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue
index a534a645..5d05a247 100644
--- a/src/views/oms/order/index.vue
+++ b/src/views/oms/order/index.vue
@@ -130,7 +130,7 @@
 import {listOrdersWithPage, getOrderDetail} from '@/api/oms/order'
 import {onMounted, reactive, ref, toRefs} from "vue"
 import {ElForm, ElMessage, ElMessageBox} from "element-plus"
-import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons'
+import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons-vue'
 
 const dataForm = ref(ElForm)  // 属性名必须和元素的ref属性值一致
 
diff --git a/src/views/pms/brand/index.vue b/src/views/pms/brand/index.vue
index 9c35968a..23e1a7e4 100644
--- a/src/views/pms/brand/index.vue
+++ b/src/views/pms/brand/index.vue
@@ -135,7 +135,7 @@ import {listBrandsWithPage, getBrandDetail, updateBrand, addBrand, deleteBrands}
 import SingleUpload from "@/components/Upload/SingleUpload.vue"
 import {onMounted, reactive, ref, toRefs, unref} from "vue";
 import {ElForm, ElTable, ElMessage, ElMessageBox} from "element-plus";
-import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons'
+import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons-vue'
 
 const dataTableRef = ref(ElTable)
 const queryFormRef = ref(ElForm)  // 属性名必须和元素的ref属性值一致
diff --git a/src/views/pms/category/components/Attribute.vue b/src/views/pms/category/components/Attribute.vue
index 200dae6a..f2beec61 100644
--- a/src/views/pms/category/components/Attribute.vue
+++ b/src/views/pms/category/components/Attribute.vue
@@ -54,7 +54,7 @@
 <script setup lang="ts">
 import {listAttributes, saveAttributeBatch} from "@/api/pms/attribute";
 import {computed, reactive, toRefs, watch} from "vue";
-import {Plus, Check, Delete} from '@element-plus/icons'
+import {Plus, Check, Delete} from '@element-plus/icons-vue'
 import {ElMessage} from "element-plus";
 import SvgIcon from '@/components/SvgIcon/index.vue';
 
diff --git a/src/views/pms/category/components/Category.vue b/src/views/pms/category/components/Category.vue
index 7c084b22..57c47520 100644
--- a/src/views/pms/category/components/Category.vue
+++ b/src/views/pms/category/components/Category.vue
@@ -105,7 +105,7 @@
 
 <script setup lang="ts">
 import {listCategories, addCategory, updateCategory, deleteCategories} from '@/api/pms/category'
-import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons'
+import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons-vue'
 import SingleUpload from '@/components/Upload/SingleUpload.vue'
 import {getCurrentInstance, onMounted, reactive, ref, toRefs, unref} from "vue";
 import {ElForm, ElMessage, ElMessageBox, ElTree} from "element-plus";
diff --git a/src/views/pms/goods/components/GoodsAttribute.vue b/src/views/pms/goods/components/GoodsAttribute.vue
index 0bf08a2e..4f4552c2 100644
--- a/src/views/pms/goods/components/GoodsAttribute.vue
+++ b/src/views/pms/goods/components/GoodsAttribute.vue
@@ -79,7 +79,7 @@
 import {listAttributes} from "@/api/pms/attribute";
 import {computed, nextTick, reactive, ref, toRefs, unref, watch} from "vue";
 import {ElForm} from "element-plus";
-import {Minus, Plus} from '@element-plus/icons'
+import {Minus, Plus} from '@element-plus/icons-vue'
 
 const emit = defineEmits(['prev', 'next'])
 const dataForm = ref(ElForm)
diff --git a/src/views/pms/goods/components/GoodsStock.vue b/src/views/pms/goods/components/GoodsStock.vue
index abe633e3..ea8a0bef 100644
--- a/src/views/pms/goods/components/GoodsStock.vue
+++ b/src/views/pms/goods/components/GoodsStock.vue
@@ -180,7 +180,7 @@ import SingleUpload from '@/components/Upload/SingleUpload.vue'
 import {addGoods, updateGoods} from "@/api/pms/goods";
 import {computed, getCurrentInstance, nextTick, onMounted, reactive, ref, toRefs, unref, watch} from "vue";
 import {ElNotification, ElMessage, ElTable, ElForm} from "element-plus"
-import {Plus, Minus} from '@element-plus/icons'
+import {Plus, Minus} from '@element-plus/icons-vue'
 import SvgIcon from '@/components/SvgIcon/index.vue'
 import {useRouter} from "vue-router";
 
diff --git a/src/views/pms/goods/index.vue b/src/views/pms/goods/index.vue
index ac50438e..1710c687 100644
--- a/src/views/pms/goods/index.vue
+++ b/src/views/pms/goods/index.vue
@@ -115,7 +115,7 @@
 </template>
 
 <script setup lang="ts">
-import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons'
+import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons-vue'
 import {listGoodsWithPage, deleteGoods} from '@/api/pms/goods'
 import {listCascadeCategories} from '@/api/pms/category'
 import {reactive, ref, onMounted, toRefs} from 'vue'
diff --git a/src/views/sms/advert/index.vue b/src/views/sms/advert/index.vue
index d435b926..a6e1a2d5 100644
--- a/src/views/sms/advert/index.vue
+++ b/src/views/sms/advert/index.vue
@@ -156,7 +156,7 @@ import {listAdvertsWithPage, getAdvertDetail, updateAdvert, addAdvert, deleteAdv
 import SingleUpload from "@/components/Upload/SingleUpload.vue";
 import {onMounted, reactive, ref, toRefs, unref} from "vue";
 import {ElForm, ElMessage, ElMessageBox} from "element-plus";
-import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons'
+import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons-vue'
 
 const dataFormRef = ref(ElForm)  // 属性名必须和元素的ref属性值一致
 
diff --git a/src/views/system/client/index.vue b/src/views/system/client/index.vue
index 34d02f7c..5c5a7895 100644
--- a/src/views/system/client/index.vue
+++ b/src/views/system/client/index.vue
@@ -108,7 +108,7 @@
 
 <script setup lang="ts">
 import {listClientsWithPage, detail, update, add, del} from '@/api/system/client'
-import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons'
+import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons-vue'
 import {onMounted, reactive, getCurrentInstance, ref, unref, toRefs} from 'vue'
 import {ElForm, ElMessage, ElMessageBox} from "element-plus"
 
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 513534a3..f0b2390f 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -162,7 +162,7 @@ import {onMounted, reactive, unref, ref, toRefs} from 'vue'
 import {listDeptTable, getDeptDetail, deleteDept, updateDept, addDept, listDeptSelect} from '@/api/system/dept'
 
 // 组件依赖
-import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons'
+import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons-vue'
 import TreeSelect from '@/components/TreeSelect/index.vue'
 import {ElForm, ElMessage, ElMessageBox} from 'element-plus'
 
diff --git a/src/views/system/dict/components/Dict.vue b/src/views/system/dict/components/Dict.vue
index 7675ba11..c0ef9a09 100644
--- a/src/views/system/dict/components/Dict.vue
+++ b/src/views/system/dict/components/Dict.vue
@@ -111,7 +111,7 @@
 
 <script setup lang="ts">
 import {listDictWithPage, getDictDetail, addDict, updateDict, deleteDict} from "@/api/system/dict";
-import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons'
+import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons-vue'
 import {onMounted, reactive, ref, unref} from 'vue'
 import {ElForm, ElMessage, ElMessageBox} from "element-plus";
 
diff --git a/src/views/system/dict/components/DictItem.vue b/src/views/system/dict/components/DictItem.vue
index 6ee8accc..a09ccbe2 100644
--- a/src/views/system/dict/components/DictItem.vue
+++ b/src/views/system/dict/components/DictItem.vue
@@ -119,7 +119,7 @@ import {
   updateDictItem,
   deleteDictItem
 } from "@/api/system/dict";
-import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons';
+import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons-vue';
 import {onMounted, reactive, ref, unref, watch} from 'vue'
 import {ElForm, ElMessage, ElMessageBox} from "element-plus";
 
diff --git a/src/views/system/menu/components/Menu.vue b/src/views/system/menu/components/Menu.vue
index 9f7216b0..80000bf7 100644
--- a/src/views/system/menu/components/Menu.vue
+++ b/src/views/system/menu/components/Menu.vue
@@ -181,7 +181,7 @@
 
 <script setup lang="ts">
 import {listTableMenus, getMenuDetail, listTreeSelectMenus, addMenu, deleteMenus, updateMenu} from "@/api/system/menu";
-import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons'
+import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons-vue'
 import {ElForm, ElMessage, ElMessageBox} from "element-plus";
 import {reactive, ref, unref, onMounted, toRefs} from "vue";
 import SvgIcon from '@/components/SvgIcon/index.vue';
diff --git a/src/views/system/menu/components/Perm.vue b/src/views/system/menu/components/Perm.vue
index c543adf9..cc9cd4fb 100644
--- a/src/views/system/menu/components/Perm.vue
+++ b/src/views/system/menu/components/Perm.vue
@@ -133,7 +133,7 @@
 
 <script setup lang="ts">
 import {listPermsWithPage, getPermDetail, addPerm, updatePerm, deletePerms} from "@/api/system/perm"
-import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons'
+import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons-vue'
 import {onMounted, watch, reactive, ref, unref, getCurrentInstance, toRefs} from 'vue'
 import {ElForm, ElMessage, ElMessageBox} from "element-plus"
 
diff --git a/src/views/system/role/components/Menu.vue b/src/views/system/role/components/Menu.vue
index d3c24b4f..d86636d8 100644
--- a/src/views/system/role/components/Menu.vue
+++ b/src/views/system/role/components/Menu.vue
@@ -34,7 +34,7 @@ import {listTreeSelectMenus} from "@/api/system/menu";
 import {listRoleMenuIds, updateRoleMenu} from "@/api/system/role"
 import { nextTick, onMounted, reactive, ref, toRefs, watch} from "vue"
 import {ElTree, ElMessage, ElMessageBox} from "element-plus"
-import {Switch, Check} from '@element-plus/icons'
+import {Switch, Check} from '@element-plus/icons-vue'
 
 const emit = defineEmits(['menuClick'])
 const props = defineProps({
diff --git a/src/views/system/role/components/Perm.vue b/src/views/system/role/components/Perm.vue
index db025349..aec78b41 100644
--- a/src/views/system/role/components/Perm.vue
+++ b/src/views/system/role/components/Perm.vue
@@ -44,7 +44,7 @@ import {listPerms} from "@/api/system/perm";
 import {listRolePerms, saveRolePerms} from "@/api/system/role";
 import { onMounted, reactive, toRefs, watch} from "vue";
 import {ElMessage} from "element-plus";
-import {Check} from '@element-plus/icons'
+import {Check} from '@element-plus/icons-vue'
 
 const props = defineProps({
   role: {
diff --git a/src/views/system/role/components/Role.vue b/src/views/system/role/components/Role.vue
index 6edefef0..7ea620d6 100644
--- a/src/views/system/role/components/Role.vue
+++ b/src/views/system/role/components/Role.vue
@@ -115,7 +115,7 @@
 import {listRolesWithPage, updateRole, getRoleDetail, addRole, deleteRoles} from '@/api/system/role'
 import { onMounted, reactive, ref, toRefs, unref} from "vue"
 import {ElForm, ElMessage, ElMessageBox} from "element-plus";
-import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons'
+import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons-vue'
 
 const emit = defineEmits(['roleClick'])
 const dataForm = ref(ElForm)  // 属性名必须和元素的ref属性值一致
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 6401b584..6e816f9f 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -337,7 +337,7 @@ import {listRoles} from '@/api/system/role'
 
 // 组件依赖
 import {ElMessage, ElMessageBox, ElTree, ElForm} from 'element-plus'
-import {Search, Plus, Edit, Refresh, Delete, Lock} from '@element-plus/icons'
+import {Search, Plus, Edit, Refresh, Delete, Lock} from '@element-plus/icons-vue'
 import TreeSelect from '@/components/TreeSelect/index.vue'
 
 // DOM元素的引用声明定义
@@ -459,8 +459,8 @@ function filterDeptNode(value: string, data: any) {
 }
 
 /**
- * 部门树点击
- **/
+ * 部门树节点点击事件
+ */
 function handleDeptNodeClick(data: { [key: string]: any }) {
   state.queryParams.deptId = data.id
   handleQuery()
@@ -477,7 +477,7 @@ async function loadRoleOptions() {
 
 /**
  * 用户状态修改
- **/
+ */
 function handleStatusChange(row: { [key: string]: any }) {
   const text = row.status === 1 ? '启用' : '停用'
   ElMessageBox.confirm('确认要' + text + '' + row.username + '用户吗?', '警告', {
@@ -604,11 +604,10 @@ function submitForm() {
 
 
 /**
- * 表单重置
- **/
+ * 重置表单
+ */
 function resetForm() {
-  const dataForm = unref(dataFormRef)
-  dataForm.resetFields()
+  dataFormRef.value.resetFields()
 }
 
 
@@ -667,6 +666,7 @@ function loadData() {
 }
 
 onMounted(() => {
+
   loadData()
 })
 </script>
diff --git a/src/views/ums/member/index.vue b/src/views/ums/member/index.vue
index c0b1a867..ea5bec35 100644
--- a/src/views/ums/member/index.vue
+++ b/src/views/ums/member/index.vue
@@ -102,7 +102,7 @@
 <script setup lang="ts">
 import {reactive, onMounted, toRefs} from 'vue'
 import {ElTable, ElMessage, ElMessageBox} from 'element-plus'
-import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons'
+import {Search, Plus, Edit, Refresh, Delete} from '@element-plus/icons-vue'
 
 import {listMembersWithPage} from '@/api/ums/member'