From 7c7e9cd7f055b3d54cb6c004dcba6c90c340979f Mon Sep 17 00:00:00 2001
From: liu liang <liuliang79@live.com>
Date: Fri, 16 Jun 2023 11:39:38 +0800
Subject: [PATCH 01/12] update datetimeconverter

---
 src/WalkingTec.Mvvm.Core/Json/DateTimeConverter.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/WalkingTec.Mvvm.Core/Json/DateTimeConverter.cs b/src/WalkingTec.Mvvm.Core/Json/DateTimeConverter.cs
index 74628d4a5..1564a62cc 100644
--- a/src/WalkingTec.Mvvm.Core/Json/DateTimeConverter.cs
+++ b/src/WalkingTec.Mvvm.Core/Json/DateTimeConverter.cs
@@ -9,21 +9,26 @@
 namespace WalkingTec.Mvvm.Core.Json
 {
 
-    public class DateTimeConverter : JsonConverter<DateTime>
+    public class DateTimeConverter : JsonConverter<DateTime?>
     {
-        public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override DateTime? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             if (reader.TokenType == JsonTokenType.String)
             {
                 if (DateTime.TryParse(reader.GetString(), out DateTime date))
                     return date;
+                else
+                    return null;
             }
             return reader.GetDateTime();
         }
 
-        public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, DateTime? value, JsonSerializerOptions options)
         {
-            writer.WriteStringValue(value.ToString("yyyy-MM-dd HH:mm:ss"));
+            if (value != null)
+            {
+                writer.WriteStringValue(value?.ToString("yyyy-MM-dd HH:mm:ss"));
+            }
         }
     }
 }

From 9306c80c5e0259348659c59599542232e57e7634 Mon Sep 17 00:00:00 2001
From: liu liang <liuliang79@live.com>
Date: Fri, 16 Jun 2023 23:11:41 +0800
Subject: [PATCH 02/12] update vue

---
 .../ClientApp/src/components/table/index.vue                  | 4 +++-
 .../ClientApp/src/views/_admin/frameworkgroup/index.vue       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/components/table/index.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/components/table/index.vue
index d2839c582..c8da0e9e6 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/components/table/index.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/components/table/index.vue
@@ -13,7 +13,7 @@
 			<el-table-column type="index" :label="$t('message._system.table.no')" width="60" v-if="config.isSerialNo" />
 			<el-table-column v-for="(item, index) in setHeader" :key="index"
 				:show-overflow-tooltip="item.type !== 'combobox' && item.type !== 'switch' && item.type !== 'date' && item.type !== 'textbox'"
-				:prop="item.key" :width="item.colWidth" :label="item.title" :sortable="item.sortable">
+				:prop="item.key" :width="item.colWidth" :label="item.title" :sortable="item.sortable" :align="item.align">
 				<template v-slot="scope">
 					<template v-if="item.type === 'image'">
 						<el-image :preview-teleported="true" v-if="scope.row[item.key + '__localurl__'] !== ''"
@@ -143,6 +143,7 @@ const props = defineProps({
 	 * colWidth:字符串类型，列宽，
 	 * title：字符串类型，列头文字，
 	 * type：字符串类型，可填'text','switch','image','textbox,'combobox','date','icon'
+	 * align: 字符串，可填'left','right','center'，默认是left
 	 * isChecked:是否默认展示
 	 * isDisabled:列中控件是否显示为禁用状态
 	 * comboData:当type='combobox'时，指定下拉菜单的数据，可以为{value1:label1,value2:label2}这种格式，也可以为某个后台url
@@ -294,6 +295,7 @@ const doSearch = (api: any = null, para: any = null, isTree: any = null, parentK
 	if (isTree !== null) {
 		isTreeState = isTree
 	}
+	
 	let pro: Promise<AxiosResponse<any, any>> = searchApi(state.searcher);
 	return pro.then(res => {
 		const datatemp: any[] = [];
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/index.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/index.vue
index 465699320..d1981fdd4 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/index.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/index.vue
@@ -99,7 +99,7 @@ const searchData = ref({
 
 // 初始化表格数据
 const getTableData = () => {
-	tableRef.value.doSearch(frameworkgroupApi().search, searchData.value)
+	tableRef.value.doSearch(frameworkgroupApi().search, searchData.value,true)
 		.catch((error: any) => {
 			other.setFormError(ci, error);
 		});

From 7ffdb62a76963c5ee8153bb44c02c54e28311bbe Mon Sep 17 00:00:00 2001
From: liu liang <liuliang79@live.com>
Date: Sun, 18 Jun 2023 01:00:13 +0800
Subject: [PATCH 03/12] update vue

---
 .../ClientApp/src/components/table/index.vue  | 12 ++++---
 .../ClientApp/src/router/backEnd.ts           | 36 ++++++++++++-------
 .../src/views/_admin/frameworkmenu/create.vue |  6 ++--
 .../src/views/_admin/frameworkmenu/detail.vue |  6 ++--
 .../src/views/_admin/frameworkmenu/edit.vue   |  7 ++--
 5 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/components/table/index.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/components/table/index.vue
index c8da0e9e6..a45616b50 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/components/table/index.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/components/table/index.vue
@@ -71,13 +71,13 @@
 			</template>
 		</el-table>
 		<div class="table-footer mt15" v-if="props.config.isSub !== true">
-			<el-pagination v-if="config.total > 0" v-model:current-page="state.searcher.Page"
+			<el-pagination v-if="config.total > 0 && config.hidePagination!=true" v-model:current-page="state.searcher.Page"
 				v-model:page-size="state.searcher.Limit" :pager-count="5" :page-sizes="[20, 50, 100, 200]"
 				:total="config.total" layout="total, sizes, prev, pager, next, jumper" background
 				@size-change="onHandleSizeChange" @current-change="onHandleCurrentChange">
 			</el-pagination>
 			<div class="table-footer-tool">
-				<el-popover placement="top-end" trigger="click" transition="el-zoom-in-top" popper-class="table-tool-popper"
+				<el-popover v-if="config.hideSetting!=true" placement="top-end" trigger="click" transition="el-zoom-in-top" popper-class="table-tool-popper"
 					:width="300" :persistent="false" @show="onSetTable">
 					<template #reference>
 						<i class="fa fa-gear">{{ $t('message._system.table.setting') }}</i>
@@ -105,8 +105,8 @@
 						</el-scrollbar>
 					</template>
 				</el-popover>
-				<i class="fa fa-print" @click="doPrint">{{ $t('message._system.table.print') }}</i>
-				<i class="fa fa-refresh" @click="doSearch(null, null, isTreeState)">{{ $t('message._system.table.refresh')
+				<i v-if="config.hidePrint!=true" class="fa fa-print" @click="doPrint">{{ $t('message._system.table.print') }}</i>
+				<i v-if="config.hideRefresh!=true" class="fa fa-refresh" @click="doSearch(null, null, isTreeState)">{{ $t('message._system.table.refresh')
 				}}</i>
 			</div>
 		</div>
@@ -165,6 +165,10 @@ const props = defineProps({
 	 * isOperate: 布尔值，是否显示表格操作栏
 	 * isDisabled:布尔值，是否禁用
 	 * isSub:是否为子表控件
+	 * hidePagination:是否显示分页
+	 * hideSetting:是否显示设置按钮
+	 * hidePrint:是否显示打印按钮
+	 * hideRefresh:是否显示刷新按钮
 	 */
 	config: {
 		type: Object,
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/router/backEnd.ts b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/router/backEnd.ts
index c746fe41e..2800eae00 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/router/backEnd.ts
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/router/backEnd.ts
@@ -50,8 +50,9 @@ export async function initBackEndControlRoutes() {
 	}
 	else {
 		localMenu = formatFlatteningRoutes(localMenu);
-		menu = await getBackEndControlRoutes(useUserInfo().userInfos.menu.filter(x => !x.ParentId || x.ParentId == ''),useUserInfo().userInfos.menu,localMenu);
-		menu.push(...localMenu.filter(x=>x.meta.isHide == true));
+		menu = await getBackEndControlRoutes(useUserInfo().userInfos.menu.filter(x => !x.ParentId || x.ParentId == ''), useUserInfo().userInfos.menu, localMenu);
+		console.log(menu);
+		menu.push(...localMenu.filter(x => x.meta.isHide == true));
 	}
 	// 无登录权限时，添加判断
 	// https://gitee.com/lyt-top/vue-next-admin/issues/I64HVO
@@ -132,29 +133,40 @@ export async function setAddRoute() {
  * @description isRequestRoutes 为 true，则开启后端控制路由
  * @returns 返回后端路由菜单数据
  */
-export function getBackEndControlRoutes(menus: any[],allMenus: any[],localMenu: any[]) {
+export function getBackEndControlRoutes(menus: any[], allMenus: any[], localMenu: any[]) {
 	let rv: any[] = [];
 	menus.forEach(element => {
 		const newdata = {
 			path: element.Url && element.Url != '' ? element.Url : '/' + element.Id,
 			name: element.Id,
-			component:'',
+			component: '',
 			meta: {
 				title: element.Text,
 				isHide: false,
 				isKeepAlive: true,
+				isLink: '',
 				isAffix: false,
 				isIframe: false,
+				className: null,
 				icon: element.Icon
-			},			
-			children:getBackEndControlRoutes(allMenus.filter(x=>x.ParentId == element.Id),allMenus,localMenu)
+			},
+			children: getBackEndControlRoutes(allMenus.filter(x => x.ParentId == element.Id), allMenus, localMenu)
 		}
-		let comp = localMenu.filter(x=>x.path == newdata.path);
-		if(comp.length>0){
-			newdata.component = comp[0].component;
+		if (newdata.path && (newdata.path.toLowerCase().indexOf("http://") !== -1 || newdata.path.toLowerCase().indexOf("https://") !== -1)) {
+			newdata.meta.isIframe = true;
+			newdata.meta.isLink = newdata.path;
+			newdata.component = "layout/routerView/iframes.vue";
+			newdata.path = '/' + element.Id
 		}
-		else{
-			newdata.component = "layout/routerView/parent.vue";
+		else {
+			let comp = localMenu.filter(x => x.path == newdata.path);
+			if (comp.length > 0) {
+				newdata.component = comp[0].component;
+				newdata.meta.className = comp[0].meta.className;
+			}
+			else {
+				newdata.component = "layout/routerView/parent.vue";
+			}
 		}
 		rv.push(newdata);
 	});
@@ -213,7 +225,7 @@ async function GetLocalFile() {
 			let cur = null;
 			if (dir.length == 0) {
 				cur = {
-					path: "/" + name+"_folder",
+					path: "/" + name + "_folder",
 					name: name,
 					component: "layout/routerView/parent.vue",
 					meta: {
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/create.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/create.vue
index eb22a62b5..6d3002f0b 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/create.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/create.vue
@@ -50,7 +50,7 @@
 					</el-col>
 				</el-row>
 
-				<el-row v-if="state.vmModel.Entity.IsInside">
+				<el-row >
 					<el-col :xs="24" :lg="12" class="mb20">
 						<el-form-item ref="Entity_PageName_FormItem" prop="Entity.PageName"
 							:label="$t('message._admin.menu.vm.PageName')"
@@ -243,7 +243,9 @@ const modelChange = (value: any) => {
 	}
 	else {
 		state.allActions = [];
-		state.vmModel.Entity.Url = '';
+		if(state.vmModel.Entity.IsInside == true){
+			state.vmModel.Entity.Url = '';
+		}
 	}
 }
 
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/detail.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/detail.vue
index 72c0a0646..f3d8deb6b 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/detail.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/detail.vue
@@ -45,7 +45,7 @@
 					</el-col>
 				</el-row>
 
-				<el-row v-if="state.vmModel.Entity.IsInside">
+				<el-row>
 					<el-col :xs="24" :lg="12" class="mb20">
 						<el-form-item ref="Entity_PageName_FormItem" prop="Entity.PageName"
 							:label="$t('message._admin.menu.vm.PageName')"
@@ -223,7 +223,9 @@ const modelChange = (value: any, reset: boolean = true) => {
 	}
 	else {
 		state.allActions = [];
-		state.vmModel.Entity.Url = '';
+		if(state.vmModel.Entity.IsInside == true){
+			state.vmModel.Entity.Url = '';
+		}
 	}
 }
 // 暴露变量
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/edit.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/edit.vue
index 01eec79b6..a5d3cdf61 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/edit.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/edit.vue
@@ -49,7 +49,7 @@
 						</el-form-item> </el-col>
 				</el-row>
 
-				<el-row v-if="state.vmModel.Entity.IsInside">
+				<el-row>
 					<el-col :xs="24" :lg="12" class="mb20">
 						<el-form-item ref="Entity_PageName_FormItem" prop="Entity.PageName"
 							:label="$t('message._admin.menu.vm.PageName')"
@@ -192,6 +192,7 @@ onMounted(() => {
 		state.vmModel.Entity.ID = useRouter().currentRoute.value.query.id as any;
 	}
 	state.menuData = getMenuData(routesList.value);
+	console.log(state.menuData)
 	frameworkmenuApi().get(state.vmModel.Entity.ID ?? "").then((data: any) => { other.setValue(state.vmModel, data); modelChange(state.vmModel.SelectedModule, false) });
 	other.getSelectList('/api/_account/GetFrameworkRoles', [], false).then(x => { state.allRoles = x });
 	other.getSelectList('/api/_FrameworkMenu/GetFolders', [], false).then(x => { state.allParents = x });
@@ -248,7 +249,9 @@ const modelChange = (value: any, reset: boolean = true) => {
 	}
 	else {
 		state.allActions = [];
-		state.vmModel.Entity.Url = '';
+		if(state.vmModel.Entity.IsInside == true){
+			state.vmModel.Entity.Url = '';
+		}
 	}
 }
 const handleCheckAllChange = (val: boolean) => {

From 148bf608d8f62ab6990b97f52d4f1b352ba5b380 Mon Sep 17 00:00:00 2001
From: liu liang <liuliang79@live.com>
Date: Mon, 19 Jun 2023 21:49:01 +0800
Subject: [PATCH 04/12] update default json options

---
 .../Json/DateTimeConverter.cs                 |  13 +--
 .../Json/NullableConverter.cs                 |  37 ++++++
 .../Json/NullableEnumConverter.cs             | 105 ++++++++++++++++++
 .../Filters/FrameworkFilter.cs                |   2 +-
 .../Helper/MvcOptionExtension.cs              |  26 ++++-
 5 files changed, 170 insertions(+), 13 deletions(-)
 create mode 100644 src/WalkingTec.Mvvm.Core/Json/NullableConverter.cs
 create mode 100644 src/WalkingTec.Mvvm.Core/Json/NullableEnumConverter.cs

diff --git a/src/WalkingTec.Mvvm.Core/Json/DateTimeConverter.cs b/src/WalkingTec.Mvvm.Core/Json/DateTimeConverter.cs
index 1564a62cc..74628d4a5 100644
--- a/src/WalkingTec.Mvvm.Core/Json/DateTimeConverter.cs
+++ b/src/WalkingTec.Mvvm.Core/Json/DateTimeConverter.cs
@@ -9,26 +9,21 @@
 namespace WalkingTec.Mvvm.Core.Json
 {
 
-    public class DateTimeConverter : JsonConverter<DateTime?>
+    public class DateTimeConverter : JsonConverter<DateTime>
     {
-        public override DateTime? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             if (reader.TokenType == JsonTokenType.String)
             {
                 if (DateTime.TryParse(reader.GetString(), out DateTime date))
                     return date;
-                else
-                    return null;
             }
             return reader.GetDateTime();
         }
 
-        public override void Write(Utf8JsonWriter writer, DateTime? value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
         {
-            if (value != null)
-            {
-                writer.WriteStringValue(value?.ToString("yyyy-MM-dd HH:mm:ss"));
-            }
+            writer.WriteStringValue(value.ToString("yyyy-MM-dd HH:mm:ss"));
         }
     }
 }
diff --git a/src/WalkingTec.Mvvm.Core/Json/NullableConverter.cs b/src/WalkingTec.Mvvm.Core/Json/NullableConverter.cs
new file mode 100644
index 000000000..6b5f5f234
--- /dev/null
+++ b/src/WalkingTec.Mvvm.Core/Json/NullableConverter.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+
+namespace WalkingTec.Mvvm.Core.Json
+{
+
+    public class NullableConverter<T> : JsonConverter<Nullable<T>> where T : struct
+    {
+        public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            if (reader.TokenType == JsonTokenType.String)
+            {
+                if (string.IsNullOrEmpty(reader.GetString()) || string.IsNullOrWhiteSpace(reader.GetString()))
+                {
+                    return null;
+                }
+                else
+                {
+                    return JsonSerializer.Deserialize<T>(ref reader, options);
+                }
+            }
+            return JsonSerializer.Deserialize<T>(ref reader, options);
+        }
+
+
+        public override void Write(Utf8JsonWriter writer, T? value, JsonSerializerOptions options)
+        {
+            JsonSerializer.Serialize(writer, value!.Value, options);
+        }
+    }
+
+}
diff --git a/src/WalkingTec.Mvvm.Core/Json/NullableEnumConverter.cs b/src/WalkingTec.Mvvm.Core/Json/NullableEnumConverter.cs
new file mode 100644
index 000000000..d3ec42b43
--- /dev/null
+++ b/src/WalkingTec.Mvvm.Core/Json/NullableEnumConverter.cs
@@ -0,0 +1,105 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Text.Encodings.Web;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Text.RegularExpressions;
+using System.Text.Unicode;
+using System.Threading.Tasks;
+using WalkingTec.Mvvm.Core.Extensions;
+
+namespace WalkingTec.Mvvm.Core.Json
+{
+    public class NullableEnumConverter : JsonConverterFactory
+    {
+
+        public override bool CanConvert(Type typeToConvert)
+        {
+            return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(Nullable<>) && typeToConvert.GetGenericArguments()[0].IsEnum;
+        }
+
+        public override JsonConverter CreateConverter(
+            Type type,
+            JsonSerializerOptions options)
+        {
+
+            var temp = CloneOptions(options);
+            foreach (var item in options.Converters)
+            {
+                if(item.GetType() != typeof(PocoConverter) && item.GetType() != typeof(NullableEnumConverter))
+                {
+                    temp.Converters.Add(item);
+                }
+            }
+            JsonConverter converter = (JsonConverter)Activator.CreateInstance(
+                typeof(NullableEnumConverterInner<>).MakeGenericType(
+                    new Type[] { type }),
+                BindingFlags.Instance | BindingFlags.Public,
+                binder: null,
+                args: new object[] { temp },
+                culture: null);
+
+            return converter;
+        }
+
+        private JsonSerializerOptions CloneOptions(JsonSerializerOptions op)
+        {
+            JsonSerializerOptions rv = new JsonSerializerOptions();
+            rv.PropertyNamingPolicy = op.PropertyNamingPolicy;
+            rv.AllowTrailingCommas = op.AllowTrailingCommas;
+            rv.DefaultBufferSize = op.DefaultBufferSize;
+            rv.DefaultIgnoreCondition = op.DefaultIgnoreCondition;
+            rv.DictionaryKeyPolicy = op.DictionaryKeyPolicy;
+            rv.Encoder = op.Encoder;
+            rv.IgnoreNullValues = op.IgnoreNullValues;
+            rv.IgnoreReadOnlyFields = op.IgnoreReadOnlyFields;
+            rv.IgnoreReadOnlyProperties = op.IgnoreReadOnlyProperties;
+            rv.IncludeFields = op.IncludeFields;
+            rv.DefaultIgnoreCondition = op.DefaultIgnoreCondition;
+            rv.DictionaryKeyPolicy = op.DictionaryKeyPolicy;
+            rv.MaxDepth = op.MaxDepth;
+            rv.NumberHandling = op.NumberHandling;
+            rv.ReadCommentHandling = op.ReadCommentHandling;
+            rv.ReferenceHandler = op.ReferenceHandler;
+            rv.WriteIndented = op.WriteIndented;
+            return rv;
+        }
+
+        private class NullableEnumConverterInner<T> :
+            JsonConverter<T>
+        {
+            protected readonly JsonSerializerOptions _options;
+            public NullableEnumConverterInner(JsonSerializerOptions options)
+            {
+                _options = options;
+            }
+
+            public override T Read(
+                ref Utf8JsonReader reader,
+                Type typeToConvert,
+                JsonSerializerOptions options)
+            {
+                if (reader.TokenType == JsonTokenType.String)
+                {
+                    if (string.IsNullOrEmpty(reader.GetString()) || string.IsNullOrWhiteSpace(reader.GetString()))
+                    {
+                        return default(T);
+                    }
+                }
+                return JsonSerializer.Deserialize<T>(ref reader, _options);
+            }
+
+            public override void Write(
+                Utf8JsonWriter writer,
+                T data,
+                JsonSerializerOptions options)
+            {
+                JsonSerializer.Serialize(writer, data, typeof(T), _options);
+            }
+        }
+
+    }
+}
diff --git a/src/WalkingTec.Mvvm.Mvc/Filters/FrameworkFilter.cs b/src/WalkingTec.Mvvm.Mvc/Filters/FrameworkFilter.cs
index 684ba22e7..2128cc5f7 100644
--- a/src/WalkingTec.Mvvm.Mvc/Filters/FrameworkFilter.cs
+++ b/src/WalkingTec.Mvvm.Mvc/Filters/FrameworkFilter.cs
@@ -93,7 +93,7 @@ public override void OnActionExecuting(ActionExecutingContext context)
                         if (context.HttpContext.Items.ContainsKey("DONOTUSE_REQUESTBODY"))
                         {
                             string body = context.HttpContext.Items["DONOTUSE_REQUESTBODY"].ToString();
-                            var joption = new JsonSerializerOptions();
+                            var joption = new JsonSerializerOptions(Core.CoreProgram.DefaultJsonOption);
                             joption.Converters.Add(new BodyConverter());
                             try
                             {
diff --git a/src/WalkingTec.Mvvm.Mvc/Helper/MvcOptionExtension.cs b/src/WalkingTec.Mvvm.Mvc/Helper/MvcOptionExtension.cs
index c61319f76..e38f7d647 100644
--- a/src/WalkingTec.Mvvm.Mvc/Helper/MvcOptionExtension.cs
+++ b/src/WalkingTec.Mvvm.Mvc/Helper/MvcOptionExtension.cs
@@ -50,19 +50,39 @@ public static void UseWtmJsonOptions(this JsonOptions options)
             options.JsonSerializerOptions.IgnoreNullValues = true;
             options.JsonSerializerOptions.NumberHandling = JsonNumberHandling.AllowReadingFromString;
             options.JsonSerializerOptions.AllowTrailingCommas = true;
+            options.JsonSerializerOptions.Converters.Add(new NullableConverter<int>());
+            options.JsonSerializerOptions.Converters.Add(new NullableConverter<long>());
+            options.JsonSerializerOptions.Converters.Add(new NullableConverter<decimal>());
+            options.JsonSerializerOptions.Converters.Add(new NullableConverter<short>());
+            options.JsonSerializerOptions.Converters.Add(new NullableConverter<float>());
+            options.JsonSerializerOptions.Converters.Add(new NullableConverter<double>());
+            options.JsonSerializerOptions.Converters.Add(new NullableConverter<bool>());
+            options.JsonSerializerOptions.Converters.Add(new NullableConverter<DateTime>());
+            options.JsonSerializerOptions.Converters.Add(new NullableConverter<Guid>());
+            options.JsonSerializerOptions.Converters.Add(new NullableEnumConverter());
+            options.JsonSerializerOptions.Converters.Add(new BoolStringConverter());
+            options.JsonSerializerOptions.Converters.Add(new DateRangeConverter());
             options.JsonSerializerOptions.Converters.Add(new DateTimeConverter());
             options.JsonSerializerOptions.Converters.Add(new StringIgnoreLTGTConverter());
             options.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
-            options.JsonSerializerOptions.Converters.Add(new BoolStringConverter());
-            options.JsonSerializerOptions.Converters.Add(new DateRangeConverter());
             options.JsonSerializerOptions.Converters.Add(new PocoConverter());
             options.JsonSerializerOptions.Converters.Add(new TypeConverter());
             options.JsonSerializerOptions.Converters.Add(new DynamicDataConverter());
             Core.CoreProgram.DefaultJsonOption = options.JsonSerializerOptions;
             JsonSerializerOptions jsonOptions2 = new JsonSerializerOptions();
             jsonOptions2.PropertyNamingPolicy = null;
-            jsonOptions2.NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString;
+            jsonOptions2.NumberHandling = JsonNumberHandling.AllowReadingFromString;
             jsonOptions2.AllowTrailingCommas = true;
+            jsonOptions2.Converters.Add(new NullableConverter<int>());
+            jsonOptions2.Converters.Add(new NullableConverter<long>());
+            jsonOptions2.Converters.Add(new NullableConverter<decimal>());
+            jsonOptions2.Converters.Add(new NullableConverter<short>());
+            jsonOptions2.Converters.Add(new NullableConverter<float>());
+            jsonOptions2.Converters.Add(new NullableConverter<double>());
+            jsonOptions2.Converters.Add(new NullableConverter<bool>());
+            jsonOptions2.Converters.Add(new NullableConverter<DateTime>());
+            jsonOptions2.Converters.Add(new NullableConverter<Guid>());
+            jsonOptions2.Converters.Add(new NullableEnumConverter());
             jsonOptions2.Converters.Add(new DateTimeConverter());
             jsonOptions2.Converters.Add(new JsonStringEnumConverter());
             jsonOptions2.Converters.Add(new BoolStringConverter());

From bf7c6df6296ed425f2519482151af9345db9abc6 Mon Sep 17 00:00:00 2001
From: liu liang <liuliang79@live.com>
Date: Mon, 19 Jun 2023 22:26:33 +0800
Subject: [PATCH 05/12] update GetSingleProperty

---
 .../Extensions/SystemExtensions/TypeExtension.cs     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/WalkingTec.Mvvm.Core/Extensions/SystemExtensions/TypeExtension.cs b/src/WalkingTec.Mvvm.Core/Extensions/SystemExtensions/TypeExtension.cs
index 54c49018e..996286804 100644
--- a/src/WalkingTec.Mvvm.Core/Extensions/SystemExtensions/TypeExtension.cs
+++ b/src/WalkingTec.Mvvm.Core/Extensions/SystemExtensions/TypeExtension.cs
@@ -488,7 +488,11 @@ public static PropertyInfo GetSingleProperty(this Type self, string name)
             if (_propertyCache.ContainsKey(self.FullName) == false)
             {
                 var properties = self.GetProperties().ToList();
-                _propertyCache = _propertyCache.Add(self.FullName, properties);
+                try
+                {
+                    _propertyCache = _propertyCache.Add(self.FullName, properties);
+                }
+                catch { }
                 return properties.Where(x => x.Name == name).FirstOrDefault();
             }
             else
@@ -502,7 +506,11 @@ public static PropertyInfo GetSingleProperty(this Type self, Func<PropertyInfo,b
             if (_propertyCache.ContainsKey(self.FullName) == false)
             {
                 var properties = self.GetProperties().ToList();
-                _propertyCache = _propertyCache.Add(self.FullName, properties);
+                try
+                {
+                    _propertyCache = _propertyCache.Add(self.FullName, properties);
+                }
+                catch { }
                 return properties.Where(where).FirstOrDefault();
             }
             else

From ad8efec3f4c0b1b726566e690cbe9b411cfe5b6b Mon Sep 17 00:00:00 2001
From: liu liang <liuliang79@live.com>
Date: Wed, 21 Jun 2023 13:56:05 +0800
Subject: [PATCH 06/12] updatge js

---
 .../_Admin/Views/ActionLog/Details.cshtml     |  4 +-
 src/WalkingTec.Mvvm.Mvc/framework_layui.js    | 70 +++++++++++--------
 2 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/demo/WalkingTec.Mvvm.Demo/Areas/_Admin/Views/ActionLog/Details.cshtml b/demo/WalkingTec.Mvvm.Demo/Areas/_Admin/Views/ActionLog/Details.cshtml
index 1ab34ecd0..e1b3e6897 100644
--- a/demo/WalkingTec.Mvvm.Demo/Areas/_Admin/Views/ActionLog/Details.cshtml
+++ b/demo/WalkingTec.Mvvm.Demo/Areas/_Admin/Views/ActionLog/Details.cshtml
@@ -20,7 +20,9 @@
   </wt:row>
 
   <wt:textarea field="Entity.Remark" height="200" />
-
+    <wt:row align="AlignEnum.Right">
+        <wt:closebutton />
+    </wt:row>
 </wt:form>
 
 <!-- WTM默认页面 Wtm buidin page-->
diff --git a/src/WalkingTec.Mvvm.Mvc/framework_layui.js b/src/WalkingTec.Mvvm.Mvc/framework_layui.js
index 7a25a5889..8334b1a0b 100644
--- a/src/WalkingTec.Mvvm.Mvc/framework_layui.js
+++ b/src/WalkingTec.Mvvm.Mvc/framework_layui.js
@@ -162,37 +162,45 @@ window.ff = {
             if (para !== undefined) {
                 getpost = "Post";
             }
-            $.ajax({
-                type: getpost,
-                url: url,
-                data: para,
-                success: function (data, textStatus, request) {
-                    if (request.getResponseHeader('IsScript') === 'true') {
-                        eval(data);
-                    }
-                    else {
-                        data = '<div class="layui-card donotuse_pdiv"><div class="layui-card-body donotuse_pdiv" id=\"' + $.cookie("divid") + '\" >' + data + "</div></div>";
-                        var child = window.open("/Home/PIndex#/_framework/redirect");
-                        child.document.close();
-                        $(child.document).ready(function () {
-                            setTimeout(function () {
-                                $('#LAY_app_body', child.document).html(data);
-                                $(child.document).attr("title", title);
-                            }, 500);
-                        });
-                    }
-                    layer.close(index);
-                },
-                error: function (a, b, c) {
-                    layer.close(index);
-                    if (a.responseText !== undefined && a.responseText !== "") {
-                        layer.alert(a.responseText);
-                    }
-                    else {
-                        layer.alert(ff.DONOTUSE_Text_LoadFailed);
-                    }
-                }
+            var child = window.open("/Home/PIndex/#" + url);
+            $(child.document).ready(function() {
+            setTimeout(function() {
+                    $(child.document).attr("title", title);
+                }, 500);
             });
+            layer.close(index);
+        //    $.ajax({
+        //        type: getpost,
+        //        url: url,
+        //        data: para,
+        //        success: function (data, textStatus, request) {
+        //            if (request.getResponseHeader('IsScript') === 'true') {
+        //                eval(data);
+        //            }
+        //            else {
+        //                data = '<div class="layui-card donotuse_pdiv"><div class="layui-card-body donotuse_pdiv" id=\"' + $.cookie("divid") + '\" >' + data + "</div></div>";
+        //                var child = window.open("/Home/PIndex/#/_framework/redirect");
+        //                child.document.close();
+        //                $(child.document).ready(function () {
+        //                    setTimeout(function() {
+        //                        debugger;
+        //                        $('#LAY_app_body', child.document).html(data);
+        //                        $(child.document).attr("title", title);
+        //                    }, 500);
+        //                });
+        //            }
+        //            layer.close(index);
+        //        },
+        //        error: function (a, b, c) {
+        //            layer.close(index);
+        //            if (a.responseText !== undefined && a.responseText !== "") {
+        //                layer.alert(a.responseText);
+        //            }
+        //            else {
+        //                layer.alert(ff.DONOTUSE_Text_LoadFailed);
+        //            }
+        //        }
+        //    });
         }
         else {
             layer.close(index);
@@ -553,7 +561,7 @@ window.ff = {
             this.SetCookie("windowids", wids.join());
         }
         else {
-            if (layui.setter == undefined || layui.setter.pageTabs == undefined) {
+            if (layui.setter == undefined || layui.setter.pageTabs == undefined || window.location.href.toLocaleLowerCase().indexOf("/home/pindex/")>-1) {
                 window.close();
             }
             else if (layui.setter.pageTabs === false || $('.layadmin-tabsbody-item').length === 0) {

From 1a9bfd186adc9709645a7d6986eb0f47f0bfa9e8 Mon Sep 17 00:00:00 2001
From: liu liang <liuliang79@live.com>
Date: Tue, 27 Jun 2023 00:10:01 +0800
Subject: [PATCH 07/12] 1

---
 .../WalkingTec.Mvvm.BlazorDemo.Shared/wwwroot/js/common.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/wwwroot/js/common.js b/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/wwwroot/js/common.js
index 3a2686f49..608726840 100644
--- a/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/wwwroot/js/common.js
+++ b/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/wwwroot/js/common.js
@@ -59,9 +59,9 @@ window.urlFuncs = {
                     var a = document.createElement('a');
                     a.download = filename;
                     a.href = e.target.result;
-                    $("body").append(a);
+                    document.body.append(a);
                     a.click();
-                    $(a).remove();
+                    a.remove();
                 }
             }
         };

From c1763655e8e2c66edcb8ccceec4ad97c341f94b6 Mon Sep 17 00:00:00 2001
From: liu liang <liuliang79@live.com>
Date: Tue, 27 Jun 2023 18:52:54 +0800
Subject: [PATCH 08/12] 1

---
 demo/WalkingTec.Mvvm.Demo/Startup.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/WalkingTec.Mvvm.Demo/Startup.cs b/demo/WalkingTec.Mvvm.Demo/Startup.cs
index 0081ca923..b19e76d35 100644
--- a/demo/WalkingTec.Mvvm.Demo/Startup.cs
+++ b/demo/WalkingTec.Mvvm.Demo/Startup.cs
@@ -114,7 +114,7 @@ public List<IDataPrivilege> DataPrivilegeSettings()
             List<IDataPrivilege> pris = new List<IDataPrivilege>();
             //Add data privilege to specific type
             //指定哪些模型需要数据权限
-            //pris.Add(new DataPrivilegeInfo<City>("城市权限", m => m.Name));
+            pris.Add(new DataPrivilegeInfo<City>("城市权限", m => (string)(object)m.Name));
             //pris.Add(new DataPrivilegeInfo<School>("学校权限", m => m.SchoolName));
             //pris.Add(new DataPrivilegeInfo<Major>("专业权限", m => m.MajorName));
             return pris;

From 4f67c321397eeb221c592691891c8e06a8a11c4c Mon Sep 17 00:00:00 2001
From: liu liang <liuliang79@live.com>
Date: Wed, 28 Jun 2023 13:14:50 +0800
Subject: [PATCH 09/12] update vue

---
 .../ClientApp/src/components/table/index.vue  | 620 +++++++++---------
 .../src/views/_admin/school/create.vue        |   2 +-
 .../src/views/_admin/school/detail.vue        |   8 +-
 .../src/views/_admin/school/edit.vue          |   4 +-
 demo/WalkingTec.Mvvm.Vue3Demo/Models/Major.cs |   5 +
 5 files changed, 325 insertions(+), 314 deletions(-)

diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/components/table/index.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/components/table/index.vue
index a45616b50..73a25b8b5 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/components/table/index.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/components/table/index.vue
@@ -39,7 +39,7 @@
 					<template v-else-if="item.type === 'combobox'">
 						<el-select v-model="listvalue[scope.$index][item.key]"
 							:disabled="item.isDisabled || props.config.isDisabled">
-							<el-option v-for="(op, opkey, opindex) in comboData[item.key]" :key="opindex" :value="opkey"
+							<el-option v-for="(op, opkey, opindex) in state.comboData[item.key]" :key="opindex" :value="opkey"
 								:label="op"></el-option>
 						</el-select>
 					</template>
@@ -116,264 +116,266 @@
 
 
 <script setup lang="ts" name="netxTable">
-import { reactive, computed, nextTick, ref, getCurrentInstance } from 'vue';
-import { ElMessage } from 'element-plus';
-import table2excel from 'js-table2excel';
-import Sortable from 'sortablejs';
-import { storeToRefs } from 'pinia';
-import { useThemeConfig } from '/@/stores/themeConfig';
-import fileapi from '/@/api/file'
-import '/@/theme/tableTool.scss';
-import { AxiosResponse } from 'axios';
-import { VueDevToolsIDs } from '@intlify/vue-devtools';
-import printJs from 'print-js';
-import other from '/@/utils/other';
-
-const emit = defineEmits(['update:modelValue']);
-// 定义父组件传过来的值
-const props = defineProps({
-	// 列表内容
-	data: {
-		type: Array<any>,
-		default: () => [],
-	},
-	/**
-	 * 表头内容,object数组，可设置
-	 * key:字符串类型，字段名称，
-	 * colWidth:字符串类型，列宽，
-	 * title：字符串类型，列头文字，
-	 * type：字符串类型，可填'text','switch','image','textbox,'combobox','date','icon'
-	 * align: 字符串，可填'left','right','center'，默认是left
-	 * isChecked:是否默认展示
-	 * isDisabled:列中控件是否显示为禁用状态
-	 * comboData:当type='combobox'时，指定下拉菜单的数据，可以为{value1:label1,value2:label2}这种格式，也可以为某个后台url
-	 * imageWidth:当type='image'时，指定图片宽度
-	 * imageHeight:当type='image时'，指定图片高度
-	 * dateType:当type='date'时，指定日期控件模式，可填写'date','month','year','week','datetime','time'
-	 */
-	header: {
-		type: Array<EmptyObjectType>,
-		default: () => [],
-	},
-	/**
-	 * 配置项，可设置
-	 * total: 列表总数
-	 * loading: 布尔值，是否显示加载
-	 * isBorder: 布尔值，是否显示表格边框
-	 * isSerialNo: 布尔值，是否显示表格序号
-	 * isSelection: 布尔值，是否显示表格多选
-	 * isOperate: 布尔值，是否显示表格操作栏
-	 * isDisabled:布尔值，是否禁用
-	 * isSub:是否为子表控件
-	 * hidePagination:是否显示分页
-	 * hideSetting:是否显示设置按钮
-	 * hidePrint:是否显示打印按钮
-	 * hideRefresh:是否显示刷新按钮
-	 */
-	config: {
-		type: Object,
-		default: () => { },
-	},
-	modelValue: {
-		type: Array<EmptyObjectType>,
-		default: () => [],
-	},
-});
-
-const listvalue = computed({
-	get() {
-		return props.modelValue;
-	},
-	set(value) {
-		emit('update:modelValue', value)
-	}
-})
-const comboData = computed(() => {
-	const ch = props.header.filter((item) => item.type === 'combobox');
-	const rv = {} as any;
-	ch.forEach(element => {
-		let cd = {} as any;
-		if (element.comboData && typeof element.comboData == 'string') {
-			other.getSelectList(element.comboData, [], false).then((data: any) => {
-				data.forEach((x: any) => {
-					cd[x.Value] = x.Text
-				});
-			})
-		}
-		else {
-			cd = element.comboData
-		}
-		const newdata = {};
-		rv[element.key] = cd;
-	});
-	return rv;
-});
-
-
-// 定义变量内容
-const ci = getCurrentInstance() as any;
-const toolSetRef = ref();
-const forPrint = ref();
-const storesThemeConfig = useThemeConfig();
-const { themeConfig } = storeToRefs(storesThemeConfig);
-const state = reactive({
-	searcher: {
-		Page: 1,
-		Limit: 20,
-		SortInfo: null as any
-	},
-	data: ref(props.data),
-	picList: [] as string[],
-	selectlist: [] as EmptyObjectType[],
-	checkListAll: true,
-	checkListIndeterminate: false,
-});
-let searchApi: Function = function (a: any = null, b: any = null) { };
-let isTreeState: any = null;
-// 设置边框显示/隐藏
-const setBorder = computed(() => {
-	return Object.hasOwn(props.config,"isBorder")? props.config.isBorder : false;
-});
-// 获取父组件 配置项（必传）
-const getConfig = computed(() => {
-	return props.config;
-});
-// 设置 tool header 数据
-const setHeader = computed(() => {
-	return props.header.filter((v) => v.isCheck);
-});
-// tool 列显示全选改变时
-const onCheckAllChange = <T>(val: T) => {
-	if (val) props.header.forEach((v) => (v.isCheck = true));
-	else props.header.forEach((v) => (v.isCheck = false));
-	state.checkListIndeterminate = false;
-};
-// tool 列显示当前项改变时
-const onCheckChange = () => {
-	const headers = props.header.filter((v) => v.isCheck).length;
-	state.checkListAll = headers === props.header.length;
-	state.checkListIndeterminate = headers > 0 && headers < props.header.length;
-};
-
-// 表格多选改变时，用于导出
-const onSelectionChange = (val: EmptyObjectType[]) => {
-	state.selectlist = val;
-};
-
-// 排序改变时
-const onSortChange = (columninfo: any) => {
-	if (columninfo.prop && columninfo.order) {
-		state.searcher.SortInfo = {
-			Property: columninfo.prop,
-			Direction: columninfo.order === "descending" ? "Desc" : "Asc"
-		}
-	}
-	else {
-		state.searcher.SortInfo = null;
-	}
-	doSearch();
-};
-// 删除当前项
-const onDelRow = (row: EmptyObjectType) => {
-	//emit('delRow', row);
-};
-// 分页改变
-const onHandleSizeChange = (val: number) => {
-	state.searcher.Limit = val;
-	doSearch();
-};
-// 分页改变
-const onHandleCurrentChange = (val: number) => {
-	state.searcher.Page = val;
-	doSearch();
-};
-
-const doSearch = (api: any = null, para: any = null, isTree: any = null, parentKey: string = 'ParentId') => {
-
-	if (para !== null) {
-		Object.assign(state.searcher, para);
-	}
-	if (api != null) {
-		searchApi = api;
-	}
-	if (isTree !== null) {
-		isTreeState = isTree
-	}
-	
-	let pro: Promise<AxiosResponse<any, any>> = searchApi(state.searcher);
-	return pro.then(res => {
-		const datatemp: any[] = [];
-		const imageHeaders = props.header.filter((v) => v.isCheck && v.type === 'image');
-		let index = 0;
-		res.Data.forEach((element: EmptyObjectType<any>) => {
-			imageHeaders.forEach((ih) => {
-				element[ih.key + "__localurl__"] = "";
-				if (element[ih.key]) {
-					element[ih.key + "__localurl__"] = '/api/_file/getfile/' + element[ih.key] + "?width=150&height=150";
-					element[ih.key + "__preview__"] = index++;
-					state.picList.push(element[ih.key + "__localurl__"]);
-				}
-			})
-			datatemp.push(element);
-		});
-		if (isTreeState !== true) {
-			state.data = datatemp;
-			props.config.total = res.Count;
-			props.config.loading = false;
-		}
-		else {
-			datatemp.forEach(element => {
-				element['children'] = datatemp.filter(x => x[parentKey] == element.ID);
-
-			});
-			state.data = datatemp.filter(x => !x[parentKey] || x[parentKey] == '')
-			props.config.total = 0;
-			props.config.loading = false;
-		}
-	}).catch(e=>{		
-		props.config.loading = false;
-	});
-}
-
-const setData = (data: any[], istree: any = false, parentKey: string = 'ParentId') => {
-	if (istree !== true) {
-		if(props.config.isSub){
-			listvalue.value = data;
-		}
-		else{
-			state.data = data;
-		}
-		props.config.total = data.length;
-		props.config.loading = false;
-	}
-	else {
-		data.forEach(element => {
-			element['children'] = data.filter(x => x[parentKey] == element.ID);
-		});
-		if(props.config.isSub){
-			listvalue.value = data.filter(x => !x[parentKey] || x[parentKey] == '');
-		}
-		else{
-			state.data = data.filter(x => !x[parentKey] || x[parentKey] == '')
-		}
-		props.config.total = 0;
-		props.config.loading = false;
-	}
-}
-
-const doPrint = () => {
-	var printdata = other.flatTree(state.data, setHeader.value[0].key)
-	printJs({
-		documentTitle: ' ',
-		printable: printdata,
-		type: 'json',
-		properties: setHeader.value.map((item) => {
-			return {
-				field: item.key,
-				displayName: item.title
-			}
-		}),
-		gridHeaderStyle: `
+    import { reactive, computed, nextTick, ref, getCurrentInstance, onMounted } from 'vue';
+    import { ElMessage } from 'element-plus';
+    import table2excel from 'js-table2excel';
+    import Sortable from 'sortablejs';
+    import { storeToRefs } from 'pinia';
+    import { useThemeConfig } from '/@/stores/themeConfig';
+    import fileapi from '/@/api/file'
+    import '/@/theme/tableTool.scss';
+    import { AxiosResponse } from 'axios';
+    import { VueDevToolsIDs } from '@intlify/vue-devtools';
+    import printJs from 'print-js';
+    import other from '/@/utils/other';
+
+    const emit = defineEmits(['update:modelValue']);
+    // 定义父组件传过来的值
+    const props = defineProps({
+        // 列表内容
+        data: {
+            type: Array<any>,
+            default: () => [],
+        },
+        /**
+         * 表头内容,object数组，可设置
+         * key:字符串类型，字段名称，
+         * colWidth:字符串类型，列宽，
+         * title：字符串类型，列头文字，
+         * type：字符串类型，可填'text','switch','image','textbox,'combobox','date','icon'
+         * align: 字符串，可填'left','right','center'，默认是left
+         * isChecked:是否默认展示
+         * isDisabled:列中控件是否显示为禁用状态
+         * comboData:当type='combobox'时，指定下拉菜单的数据，可以为{value1:label1,value2:label2}这种格式，也可以为某个后台url
+         * imageWidth:当type='image'时，指定图片宽度
+         * imageHeight:当type='image时'，指定图片高度
+         * dateType:当type='date'时，指定日期控件模式，可填写'date','month','year','week','datetime','time'
+         */
+        header: {
+            type: Array<EmptyObjectType>,
+            default: () => [],
+        },
+        /**
+         * 配置项，可设置
+         * total: 列表总数
+         * loading: 布尔值，是否显示加载
+         * isBorder: 布尔值，是否显示表格边框
+         * isSerialNo: 布尔值，是否显示表格序号
+         * isSelection: 布尔值，是否显示表格多选
+         * isOperate: 布尔值，是否显示表格操作栏
+         * isDisabled:布尔值，是否禁用
+         * isSub:是否为子表控件
+         * hidePagination:是否显示分页
+         * hideSetting:是否显示设置按钮
+         * hidePrint:是否显示打印按钮
+         * hideRefresh:是否显示刷新按钮
+         */
+        config: {
+            type: Object,
+            default: () => { },
+        },
+        modelValue: {
+            type: Array<EmptyObjectType>,
+            default: () => [],
+        }        
+    });
+
+    const listvalue = computed({
+        get() {
+            return props.modelValue;
+        },
+        set(value) {
+            emit('update:modelValue', value)
+        }
+    })
+
+
+    // 定义变量内容
+    const ci = getCurrentInstance() as any;
+    const toolSetRef = ref();
+    const forPrint = ref();
+    const storesThemeConfig = useThemeConfig();
+    const { themeConfig } = storeToRefs(storesThemeConfig);
+    const state = reactive({
+        searcher: {
+            Page: 1,
+            Limit: 20,
+            SortInfo: null as any
+        },
+        data: ref(props.data),
+        picList: [] as string[],
+        selectlist: [] as EmptyObjectType[],
+        checkListAll: true,
+        checkListIndeterminate: false,
+        comboData:{},
+    });
+    let searchApi: Function = function (a: any = null, b: any = null) { };
+    let isTreeState: any = null;
+    // 设置边框显示/隐藏
+    const setBorder = computed(() => {
+        return Object.hasOwn(props.config, "isBorder") ? props.config.isBorder : false;
+    });
+    // 获取父组件 配置项（必传）
+    const getConfig = computed(() => {
+        return props.config;
+    });
+    // 设置 tool header 数据
+    const setHeader = computed(() => {
+        return props.header.filter((v) => v.isCheck);
+    });
+    // tool 列显示全选改变时
+    const onCheckAllChange = <T>(val: T) => {
+        if (val) props.header.forEach((v) => (v.isCheck = true));
+        else props.header.forEach((v) => (v.isCheck = false));
+        state.checkListIndeterminate = false;
+    };
+    // tool 列显示当前项改变时
+    const onCheckChange = () => {
+        const headers = props.header.filter((v) => v.isCheck).length;
+        state.checkListAll = headers === props.header.length;
+        state.checkListIndeterminate = headers > 0 && headers < props.header.length;
+    };
+
+    // 表格多选改变时，用于导出
+    const onSelectionChange = (val: EmptyObjectType[]) => {
+        state.selectlist = val;
+    };
+
+    // 排序改变时
+    const onSortChange = (columninfo: any) => {
+        if (columninfo.prop && columninfo.order) {
+            state.searcher.SortInfo = {
+                Property: columninfo.prop,
+                Direction: columninfo.order === "descending" ? "Desc" : "Asc"
+            }
+        }
+        else {
+            state.searcher.SortInfo = null;
+        }
+        doSearch();
+    };
+    // 删除当前项
+    const onDelRow = (row: EmptyObjectType) => {
+        //emit('delRow', row);
+    };
+    // 分页改变
+    const onHandleSizeChange = (val: number) => {
+        state.searcher.Limit = val;
+        doSearch();
+    };
+    // 分页改变
+    const onHandleCurrentChange = (val: number) => {
+        state.searcher.Page = val;
+        doSearch();
+    };
+
+    onMounted(() => {
+        const ch = props.header.filter((item) => item.type === 'combobox');
+        const rv = {} as any;
+        ch.forEach(element => {
+            let cd = {} as any;
+            if (element.comboData && typeof element.comboData == 'string') {
+                other.getSelectList(element.comboData, [], false).then((data: any) => {
+                    data.forEach((x: any) => {
+                        cd[x.Value] = x.Text
+                    });
+                })
+            }
+            else {
+                cd = element.comboData
+            }
+            const newdata = {};
+            rv[element.key] = cd;
+        });
+        state.comboData = rv;
+    });
+
+    const doSearch = (api: any = null, para: any = null, isTree: any = null, parentKey: string = 'ParentId') => {
+
+        if (para !== null) {
+            Object.assign(state.searcher, para);
+        }
+        if (api != null) {
+            searchApi = api;
+        }
+        if (isTree !== null) {
+            isTreeState = isTree
+        }
+
+        let pro: Promise<AxiosResponse<any, any>> = searchApi(state.searcher);
+        return pro.then(res => {
+            const datatemp: any[] = [];
+            const imageHeaders = props.header.filter((v) => v.isCheck && v.type === 'image');
+            let index = 0;
+            res.Data.forEach((element: EmptyObjectType<any>) => {
+                imageHeaders.forEach((ih) => {
+                    element[ih.key + "__localurl__"] = "";
+                    if (element[ih.key]) {
+                        element[ih.key + "__localurl__"] = '/api/_file/getfile/' + element[ih.key] + "?width=150&height=150";
+                        element[ih.key + "__preview__"] = index++;
+                        state.picList.push(element[ih.key + "__localurl__"]);
+                    }
+                })
+                datatemp.push(element);
+            });
+            if (isTreeState !== true) {
+                state.data = datatemp;
+                props.config.total = res.Count;
+                props.config.loading = false;
+            }
+            else {
+                datatemp.forEach(element => {
+                    element['children'] = datatemp.filter(x => x[parentKey] == element.ID);
+
+                });
+                state.data = datatemp.filter(x => !x[parentKey] || x[parentKey] == '')
+                props.config.total = 0;
+                props.config.loading = false;
+            }
+        }).catch(e => {
+            props.config.loading = false;
+        });
+    }
+
+    const setData = (data: any[], istree: any = false, parentKey: string = 'ParentId') => {
+        if (istree !== true) {
+            if (props.config.isSub) {
+                listvalue.value = data;
+            }
+            else {
+                state.data = data;
+            }
+            props.config.total = data.length;
+            props.config.loading = false;
+        }
+        else {
+            data.forEach(element => {
+                element['children'] = data.filter(x => x[parentKey] == element.ID);
+            });
+            if (props.config.isSub) {
+                listvalue.value = data.filter(x => !x[parentKey] || x[parentKey] == '');
+            }
+            else {
+                state.data = data.filter(x => !x[parentKey] || x[parentKey] == '')
+            }
+            props.config.total = 0;
+            props.config.loading = false;
+        }
+    }
+
+    const doPrint = () => {
+        var printdata = other.flatTree(state.data, setHeader.value[0].key)
+        printJs({
+            documentTitle: ' ',
+            printable: printdata,
+            type: 'json',
+            properties: setHeader.value.map((item) => {
+                return {
+                    field: item.key,
+                    displayName: item.title
+                }
+            }),
+            gridHeaderStyle: `
 			font-size:12px;
 			border:0;
             border-top: 1px solid gray;
@@ -381,7 +383,7 @@ const doPrint = () => {
             border-right:1px solid gray;
             border-bottom:1px solid gray;
 		`,
-		gridStyle: `
+            gridStyle: `
 			font-size:12px;
 			border:0;
             border-top: 1px solid gray;
@@ -389,55 +391,55 @@ const doPrint = () => {
             border-right:1px solid gray;
             border-bottom:1px solid gray;
 		`,
-		style: `@page { size: landscape;} `,
-
-	});
-}
-const getSelectedRows = () => {
-	return state.selectlist;
-}
-
-
-// 设置
-const onSetTable = () => {
-	nextTick(() => {
-		const sortable = Sortable.create(toolSetRef.value, {
-			handle: '.handle',
-			dataIdAttr: 'data-key',
-			animation: 150,
-			onEnd: () => {
-				const headerList: EmptyObjectType[] = [];
-				sortable.toArray().forEach((val) => {
-					props.header.forEach((v) => {
-						if (v.key === val) headerList.push({ ...v });
-					});
-				});
-				props.header.length = 0;
-				headerList.forEach((val) => {
-					props.header.push(val);
-				})
-			},
-		});
-	});
-};
-
-
-const subDelete = (index: any) => {
-
-	listvalue.value.splice(index, 1);
-
-}
-
-const subCreate = () => {
-	listvalue.value.push({});
-}
-// 暴露变量
-defineExpose({
-	doSearch,
-	getSelectedRows,
-	setData,
-	inheritAttrs: false
-});
+            style: `@page { size: landscape;} `,
+
+        });
+    }
+    const getSelectedRows = () => {
+        return state.selectlist;
+    }
+
+
+    // 设置
+    const onSetTable = () => {
+        nextTick(() => {
+            const sortable = Sortable.create(toolSetRef.value, {
+                handle: '.handle',
+                dataIdAttr: 'data-key',
+                animation: 150,
+                onEnd: () => {
+                    const headerList: EmptyObjectType[] = [];
+                    sortable.toArray().forEach((val) => {
+                        props.header.forEach((v) => {
+                            if (v.key === val) headerList.push({ ...v });
+                        });
+                    });
+                    props.header.length = 0;
+                    headerList.forEach((val) => {
+                        props.header.push(val);
+                    })
+                },
+            });
+        });
+    };
+
+
+    const subDelete = (index: any) => {
+
+        listvalue.value.splice(index, 1);
+
+    }
+
+    const subCreate = () => {
+        listvalue.value.push({});
+    }
+    // 暴露变量
+    defineExpose({
+        doSearch,
+        getSelectedRows,
+        setData,
+        inheritAttrs: false
+    });
 </script>
 
 <style scoped lang="scss">
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/create.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/create.vue
index 51f63849e..3ab7c2459 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/create.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/create.vue
@@ -72,7 +72,7 @@ const tableData = ref({
 		{ key: 'MajorName', colWidth: '', title: '专业名称', type: 'textbox', isCheck: true },
 		{ key: 'MajorCode', colWidth: '', title: '专业编号', type: 'textbox', isCheck: true },
 		{ key: 'MajorType', colWidth:'', title:'专业类别', type:'combobox',isCheck:true,comboData:{Required:'必修',Optional:'选修'}},
-		{ key: 'MajorTypeUrl', colWidth:'', title:'url测试', type:'combobox',isCheck:true,comboData:'/api/_FrameworkUser/GetFrameworkRoles'},
+		{ key: 'CityId', colWidth:'', title:'url测试', type:'combobox',isCheck:true,comboData:'/api/city/GetCitys'},
 		{ key: 'test', colWidth: '250', title: 'test', type: 'date', isCheck: true },
 	],
 	// 配置项（必传）
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/detail.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/detail.vue
index 7842adb53..cbf34a516 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/detail.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/detail.vue
@@ -63,9 +63,11 @@ const tableData = ref({
 	data: [],
 	// 表头内容（必传，注意格式）
 	header: [
-		{ key: 'MajorName', colWidth: '', title: '专业名称', type: 'textbox', isCheck: true },
-		{ key: 'MajorCode', colWidth: '', title: '专业编号', type: 'textbox', isCheck: true  },
-		{ key: 'MajorType', colWidth:'', title:'专业类别', type:'combobox',isCheck:true,comboData:{Required:'必修',Optional:'选修'} }
+        { key: 'MajorName', colWidth: '', title: '专业名称', type: 'textbox', isCheck: true },
+        { key: 'MajorCode', colWidth: '', title: '专业编号', type: 'textbox', isCheck: true },
+        { key: 'MajorType', colWidth: '', title: '专业类别', type: 'combobox', isCheck: true, comboData: { Required: '必修', Optional: '选修' } },
+        { key: 'CityId', colWidth: '', title: 'url测试', type: 'combobox', isCheck: true, comboData: '/api/city/GetCitys' },
+        { key: 'test', colWidth: '250', title: 'test', type: 'date', isCheck: true },
 	],
 	// 配置项（必传）
 	config: {
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/edit.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/edit.vue
index 05881b137..4a39f186c 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/edit.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/edit.vue
@@ -72,7 +72,9 @@ const tableData = ref({
 	header: [
 		{ key: 'MajorName', colWidth: '', title: '专业名称', type: 'textbox', isCheck: true },
 		{ key: 'MajorCode', colWidth: '', title: '专业编号', type: 'textbox', isCheck: true },
-		{ key: 'MajorType', colWidth:'', title:'专业类别', type:'combobox',isCheck:true,comboData:{Required:'必修',Optional:'选修'}}
+		{ key: 'MajorType', colWidth:'', title:'专业类别', type:'combobox',isCheck:true,comboData:{Required:'必修',Optional:'选修'}},
+        { key: 'CityId', colWidth: '', title: 'url测试', type: 'combobox', isCheck: true, comboData: '/api/city/GetCitys' },
+        { key: 'test', colWidth: '250', title: 'test', type: 'date', isCheck: true },
 	],
 	// 配置项（必传）
 	config: {
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/Models/Major.cs b/demo/WalkingTec.Mvvm.Vue3Demo/Models/Major.cs
index 1b747c8f3..2ee6c7b7e 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/Models/Major.cs
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/Models/Major.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
@@ -21,6 +22,9 @@ public class Major : BasePoco
         [RegularExpression("^[0-9]{3,3}$", ErrorMessage = "{0}必须是3位数字")]
         public string MajorCode { get; set; }
 
+        public Guid? CityId { get; set; }
+        public City City { get; set; }
+
         [Display(Name = "专业名称")]
         [StringLength(50, ErrorMessage = "{0}最多输入{1}个字符")]
         [Required(ErrorMessage = "{0}是必填项")]
@@ -37,6 +41,7 @@ public class Major : BasePoco
         [Required()]
         public int? SchoolId { get; set; }
 
+        public DateTime? test { get; set; }
 
         [Display(Name = "所属学校")]
         public School School { get; set; }

From dac3642bae9326e8e8360049a592c30b29a40e0a Mon Sep 17 00:00:00 2001
From: liu liang <liuliang79@live.com>
Date: Wed, 28 Jun 2023 22:46:46 +0800
Subject: [PATCH 10/12] update

---
 .../ClientApp/.env.production                 |   3 +-
 .../ClientApp/package-lock.json               | 393 +++++++++++++++++-
 .../ClientApp/package.json                    |  14 +-
 .../ClientApp/src/router/backEnd.ts           |  15 +-
 .../ClientApp/src/stores/themeConfig.ts       |   2 +-
 .../src/views/_admin/actionlog/detail.vue     |   2 +-
 .../src/views/_admin/actionlog/index.vue      |   2 +-
 .../src/views/_admin/dataprivilege/create.vue |   2 +-
 .../src/views/_admin/dataprivilege/detail.vue |   2 +-
 .../src/views/_admin/dataprivilege/edit.vue   |   2 +-
 .../src/views/_admin/dataprivilege/index.vue  |   2 +-
 .../views/_admin/frameworkgroup/create.vue    |   2 +-
 .../views/_admin/frameworkgroup/detail.vue    |   2 +-
 .../src/views/_admin/frameworkgroup/edit.vue  |   2 +-
 .../views/_admin/frameworkgroup/import.vue    |   2 +-
 .../src/views/_admin/frameworkgroup/index.vue |   2 +-
 .../src/views/_admin/frameworkmenu/create.vue |  77 +---
 .../src/views/_admin/frameworkmenu/detail.vue |   2 +-
 .../src/views/_admin/frameworkmenu/edit.vue   |   2 +-
 .../src/views/_admin/frameworkmenu/index.vue  |   2 +-
 .../src/views/_admin/frameworkrole/create.vue |   2 +-
 .../src/views/_admin/frameworkrole/detail.vue |   2 +-
 .../src/views/_admin/frameworkrole/edit.vue   |   2 +-
 .../src/views/_admin/frameworkrole/import.vue |   2 +-
 .../src/views/_admin/frameworkrole/index.vue  |   2 +-
 .../views/_admin/frameworkrole/privilege.vue  |   2 +-
 .../views/_admin/frameworktenant/create.vue   |   2 +-
 .../views/_admin/frameworktenant/detail.vue   |   2 +-
 .../src/views/_admin/frameworktenant/edit.vue |   2 +-
 .../views/_admin/frameworktenant/index.vue    |   2 +-
 .../src/views/_admin/school/create.vue        |   2 +-
 .../src/views/_admin/school/detail.vue        |   2 +-
 .../src/views/_admin/school/edit.vue          |   2 +-
 .../src/views/_admin/school/import.vue        |   2 +-
 .../src/views/_admin/school/index.vue         |   2 +-
 .../src/views/_admin/user/batchedit.vue       |   4 +-
 .../src/views/_admin/user/create.vue          |   2 +-
 .../ClientApp/src/views/_admin/user/edit.vue  |   2 +-
 .../src/views/_admin/user/import.vue          |   2 +-
 .../ClientApp/src/views/_admin/user/index.vue |   2 +-
 .../src/views/schooldata/city/create.vue      |   4 +-
 .../src/views/schooldata/city/details.vue     |   4 +-
 .../src/views/schooldata/city/edit.vue        |   4 +-
 .../src/views/schooldata/city/import.vue      |   4 +-
 .../src/views/schooldata/city/index.vue       |   4 +-
 .../src/views/testvue/schoolvue3/create.vue   |   4 +-
 .../src/views/testvue/schoolvue3/details.vue  |   4 +-
 .../src/views/testvue/schoolvue3/edit.vue     |   4 +-
 .../src/views/testvue/schoolvue3/import.vue   |   4 +-
 .../src/views/testvue/schoolvue3/index.vue    |   4 +-
 src/WalkingTec.Mvvm.Mvc/CodeGenVM.cs          |   2 +-
 .../GeneratorFiles/Spa/Vue3/Create.txt        |   2 +-
 .../GeneratorFiles/Spa/Vue3/Details.txt       |   2 +-
 .../GeneratorFiles/Spa/Vue3/Edit.txt          |   2 +-
 .../GeneratorFiles/Spa/Vue3/Import.txt        |   2 +-
 .../GeneratorFiles/Spa/Vue3/Index.txt         |   2 +-
 56 files changed, 456 insertions(+), 170 deletions(-)

diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/.env.production b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/.env.production
index f2e42fe52..8757b48ae 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/.env.production
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/.env.production
@@ -2,4 +2,5 @@
 ENV = production
 
 # 线上环境接口地址
- VITE_API_URL = 
\ No newline at end of file
+VITE_API_URL = http://localhost:8598
+VITE_PUBLIC_PATH = ''
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/package-lock.json b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/package-lock.json
index 3eab937c8..69f94a87d 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/package-lock.json
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/package-lock.json
@@ -19,6 +19,7 @@
 				"echarts-gl": "^2.0.9",
 				"echarts-wordcloud": "^2.1.0",
 				"element-plus": "^2.3.3",
+				"http-server": "^14.1.1",
 				"js-cookie": "^3.0.1",
 				"js-table2excel": "^1.0.3",
 				"jsplumb": "^2.15.6",
@@ -1501,7 +1502,6 @@
 			"version": "4.3.0",
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
 			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-			"dev": true,
 			"dependencies": {
 				"color-convert": "^2.0.1"
 			},
@@ -1540,6 +1540,14 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/async": {
+			"version": "2.6.4",
+			"resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+			"integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+			"dependencies": {
+				"lodash": "^4.17.14"
+			}
+		},
 		"node_modules/async-validator": {
 			"version": "4.2.5",
 			"resolved": "https://registry.npmjs.org/async-validator/-/async-validator-4.2.5.tgz",
@@ -1566,6 +1574,17 @@
 			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
 			"dev": true
 		},
+		"node_modules/basic-auth": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
+			"integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
+			"dependencies": {
+				"safe-buffer": "5.1.2"
+			},
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
 		"node_modules/batch-processor": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
@@ -1633,7 +1652,6 @@
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
 			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-			"dev": true,
 			"dependencies": {
 				"ansi-styles": "^4.1.0",
 				"supports-color": "^7.1.0"
@@ -1703,7 +1721,6 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
 			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-			"dev": true,
 			"dependencies": {
 				"color-name": "~1.1.4"
 			},
@@ -1714,8 +1731,7 @@
 		"node_modules/color-name": {
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-			"dev": true
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
 		},
 		"node_modules/combined-stream": {
 			"version": "1.0.8",
@@ -1739,6 +1755,14 @@
 			"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
 			"dev": true
 		},
+		"node_modules/corser": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/corser/-/corser-2.0.1.tgz",
+			"integrity": "sha512-utCYNzRSQIZNPIcGZdQc92UVJYAhtGAteCFg0yRaFm8f0P+CPtyGyHXJcGXnffjCybUCEx3FQ2G7U3/o9eIkVQ==",
+			"engines": {
+				"node": ">= 0.4.0"
+			}
+		},
 		"node_modules/countup.js": {
 			"version": "2.6.2",
 			"resolved": "https://registry.npmjs.org/countup.js/-/countup.js-2.6.2.tgz",
@@ -2229,6 +2253,11 @@
 				"es5-ext": "~0.10.14"
 			}
 		},
+		"node_modules/eventemitter3": {
+			"version": "4.0.7",
+			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+			"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+		},
 		"node_modules/ext": {
 			"version": "1.7.0",
 			"resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
@@ -2549,7 +2578,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
 			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -2576,6 +2604,25 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/he": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+			"bin": {
+				"he": "bin/he"
+			}
+		},
+		"node_modules/html-encoding-sniffer": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
+			"integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
+			"dependencies": {
+				"whatwg-encoding": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/html-void-elements": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-2.0.1.tgz",
@@ -2585,6 +2632,45 @@
 				"url": "https://github.com/sponsors/wooorm"
 			}
 		},
+		"node_modules/http-proxy": {
+			"version": "1.18.1",
+			"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+			"integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+			"dependencies": {
+				"eventemitter3": "^4.0.0",
+				"follow-redirects": "^1.0.0",
+				"requires-port": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/http-server": {
+			"version": "14.1.1",
+			"resolved": "https://registry.npmjs.org/http-server/-/http-server-14.1.1.tgz",
+			"integrity": "sha512-+cbxadF40UXd9T01zUHgA+rlo2Bg1Srer4+B4NwIHdaGxAGGv59nYRnGGDJ9LBk7alpS0US+J+bLLdQOOkJq4A==",
+			"dependencies": {
+				"basic-auth": "^2.0.1",
+				"chalk": "^4.1.2",
+				"corser": "^2.0.1",
+				"he": "^1.2.0",
+				"html-encoding-sniffer": "^3.0.0",
+				"http-proxy": "^1.18.1",
+				"mime": "^1.6.0",
+				"minimist": "^1.2.6",
+				"opener": "^1.5.1",
+				"portfinder": "^1.0.28",
+				"secure-compare": "3.0.1",
+				"union": "~0.5.0",
+				"url-join": "^4.0.1"
+			},
+			"bin": {
+				"http-server": "bin/http-server"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/i18next": {
 			"version": "20.6.1",
 			"resolved": "https://registry.npmjs.org/i18next/-/i18next-20.6.1.tgz",
@@ -2593,6 +2679,17 @@
 				"@babel/runtime": "^7.12.0"
 			}
 		},
+		"node_modules/iconv-lite": {
+			"version": "0.6.3",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+			"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+			"dependencies": {
+				"safer-buffer": ">= 2.1.2 < 3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/ignore": {
 			"version": "5.2.4",
 			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
@@ -2935,6 +3032,17 @@
 				"node": ">=8.6"
 			}
 		},
+		"node_modules/mime": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+			"bin": {
+				"mime": "cli.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/mime-db": {
 			"version": "1.52.0",
 			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -2974,16 +3082,34 @@
 				"node": "*"
 			}
 		},
+		"node_modules/minimist": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+			"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/mitt": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz",
 			"integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ=="
 		},
+		"node_modules/mkdirp": {
+			"version": "0.5.6",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+			"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+			"dependencies": {
+				"minimist": "^1.2.6"
+			},
+			"bin": {
+				"mkdirp": "bin/cmd.js"
+			}
+		},
 		"node_modules/ms": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-			"dev": true
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
 		},
 		"node_modules/namespace-emitter": {
 			"version": "2.0.1",
@@ -3072,6 +3198,14 @@
 				"wrappy": "1"
 			}
 		},
+		"node_modules/opener": {
+			"version": "1.5.2",
+			"resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
+			"integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
+			"bin": {
+				"opener": "bin/opener-bin.js"
+			}
+		},
 		"node_modules/optionator": {
 			"version": "0.9.1",
 			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -3234,6 +3368,27 @@
 				}
 			}
 		},
+		"node_modules/portfinder": {
+			"version": "1.0.32",
+			"resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz",
+			"integrity": "sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==",
+			"dependencies": {
+				"async": "^2.6.4",
+				"debug": "^3.2.7",
+				"mkdirp": "^0.5.6"
+			},
+			"engines": {
+				"node": ">= 0.12.0"
+			}
+		},
+		"node_modules/portfinder/node_modules/debug": {
+			"version": "3.2.7",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+			"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+			"dependencies": {
+				"ms": "^2.1.1"
+			}
+		},
 		"node_modules/postcss": {
 			"version": "8.4.24",
 			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz",
@@ -3390,6 +3545,11 @@
 			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
 			"integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
 		},
+		"node_modules/requires-port": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+			"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
+		},
 		"node_modules/resolve-from": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -3463,6 +3623,16 @@
 				"queue-microtask": "^1.2.2"
 			}
 		},
+		"node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+		},
+		"node_modules/safer-buffer": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+		},
 		"node_modules/sass": {
 			"version": "1.62.1",
 			"resolved": "https://registry.npmjs.org/sass/-/sass-1.62.1.tgz",
@@ -3499,6 +3669,11 @@
 				"compute-scroll-into-view": "^1.0.20"
 			}
 		},
+		"node_modules/secure-compare": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/secure-compare/-/secure-compare-3.0.1.tgz",
+			"integrity": "sha512-AckIIV90rPDcBcglUwXPF3kg0P0qmPsPXAj6BBEENQE1p5yA1xfmDJzfi1Tappj37Pv2mVbKpL3Z1T+Nn7k1Qw=="
+		},
 		"node_modules/select": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
@@ -3660,7 +3835,6 @@
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
 			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
 			"dependencies": {
 				"has-flag": "^4.0.0"
 			},
@@ -3764,6 +3938,17 @@
 				"node": ">=14.17"
 			}
 		},
+		"node_modules/union": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/union/-/union-0.5.0.tgz",
+			"integrity": "sha512-N6uOhuW6zO95P3Mel2I2zMsbsanvvtgn6jVqJv4vbVcz/JN0OkL9suomjQGmWtxJQXOCqUJvquc1sMeNz/IwlA==",
+			"dependencies": {
+				"qs": "^6.4.0"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
 		"node_modules/universalify": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -3782,6 +3967,11 @@
 				"punycode": "^2.1.0"
 			}
 		},
+		"node_modules/url-join": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
+			"integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA=="
+		},
 		"node_modules/util-deprecate": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -4049,6 +4239,17 @@
 				"vue": "^3.2.0"
 			}
 		},
+		"node_modules/whatwg-encoding": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
+			"integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
+			"dependencies": {
+				"iconv-lite": "0.6.3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/which": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -5055,7 +5256,6 @@
 			"version": "4.3.0",
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
 			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-			"dev": true,
 			"requires": {
 				"color-convert": "^2.0.1"
 			}
@@ -5082,6 +5282,14 @@
 			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
 			"dev": true
 		},
+		"async": {
+			"version": "2.6.4",
+			"resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+			"integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+			"requires": {
+				"lodash": "^4.17.14"
+			}
+		},
 		"async-validator": {
 			"version": "4.2.5",
 			"resolved": "https://registry.npmjs.org/async-validator/-/async-validator-4.2.5.tgz",
@@ -5108,6 +5316,14 @@
 			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
 			"dev": true
 		},
+		"basic-auth": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
+			"integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
+			"requires": {
+				"safe-buffer": "5.1.2"
+			}
+		},
 		"batch-processor": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz",
@@ -5163,7 +5379,6 @@
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
 			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-			"dev": true,
 			"requires": {
 				"ansi-styles": "^4.1.0",
 				"supports-color": "^7.1.0"
@@ -5215,7 +5430,6 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
 			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-			"dev": true,
 			"requires": {
 				"color-name": "~1.1.4"
 			}
@@ -5223,8 +5437,7 @@
 		"color-name": {
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-			"dev": true
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
 		},
 		"combined-stream": {
 			"version": "1.0.8",
@@ -5245,6 +5458,11 @@
 			"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
 			"dev": true
 		},
+		"corser": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/corser/-/corser-2.0.1.tgz",
+			"integrity": "sha512-utCYNzRSQIZNPIcGZdQc92UVJYAhtGAteCFg0yRaFm8f0P+CPtyGyHXJcGXnffjCybUCEx3FQ2G7U3/o9eIkVQ=="
+		},
 		"countup.js": {
 			"version": "2.6.2",
 			"resolved": "https://registry.npmjs.org/countup.js/-/countup.js-2.6.2.tgz",
@@ -5633,6 +5851,11 @@
 				"es5-ext": "~0.10.14"
 			}
 		},
+		"eventemitter3": {
+			"version": "4.0.7",
+			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+			"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+		},
 		"ext": {
 			"version": "1.7.0",
 			"resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
@@ -5881,8 +6104,7 @@
 		"has-flag": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
 		},
 		"has-proto": {
 			"version": "1.0.1",
@@ -5894,11 +6116,54 @@
 			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
 			"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
 		},
+		"he": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
+		},
+		"html-encoding-sniffer": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
+			"integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
+			"requires": {
+				"whatwg-encoding": "^2.0.0"
+			}
+		},
 		"html-void-elements": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-2.0.1.tgz",
 			"integrity": "sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A=="
 		},
+		"http-proxy": {
+			"version": "1.18.1",
+			"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+			"integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+			"requires": {
+				"eventemitter3": "^4.0.0",
+				"follow-redirects": "^1.0.0",
+				"requires-port": "^1.0.0"
+			}
+		},
+		"http-server": {
+			"version": "14.1.1",
+			"resolved": "https://registry.npmjs.org/http-server/-/http-server-14.1.1.tgz",
+			"integrity": "sha512-+cbxadF40UXd9T01zUHgA+rlo2Bg1Srer4+B4NwIHdaGxAGGv59nYRnGGDJ9LBk7alpS0US+J+bLLdQOOkJq4A==",
+			"requires": {
+				"basic-auth": "^2.0.1",
+				"chalk": "^4.1.2",
+				"corser": "^2.0.1",
+				"he": "^1.2.0",
+				"html-encoding-sniffer": "^3.0.0",
+				"http-proxy": "^1.18.1",
+				"mime": "^1.6.0",
+				"minimist": "^1.2.6",
+				"opener": "^1.5.1",
+				"portfinder": "^1.0.28",
+				"secure-compare": "3.0.1",
+				"union": "~0.5.0",
+				"url-join": "^4.0.1"
+			}
+		},
 		"i18next": {
 			"version": "20.6.1",
 			"resolved": "https://registry.npmjs.org/i18next/-/i18next-20.6.1.tgz",
@@ -5907,6 +6172,14 @@
 				"@babel/runtime": "^7.12.0"
 			}
 		},
+		"iconv-lite": {
+			"version": "0.6.3",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+			"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+			"requires": {
+				"safer-buffer": ">= 2.1.2 < 3.0.0"
+			}
+		},
 		"ignore": {
 			"version": "5.2.4",
 			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
@@ -6182,6 +6455,11 @@
 				"picomatch": "^2.3.1"
 			}
 		},
+		"mime": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+		},
 		"mime-db": {
 			"version": "1.52.0",
 			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -6212,16 +6490,28 @@
 				"brace-expansion": "^1.1.7"
 			}
 		},
+		"minimist": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+			"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="
+		},
 		"mitt": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz",
 			"integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ=="
 		},
+		"mkdirp": {
+			"version": "0.5.6",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+			"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+			"requires": {
+				"minimist": "^1.2.6"
+			}
+		},
 		"ms": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-			"dev": true
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
 		},
 		"namespace-emitter": {
 			"version": "2.0.1",
@@ -6289,6 +6579,11 @@
 				"wrappy": "1"
 			}
 		},
+		"opener": {
+			"version": "1.5.2",
+			"resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
+			"integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A=="
+		},
 		"optionator": {
 			"version": "0.9.1",
 			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -6382,6 +6677,26 @@
 				}
 			}
 		},
+		"portfinder": {
+			"version": "1.0.32",
+			"resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz",
+			"integrity": "sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==",
+			"requires": {
+				"async": "^2.6.4",
+				"debug": "^3.2.7",
+				"mkdirp": "^0.5.6"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.2.7",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+					"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				}
+			}
+		},
 		"postcss": {
 			"version": "8.4.24",
 			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz",
@@ -6473,6 +6788,11 @@
 			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
 			"integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
 		},
+		"requires-port": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+			"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
+		},
 		"resolve-from": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -6512,6 +6832,16 @@
 				"queue-microtask": "^1.2.2"
 			}
 		},
+		"safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+		},
+		"safer-buffer": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+		},
 		"sass": {
 			"version": "1.62.1",
 			"resolved": "https://registry.npmjs.org/sass/-/sass-1.62.1.tgz",
@@ -6536,6 +6866,11 @@
 				"compute-scroll-into-view": "^1.0.20"
 			}
 		},
+		"secure-compare": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/secure-compare/-/secure-compare-3.0.1.tgz",
+			"integrity": "sha512-AckIIV90rPDcBcglUwXPF3kg0P0qmPsPXAj6BBEENQE1p5yA1xfmDJzfi1Tappj37Pv2mVbKpL3Z1T+Nn7k1Qw=="
+		},
 		"select": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
@@ -6654,7 +6989,6 @@
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
 			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
 			"requires": {
 				"has-flag": "^4.0.0"
 			}
@@ -6732,6 +7066,14 @@
 			"integrity": "sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==",
 			"devOptional": true
 		},
+		"union": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/union/-/union-0.5.0.tgz",
+			"integrity": "sha512-N6uOhuW6zO95P3Mel2I2zMsbsanvvtgn6jVqJv4vbVcz/JN0OkL9suomjQGmWtxJQXOCqUJvquc1sMeNz/IwlA==",
+			"requires": {
+				"qs": "^6.4.0"
+			}
+		},
 		"universalify": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -6747,6 +7089,11 @@
 				"punycode": "^2.1.0"
 			}
 		},
+		"url-join": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
+			"integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA=="
+		},
 		"util-deprecate": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -6923,6 +7270,14 @@
 				"@vue/devtools-api": "^6.5.0"
 			}
 		},
+		"whatwg-encoding": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
+			"integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
+			"requires": {
+				"iconv-lite": "0.6.3"
+			}
+		},
 		"which": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/package.json b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/package.json
index c8b008143..be1263de0 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/package.json
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/package.json
@@ -3,12 +3,12 @@
 	"version": "2.4.3",
 	"description": "vue3 vite admin template",
 	"license": "MIT",
-	"scripts": {
-		"dev": "vite",
-		"build": "vite build",
-		"serve": "http-server ./dist",
-		"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
-	},
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "serve": "http-server ./dist --cors ",
+    "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
+  },
 	"dependencies": {
 		"@element-plus/icons-vue": "^2.1.0",
 		"@wangeditor/editor": "^5.1.23",
@@ -20,6 +20,7 @@
 		"echarts-gl": "^2.0.9",
 		"echarts-wordcloud": "^2.1.0",
 		"element-plus": "^2.3.3",
+		"http-server": "^14.1.1",
 		"js-cookie": "^3.0.1",
 		"js-table2excel": "^1.0.3",
 		"jsplumb": "^2.15.6",
@@ -63,7 +64,6 @@
 		"last 2 versions",
 		"not dead"
 	],
-
 	"engines": {
 		"node": ">=16.0.0",
 		"npm": ">= 7.0.0"
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/router/backEnd.ts b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/router/backEnd.ts
index 2800eae00..651a7f63f 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/router/backEnd.ts
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/router/backEnd.ts
@@ -80,7 +80,7 @@ export async function initBackEndControlRoutes() {
 	// 添加动态路由
 	await setAddRoute();
 	// 设置路由到 pinia routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
-	await setFilterMenuAndCacheTagsViewRoutes();
+    await setFilterMenuAndCacheTagsViewRoutes();
 }
 
 /**
@@ -212,7 +212,7 @@ export function dynamicImport(dynamicViewsModules: Record<string, Function>, com
 async function GetLocalFile() {
 	const keys = Object.keys(viewsModules);
 	const rv: any[] = [];
-	for (let i = 0; i < keys.length; i++) {
+    for (let i = 0; i < keys.length; i++) {
 		const key = keys[i];
 		const k = key.replace(/..\/views|../, '');
 		const match = k.match(/\/(.*?)\/.*?/) ?? [];
@@ -249,21 +249,24 @@ async function GetLocalFile() {
 			let ishide = false;
 			let className = '';
 			let title = '';
+            var nname = p.replace(/\//, '_');
 			if (cmp.default && cmp.default.name) {
-				const narray = cmp.default.name.split(',');
+				const narray = cmp.default.name.split(';');
 				title = narray[0] ? narray[0] : p.replace(/\//, '_');
 				ishide = (narray.length > 1 && narray[1] == "false") ? true : false;
 				className = narray.length > 2 ? narray[2] : '';
 				if (narray.length > 3) {
 					className += "," + narray[3];
-				}
+                }
+                nname = cmp.default.name;
 			}
 			else {
 				title = p.replace(/\//, '_');
-			}
+            }
+
 			cur.children.push({
 				path: p,
-				name: p.replace(/\//, '_'),
+                name: nname,
 				component: k,
 				meta: {
 					title: title,
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/stores/themeConfig.ts b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/stores/themeConfig.ts
index 0763aff02..27e012c5e 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/stores/themeConfig.ts
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/stores/themeConfig.ts
@@ -90,7 +90,7 @@ export const useThemeConfig = defineStore('themeConfig', {
 			// 是否开启 Tagsview 图标
 			isTagsviewIcon: false,
 			// 是否开启 TagsView 缓存
-			isCacheTagsView: false,
+			isCacheTagsView: true,
 			// 是否开启 TagsView 拖拽
 			isSortableTagsView: true,
 			// 是否开启 TagsView 共用
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/actionlog/detail.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/actionlog/detail.vue
index 22684ff85..374bdb461 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/actionlog/detail.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/actionlog/detail.vue
@@ -72,7 +72,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.detail,false">
+<script setup lang="ts" name="message._system.common.vm.detail;false">
 import { ElMessage } from 'element-plus';
 import { array } from 'snabbdom';
 import { reactive, ref, getCurrentInstance, onMounted } from 'vue';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/actionlog/index.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/actionlog/index.vue
index 5d17d7e6f..d140fc12a 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/actionlog/index.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/actionlog/index.vue
@@ -60,7 +60,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.menukey.ActionLog,true,WalkingTec.Mvvm.Admin.Api,ActionLog">
+<script setup lang="ts" name="message._system.menukey.ActionLog;true;WalkingTec.Mvvm.Admin.Api;ActionLog">
 import { defineAsyncComponent, reactive, onMounted, ref, getCurrentInstance } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import actionlogApi from '/@/api/actionlog';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/dataprivilege/create.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/dataprivilege/create.vue
index 7231678e1..61d57c3a9 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/dataprivilege/create.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/dataprivilege/create.vue
@@ -71,7 +71,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.add,false">
+<script setup lang="ts" name="message._system.common.vm.add;false">
 import { ElMessage } from 'element-plus';
 import { reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import dataPrivilegeApi from '/@/api/dataprivilege';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/dataprivilege/detail.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/dataprivilege/detail.vue
index c733aac18..2bd9578a5 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/dataprivilege/detail.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/dataprivilege/detail.vue
@@ -75,7 +75,7 @@
 		</el-card>
 	</div>
 </template>
-<script setup lang="ts" name="message._system.common.vm.edit,false">
+<script setup lang="ts" name="message._system.common.vm.edit;false">
 import { ElMessage } from 'element-plus';
 import { reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import dataPrivilegeApi from '/@/api/dataprivilege';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/dataprivilege/edit.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/dataprivilege/edit.vue
index 532f85ef9..c984d3394 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/dataprivilege/edit.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/dataprivilege/edit.vue
@@ -75,7 +75,7 @@
 		</el-card>
 	</div>
 </template>
-<script setup lang="ts" name="message._system.common.vm.edit,false">
+<script setup lang="ts" name="message._system.common.vm.edit;false">
 import { ElMessage } from 'element-plus';
 import { reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import dataPrivilegeApi from '/@/api/dataprivilege';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/dataprivilege/index.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/dataprivilege/index.vue
index 6f96efa52..d05902cd0 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/dataprivilege/index.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/dataprivilege/index.vue
@@ -52,7 +52,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.menukey.DataPrivilege,true,WalkingTec.Mvvm.Admin.Api,DataPrivilege">
+<script setup lang="ts" name="message._system.menukey.DataPrivilege;true;WalkingTec.Mvvm.Admin.Api;DataPrivilege">
 import { defineAsyncComponent, reactive, onMounted, ref, getCurrentInstance } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import dataPrivilegeApi from '/@/api/dataprivilege';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/create.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/create.vue
index 689a9d37f..f26b1b78f 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/create.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/create.vue
@@ -56,7 +56,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.add,false">
+<script setup lang="ts" name="message._system.common.vm.add;false">
 import { ElMessage } from 'element-plus';
 import { reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import frameworkgroupApi from '/@/api/frameworkgroup';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/detail.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/detail.vue
index bcafd97da..d5ba7baa9 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/detail.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/detail.vue
@@ -53,7 +53,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.detail,false">
+<script setup lang="ts" name="message._system.common.vm.detail;false">
 import { ElMessage } from 'element-plus';
 import { reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import frameworkgroupApi from '/@/api/frameworkgroup';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/edit.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/edit.vue
index 41da1af06..16ffa5dd7 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/edit.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/edit.vue
@@ -55,7 +55,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.edit,false">
+<script setup lang="ts" name="message._system.common.vm.edit;false">
 import { ElMessage } from 'element-plus';
 import { reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import frameworkgroupApi from '/@/api/frameworkgroup';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/import.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/import.vue
index 1450b9030..a547c7fbd 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/import.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/import.vue
@@ -20,7 +20,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.import,false">
+<script setup lang="ts" name="message._system.common.vm.import;false">
 import { ElMessage } from 'element-plus';
 import { reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import frameworkgroupApi from '/@/api/frameworkgroup';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/index.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/index.vue
index d1981fdd4..a0b747860 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/index.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkgroup/index.vue
@@ -56,7 +56,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.menukey.GroupManagement,true,WalkingTec.Mvvm.Admin.Api,FrameworkGroup">
+<script setup lang="ts" name="message._system.menukey.GroupManagement;true;WalkingTec.Mvvm.Admin.Api;FrameworkGroup">
 import { defineAsyncComponent, reactive, onMounted, ref, getCurrentInstance } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import frameworkgroupApi from '/@/api/frameworkgroup';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/create.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/create.vue
index 6d3002f0b..985a6cfd2 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/create.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/create.vue
@@ -139,7 +139,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.add,false">
+<script setup lang="ts" name="message._system.common.vm.add;false">
 import { ElMessage } from 'element-plus';
 import { reactive, ref, getCurrentInstance, onMounted, defineAsyncComponent } from 'vue';
 import frameworkmenuApi from '/@/api/frameworkmenu';
@@ -185,11 +185,7 @@ const state = reactive({
 onMounted(() => {
 	other.getSelectList('/api/_account/GetFrameworkRoles', [], false).then(x => { state.allRoles = x });
 	other.getSelectList('/api/_FrameworkMenu/GetFolders', [], false).then(x => { state.allParents = x });
-	GetLocalFile().then((res:any)=>{
-		console.log(res);
-		state.menuData = getMenuData(res);
-
-	})
+	state.menuData = getMenuData(routesList.value);
 });
 
 // 关闭弹窗
@@ -259,75 +255,6 @@ const handleCheckedChange = (value: string[]) => {
 	isIndeterminate.value = checkedCount > 0 && checkedCount < state.allActions.length
 }
 
-const GetLocalFile= async ()=> {
-	const keys = Object.keys(viewsModules);
-	console.log(keys);
-	const rv: any[] = [];
-	for (let i = 0; i < keys.length; i++) {
-		const key = keys[i];
-		const k = key.replace(/..\/views|../, '');
-		const match = k.match(/\/(.*?)\/.*?/) ?? [];
-		if (match.length > 1) {
-			const name = match[1];
-			if (name == 'home' || name == 'error' || name == 'login') {
-				continue;
-			}
-			let dir = rv.filter((item) => { return item.name == name });
-			let cur = null;
-			if (dir.length == 0) {
-				cur = {
-					path: "/" + name,
-					name: name,
-					component: "layout/routerView/parent.vue",
-					meta: {
-						title: name,
-						isHide: false,
-						isKeepAlive: true,
-						isAffix: false,
-						isIframe: false,
-						icon: "fa fa-folder"
-					},
-					children: []
-				}
-				rv.push(cur);
-			}
-			else {
-				cur = dir[0];
-			}
-			const p = k.replace(/\/index.vue/, '').replace(/.vue/, '')
-
-			const cmp = await viewsModules[key]();
-			let ishide = false;
-			let className = '';
-			let title = '';
-			if (cmp.default && cmp.default.name) {
-				const narray = cmp.default.name.split(',');
-				title = narray[0] ? narray[0] : p.replace(/\//, '_');
-				ishide = (narray.length > 1 && narray[1] == "false") ? true : false;
-				className = narray.length > 2 ? narray[2] : '';
-				if (narray.length > 3) {
-					className += "," + narray[3];
-				}
-			}
-			else {
-				title = p.replace(/\//, '_');
-			}
-			cur.children.push({
-				path: p,
-				name: p.replace(/\//, '_'),
-				component: k,
-				meta: {
-					title: title,
-					isHide: ishide,
-					isKeepAlive: !ishide,
-					className: className,
-					icon: "fa fa-file"
-				}
-			});
-		}
-	}
-	return rv;
-}
 // 暴露变量
 defineExpose({
 });
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/detail.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/detail.vue
index f3d8deb6b..e358b8c20 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/detail.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/detail.vue
@@ -133,7 +133,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.detail,false">
+<script setup lang="ts" name="message._system.common.vm.detail;false">
 import { ElMessage } from 'element-plus';
 import { reactive, ref, getCurrentInstance, onMounted, defineAsyncComponent } from 'vue';
 import frameworkmenuApi from '/@/api/frameworkmenu';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/edit.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/edit.vue
index a5d3cdf61..1a699e4ac 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/edit.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/edit.vue
@@ -138,7 +138,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.edit,false">
+<script setup lang="ts" name="message._system.common.vm.edit;false">
 import { ElMessage } from 'element-plus';
 import { reactive, ref, getCurrentInstance, onMounted, defineAsyncComponent } from 'vue';
 import frameworkmenuApi from '/@/api/frameworkmenu';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/index.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/index.vue
index 229d3735e..a9b0b1f22 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/index.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/index.vue
@@ -42,7 +42,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.menukey.MenuMangement,true,WalkingTec.Mvvm.Admin.Api,FrameworkMenu">
+<script setup lang="ts" name="message._system.menukey.MenuMangement;true;WalkingTec.Mvvm.Admin.Api;FrameworkMenu">
 import { defineAsyncComponent, reactive, onMounted, ref, getCurrentInstance } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import frameworkmenuApi from '/@/api/frameworkmenu';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/create.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/create.vue
index 8268f7d4a..6a5a7353c 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/create.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/create.vue
@@ -40,7 +40,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.add,false">
+<script setup lang="ts" name="message._system.common.vm.add;false">
 import { ElMessage } from 'element-plus';
 import { reactive, ref, getCurrentInstance, onMounted } from 'vue';
 import frameworkroleApi from '/@/api/frameworkrole';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/detail.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/detail.vue
index 5680beca6..1dd4c0cac 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/detail.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/detail.vue
@@ -38,7 +38,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.detail,false">
+<script setup lang="ts" name="message._system.common.vm.detail;false">
 import { ElMessage } from 'element-plus';
 import { array } from 'snabbdom';
 import { reactive, ref, getCurrentInstance,onMounted } from 'vue';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/edit.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/edit.vue
index 1ed0fb76d..b6e9ceddb 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/edit.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/edit.vue
@@ -40,7 +40,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.edit,false">
+<script setup lang="ts" name="message._system.common.vm.edit;false">
 import { ElMessage } from 'element-plus';
 import { array } from 'snabbdom';
 import { reactive, ref, getCurrentInstance,onMounted } from 'vue';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/import.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/import.vue
index 3d131cd1c..c1862f366 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/import.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/import.vue
@@ -20,7 +20,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.import,false">
+<script setup lang="ts" name="message._system.common.vm.import;false">
 import { ElMessage } from 'element-plus';
 import { reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import frameworkroleApi from '/@/api/frameworkrole';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/index.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/index.vue
index cefbc3070..0020ae113 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/index.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/index.vue
@@ -56,7 +56,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.menukey.RoleManagement,true,WalkingTec.Mvvm.Admin.Api,FrameworkRole">
+<script setup lang="ts" name="message._system.menukey.RoleManagement;true;WalkingTec.Mvvm.Admin.Api;FrameworkRole">
 import { defineAsyncComponent, reactive, onMounted, ref, getCurrentInstance } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import frameworkRoleApi from '/@/api/frameworkrole';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/privilege.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/privilege.vue
index eb6e31122..c5b9ad343 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/privilege.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkrole/privilege.vue
@@ -49,7 +49,7 @@
 </template>
 
 
-<script setup lang="ts" name="message._system.common.vm.action_privilege,false">
+<script setup lang="ts" name="message._system.common.vm.action_privilege;false">
 import { ElMessage } from 'element-plus';
 import { reactive, ref, getCurrentInstance, onMounted } from 'vue';
 import frameworkroleApi from '/@/api/frameworkrole';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworktenant/create.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworktenant/create.vue
index 797a4bd6f..4496143eb 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworktenant/create.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworktenant/create.vue
@@ -91,7 +91,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.add,false">
+<script setup lang="ts" name="message._system.common.vm.add;false">
 import { ElMessage } from 'element-plus';
 import { reactive, ref, getCurrentInstance, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworktenant/detail.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworktenant/detail.vue
index 8a9d4c684..2c58ad578 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworktenant/detail.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworktenant/detail.vue
@@ -87,7 +87,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.detail,false">
+<script setup lang="ts" name="message._system.common.vm.detail;false">
 import { ElMessage } from 'element-plus';
 import { array } from 'snabbdom';
 import { reactive, ref, getCurrentInstance,onMounted } from 'vue';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworktenant/edit.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworktenant/edit.vue
index 29ba71877..b695424ca 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworktenant/edit.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworktenant/edit.vue
@@ -88,7 +88,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.edit,false">
+<script setup lang="ts" name="message._system.common.vm.edit;false">
 import { ElMessage } from 'element-plus';
 import { array } from 'snabbdom';
 import { reactive, ref, getCurrentInstance, onMounted } from 'vue';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworktenant/index.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworktenant/index.vue
index 06ffa2450..518097839 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworktenant/index.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworktenant/index.vue
@@ -51,7 +51,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.menukey.FrameworkTenant,true,WalkingTec.Mvvm.Admin.Api,FrameworkTenant">
+<script setup lang="ts" name="message._system.menukey.FrameworkTenant;true;WalkingTec.Mvvm.Admin.Api;FrameworkTenant">
 import { defineAsyncComponent, reactive, onMounted, ref,getCurrentInstance } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import frameworktenantApi from '/@/api/frameworktenant';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/create.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/create.vue
index 3ab7c2459..52bdcbffc 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/create.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/create.vue
@@ -42,7 +42,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.add,false">
+<script setup lang="ts" name="message._system.common.vm.add;false">
 import { ElMessage } from 'element-plus';
 import { reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import schoolApi from '/@/api/school';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/detail.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/detail.vue
index cbf34a516..badf606ca 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/detail.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/detail.vue
@@ -35,7 +35,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.detail,false">
+<script setup lang="ts" name="message._system.common.vm.detail;false">
 import { ElMessage } from 'element-plus';
 import { reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import schoolApi from '/@/api/school';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/edit.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/edit.vue
index 4a39f186c..899beb9af 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/edit.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/edit.vue
@@ -41,7 +41,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.edit,false">
+<script setup lang="ts" name="message._system.common.vm.edit;false">
 import { ElMessage } from 'element-plus';
 import { reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import schoolApi from '/@/api/school';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/import.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/import.vue
index 49f378684..90d65b564 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/import.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/import.vue
@@ -20,7 +20,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.import,false">
+<script setup lang="ts" name="message._system.common.vm.import;false">
 import { ElMessage } from 'element-plus';
 import { reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import schoolApi from '/@/api/school';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/index.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/index.vue
index 8e303e307..97e8be881 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/index.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/school/index.vue
@@ -43,7 +43,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="学校管理,true,WalkingTec.Mvvm.ReactDemo.Controllers,School">
+<script setup lang="ts" name="学校管理;true;WalkingTec.Mvvm.ReactDemo.Controllers;School">
 import { defineAsyncComponent, reactive, onMounted, ref, getCurrentInstance } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import schoolapi from '/@/api/school';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/user/batchedit.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/user/batchedit.vue
index b698952da..51cc6ef4e 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/user/batchedit.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/user/batchedit.vue
@@ -1,4 +1,4 @@
-
+
 <template>
 <div class="card-fill layout-padding">
 <el-card shadow="hover" class="layout-padding-auto" >
@@ -37,7 +37,7 @@
 </template>
 
 
-<script setup lang="ts" name="message.autotrans._Page_AdminFrameworkUserBatchEdit,false">
+<script setup lang="ts" name="message.autotrans._Page_AdminFrameworkUserBatchEdit;false">
 import {  ElMessageBox, ElMessage } from 'element-plus';
 import { defineAsyncComponent,reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import frameworkuserApi from '/@/api//frameworkuser';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/user/create.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/user/create.vue
index 21f4e8b70..4ed07be19 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/user/create.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/user/create.vue
@@ -105,7 +105,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.add,false">
+<script setup lang="ts" name="message._system.common.vm.add;false">
 import { ElMessage } from 'element-plus';
 import { reactive, ref, getCurrentInstance, onMounted} from 'vue';
 import { useI18n } from 'vue-i18n';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/user/edit.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/user/edit.vue
index 7badce244..7922c570b 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/user/edit.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/user/edit.vue
@@ -103,7 +103,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.edit,false">
+<script setup lang="ts" name="message._system.common.vm.edit;false">
 import { ElMessage } from 'element-plus';
 import { array } from 'snabbdom';
 import { reactive, ref, getCurrentInstance,nextTick } from 'vue';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/user/import.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/user/import.vue
index 8d7ed2d97..27baeb77a 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/user/import.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/user/import.vue
@@ -17,7 +17,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.common.vm.import,false">
+<script setup lang="ts" name="message._system.common.vm.import;false">
 import { ElMessage } from 'element-plus';
 import { reactive, ref, getCurrentInstance } from 'vue';
 import frameworkuserApi from '/@/api/frameworkuser';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/user/index.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/user/index.vue
index 5699b65fe..24da696cd 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/user/index.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/user/index.vue
@@ -56,7 +56,7 @@
 	</div>
 </template>
 
-<script setup lang="ts" name="message._system.menukey.UserManagement,true,WalkingTec.Mvvm.Admin.Api,FrameworkUser">
+<script setup lang="ts" name="message._system.menukey.UserManagement;true;WalkingTec.Mvvm.Admin.Api;FrameworkUser">
 import { defineAsyncComponent, reactive, onMounted, onUpdated, ref,nextTick } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import frameworkuserApi from '/@/api/frameworkuser';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/schooldata/city/create.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/schooldata/city/create.vue
index 545ee6201..040ab9dfb 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/schooldata/city/create.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/schooldata/city/create.vue
@@ -1,4 +1,4 @@
-
+
 <template>
 <div class="card-fill layout-padding">
 <el-card shadow="hover" class="layout-padding-auto" >
@@ -34,7 +34,7 @@
 </template>
 
 
-<script setup lang="ts" name="message._system.common.vm.add,false">
+<script setup lang="ts" name="message._system.common.vm.add;false">
 import {  ElMessageBox, ElMessage } from 'element-plus';
 import { defineAsyncComponent,reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import { CityApi } from '/@/api/schooldata/City';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/schooldata/city/details.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/schooldata/city/details.vue
index 623f78a51..3f6ac1a94 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/schooldata/city/details.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/schooldata/city/details.vue
@@ -1,4 +1,4 @@
-
+
 <template>
 <div class="card-fill layout-padding">
 <el-card shadow="hover" class="layout-padding-auto" >
@@ -33,7 +33,7 @@
 </template>
 
 
-<script setup lang="ts" name="message._system.common.vm.detail,false">
+<script setup lang="ts" name="message._system.common.vm.detail;false">
 import {  ElMessageBox, ElMessage } from 'element-plus';
 import { defineAsyncComponent,reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import { CityApi } from '/@/api/schooldata/City';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/schooldata/city/edit.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/schooldata/city/edit.vue
index 2743fb658..45612c75d 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/schooldata/city/edit.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/schooldata/city/edit.vue
@@ -1,4 +1,4 @@
-
+
 <template>
 <div class="card-fill layout-padding">
 <el-card shadow="hover" class="layout-padding-auto" >
@@ -34,7 +34,7 @@
 </template>
 
 
-<script setup lang="ts" name="message._system.common.vm.edit,false">
+<script setup lang="ts" name="message._system.common.vm.edit;false">
 import {  ElMessageBox, ElMessage } from 'element-plus';
 import { defineAsyncComponent,reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import { CityApi } from '/@/api/schooldata/City';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/schooldata/city/import.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/schooldata/city/import.vue
index 885b423eb..614c92778 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/schooldata/city/import.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/schooldata/city/import.vue
@@ -1,4 +1,4 @@
-
+
 <template>
 <div class="card-fill layout-padding">
 <el-card shadow="hover" class="layout-padding-auto" >
@@ -20,7 +20,7 @@
 </template>
 
 
-<script setup lang="ts" name="message._system.common.vm.import,false">
+<script setup lang="ts" name="message._system.common.vm.import;false">
 import {  ElMessageBox, ElMessage } from 'element-plus';
 import { defineAsyncComponent,reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import { CityApi } from '/@/api/schooldata/City';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/schooldata/city/index.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/schooldata/city/index.vue
index dc195d7ad..83ee9a2f1 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/schooldata/city/index.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/schooldata/city/index.vue
@@ -1,4 +1,4 @@
-
+
 <template>
 <div class="card-fill layout-padding">
 <el-card shadow="hover" class="layout-padding-auto" >
@@ -48,7 +48,7 @@
 </template>
 
 
-<script setup lang="ts" name="城市,true,WalkingTec.Mvvm.Vue3Demo.Controllers,City">
+<script setup lang="ts" name="城市;true;WalkingTec.Mvvm.Vue3Demo.Controllers;City">
 import {  ElMessageBox, ElMessage } from 'element-plus';
 import { defineAsyncComponent,reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import { CityApi } from '/@/api/schooldata/City';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/testvue/schoolvue3/create.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/testvue/schoolvue3/create.vue
index 0b73951b3..d248cfc94 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/testvue/schoolvue3/create.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/testvue/schoolvue3/create.vue
@@ -1,4 +1,4 @@
-
+
 <template>
 <div class="card-fill layout-padding">
 <el-card shadow="hover" class="layout-padding-auto" >
@@ -69,7 +69,7 @@
 </template>
 
 
-<script setup lang="ts" name="message._system.common.vm.add,false">
+<script setup lang="ts" name="message._system.common.vm.add;false">
 import {  ElMessageBox, ElMessage } from 'element-plus';
 import { defineAsyncComponent,reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import { SchoolVue3Api } from '/@/api/testvue/SchoolVue3';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/testvue/schoolvue3/details.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/testvue/schoolvue3/details.vue
index 2e273fef8..f62ce0e3d 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/testvue/schoolvue3/details.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/testvue/schoolvue3/details.vue
@@ -1,4 +1,4 @@
-
+
 <template>
 <div class="card-fill layout-padding">
 <el-card shadow="hover" class="layout-padding-auto" >
@@ -68,7 +68,7 @@
 </template>
 
 
-<script setup lang="ts" name="message._system.common.vm.detail,false">
+<script setup lang="ts" name="message._system.common.vm.detail;false">
 import {  ElMessageBox, ElMessage } from 'element-plus';
 import { defineAsyncComponent,reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import { SchoolVue3Api } from '/@/api/testvue/SchoolVue3';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/testvue/schoolvue3/edit.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/testvue/schoolvue3/edit.vue
index 29f44b591..f0bb383f3 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/testvue/schoolvue3/edit.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/testvue/schoolvue3/edit.vue
@@ -1,4 +1,4 @@
-
+
 <template>
 <div class="card-fill layout-padding">
 <el-card shadow="hover" class="layout-padding-auto" >
@@ -69,7 +69,7 @@
 </template>
 
 
-<script setup lang="ts" name="message._system.common.vm.edit,false">
+<script setup lang="ts" name="message._system.common.vm.edit;false">
 import {  ElMessageBox, ElMessage } from 'element-plus';
 import { defineAsyncComponent,reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import { SchoolVue3Api } from '/@/api/testvue/SchoolVue3';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/testvue/schoolvue3/import.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/testvue/schoolvue3/import.vue
index bbfb54a1e..6b4e44e32 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/testvue/schoolvue3/import.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/testvue/schoolvue3/import.vue
@@ -1,4 +1,4 @@
-
+
 <template>
 <div class="card-fill layout-padding">
 <el-card shadow="hover" class="layout-padding-auto" >
@@ -20,7 +20,7 @@
 </template>
 
 
-<script setup lang="ts" name="message._system.common.vm.import,false">
+<script setup lang="ts" name="message._system.common.vm.import;false">
 import {  ElMessageBox, ElMessage } from 'element-plus';
 import { defineAsyncComponent,reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import { SchoolVue3Api } from '/@/api/testvue/SchoolVue3';
diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/testvue/schoolvue3/index.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/testvue/schoolvue3/index.vue
index ce6247d66..bb3a95c57 100644
--- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/testvue/schoolvue3/index.vue
+++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/testvue/schoolvue3/index.vue
@@ -1,4 +1,4 @@
-
+
 <template>
 <div class="card-fill layout-padding">
 <el-card shadow="hover" class="layout-padding-auto" >
@@ -62,7 +62,7 @@
 </template>
 
 
-<script setup lang="ts" name="测试,true,WalkingTec.Mvvm.Vue3Demo.Controllers,SchoolVue3">
+<script setup lang="ts" name="测试;true;WalkingTec.Mvvm.Vue3Demo.Controllers;SchoolVue3">
 import {  ElMessageBox, ElMessage } from 'element-plus';
 import { defineAsyncComponent,reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import { SchoolVue3Api } from '/@/api/testvue/SchoolVue3';
diff --git a/src/WalkingTec.Mvvm.Mvc/CodeGenVM.cs b/src/WalkingTec.Mvvm.Mvc/CodeGenVM.cs
index cf2d3b079..aa4859949 100644
--- a/src/WalkingTec.Mvvm.Mvc/CodeGenVM.cs
+++ b/src/WalkingTec.Mvvm.Mvc/CodeGenVM.cs
@@ -2637,7 +2637,7 @@ public string GenerateVue3View(string name)
                 .Replace("$modelname$", ModelName)
                 .Replace("$vmnamespace$", VMNs)
                 .Replace("$des$", ModuleName)
-                .Replace("$controllername$", $"{ControllerNs},{ModelName}")
+                .Replace("$controllername$", $"{ControllerNs};{ModelName}")
                 .Replace("$pagepath$", pagepath);
             Type modelType = Type.GetType(SelectedModel);
             if (name == "Index")
diff --git a/src/WalkingTec.Mvvm.Mvc/GeneratorFiles/Spa/Vue3/Create.txt b/src/WalkingTec.Mvvm.Mvc/GeneratorFiles/Spa/Vue3/Create.txt
index a921c6705..1e293f501 100644
--- a/src/WalkingTec.Mvvm.Mvc/GeneratorFiles/Spa/Vue3/Create.txt
+++ b/src/WalkingTec.Mvvm.Mvc/GeneratorFiles/Spa/Vue3/Create.txt
@@ -18,7 +18,7 @@
 </template>
 
 
-<script setup lang="ts" name="message._system.common.vm.add,false">
+<script setup lang="ts" name="message._system.common.vm.add;false">
 import {  ElMessageBox, ElMessage } from 'element-plus';
 import { defineAsyncComponent,reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import { $modelname$Api } from '/@/api$pagepath$';
diff --git a/src/WalkingTec.Mvvm.Mvc/GeneratorFiles/Spa/Vue3/Details.txt b/src/WalkingTec.Mvvm.Mvc/GeneratorFiles/Spa/Vue3/Details.txt
index 17cd825f8..0d77d503d 100644
--- a/src/WalkingTec.Mvvm.Mvc/GeneratorFiles/Spa/Vue3/Details.txt
+++ b/src/WalkingTec.Mvvm.Mvc/GeneratorFiles/Spa/Vue3/Details.txt
@@ -17,7 +17,7 @@
 </template>
 
 
-<script setup lang="ts" name="message._system.common.vm.detail,false">
+<script setup lang="ts" name="message._system.common.vm.detail;false">
 import {  ElMessageBox, ElMessage } from 'element-plus';
 import { defineAsyncComponent,reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import { $modelname$Api } from '/@/api$pagepath$';
diff --git a/src/WalkingTec.Mvvm.Mvc/GeneratorFiles/Spa/Vue3/Edit.txt b/src/WalkingTec.Mvvm.Mvc/GeneratorFiles/Spa/Vue3/Edit.txt
index b878330f1..abd43536d 100644
--- a/src/WalkingTec.Mvvm.Mvc/GeneratorFiles/Spa/Vue3/Edit.txt
+++ b/src/WalkingTec.Mvvm.Mvc/GeneratorFiles/Spa/Vue3/Edit.txt
@@ -18,7 +18,7 @@
 </template>
 
 
-<script setup lang="ts" name="message._system.common.vm.edit,false">
+<script setup lang="ts" name="message._system.common.vm.edit;false">
 import {  ElMessageBox, ElMessage } from 'element-plus';
 import { defineAsyncComponent,reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import { $modelname$Api } from '/@/api$pagepath$';
diff --git a/src/WalkingTec.Mvvm.Mvc/GeneratorFiles/Spa/Vue3/Import.txt b/src/WalkingTec.Mvvm.Mvc/GeneratorFiles/Spa/Vue3/Import.txt
index 1924cccba..97538fafd 100644
--- a/src/WalkingTec.Mvvm.Mvc/GeneratorFiles/Spa/Vue3/Import.txt
+++ b/src/WalkingTec.Mvvm.Mvc/GeneratorFiles/Spa/Vue3/Import.txt
@@ -20,7 +20,7 @@
 </template>
 
 
-<script setup lang="ts" name="message._system.common.vm.import,false">
+<script setup lang="ts" name="message._system.common.vm.import;false">
 import {  ElMessageBox, ElMessage } from 'element-plus';
 import { defineAsyncComponent,reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import { $modelname$Api } from '/@/api$pagepath$';
diff --git a/src/WalkingTec.Mvvm.Mvc/GeneratorFiles/Spa/Vue3/Index.txt b/src/WalkingTec.Mvvm.Mvc/GeneratorFiles/Spa/Vue3/Index.txt
index ee36e87be..2baff3328 100644
--- a/src/WalkingTec.Mvvm.Mvc/GeneratorFiles/Spa/Vue3/Index.txt
+++ b/src/WalkingTec.Mvvm.Mvc/GeneratorFiles/Spa/Vue3/Index.txt
@@ -37,7 +37,7 @@
 </template>
 
 
-<script setup lang="ts" name="$des$,true,$controllername$">
+<script setup lang="ts" name="$des$;true;$controllername$">
 import {  ElMessageBox, ElMessage } from 'element-plus';
 import { defineAsyncComponent,reactive, ref, getCurrentInstance, onMounted, nextTick } from 'vue';
 import { $modelname$Api } from '/@/api$pagepath$';

From 3ee10c518e7a62887782f653ce881ddf6be2fc0d Mon Sep 17 00:00:00 2001
From: liu liang <liuliang79@live.com>
Date: Thu, 29 Jun 2023 00:16:57 +0800
Subject: [PATCH 11/12] 1

---
 src/WalkingTec.Mvvm.Mvc/Helper/MvcOptionExtension.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/WalkingTec.Mvvm.Mvc/Helper/MvcOptionExtension.cs b/src/WalkingTec.Mvvm.Mvc/Helper/MvcOptionExtension.cs
index e38f7d647..10d65cf5d 100644
--- a/src/WalkingTec.Mvvm.Mvc/Helper/MvcOptionExtension.cs
+++ b/src/WalkingTec.Mvvm.Mvc/Helper/MvcOptionExtension.cs
@@ -48,7 +48,7 @@ public static void UseWtmJsonOptions(this JsonOptions options)
         {
             options.JsonSerializerOptions.PropertyNamingPolicy = null;
             options.JsonSerializerOptions.IgnoreNullValues = true;
-            options.JsonSerializerOptions.NumberHandling = JsonNumberHandling.AllowReadingFromString;
+            options.JsonSerializerOptions.NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString;
             options.JsonSerializerOptions.AllowTrailingCommas = true;
             options.JsonSerializerOptions.Converters.Add(new NullableConverter<int>());
             options.JsonSerializerOptions.Converters.Add(new NullableConverter<long>());
@@ -71,7 +71,7 @@ public static void UseWtmJsonOptions(this JsonOptions options)
             Core.CoreProgram.DefaultJsonOption = options.JsonSerializerOptions;
             JsonSerializerOptions jsonOptions2 = new JsonSerializerOptions();
             jsonOptions2.PropertyNamingPolicy = null;
-            jsonOptions2.NumberHandling = JsonNumberHandling.AllowReadingFromString;
+            options.JsonSerializerOptions.NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString;
             jsonOptions2.AllowTrailingCommas = true;
             jsonOptions2.Converters.Add(new NullableConverter<int>());
             jsonOptions2.Converters.Add(new NullableConverter<long>());

From d028c7b142b924df9f176d15a827374b99d6618d Mon Sep 17 00:00:00 2001
From: liu liang <liuliang79@live.com>
Date: Thu, 29 Jun 2023 00:24:13 +0800
Subject: [PATCH 12/12] 5.10.29

---
 CHANGELOG.md  | 13 +++++++++++++
 version.props |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1d19c2b1..a22bcc2ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 ## v6.x.x
 
+##6.3.29(2023-6-29)
+* **修改：**  默认的Json序列化，数字类型仍然会被输出为字符串，这是因为很多前端控件都需要对比字符串
+* **修改：**  修复了LayUI模式下导出之后搜索的问题
+* **修改：**  优化了LayUI模式下TreeContainer控件
+* **修改：**  默认的Json序列化，添加了可为空的类型的读写判断
+
+
 ##6.3.25(2023-6-8)
 * **新增：**  新增针对WtmPlus中生成的vue3的项目的简易代码生成器
 * **修改：**  修复了多租户模式下GetUserDC方法
@@ -180,6 +187,12 @@
 
 ## v5.x.x
 
+##5.10.29(2023-6-29)
+* **修改：**  默认的Json序列化，数字类型仍然会被输出为字符串，这是因为很多前端控件都需要对比字符串
+* **修改：**  修复了LayUI模式下导出之后搜索的问题
+* **修改：**  优化了LayUI模式下TreeContainer控件
+* **修改：**  默认的Json序列化，添加了可为空的类型的读写判断
+
 ##5.10.25(2023-6-8)
 * **新增：**  新增针对WtmPlus中生成的vue3的项目的简易代码生成器
 * **修改：**  修复了多租户模式下GetUserDC方法
diff --git a/version.props b/version.props
index 6e23399ab..62c7adfd9 100644
--- a/version.props
+++ b/version.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>5.10.28</VersionPrefix>
+    <VersionPrefix>5.10.29</VersionPrefix>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">