gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
341 Commits 1 Branch 0 Tags 68 MiB
e0398303fa
Commit Graph

341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zuohuaijun
e0398303fa 😎调整接口与按钮权限对应 2024-07-22 02:54:41 +08:00
zuohuaijun
c6c49b31a4 😎代码优化 2024-07-21 17:08:33 +08:00
zuohuaijun
c61c12325b Merge pull request '控制台显示正在初始化的表和种子数据' (#70) from coolcalf/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/70
 2024-07-21 16:47:16 +08:00
zuohuaijun
245c52214b Merge pull request '修复用户编辑界面，添加多个附属机构时页面太长而无法显示的问题' (#69) from skywolf627/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/69
 2024-07-21 16:47:03 +08:00
coolcalf
8361c21532 控制台显示正在初始化的表和种子数据 
支持拆分表数据初始化
菜单icon增加默认值
 2024-07-21 16:32:44 +08:00
coolcalf
357cfb57d7 Merge pull request 'main' (#2) from Admin.NET/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/coolcalf/Admin.NET.Pro/pulls/2
 2024-07-21 15:51:26 +08:00
skywolf627
2f5a0784f6 修复用户编辑界面，添加多个附属机构时页面太长而无法显示的问题 2024-07-21 15:10:51 +08:00
zuohuaijun
2d96e3aebf Merge pull request '修复添加机构后，机构列表不会更新的问题' (#68) from skywolf627/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/68
 2024-07-21 11:08:24 +08:00
zuohuaijun
76320909c1 😎升级Furion v4.9.4.7 2024-07-21 11:08:07 +08:00
skywolf627
4bc17a3be6 修复添加机构后，机构列表不会更新的问题 2024-07-21 10:52:02 +08:00
zuohuaijun
f52f7aa1ed 😎限制删除被开放接口绑定的用户和租户 2024-07-20 23:24:16 +08:00
zuohuaijun
1567099226 😎调整优化日程相关代码和升级npm依赖 2024-07-20 16:25:10 +08:00
zuohuaijun
4a07a213fd 😎升级nuget包依赖 2024-07-20 15:33:02 +08:00
IMaster
2f1c8a00a9 Merge pull request '避免前端警告 tagType 为 ""' (#67) from orzsoft_admin/Admin.NET.Pro:template into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/67
 2024-07-19 18:29:40 +08:00
Master
b1c1d64973 纠正错误的逻辑 2024-07-19 18:26:20 +08:00
Master
86519d69fe 避免前端警告 tagType 为 "" 2024-07-19 18:24:42 +08:00
zuohuaijun
a47ded2605 Merge pull request '删除重复的枚举扩展 添加Theme到字典数据库' (#66) from orzsoft_admin/Admin.NET.Pro:template into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/66
 2024-07-19 13:52:01 +08:00
Master
139f000b39 删除重复的枚举扩展 
添加Theme到字典数据库
更新字典数据库
 2024-07-19 09:32:25 +08:00
zuohuaijun
c556ed05a3 Merge pull request '编辑页面字典下拉框显示name' (#65) from suncaomei/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/65
 2024-07-19 00:46:56 +08:00
CAOMEI\s
57d6bbd874 编辑页面字典下拉框显示name 2024-07-19 00:45:26 +08:00
zuohuaijun
5e0b3c4cb1 Merge pull request '修改前端index.vue字典使用value值为存储值查询' (#64) from suncaomei/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/64
 2024-07-19 00:42:17 +08:00
CAOMEI\s
25dce06bfd 修改前端index.vue字典使用value值为存储值查询 2024-07-19 00:36:31 +08:00
zuohuaijun
d6cbbee1e0 😎删除多余的调试和打印 2024-07-18 17:59:01 +08:00
zuohuaijun
ac630a2d07 😎优化判断 2024-07-18 17:49:22 +08:00
zuohuaijun
1faff96638 😎增加事件总线广播消息功能 2024-07-18 17:48:15 +08:00
zuohuaijun
3eb7f2e14f 😎兼容createTime可空模式 2024-07-18 11:28:17 +08:00
zuohuaijun
e8daf7aa5b 😎1、优化SignalR配置 2、恢复消息发送 2024-07-18 00:51:07 +08:00
zuohuaijun
572b3bf72f 😎更新接口请求文件 2024-07-17 21:15:41 +08:00
zuohuaijun
b4632cfffd 😎默认node内存8G 2024-07-17 20:39:22 +08:00
许俊杰
e8a471efba style: 调整代码写法避免可空警告 2024-07-17 18:30:44 +08:00
zuohuaijun
00da8d15a2 😎升级npm依赖 2024-07-17 18:18:28 +08:00
zuohuaijun
0b79002afb 😎1、优化种子判断 2、默认开启redis事件源 3、优化行政区域处理 2024-07-17 18:01:34 +08:00
zuohuaijun
c8c9488c4f 😎调整索引过长问题 2024-07-17 17:53:10 +08:00
zuohuaijun
a9315d7404 😎调整代码生成模板 2024-07-17 17:45:26 +08:00
zuohuaijun
995e2b8bfd 😎阻止火狐浏览器在拖动时打开新窗口 2024-07-17 17:42:16 +08:00
zuohuaijun
9f7f454bd5 😂解决冲突 2024-07-17 17:40:16 +08:00
zuohuaijun
c10ae9d849 😂恢复本地时间格式 2024-07-17 17:37:06 +08:00
zuohuaijun
09f3e285c7 Merge pull request '🌃调整水印获取IP的方法' (#61) from KaneLeung/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/61
 2024-07-17 11:18:46 +08:00
KaneLeung
557ac3536d 👨‍🦱消除树表格报黄 2024-07-17 11:00:52 +08:00
zuohuaijun
deebfa5896 😎1、去掉基类时间多余特性 2、修复创建时间默认逻辑 2024-07-17 10:45:38 +08:00
KaneLeung
f04fbdb90f 🧪修复LDAP列表查询报错 2024-07-17 10:19:14 +08:00
KaneLeung
578237571b 🌃调整水印获取IP的方法 2024-07-17 09:56:16 +08:00
zuohuaijun
33c7f7c3bd 😎修复日志js文件 2024-07-17 01:16:44 +08:00
zuohuaijun
1895fe4c9d Merge pull request '移除代码生成器中按照时间排序导致前端如果传入field:createTime会出现"SqlSugar.SqlSugarException: 在排序依据列表中多次指定了某一列。排序依据列表中的列必须是唯一的。"的错误' (#59) from suncaomei/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/59
 2024-07-17 01:03:55 +08:00
CAOMEI\s
e1957dc7df 移除代码生成器中按照时间排序导致前端如果传入field:createTime会出现"SqlSugar.SqlSugarException: 在排序依据列表中多次指定了某一列。排序依据列表中的列必须是唯一的。"的错误 2024-07-17 01:01:39 +08:00
zuohuaijun
88fc37c75c Merge pull request '需要将表达式中的 Expression.Or 替换为 Expression.OrElse。在表达式树中，Expression.Or 对应于位运算符 OR（|），而 Expression.OrElse 对应于逻辑运算符 OR（||），后者才是 SQL 中使用的正确逻辑运算符。' (#58) from suncaomei/Admin.NET.Pro:main into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/58
 2024-07-16 23:10:52 +08:00
CAOMEI\s
dc2117a3d8 需要将表达式中的 Expression.Or 替换为 Expression.OrElse。在表达式树中，Expression.Or 对应于位运算符 OR（|），而 Expression.OrElse 对应于逻辑运算符 OR（||），后者才是 SQL 中使用的正确逻辑运算符。 2024-07-16 23:07:55 +08:00
zuohuaijun
80745e5cb4 Merge pull request '修正字典匹配' (#57) from orzsoft_admin/Admin.NET.Pro:template into main 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/57
 2024-07-16 20:33:33 +08:00
Master
15fec5d2c8 修正字典匹配 2024-07-16 19:08:22 +08:00
zuohuaijun
cfb09f9f45 😎统一时间为UTC格式：Now => UtcNow 2024-07-16 18:06:39 +08:00