1441 Commits

Author SHA1 Message Date
YunaiV
8d2d1a26b5 代码生成:增加主子表 normal 模式的示例
(cherry picked from commit 9aca49c1ffb1344f5416d793e6c9edc56179ffab)
2024-03-06 20:43:58 +08:00
YunaiV
59e98a6679 代码生成:增加 tree 树形的示例
(cherry picked from commit bbc37613b6c1aa236752926d09c997b046f117e8)
2024-03-06 20:43:52 +08:00
YunaiV
eeaa608995 代码生成:支持树形表结构的配置
(cherry picked from commit 3d0c4f442210e89062f0cf407a31f27e47984e06)
2024-03-06 20:43:44 +08:00
YunaiV
4cf6b9000a 代码生成:增加 crud 单表示例
(cherry picked from commit 40b1522ed0da116f361a17f9ba5d6ee5df021b16)
2024-03-06 20:43:40 +08:00
Wanwan
13d1b3a084 feat: CRM 客户限制
(cherry picked from commit 22206b25e1357e6f69a4d027d130544affcc3b04)
2024-03-06 20:43:21 +08:00
xingyu
9d52790910 fix: stylelint
(cherry picked from commit 821c804189ffc81b8d8f8444076ab8948dcd3615)
2024-03-06 20:41:49 +08:00
xingyu
18251290f9 fix: eslint
(cherry picked from commit 249e0d21a3a96cec9e437544b27b1d60664cd12f)
2024-03-06 20:41:08 +08:00
xingyu
62a6d5490f docs: update deps
(cherry picked from commit 8a74b954d09b47d02d5a92a152c17de6c93ca3b1)
2024-03-06 20:39:33 +08:00
xingyu
4248cd1541 chore: update deps
(cherry picked from commit e56afbf80f892f382ae1b61ddfa62d79307ef247)
2024-03-06 20:39:19 +08:00
puhui999
76c05964fa crm-团队成员:新增获得权限级别名称函数 getLevelName
(cherry picked from commit 8e0cf5c1e54afd114a41fd40f838614a68bbb4d0)
2024-03-06 20:36:44 +08:00
puhui999
8e08665344 crm-团队成员:完善团队成员通用组件封装
(cherry picked from commit 015a1640c1a1c66d6975788158eaeaa4c4200130)
2024-03-06 20:36:29 +08:00
YunaiV
3524e3525b 代码生成:支持设置主子表的信息
(cherry picked from commit 45656562a82353927da0aa614a1ce0689e7bd6b0)
2024-03-06 20:36:07 +08:00
柯杨
9449829fd3 【bugfix】:修复滑块验证码无任何滑动直接点击验证时,x坐标空,导致后端NPE的问题
Signed-off-by: 柯杨 <key5230@163.com>
(cherry picked from commit 8bb9dec32867881f0555a81268b8f096b2251863)
2024-03-06 20:33:44 +08:00
puhui999
fa1d2f25e7 crm-团队成员: 先提交一波
(cherry picked from commit 27c9a0f32deee6e69b81348aae08ba114a5a0797)
2024-03-06 20:33:39 +08:00
puhui999
c58275cd41 fix:如果已经到重新登录页面则不进行弹窗提示
(cherry picked from commit 2385cd9b9a88f7b1f0de303a1c7b473ec203f544)
2024-03-06 20:33:26 +08:00
YunaiV
8823f11109 代码生成:增加主子表(内嵌)的示例
(cherry picked from commit 999d8de9e972d62ae4bf2a23bcb05d7559c8c101)
2024-03-06 20:33:21 +08:00
YunaiV
05592577ff 代码生成:增加主子表(普通)的示例
(cherry picked from commit f0f78860255d1b3190556cd4dbd500c69d8a4b1f)
2024-03-06 20:33:18 +08:00
YunaiV
26e6d287f5 代码生成:增加 one 情况下的示例代码
(cherry picked from commit 72c5eaae31fd37dcfcd016224351237a9e2004d7)
2024-03-06 20:33:14 +08:00
owen
d176271313 营销:适配商城装修组件【广告魔方】
(cherry picked from commit 49ebadd748157cb814a7a203f449a0feb2ed23c3)
2024-03-06 20:33:03 +08:00
Wanwan
291c34f45a feat: CRM 客户限制
(cherry picked from commit 702f23e6727f57340f5f0e3840fee0a59db3bcbf)
2024-03-06 20:32:59 +08:00
zyna
1f22d9ad0b crm联系人init
(cherry picked from commit ed26142bb0d928af1727de1bf1bf6a5fd4a7c140)
2024-03-06 20:32:54 +08:00
Wanwan
5a3fcb3b88 feat: CRM 客户限制
(cherry picked from commit a7f86dfd8bdc2813263d8a449d1b0efeec8fd490)
2024-03-06 20:32:47 +08:00
Wanwan
f356bf8076 feat: CRM 客户限制
(cherry picked from commit 6369b334e311f5cc402685d230df8d453d4c5007)
2024-03-06 20:32:43 +08:00
YunaiV
e7886a1224 主子表:确认列表编辑的支持组件情况
(cherry picked from commit 55f6e4ca25eb246d6c49327e0b23b6839d187c19)
2024-03-06 20:32:39 +08:00
YunaiV
7613a3b454 主子表:同步三种模式的代码
(cherry picked from commit 9f9e0f8bda0c19afbd6bc1d1290062d8f5ed9d3c)
2024-03-06 20:32:30 +08:00
niou233
95f6dd4bbf update src/locales/zh-CN.ts.
Signed-off-by: niou233 <2922564446@qq.com>
(cherry picked from commit af5d1cf25ee8898cab5e1d1b520b288021d982bc)
2024-03-06 20:32:26 +08:00
niou233
06d62672e9 update src/locales/en.ts.
Signed-off-by: niou233 <2922564446@qq.com>
(cherry picked from commit 1ab5b44254415e050615d91128df0afb703ccc1d)
2024-03-06 20:32:22 +08:00
niou233
c0b6729620 update src/hooks/web/useMessage.ts.
Signed-off-by: niou233 <2922564446@qq.com>
(cherry picked from commit 2ff97758fd720b281e2b76afa56f2fc637476916)
2024-03-06 20:32:19 +08:00
YunaiV
c1d82098f9 主子表:暂时存储,参数校验-表单数据跑通
(cherry picked from commit 86d9a97ccb08bec766ada95d5860deb28588e2b4)
2024-03-06 20:32:11 +08:00
YunaiV
980d546b06 主子表:暂时存储,样式跑通
(cherry picked from commit d45ebd4fcfb0bac96a575b5f594248e5b85f8778)
2024-03-06 20:32:07 +08:00
YunaiV
c8a3c5a3ad 主子表:暂时存储,准备重构
(cherry picked from commit 4e413a10e621a34235a6f520f8b97cd77cc00c95)
2024-03-06 20:31:57 +08:00
owen
914ceff305 unplugin-auto-import:排除自动导入店铺装修组件
(cherry picked from commit 55b477acdb4e4246648ab6198440cfc0649efc04)
2024-03-06 20:31:54 +08:00
owen
e8ec61a280 营销:适配商城装修组件【菜单导航】
(cherry picked from commit 82aed175ab31296666a317e81e0e2bb7744b4f5d)
2024-03-06 20:30:40 +08:00
Wanwan
2ed3c2a51c feat: CRM 客户公海配置
(cherry picked from commit 59b2d89a18855091851270d6c1cebcc1fb6b0178)
2024-03-06 20:30:33 +08:00
Wanwan
c3dc0836c2 feat: CRM 客户公海配置
(cherry picked from commit 288aa72cdd3ebd889118d02f8e66ca606ddc4d09)
2024-03-06 20:30:20 +08:00
owen
2d838325c9 营销:适配商城装修组件【宫格导航】
(cherry picked from commit ac42493659cd79b4ae7b451386b229dc293221fa)
2024-03-06 20:30:15 +08:00
owen
9bf49b4d38 营销:适配商城装修组件【列表导航】
(cherry picked from commit 325e2e4ff20b23d8b1a64902bb19bb24c4f0190f)
2024-03-06 20:30:10 +08:00
niou233
4d02972b86 refactor: 会员商品收藏
(cherry picked from commit f2c71d5836895b7d4ff6520388709f5426d88559)
2024-03-06 20:30:03 +08:00
Wanwan
cc577dfc6f style: 客户 review 修改
(cherry picked from commit 7146fdc9b9640c140d39e676453c09fe6a5248a2)
2024-03-06 20:29:35 +08:00
shizhong
800c6c83d9 BUG 2024-03-05 20:40:16 +08:00
YunaiV
adba0142f1 多租户:登录界面,根据 host 域名获取对应的租户编号
(cherry picked from commit 85ee558bef3937554deb7ab208b4c160590f6d2d)
2024-03-05 17:57:53 +08:00
shizhong
e2047eb6e9 多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突 2024-03-05 17:54:50 +08:00
owen
8f70c7f299 营销:适配商城装修组件【轮播图】
(cherry picked from commit 4253173a2a9c9e716c7ebfcfb9ac25e93bbd1171)
2024-03-05 17:52:32 +08:00
dhb52
fa174ba54e perf: 优化.env配置
(cherry picked from commit 89dbb8c9e8b5a4b280967d73cadbde8ad6b1dc20)
2024-03-05 17:52:24 +08:00
owen
8c2b96afc9 营销:增加商城装修组件【视频播放】
(cherry picked from commit bb2b7ffd034fc8abab9041be02f35d6284ebebc4)
2024-03-05 17:52:08 +08:00
VicoHu
79cf4d31e8 fix: 修复关闭拼团活动请求URL错误的问题
Signed-off-by: VicoHu <vicohu@163.com>
(cherry picked from commit 3f803767c43afca73a8e456282129a0aea4e8285)
2024-03-05 17:51:58 +08:00
YunaiV
e354a6f22e code review:产品分类
(cherry picked from commit 47bb88d8924543f00900f594b8eabfb37813fb0d)
2024-03-05 17:51:53 +08:00
owen
11a28eb196 营销:增加商城装修组件【图片展示】
(cherry picked from commit fa710b560d9a146c49bfc5f24dff7df3d6373c8c)
2024-03-05 17:51:08 +08:00
YunaiV
e3ef2c7e4c code review:回款
(cherry picked from commit 17742988c9607b4dab3bbb05f4a5896aa3488746)
2024-03-05 17:50:42 +08:00
owen
ce5314ab41 营销:优化装修编辑器
(cherry picked from commit 434aa864da30e4a35a093099e09fb620302ab944)
2024-03-05 17:50:00 +08:00