lxd/FlowBL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,169 Commits 1 Branch 0 Tags 16 MiB
4df8d76a42
Commit Graph

1825 Commits

Author SHA1 Message Date
DevDengChao
d883b860ac refactor: 提取默认登录使用的租户与账号密码, 规避潜在的账户泄露问题 2024-05-21 17:44:37 +08:00
芋道源码
be978f2e9f
Merge pull request #53 from DevDengChao/fix/wx-pay-channels 
fix: 修复无法配置微信原生支付与网站支付的问题
 2024-05-11 23:26:30 +08:00
芋道源码
663c8b3824
Merge pull request #42 from JJBoy1995/fix-bug 
【修复】商城管理首页统计数据显示问题
 2024-05-11 23:25:05 +08:00
芋道源码
05e6c2c2df
Merge pull request #50 from DevDengChao/fix/demo-order-return-url 
fix: 修复实例订单完成支付后跳转到 404 页面的问题
 2024-05-11 23:23:45 +08:00
芋道源码
93bee8c82c
!445 解决部门管理页面中，重置按钮失效问题 
Merge pull request !445 from 刘岩Tony/N/A
 2024-05-11 13:59:08 +00:00
芋道源码
0385d4dbb3
!442 update src/views/Login/SocialLogin.vue. 
Merge pull request !442 from 天痕/N/A
 2024-05-11 13:58:56 +00:00
芋道源码
aefee5211a
!443 update src/views/Login/SocialLogin.vue. 
Merge pull request !443 from 天痕/N/A
 2024-05-11 13:57:12 +00:00
DevDengChao
7883e3161d fix: 修复微信原生支付与网站支付无法配置的问题 2024-05-11 11:00:00 +08:00
DevDengChao
0275cb6dd7 fix: 修复 el-upload 组件提示 http-request 属性报错的问题 2024-05-11 10:59:59 +08:00
DevDengChao
e1d2305ddd fix: 补充缺失的微信 Native 支付与 WAP 支付枚举 2024-05-11 10:59:59 +08:00
DevDengChao
79f011fe17 fix: 修复实例订单完成支付后跳转到 404 页面的问题 2024-05-10 10:24:57 +08:00
DevDengChao
1ce3343578 fix: 修复填写商品属性后按回车键导致页面刷新的问题 2024-05-09 15:02:45 +08:00
JJBoy
1cf286b057 【修复】商城管理首页统计数据显示问题 
(cherry picked from commit 78dd2fa38a2d040c1c97d70cababc4f9265ac705)
 2024-05-08 21:16:09 +08:00
syubun
e8f1b411ba 修改流程流转类型判断错误的问题 2024-05-08 15:13:51 +08:00
刘岩Tony
742456dd87
解决部门管理页面中，重置按钮失效问题 
部门名称中的prop属性值写错了，会导致重置按钮不生效，已做相应更改

Signed-off-by: 刘岩Tony <345006662@qq.com>
 2024-05-08 06:14:01 +00:00
syubun
657ad506a4 oa请假，修复列表展示的状态字段取值错误 2024-05-08 09:44:47 +08:00
YunaiV
760bab7d29 【修复】全局：id=0导致sqlserver的insert失败 2024-05-07 22:18:43 +08:00
YunaiV
3976e49e35 【新增】AI：新增 chat 对话界面（草稿状态） 2024-05-07 21:59:47 +08:00
天痕
7092e24098
update src/views/Login/SocialLogin.vue. 
这里应该取反

Signed-off-by: 天痕 <614891294@qq.com>
 2024-05-07 09:10:43 +00:00
天痕
eeae01e661
update src/views/Login/SocialLogin.vue. 
这里已经是布尔值了，不用在判断为布尔值

Signed-off-by: 天痕 <614891294@qq.com>
 2024-05-07 09:08:28 +00:00
YunaiV
9402b29684 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-05-07 09:13:25 +08:00
dhb52
0fb70607d9 fix: id=0导致sqlserver的insert失败 2024-05-06 23:28:33 +08:00
芋道源码
a60826529b
!440 fix: id=0导致sqlserver新增菜单失败 
Merge pull request !440 from dhb52/N/A
 2024-05-06 14:53:17 +00:00
YunaiV
0222eef6b5 【优化】全局：动态表单的注释、error log 打印 2024-05-06 22:51:26 +08:00
dhb52
c350fc466e
fix: id=0导致sqlserver新增菜单失败 
Signed-off-by: dhb52 <dhb52@126.com>
 2024-05-06 14:43:52 +00:00
山野羡民
2101731f0b
update src/views/mall/statistics/product/components/ProductSummary.vue. 
商品统计计数显示有问题，数量显示成价格了

Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
 2024-05-06 01:55:15 +00:00
puhui999
bcf2f7a5dc Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2024-05-06 02:12:39 +08:00
puhui999
9f704fb8ff form-create: 字体图标扩展 2024-05-06 02:12:09 +08:00
puhui999
7c158af3cc form-create: 字典选择器分离，重新封装 api 选择器 2024-05-06 01:24:25 +08:00
YunaiV
66c6463f44 【修复】商城：seckill 导致打包失败的问题 2024-05-05 11:20:08 +08:00
YunaiV
f4705ad4e1 【发版】全局：2.1.0 发版 2024-05-04 21:51:06 +08:00
YunaiV
bbf009e15d 【优化】首页增加“项目说明” 2024-05-04 11:14:11 +08:00
YunaiV
ecf9052452 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-05-02 15:14:23 +08:00
芋道源码
869cae0675
!437 update src/views/infra/webSocket/index.vue. #434 
Merge pull request !437 from AhJindeg/N/A
 2024-05-02 07:14:15 +00:00
YunaiV
dd36bbce42 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-05-02 15:04:52 +08:00
芋道源码
939ceb32ce
!436 fix(useUpload.ts): 修复前端文件上传Content-Type异常问题 
Merge pull request !436 from Khalid/master
 2024-05-02 07:04:38 +00:00
YunaiV
e2fe04749b 【修复】商城系统：管理后台的商城订单统计数据有问题 2024-05-02 09:24:45 +08:00
YunaiV
20a9780654 【修复】商城：秒杀时段点击编辑报错 2024-05-01 20:53:01 +08:00
puhui999
c77526e8c5 form-create: 封装通用选择器 hook 2024-05-01 20:42:53 +08:00
puhui999
1434d7ddad Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2024-05-01 20:30:57 +08:00
puhui999
b4d85b782e form-create: 封装通用选择器 hook 2024-05-01 19:53:35 +08:00
YunaiV
f75e8d1fd4 【新增】在菜单管理中，可通过“路由地址”添加 ? 拼接参数 2024-05-01 18:47:51 +08:00
puhui999
c1c21d826d form-create: 封装通用选择器 hook 2024-05-01 17:29:13 +08:00
puhui999
51e6887bde Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2024-05-01 14:52:16 +08:00
AhJindeg
de967a0160
update src/views/infra/webSocket/index.vue. #434 
Signed-off-by: AhJindeg <ahjindeg@gmail.com>
 2024-04-30 08:50:55 +00:00
YunaiV
9527b41b62 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-04-30 15:04:41 +08:00
puhui999
1f1ac1f246 使用 tsx 封装 form-create 通用选择组件 2024-04-30 14:15:44 +08:00
khalidlife
ff14cf90f0 fix(useUpload.ts): 修复前端文件上传Content-Type异常问题 2024-04-30 09:30:43 +08:00
puhui999
769b63d9ca form-create：移除自带的下拉选择器组件，使用 currencySelectRule 替代 2024-04-30 00:07:25 +08:00
YunaiV
500b8632df 【优化】增加 pnpm-lock 保证大家更好的打包 2024-04-29 21:47:49 +08:00
puhui999
0076236280 Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2024-04-25 22:34:14 +08:00
puhui999
ae53ca6f4f feat：文件上传组件的文件列表拓展一个下载 2024-04-25 22:33:36 +08:00
puhui999
9a36d9d663 fix: import FunnelChart from echarts 2024-04-24 23:28:09 +08:00
YunaiV
f55c9b7273 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-04-24 23:01:05 +08:00
puhui999
6ff31b90c7 CRM: 修复客户导入 2024-04-24 22:55:14 +08:00
YunaiV
a0996bd0cf 【优化】移除 env 多余的 VITE_API_BASEPATH 配置项 2024-04-24 21:50:21 +08:00
YunaiV
f405ac3293 【优化】新增 sslEnable 字段，支持 outlook 邮箱 2024-04-24 09:14:43 +08:00
YunaiV
1d533e49e4 crm：bugfix FunnelBusiness.vue 导致打包失败的问题 2024-04-24 00:31:44 +08:00
YunaiV
dee479ce3c Merge remote-tracking branch 'origin/dev' into dev 2024-04-23 23:31:58 +08:00
YunaiV
715f37eb0b crm：code review 员工业绩统计 2024-04-23 23:31:52 +08:00
YunaiV
56543b8db4 Merge branch 'dev' of https://gitee.com/scholarli/yudao-ui-admin-vue3 into dev 
# Conflicts:
#	src/views/crm/statistics/performance/components/ContractCountPerformance.vue
#	src/views/crm/statistics/performance/components/ContractPricePerformance.vue
#	src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue
#	src/views/crm/statistics/performance/index.vue
 2024-04-23 23:17:15 +08:00
YunaiV
7f3950018e Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 
# Conflicts:
#	src/api/infra/codegen/index.ts
#	src/views/system/sensitiveWord/index.vue
 2024-04-23 00:28:26 +08:00
芋道源码
d26e0976db
!430 bugfix：修复角色管理页面-角色类型字段没有被字典翻译问题 
Merge pull request !430 from limz/bugfix-pull
 2024-04-22 16:27:11 +00:00
YunaiV
0925253a9d 【移除】敏感词的管理，简化项目的复杂度 2024-04-22 19:52:05 +08:00
YunaiV
98bf5a102e 【移除】错误码的管理，简化项目的复杂度 2024-04-22 19:42:56 +08:00
YunaiV
ff0c12c551 【移除】数据库文档，简化项目的复杂度 2024-04-22 19:13:57 +08:00
puhui999
243da124a8 fix: 调整价格弹窗不出来问题 2024-04-22 11:35:28 +08:00
puhui999
deb4585d4b fix: 适配 echarts map 的地名 2024-04-22 11:04:53 +08:00
puhui999
afdee2cd48 fix: 移除 form-crate 自带的富文本组件规则，使用 editorRule 替代 2024-04-22 10:56:16 +08:00
scholar
f4dd1bed63 1, 修改数据列表无法刷新的问题； 
2， 修改时间选择，后端按照年实现的，前端同样按照年份选择实现；
3，修改环比同比计算；
4，回款金额统计bug修复。
 2024-04-19 17:46:09 +08:00
limingz
d96f951113 bugfix：修复角色管理页面-角色类型字段没有被字典翻译问题 2024-04-18 14:45:43 +08:00
YunaiV
f5d013187b crm：code review 销售漏斗 2024-04-18 09:28:07 +08:00
芋道源码
50ab864698
!428 CRM: 新增商机赢单转化率分析 
Merge pull request !428 from puhui999/dev-crm
 2024-04-18 01:10:12 +00:00
AhJindeg
ac6618a943 fix: 🐞 fix sensitiveWord hasPermi value 2024-04-16 18:24:56 +08:00
AhJindeg
decdd1b25d fix: 🐞 fix post hasPermi value 2024-04-16 18:24:36 +08:00
AhJindeg
97c8cefb7d fix: 🐞 fix operatelog hasPermi value 2024-04-16 18:24:16 +08:00
AhJindeg
bfb69ccccd fix: 🐞 fix template hasPermi value 2024-04-16 18:23:57 +08:00
AhJindeg
958ec41f4e fix: 🐞 fix loginlog hasPermi value 2024-04-16 18:23:39 +08:00
AhJindeg
dc5bede084 fix: 🐞 fix fileConfig hasPermi value 2024-04-16 18:23:24 +08:00
AhJindeg
755526834e fix: 🐞 fix file hasPermi value 2024-04-16 18:23:08 +08:00
AhJindeg
221f78aa9a fix: 🐞 fix apiAccessLog hasPermi value 2024-04-16 18:22:46 +08:00
puhui999
4e640bae88 CRM: 新增商机赢单转化率分析 2024-04-15 16:38:24 +08:00
puhui999
014d1f8cd2 CRM: 新增商机赢单转化率分析 2024-04-15 16:32:48 +08:00
puhui999
6acfc77d08 CRM: 完善销售漏斗 2024-04-15 15:37:37 +08:00
moon69
033462d25f
修复第四个导航模式无法点开菜单的问题 
Signed-off-by: moon69 <1016830869@qq.com>
 2024-04-15 06:24:32 +00:00
YunaiV
c331a83b74 crm：code review 销售漏斗 2024-04-14 21:21:52 +08:00
芋道源码
56829ff921
!426 CRM: 完善销售漏斗分析 
Merge pull request !426 from puhui999/dev-crm
 2024-04-14 12:19:51 +00:00
芋道源码
6037ac4052
!419 feat: 客户成交周期分析(按区域、按产品) 
Merge pull request !419 from dhb52/dev
 2024-04-14 10:23:40 +00:00
芋道源码
1c469300f5
!422 Infra模块>代码生成器>适配达梦数据库 
Merge pull request !422 from 再见七月/infraBug-by-dm
 2024-04-14 10:21:53 +00:00
芋道源码
aba61120e4
!421 fix(UserImportForm): fix a bunch of bugs 
Merge pull request !421 from AhJindeg/hotfix-UserImportForm
 2024-04-14 10:18:31 +00:00
puhui999
bc95dc2959 CRM: 完善新增商机分析 2024-04-14 16:31:43 +08:00
puhui999
3c49ed570a CRM: 完善销售漏斗分析 2024-04-14 00:34:33 +08:00
zhanhong
2f0fdd1d36 fix:移除多余的代码 2024-04-13 12:39:41 +08:00
puhui999
2d7bab8adb CRM: 完善用户画像数据统计 2024-04-13 11:04:56 +08:00
puhui999
64af029c86 CRM: 完善用户画像数据统计 2024-04-11 15:25:48 +08:00
AhJindeg
4793897511 fix(UserImportForm): 🐞 add update formLoading and dialogVisible to submitFormSuccess 2024-04-11 11:03:06 +08:00
AhJindeg
786468f437 fix(UserImportForm): 🐞 add init updateSupport to open 2024-04-11 11:00:24 +08:00
byeJuly
1f517c3faf 修复 Infra 模块: 
修复项目迁移达梦8数据库后,代码生成器导入功能报错的原因：
调整策略：删除-> autoIncrement <-字段
 2024-04-10 19:33:01 +08:00
AhJindeg
4c15e6675a fix(UserImportForm): 🐞 add nextTick to resetForm 2024-04-10 18:09:43 +08:00
dhb52
5358863fc6 refactor: 统一处理null数据为'未知' 2024-04-09 18:47:31 +08:00
dhb52
0e15d6c9d2 feat: 客户成交周期分析(按区域、按产品) 2024-04-09 00:21:10 +08:00
芋道源码
f6e4753b34
!414 fix(role): add nextTick for open 
Merge pull request !414 from AhJindeg/hotfix-role
 2024-04-07 13:28:38 +00:00
YunaiV
e8a3745b5e crm：code review 公海客户分析 2024-04-07 21:27:29 +08:00
芋道源码
091ce90359
!417 feat: 增加[客户公海分析]tab 
Merge pull request !417 from dhb52/dev
 2024-04-07 13:17:35 +00:00
AhJindeg
b5fa188805 Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vue3 into hotfix-role 
Signed-off-by: AhJindeg <ahjindeg@gmail.com>
 2024-04-06 14:37:34 +00:00
YunaiV
8f8edc9565 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-04-06 19:39:14 +08:00
dhb52
3c54f5f565 feat: 增加[客户公海分析]tab 2024-04-06 15:38:50 +08:00
dhb52
13cf1feefb refactor: 使用try finally停止loading 2024-04-06 15:38:04 +08:00
YunaiV
6772568a58 crm：code review 客户画像 2024-04-05 14:43:55 +08:00
芋道源码
8926dd1173
!415 CRM: 完善用户画像数据统计 
Merge pull request !415 from puhui999/dev-crm
 2024-04-05 05:54:06 +00:00
YunaiV
dcfad7a427 crm：code review 员工业绩的前端 2024-04-05 13:53:14 +08:00
AhJindeg
db4795744e style: 🌈 add more readable for open 2024-04-05 13:51:27 +08:00
芋道源码
f17dfb9a31
!416 CRM员工业绩统计分析v2.0 
Merge pull request !416 from scholarli/dev
 2024-04-05 05:45:09 +00:00
AhJindeg
7b84ddd358 perf: 🎈 add await for nextTick() 2024-04-04 18:54:51 +08:00
YunaiV
283a9d0507 【新增】system user 和 role 接入新操作日志 2024-04-04 09:57:25 +08:00
YunaiV
c01571d11d 【重构】V2 操作日志转正，基于注解的可使用变量、可以自定义函数的通用操作日志组件 2024-04-04 01:21:27 +08:00
YunaiV
757281ce34 【优化】增强访问日志，支持是否记录、脱敏、操作信息等功能 2024-04-03 19:55:54 +08:00
scholar
b57a2c50a9 CRM员工业绩统计分析v2.0 2024-04-03 18:43:34 +08:00
puhui999
36385a74ba CRM: 完善用户画像数据统计 2024-04-03 12:19:09 +08:00
AhJindeg
c048dcf02a fix(role): 🐞 add nextTick for open 
- 增加 nextTick()，修复在权限范围为指定机构并且已选择数据时，编辑打开提示 setChecked undefined 问题
 2024-04-01 16:14:30 +08:00
puhui999
d16bed4ad7 form-create-designer: 表单组件新增用户选择器 2024-03-31 17:58:44 +08:00
puhui999
68dae2d1fe form-create-designer: 表单组件新增字典选择器 2024-03-30 23:18:23 +08:00
YunaiV
d05c67ffaa infra：code review 表单增强 2024-03-30 21:15:01 +08:00
YunaiV
ffc81621d7 REPORT：【移除】Ureport 的实现，因为和 Spring Boot 兼容性较差 2024-03-30 20:41:32 +08:00
puhui999
a489d21add Merge remote-tracking branch 'yudao/dev' into dev-crm 2024-03-30 18:53:30 +08:00
puhui999
bc004b3b27 使用项目组件对 form-create-designer 进行增强 2024-03-30 18:53:05 +08:00
芋道源码
52889e3504
!411 SYSTEM：修复【系统管理/岗位管理/新增按钮与导出按钮】权限hasPermi错误 
Merge pull request !411 from aqiangaqiang/master
 2024-03-30 07:56:52 +00:00
芋道源码
6764f86980
!409 fix(crontab): add inputChange for crontab 
Merge pull request !409 from AhJindeg/hotfix-crontab
 2024-03-30 07:55:47 +00:00
芋道源码
02af138069
!402 修复数据权限无法回显的问题 
Merge pull request !402 from moon69/master
 2024-03-30 07:50:38 +00:00
YunaiV
427c2d5d2a MALL：修复营销的商品范围枚举不正确的问题 2024-03-30 15:42:28 +08:00
YunaiV
87d1047fa9 CRM：code review【客户画像】的实现 2024-03-30 14:17:14 +08:00
YunaiV
34b788cb88 Merge branch 'dev-crm' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev 
# Conflicts:
#	src/views/bpm/definition/index.vue
#	src/views/bpm/model/index.vue
#	src/views/bpm/processInstance/create/index.vue
#	src/views/crm/statistics/customer/index.vue
 2024-03-30 12:54:51 +08:00
YunaiV
291dc51849 CRM：完善【排行版】功能 2024-03-30 11:48:41 +08:00
YunaiV
1b7d604858 CRM：code review【客户统计】的代码实现 2024-03-30 11:02:29 +08:00
YunaiV
b51397fe19 CRM：优化【客户统计】的代码实现 2024-03-30 09:23:02 +08:00
sunva
68e1556378 SYSTEM：修复【系统管理/岗位管理/新增按钮与导出按钮】权限hasPermi错误 2024-03-29 17:06:56 +08:00
YunaiV
23150fcfc3 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 
# Conflicts:
#	package.json
 2024-03-28 19:30:02 +08:00
芋道源码
1f14bf4bda
!404 feat: [CRM-客户分析]增加[时间间隔]选项 
Merge pull request !404 from dhb52/dev
 2024-03-28 11:18:52 +00:00
YunaiV
9f3bc1ead8 BPM：修复 bpmnxml 为空时，展示的 key 被覆盖的问题 2024-03-27 18:51:06 +08:00
YunaiV
607c2b6c4a BPM：完善文档说明 2024-03-27 09:41:00 +08:00
puhui999
3820710c56 二次封装 form-create 组件，使用项目重新封装的文件上传组件实现文件上载 2024-03-26 10:59:03 +08:00
puhui999
cce1fadc33 CRM: 新增客户行业、来源、级别统计、区域数据统计 2024-03-24 22:22:09 +08:00
YunaiV
77971f9c96 Merge branch 'feature/bpm' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2024-03-24 10:47:04 +08:00
YunaiV
624594bb5c BPM：处理打开 bpmn 设计器时，key 和 name 覆盖更新 2024-03-24 10:46:37 +08:00
YunaiV
eed7bb2e1a BPM：流程模型的 icon 维护 2024-03-24 10:08:59 +08:00
YunaiV
cc14963bc8 BPM：增加流程表达式的管理 2024-03-23 21:12:09 +08:00
YunaiV
7218e71884 BPM：增加任务监听器、执行监听器的管理 2024-03-23 19:23:19 +08:00
YunaiV
faf4557783 BPM：增加任务监听器、执行监听器的管理 2024-03-23 15:58:38 +08:00
YunaiV
728cf15c45 BPM：增加「发起人自选」的任务审批人的分配策略 2024-03-23 00:54:33 +08:00
YunaiV
48f6624737 BPM：新增【流程任务】菜单，用于全部流程任务的查询 2024-03-22 09:07:04 +08:00