Commits · 41cbabcf88245fbc22b9598d28c357405842e89f · phsl / admin · GitLab

06 May, 2024 1 commit
- !435 form-create：字典选择器分离，重新封装 api 选择器。扩展字体图标。 · 41cbabcf
```
Merge pull request !435 from puhui999/dev-crm
```
  芋道源码 committed May 06, 2024
  41cbabcf Browse Files
05 May, 2024 3 commits
- Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm · bcf2f7a5
  puhui999 committed May 06, 2024
  
  bcf2f7a5 Browse Files
- form-create: 字体图标扩展 · 9f704fb8
  puhui999 committed May 06, 2024
  
  9f704fb8 Browse Files
- form-create: 字典选择器分离，重新封装 api 选择器 · 7c158af3
  puhui999 committed May 06, 2024
  
  7c158af3 Browse Files
02 May, 2024 5 commits
- Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev · ecf90524
  YunaiV committed May 02, 2024
  
  ecf90524 Browse Files
- !437 update src/views/infra/webSocket/index.vue. #434 · 869cae06
```
Merge pull request !437 from AhJindeg/N/A
```
  芋道源码 committed May 02, 2024
  869cae06 Browse Files
- Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev · dd36bbce
  YunaiV committed May 02, 2024
  
  dd36bbce Browse Files
- !436 fix(useUpload.ts): 修复前端文件上传Content-Type异常问题 · 939ceb32
```
Merge pull request !436 from Khalid/master
```
  芋道源码 committed May 02, 2024
  939ceb32 Browse Files
- 【修复】商城系统：管理后台的商城订单统计数据有问题 · e2fe0474
  YunaiV committed May 02, 2024
  
  e2fe0474 Browse Files
01 May, 2024 7 commits
- 【修复】商城：秒杀时段点击编辑报错 · 20a97806
  YunaiV committed May 01, 2024
  
  20a97806 Browse Files
- form-create: 封装通用选择器 hook · c77526e8
  puhui999 committed May 01, 2024
  
  c77526e8 Browse Files
- Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm · 1434d7dd
  puhui999 committed May 01, 2024
  
  1434d7dd Browse Files
- form-create: 封装通用选择器 hook · b4d85b78
  puhui999 committed May 01, 2024
  
  b4d85b78 Browse Files
- 【新增】在菜单管理中，可通过“路由地址”添加 `?` 拼接参数 · f75e8d1f
  YunaiV committed May 01, 2024
  
  f75e8d1f Browse Files
- form-create: 封装通用选择器 hook · c1c21d82
  puhui999 committed May 01, 2024
  
  c1c21d82 Browse Files
- Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm · 51e6887b
  puhui999 committed May 01, 2024
  
  51e6887b Browse Files
30 Apr, 2024 5 commits
- 【优化】结合 vite 机制，将 .env.local-dev 修改成 .env.local · bde55974
  YunaiV committed Apr 30, 2024
  
  bde55974 Browse Files
- update src/views/infra/webSocket/index.vue. #434 · de967a01
```
Signed-off-by: AhJindeg <ahjindeg@gmail.com>
```
  AhJindeg committed Apr 30, 2024
  de967a01 Browse Files
- Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev · 9527b41b
  YunaiV committed Apr 30, 2024
  
  9527b41b Browse Files
- 使用 tsx 封装 form-create 通用选择组件 · 1f1ac1f2
  puhui999 committed Apr 30, 2024
  
  1f1ac1f2 Browse Files
- fix(useUpload.ts): 修复前端文件上传Content-Type异常问题 · ff14cf90
  khalidlife committed Apr 30, 2024
  
  ff14cf90 Browse Files
29 Apr, 2024 4 commits
- Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm · 21483448
  puhui999 committed Apr 30, 2024
  
  21483448 Browse Files
- form-create：移除自带的下拉选择器组件，使用 currencySelectRule 替代 · 769b63d9
  puhui999 committed Apr 30, 2024
  
  769b63d9 Browse Files
- 【移除】stylelint.vscode-stylelint 插件的推荐，避免 vscode 样式红色波浪线 · dcf66749
  YunaiV committed Apr 29, 2024
  
  dcf66749 Browse Files
- 【优化】增加 pnpm-lock 保证大家更好的打包 · 500b8632
  YunaiV committed Apr 29, 2024
  
  500b8632 Browse Files
28 Apr, 2024 2 commits
- 【恢复】npm run dev 使用 local-dev 配置文件 · 730da857
  YunaiV committed Apr 28, 2024
  
  730da857 Browse Files
- !433 CRM: 修复客户导入、销售漏斗。上传组件的文件列表给拓展一个下载。 · c96902d6
```
Merge pull request !433 from puhui999/dev-crm
```
  芋道源码 committed Apr 28, 2024
  c96902d6 Browse Files
25 Apr, 2024 2 commits
- Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm · 00762362
  puhui999 committed Apr 25, 2024
  
  00762362 Browse Files
- feat：文件上传组件的文件列表拓展一个下载 · ae53ca6f
  puhui999 committed Apr 25, 2024
  
  ae53ca6f Browse Files
24 Apr, 2024 5 commits
- fix: import FunnelChart from echarts · 9a36d9d6
  puhui999 committed Apr 24, 2024
  
  9a36d9d6 Browse Files
- Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev · f55c9b72
  YunaiV committed Apr 24, 2024
  
  f55c9b72 Browse Files
- CRM: 修复客户导入 · 6ff31b90
  puhui999 committed Apr 24, 2024
  
  6ff31b90 Browse Files
- 【优化】移除 env 多余的 VITE_API_BASEPATH 配置项 · a0996bd0
  YunaiV committed Apr 24, 2024
  
  a0996bd0 Browse Files
- 【优化】新增 sslEnable 字段，支持 outlook 邮箱 · f405ac32
  YunaiV committed Apr 24, 2024
  
  f405ac32 Browse Files
23 Apr, 2024 5 commits
- 依赖升级：element-plus、axios 等依赖 · 2d999138
  YunaiV committed Apr 24, 2024
  
  2d999138 Browse Files
- crm：bugfix FunnelBusiness.vue 导致打包失败的问题 · 1d533e49
  YunaiV committed Apr 24, 2024
  
  1d533e49 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · dee479ce
  YunaiV committed Apr 23, 2024
  
  dee479ce Browse Files
- crm：code review 员工业绩统计 · 715f37eb
  YunaiV committed Apr 23, 2024
  
  715f37eb Browse Files
- Merge branch 'dev' of https://gitee.com/scholarli/yudao-ui-admin-vue3 into dev · 56543b8d
```
# 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
```
  YunaiV committed Apr 23, 2024
  56543b8d Browse Files
22 Apr, 2024 1 commit
- Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 · 7f395001
```
# Conflicts:
#	src/api/infra/codegen/index.ts
#	src/views/system/sensitiveWord/index.vue
```
  YunaiV committed Apr 23, 2024
  7f395001 Browse Files