(StringComparer.OrdinalIgnoreCase);
-
private static readonly string DefaultConnName = "defalut";
static DBServerProvider()
{
SetConnection(DefaultConnName, AppSetting.DbConnectionString);
}
+
public static void SetConnection(string key, string val)
{
if (ConnectionArray.ContainsKey(key))
@@ -33,13 +33,14 @@ namespace VOL.Core.DBManager
}
ConnectionArray.Add(key, val);
}
+
///
/// 设置默认数据库连接
///
///
public static void SetDefaultConnection(string val)
{
- SetConnection(DefaultConnName, val);
+ SetConnection(DefaultConnName, val);
}
public static string GetConnectionString(string key)
@@ -51,6 +52,7 @@ namespace VOL.Core.DBManager
}
return key;
}
+
///
/// 获取默认数据库连接
///
@@ -59,9 +61,10 @@ namespace VOL.Core.DBManager
{
return GetConnectionString(DefaultConnName);
}
+
public static VOLContext DbContext
{
get { return Utilities.HttpContext.Current.RequestServices.GetService(typeof(VOLContext)) as VOLContext; }
}
}
-}
+}
\ No newline at end of file
diff --git a/Net6.SqlSugar/VOL.WebApi/Controllers/Builder/BuilderController.cs b/Net6.SqlSugar/VOL.WebApi/Controllers/Builder/BuilderController.cs
index b61e9393..9e4aaf41 100644
--- a/Net6.SqlSugar/VOL.WebApi/Controllers/Builder/BuilderController.cs
+++ b/Net6.SqlSugar/VOL.WebApi/Controllers/Builder/BuilderController.cs
@@ -63,9 +63,9 @@ namespace VOL.WebApi.Controllers.Builder
}
[Route("LoadTableInfo")]
[HttpPost]
- public ActionResult LoadTable(int parentId, string tableName, string columnCNName, string nameSpace, string foldername, int table_Id, bool isTreeLoad)
+ public ActionResult LoadTable(int parentId, string tableName, string columnCNName, string nameSpace, string foldername, int table_Id, bool isTreeLoad,bool isAlias)
{
- return Json(Service.LoadTable(parentId, tableName, columnCNName, nameSpace, foldername, table_Id, isTreeLoad));
+ return Json(Service.LoadTable(parentId, tableName, columnCNName, nameSpace, foldername, table_Id, isTreeLoad,isAlias));
}
[Route("delTree")]
diff --git a/Net6.SqlSugar/VOL.WebApi/Template/Page/Vue3SearchPage.html b/Net6.SqlSugar/VOL.WebApi/Template/Page/Vue3SearchPage.html
index 178cb77d..931b5904 100644
--- a/Net6.SqlSugar/VOL.WebApi/Template/Page/Vue3SearchPage.html
+++ b/Net6.SqlSugar/VOL.WebApi/Template/Page/Vue3SearchPage.html
@@ -25,7 +25,7 @@
key: '#key',
footer: "Foots",
cnName: '#cnName',
- name: '#TableName',
+ name: '$TableName',
url: "#url",
sortName: "#SortName"
});
diff --git a/Net6.SqlSugar/VOL.WebApi/Template/Page/VueSearchPage.html b/Net6.SqlSugar/VOL.WebApi/Template/Page/VueSearchPage.html
index bed17735..9a7c66f4 100644
--- a/Net6.SqlSugar/VOL.WebApi/Template/Page/VueSearchPage.html
+++ b/Net6.SqlSugar/VOL.WebApi/Template/Page/VueSearchPage.html
@@ -35,7 +35,7 @@
key: '#key',
footer: "Foots",
cnName: '#cnName',
- name: '#TableName',
+ name: '$TableName',
url: "#url",
sortName: "#SortName"
},
diff --git "a/Vol.Vue3\347\211\210\346\234\254/src/router/viewGird.js" "b/Vol.Vue3\347\211\210\346\234\254/src/router/viewGird.js"
index a047b901..d26be0aa 100644
--- "a/Vol.Vue3\347\211\210\346\234\254/src/router/viewGird.js"
+++ "b/Vol.Vue3\347\211\210\346\234\254/src/router/viewGird.js"
@@ -129,6 +129,22 @@ let viewgird = [
path: '/Sys_Department',
name: 'Sys_Department',
component: () => import('@/views/system/system/Sys_Department.vue')
+ } ,{
+ path: '/OrDetail',
+ name: 'OrDetail',
+ component: () => import('@/views/order/ordetail/OrDetail.vue')
+ } ,{
+ path: '/Order',
+ name: 'Order',
+ component: () => import('@/views/order/order/Order.vue')
+ } ,{
+ path: '/Trde',
+ name: 'Trde',
+ component: () => import('@/views/order/trde/Trde.vue')
+ } ,{
+ path: '/OrderHeader2',
+ name: 'OrderHeader2',
+ component: () => import('@/views/order/orderheader2/OrderHeader2.vue')
}]
export default viewgird
diff --git "a/Vol.Vue3\347\211\210\346\234\254/src/views/builder/builderData.js" "b/Vol.Vue3\347\211\210\346\234\254/src/views/builder/builderData.js"
index 314c96ce..63f0c163 100644
--- "a/Vol.Vue3\347\211\210\346\234\254/src/views/builder/builderData.js"
+++ "b/Vol.Vue3\347\211\210\346\234\254/src/views/builder/builderData.js"
@@ -73,7 +73,8 @@ let data = {
enable: 0,
vuePath: '',
appPath: "",
- userPermissionDesc: '开启后当前用户只能操作自己(与下级角色)创建的数据,如:查询、删除、修改等操作'
+ userPermissionDesc: '开启后当前用户只能操作自己(与下级角色)创建的数据,如:查询、删除、修改等操作',
+ isAlias:false
},
addOptions: [
[{ "title": "父 级 ID", min: 0, "field": "parentId", "required": true, type: 'number', placeholder: '放在【代码生成配置】列表的文件夹ID下,如果填入【0】就是一级目录' }],
@@ -87,7 +88,9 @@ let data = {
}],
[{ "title": "表中文名", "field": "columnCNName", "required": true, placeholder: "表对应的中文名字,界面上显示会用到" }],
[{ "title": "实际表名", "field": "tableName", "required": true, placeholder: "数据库实际表名或者视图名(多表关联请创建视图再生成代码)" }],
- [{ "title": "文件夹名", placeholder: "生成文件所在类库中的文件夹名(文件夹可以不存在);注意只需要填写文件夹名，不是路径", "field": "folderName", "required": true }]
+ [{ "title": "文件夹名", placeholder: "生成文件所在类库中的文件夹名(文件夹可以不存在);注意只需要填写文件夹名，不是路径", "field": "folderName", "required": true }],
+ [{ "title": "表别名", placeholder: "文件夹名作为表的别名,默认不启用", field: "isAlias", bind: { data: [{ key: true, value: '是', key: false, value: '否' }] }, type: 'switch' }]
+
],
options: [
[
diff --git "a/Vol.Vue3\347\211\210\346\234\254/src/views/builder/coder.vue" "b/Vol.Vue3\347\211\210\346\234\254/src/views/builder/coder.vue"
index 9ade7828..cd0c890f 100644
--- "a/Vol.Vue3\347\211\210\346\234\254/src/views/builder/coder.vue"
+++ "b/Vol.Vue3\347\211\210\346\234\254/src/views/builder/coder.vue"
@@ -13,6 +13,8 @@
1、如果只是创建目录，父级id填0,其他随便填写;
2、如果是生成代码，父级id填写【代码生成配置】列表页面的id
+
+ 3、文件夹名称可以作为表的别名,默认不启用
@@ -240,7 +242,8 @@ export default {
this.layOutOptins.fields.namespace +
'&foldername=' +
this.layOutOptins.fields.folderName +
- '&isTreeLoad=false';
+ '&isTreeLoad=false'+
+ '&isAlias='+this.layOutOptins.fields.isAlias;
this.http
.post('/api/builder/LoadTableInfo?' + queryParam, {}, true)
.then((x) => {
@@ -390,7 +393,7 @@ export default {
this.http
.post(
'/api/builder/syncTable?tableName=' +
- this.layOutOptins.fields.tableName,
+ this.layOutOptins.fields.tableTrueName,
{},
true
)
--
Gitee