From c99eb1a9bc3d517bb0c3c8a35973029be2c1fb97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Mon, 25 Dec 2023 18:48:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG:=201.=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=B2=A1=E6=9C=89=E5=9C=A8=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=97=B6=E5=80=99=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?;=202.=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E7=BD=91=E7=AB=99?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E7=AD=89=E4=BF=A1=E6=81=AF=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=90=8D=E5=AD=97=E4=B8=8D=E5=88=B7=E6=96=B0;=203.=E5=88=97?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=92=E5=BA=8F=EF=BC=8C=E4=B8=94=E9=9C=80?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/layout/logo/index.vue                 | 10 ++-
 web/src/router/backEnd.ts                     | 10 ++-
 web/src/views/system/login/index.vue          |  2 +-
 .../menu/components/MenuFieldCom/crud.tsx     | 90 +++----------------
 4 files changed, 30 insertions(+), 82 deletions(-)

diff --git a/web/src/layout/logo/index.vue b/web/src/layout/logo/index.vue
index 9317333..d71010c 100644
--- a/web/src/layout/logo/index.vue
+++ b/web/src/layout/logo/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="layout-logo" v-if="setShowLogo" @click="onThemeConfigChange">
 		<img :src="logoMini" class="layout-logo-medium-img" />
-		<span style="font-size: x-large">{{ themeConfig.globalTitle }}</span>
+		<span style="font-size: x-large">{{ getSystemConfig['login.site_title'] || themeConfig.globalTitle }}</span>
 	</div>
 	<div class="layout-logo-size" v-else @click="onThemeConfigChange">
 		<img :src="logoMini" class="layout-logo-size-img" />
@@ -13,6 +13,7 @@ import { computed } from 'vue';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import logoMini from '/@/assets/logo-mini.svg';
+import {SystemConfigStore} from "/@/stores/systemConfig";
 
 // 定义变量内容
 const storesThemeConfig = useThemeConfig();
@@ -28,6 +29,13 @@ const onThemeConfigChange = () => {
 	if (themeConfig.value.layout === 'transverse') return false;
 	themeConfig.value.isCollapse = !themeConfig.value.isCollapse;
 };
+
+const systemConfigStore = SystemConfigStore()
+const {systemConfig} = storeToRefs(systemConfigStore)
+const getSystemConfig = computed(()=>{
+  return systemConfig.value
+})
+
 </script>
 
 <style scoped lang="scss">
diff --git a/web/src/router/backEnd.ts b/web/src/router/backEnd.ts
index dc42d87..5f4f2cc 100644
--- a/web/src/router/backEnd.ts
+++ b/web/src/router/backEnd.ts
@@ -12,6 +12,7 @@ import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
 import { useMenuApi } from '/@/api/menu/index';
 import { handleMenu } from '../utils/menu';
 import { BtnPermissionStore } from '/@/plugin/permission/store.permission';
+import {SystemConfigStore} from "/@/stores/systemConfig";
 
 const menuApi = useMenuApi();
 
@@ -96,11 +97,9 @@ export function setFilterRouteEnd() {
  * @link 参考：https://next.router.vuejs.org/zh/api/#addroute
  */
 export async function setAddRoute() {
-	console.log("默认路由",router.getRoutes())
 	await setFilterRouteEnd().forEach((route: RouteRecordRaw) => {
 		router.addRoute(route);
 	});
-	console.log("全部路由",router.getRoutes())
 }
 
 /**
@@ -111,6 +110,8 @@ export async function setAddRoute() {
 export function getBackEndControlRoutes() {
 	//获取所有的按钮权限
 	BtnPermissionStore().getBtnPermissionStore();
+	// 获取系统配置
+	SystemConfigStore().getSystemConfigs()
 	return menuApi.getSystemMenu();
 }
 
@@ -146,17 +147,20 @@ export function backEndComponent(routes: any) {
 			}
 		}else{
 			console.log(item.is_iframe,item.web_path)
+			console.log(router.getRoutes())
 			if(item.is_iframe){
 				const iframeRoute:RouteRecordRaw = {
 					...item
 				}
+				console.log(iframeRoute)
+				router.addRoute(iframeRoute)
 				item.meta.isLink = item.path
 				item.path = `${item.path}Link`
 				item.name = `${item.name}Link`
-				item.component = dynamicImport(dynamicViewsModules, 'layout/routerView/link.vue')
 				item.meta.isIframe = !item.is_iframe
 				item.meta.isKeepAlive = false
 				item.meta.isIframeOpen = true
+				item.component = dynamicImport(dynamicViewsModules, 'layout/routerView/link.vue')
 
 			}
 		}
diff --git a/web/src/views/system/login/index.vue b/web/src/views/system/login/index.vue
index 69b2926..585ad5b 100644
--- a/web/src/views/system/login/index.vue
+++ b/web/src/views/system/login/index.vue
@@ -18,7 +18,7 @@
 				<span class="login-right-warp-one"></span>
 				<span class="login-right-warp-two"></span>
 				<div class="login-right-warp-mian">
-					<div class="login-right-warp-main-title">{{ getThemeConfig.globalTitle }} 欢迎您！</div>
+					<div class="login-right-warp-main-title">{{ getSystemConfig['login.site_title'] || getThemeConfig.globalTitle }} 欢迎您！</div>
 					<div class="login-right-warp-main-form">
 						<div v-if="!state.isScan">
 							<el-tabs v-model="state.tabsActiveName">
diff --git a/web/src/views/system/menu/components/MenuFieldCom/crud.tsx b/web/src/views/system/menu/components/MenuFieldCom/crud.tsx
index e60ba47..879f709 100644
--- a/web/src/views/system/menu/components/MenuFieldCom/crud.tsx
+++ b/web/src/views/system/menu/components/MenuFieldCom/crud.tsx
@@ -103,6 +103,9 @@ export const createCrudOptions = function ({ crudExpose, props,modelDialog,selec
 						label:'title',
 						value:'key'
 					}),
+					column:{
+						sortable: true,
+					},
 					form: {
 						rules: [
 							// 表单校验规则
@@ -113,6 +116,13 @@ export const createCrudOptions = function ({ crudExpose, props,modelDialog,selec
 						],
 						component: {
 							span: 12,
+							showSearch: true,
+							filterable: true,
+							//默认的filterOption仅支持value的过滤，label并不会加入查询
+							//所以需要自定义filterOption
+							filterOption(inputValue, option) {
+								return option.label.indexOf(inputValue) >= 0 || option.value.indexOf(inputValue) >= 0;
+							}
 						},
 					},
 				},
@@ -143,6 +153,9 @@ export const createCrudOptions = function ({ crudExpose, props,modelDialog,selec
 					search: {
 						show: true,
 					},
+					column:{
+						sortable: true,
+					},
 					form: {
 						rules: [
 							// 表单校验规则
@@ -157,83 +170,6 @@ export const createCrudOptions = function ({ crudExpose, props,modelDialog,selec
 						},
 					},
 				},
-
-				// is_create: {
-				// 	title: '创建时显示',
-				// 	sortable: 'custom',
-				// 	search: {
-				// 		disabled: true,
-				// 	},
-				// 	type: 'dict-switch',
-				// 	dict: dict({
-				// 		data: [
-				// 			{ value: true, label: '启用' },
-				// 			{ value: false, label: '禁用' },
-				// 		],
-				// 	}),
-				// 	form: {
-				// 		value: true,
-				// 	},
-				// 	column: {
-				// 		valueChange(context){
-				// 			return api.UpdateObj(context.row)
-				// 		},
-				// 		component: {
-				// 			name: 'fs-dict-switch',
-				// 		},
-				// 	},
-				// },
-				// is_update: {
-				// 	title: '编辑时显示',
-				// 	search: {
-				// 		show: true,
-				// 	},
-				// 	type: 'dict-switch',
-				// 	dict: dict({
-				// 		data: [
-				// 			{ value: true, label: '启用' },
-				// 			{ value: false, label: '禁用' },
-				// 		],
-				// 	}),
-				// 	form: {
-				// 		value: true,
-				// 	},
-				// 	column: {
-				// 		component: {
-				// 			name: 'fs-dict-switch',
-				// 			onChange: compute((context) => {
-				// 				//动态onChange方法测试
-				// 				return () => {
-				// 					console.log('onChange', context.row.switch);
-				// 				};
-				// 			}),
-				// 		},
-				// 	},
-				// },
-				// is_query: {
-				// 	title: '列表中显示',
-				// 	type: 'dict-switch',
-				// 	dict: dict({
-				// 		data: [
-				// 			{ value: true, label: '启用' },
-				// 			{ value: false, label: '禁用' },
-				// 		],
-				// 	}),
-				// 	form: {
-				// 		value: true,
-				// 	},
-				// 	column: {
-				// 		component: {
-				// 			name: 'fs-dict-switch',
-				// 			onChange: compute((context) => {
-				// 				//动态onChange方法测试
-				// 				return () => {
-				// 					console.log('onChange', context.row.switch);
-				// 				};
-				// 			}),
-				// 		},
-				// 	},
-				// },
 			},
 		},
 	};