Merge branch 'main' into i18n-dev-275

# Conflicts:
#	web/src/view/layout/setting/index.vue

Author: pixelmaxQm

web/src/core/global.js

@@ -31,10 +31,12 @@ const registerIcons = async(app) => {
       continue
     }
     const key = `${pluginName}${iconName}`
-    const iconComponent = createIconComponent(iconName)
+    // 开发模式下列出所有 svg 图标，方便开发者直接查找复制使用
+    import.meta.env.MODE == 'development' && console.log(`svg-icon-component: <${key} />`)
+    const iconComponent = createIconComponent(key)
     config.logs.push({
       'key': key,
-      'label': iconName,
+      'label': key,
     })
     app.component(key, iconComponent)
   }

web/src/main.js

@@ -1,4 +1,5 @@
 import './style/element_visiable.scss'
+import 'element-plus/theme-chalk/dark/css-vars.css'
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
 

web/src/view/layout/setting/index.vue

@@ -1,5 +1,11 @@
 <template>
-  <el-drawer v-model="drawer" :title="t('system.systemConfig')" direction="rtl" :size="width">
+  <el-drawer v-model="drawer" :title="t('system.systemConfig')" direction="rtl" :size="width" :show-close="false">
+    <template #header>
+      <div class="flex justify-between items-center">
+        <span class="text-lg">{{t('system.systemConfig')}}</span>
+        <el-button type="primary" @click="saveConfig">{{ t('layout.setting.copyConfig') }}</el-button>
+      </div>
+    </template>
     <div class="flex flex-col">
       <div class="mb-8">
         <div class="text-gray-800 dark:text-gray-100">{{ t('layout.setting.defaultTheme') }}</div>
@@ -112,10 +118,6 @@
         </div>
       </div>
 
-
-      <el-button type="primary" class="mt-4" @click="copyConfig"
-        >{{ t('layout.setting.copyConfig') }}</el-button
-      >
     </div>
   </el-drawer>
 </template>
@@ -127,11 +129,10 @@ import { ref, computed } from "vue";
 import { ElMessage } from "element-plus";
 import {setSelfSetting} from "@/api/user";
 import { useI18n } from 'vue-i18n'; // added by mohamed hassan to support multilanguage
-
+const { t } = useI18n() // added by mohamed hassan to support multilanguage
 const appStore = useAppStore();
 const { config, device } = storeToRefs(appStore);
 
-const { t } = useI18n() // added by mohamed hassan to support multilanguage
 defineOptions({
   name: "GvaSetting",
 });
@@ -180,7 +181,6 @@ const saveConfig = async () => {
   document.execCommand("copy");
   document.body.removeChild(input);
   ElMessage.success(t('layout.setting.copyConfigSuccess'));
-  ElMessage.success("复制成功, 请自行保存到本地文件中");*/
   const res = await setSelfSetting(config.value)
   if(res.code === 0){
     localStorage.setItem('originSetting', JSON.stringify(config.value))

web/vite.config.js

@@ -94,6 +94,7 @@ export default ({
       }),
       vuePlugin(),
       svgBuilder('./src/assets/icons/'),
+      svgBuilder('./src/plugin/'),
       [Banner(`\n Build based on gin-vue-admin \n Time : ${timestamp}`)],
       VueFilePathPlugin("./src/pathInfo.json")
     ],