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

1304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zuohuaijun
0f92c2f475 Merge pull request '新增PluginCore插件库及插件示例' (#285) from tang1022.cool/Admin.NET.Pro:v2 into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/285
 2025-03-08 22:47:44 +08:00
zuohuaijun
226c2a6483 Merge pull request '新增基于Element Plus ElLoading的流程加载控制器，支持链式操作和动态文本更新，用于复杂连续的操作流程' (#290) from aq982 into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/290
 2025-03-08 22:45:56 +08:00
lqc
14aa108c39 新增基于Element Plus ElLoading的流程加载控制器，支持链式操作和动态文本更新，用于复杂连续的操作流程 2025-03-08 10:04:14 +08:00
zuohuaijun
2d64de01af 😎调整中英文顺序 2025-03-08 00:26:09 +08:00
zuohuaijun
b00de17a5c 😎升级vxe-table至最新版 2025-03-08 00:04:47 +08:00
zuohuaijun
a8a018a1b0 Merge branch 'v2' of https://code.adminnet.top/Admin.NET/Admin.NET.Pro into v2 2025-03-07 23:59:37 +08:00
zuohuaijun
df50d8de1c 😎1、恢复角色批量设置用户 2、调整首页等待条样式 3、增加获取指定机构子树API 4、升级依赖 2025-03-07 23:59:21 +08:00
zuohuaijun
c4698eeec8 Merge pull request 'style(Web): 调整布局滚动条样式' (#289) from miaomimiao/Admin.NET.Pro:v2 into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/289
 2025-03-07 23:15:29 +08:00
xuyp
ae0b47f05a style(Web): 调整布局滚动条样式 
- 在 layout-main-scroll 类中添加 min-height: 100% 样式
- 解决布局模式在经典模式时vxegrid表格高度无限递增的问题
 2025-03-07 21:15:28 +08:00
zuohuaijun
9f18a5e7e5 Merge branch 'v2' of https://code.adminnet.top/Admin.NET/Admin.NET.Pro into v2 2025-03-05 23:55:41 +08:00
zuohuaijun
b0f4021f96 😎1、优化文件上传更新 2、升级依赖 2025-03-05 23:55:26 +08:00
zuohuaijun
e2fec298d2 Merge pull request 'BUG:数据如果带双引号会出错' (#288) from koy07555/Admin.NET.Pro:种子数据生成BUG into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/288
 2025-03-05 16:44:20 +08:00
yzp
45b41ff8ea BUG:数据如果带双引号会出错 2025-03-05 16:11:15 +08:00
zuohuaijun
a53533d2a2 😎修复登录逻辑错误 2025-03-05 14:26:08 +08:00
zuohuaijun
de8b31224f 😎优化登录逻辑 2025-03-05 11:41:44 +08:00
zuohuaijun
3d50990047 Merge pull request '权限管理功能小改' (#287) from koy07555/Admin.NET.Pro:小改权限相关 into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/287
 2025-03-05 10:54:32 +08:00
yzp
c1de3b2987 BUG:删除缓存后不重启服务会登陆不了 
FIX:对API列表进行排序，方便排查权限时快带定位
 2025-03-05 10:49:08 +08:00
zuohuaijun
a6105cb002 Merge pull request '修改PartialEntity_Entity模板不选统计字段不增加输入参数' (#286) from aq982 into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/286
 2025-03-05 10:43:25 +08:00
aq982
4c6b34d1f7 修改服务端模板不选统计字段不增加自定义统计 2025-03-04 23:37:37 +08:00
aq982
99fdb86dcb 修改服务端模板不选统计字段不增加自定义统计 2025-03-04 23:34:30 +08:00
aq982
a9ee6c893e 修改PartialEntity_Entity模板不选统计字段不增加输入参数 2025-03-04 23:28:08 +08:00
zuohuaijun
5bbf1cf45e 😎升级依赖 2025-03-04 21:57:26 +08:00
zuohuaijun
f3060a64b8 Merge pull request 'Fix:判断菜单是否重复只判断在同一节点下是否重复' (#284) from koy07555/Admin.NET.Pro:菜单管理Fix into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/284
 2025-03-04 20:08:34 +08:00
tomnycool
b88759b08d 新增PluginCore插件库及插件示例 2025-03-04 19:25:01 +08:00
yzp
e6629a354d Fix:判断菜单是否重复只判断在同一节点下是否重复 2025-03-04 17:38:16 +08:00
zuohuaijun
ac8cc4c1dd 😎代码优化 2025-03-04 01:40:57 +08:00
zuohuaijun
46221a7a0d 😎1、调整默认字典ID（重新生成字典表即可，先删再自动重建） 2、清理代码及升级依赖 2025-03-04 01:26:06 +08:00
zuohuaijun
d14ea3494e Merge pull request '新增树形表生成' (#283) from aq982 into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/283
 2025-03-03 12:11:56 +08:00
aq982
38e9cddf36 新增树形表生成 2025-03-03 12:01:19 +08:00
zuohuaijun
e1c8b3b5ce Merge pull request '修改模板错误' (#282) from aq982 into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/282
 2025-03-02 23:09:30 +08:00
aq982
c13c4f5392 修改模板错误 2025-03-02 22:32:22 +08:00
zuohuaijun
e4c1cbb26d 😎降低组件cropperjs版本 2025-03-02 21:17:55 +08:00
zuohuaijun
142a18289f 😎代码优化 2025-03-02 18:10:53 +08:00
zuohuaijun
ac3d0bb6f6 😎代码优化 2025-03-02 17:20:37 +08:00
zuohuaijun
18e64c524e Merge branch 'v2' of https://code.adminnet.top/Admin.NET/Admin.NET.Pro into v2 2025-03-02 17:01:29 +08:00
zuohuaijun
21168c280d 😎清理代码 2025-03-02 17:01:18 +08:00
zuohuaijun
23854677c2 Merge pull request 'GenerateParametersForJsapiPay 要改为强类型转换，dynamic 是 diction<string,string>无法自动转为 WechatPayParaOutput' (#281) from koy07555/Admin.NET.Pro:微信小改 into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/281
 2025-03-02 12:19:10 +08:00
yzp
a77165bc33 GenerateParametersForJsapiPay 要改为强类型转换，dynamic是diction<string,string>无法自动转为 WechatPayParaOutput 2025-03-02 11:24:42 +08:00
zuohuaijun
0f30009f91 😎升级Furion v4.9.7.20 2025-03-02 02:02:28 +08:00
zuohuaijun
12b9dd84be 😎1、修复机构编辑错误 2、调整用户编辑页面 3、升级依赖 2025-03-02 00:03:06 +08:00
zuohuaijun
d96304fbc5 😎重命名多语言相关大小写 2025-03-01 12:25:02 +08:00
zuohuaijun
bdfbb2226f 😎整理格式化前端多语言相关代码 2025-03-01 12:02:59 +08:00
zuohuaijun
51a7c54aad 😎整理多语言相关代码 2025-03-01 11:31:39 +08:00
zuohuaijun
d6a41ee8d7 Merge pull request 'v2的国际化' (#280) from mayu189/Admin.NET.Pro:v2 into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/280
 2025-03-01 10:51:06 +08:00
zuohuaijun
7136375c9b Merge pull request '微信支付小改' (#279) from koy07555/Admin.NET.Pro:微信支付小改 into v2 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/279
 2025-03-01 10:17:35 +08:00
PZ688
4191e32691 fix：欢迎词 2025-03-01 01:13:09 +08:00
PZ688
f42f8b0fb3 refactor:欢迎词 2025-03-01 01:11:16 +08:00
PZ688
103cd89303 refactor:更新首页 2025-03-01 00:44:35 +08:00
yzp
e438bbf1f2 BUG:在TASK内调用支付拦截器时，外层的代码把参数内容改了。 2025-02-28 23:27:30 +08:00
yzp
4400bd4883 CreatePayTransaction生成定单时同时返回签名，减少客户端调用接口的代码 2025-02-28 23:26:05 +08:00