lxd/FlowVue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,760 Commits 2 Branches 0 Tags 18 MiB
04a42bc6d4
Commit Graph

221 Commits

Author SHA1 Message Date
owen
b4ba1043d6 eslint 2023-12-01 18:57:46 +08:00
owen
08be359578 Merge remote-tracking branch 'origin/dev' into dev 2023-12-01 00:39:55 +08:00
owen
23a6bf5ef5 营销：商城装修增加控件【APP 链接选择】 2023-12-01 00:39:10 +08:00
dhb52
e106fb73b6 Merge remote-tracking branch 'yudao/master' into dhb52_master 2023-11-28 21:53:20 +08:00
芋道源码
8aa17b673b
!331 菜单右上角加一个搜索图标 
Merge pull request !331 from boide/search-icon
 2023-11-25 10:50:20 +00:00
owen
d4dc105b4f 营销：适配商城装修组件【营销文章】 2023-11-25 15:53:07 +08:00
Marvin
b95b8008f7 feat: 菜单右上角加一个搜索图标 2023-11-25 03:52:59 +08:00
owen
c3cad3f3ee 商城：修复会员统计时间范围选择昨天时, 会强制查询两天的问题 2023-11-24 20:54:47 +08:00
dhb52
c2038b95bf Merge remote-tracking branch 'yudao/master' 2023-11-23 08:47:06 +08:00
owen
253401ace3 营销：适配商城装修组件【优惠券】 2023-11-22 16:58:00 +08:00
owen
3198688eb5 营销：适配商城装修组件【商品栏】 2023-11-19 18:27:25 +08:00
YunaiV
ebb19cfe8c Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-11-19 00:30:02 +08:00
芋道源码
5f0b0bd21d
!324 商城装修 
Merge pull request !324 from 疯狂的世界/dev
 2023-11-18 14:18:12 +00:00
芋道源码
f07d37438d
!321 修复滑块验证码无任何滑动直接点击验证时，x坐标空，导致后端NPE的问题 
Merge pull request !321 from 柯杨/master
 2023-11-18 13:43:22 +00:00
YunaiV
7c5ae17d04 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 
# Conflicts:
#	src/components/DiyEditor/components/ComponentContainer.vue
 2023-11-18 20:39:31 +08:00
芋道源码
26dba8b457
!325 新增主子表、树表的代码生成 
Merge pull request !325 from 芋道源码/feature/sub-table
 2023-11-18 09:57:33 +00:00
owen
b4a1772584 营销：适配商城装修组件【商品卡片】 2023-11-17 10:14:26 +08:00
xingyu
821c804189 fix: stylelint 2023-11-14 21:56:54 +08:00
xingyu
249e0d21a3 fix: eslint 2023-11-14 21:56:02 +08:00
柯杨
8bb9dec328
【bugfix】：修复滑块验证码无任何滑动直接点击验证时，x坐标空，导致后端NPE的问题 
Signed-off-by: 柯杨 <key5230@163.com>
 2023-11-14 01:43:59 +00:00
YunaiV
72c5eaae31 代码生成：增加 one 情况下的示例代码 2023-11-12 19:50:38 +08:00
owen
49ebadd748 营销：适配商城装修组件【广告魔方】 2023-11-12 19:29:24 +08:00
YunaiV
55f6e4ca25 主子表：确认列表编辑的支持组件情况 2023-11-10 23:01:36 +08:00
owen
82aed175ab 营销：适配商城装修组件【菜单导航】 2023-11-09 09:18:46 +08:00
owen
ac42493659 营销：适配商城装修组件【宫格导航】 2023-11-08 22:22:35 +08:00
owen
325e2e4ff2 营销：适配商城装修组件【列表导航】 2023-11-08 21:10:05 +08:00
owen
4253173a2a 营销：适配商城装修组件【轮播图】 2023-11-06 09:31:42 +08:00
owen
6e9e1d0888 Merge remote-tracking branch 'origin/dev' into dev 2023-11-06 08:33:16 +08:00
dhb52
89dbb8c9e8 perf: 优化.env配置 2023-11-05 23:14:56 +08:00
owen
bb2b7ffd03 营销：增加商城装修组件【视频播放】 2023-11-05 22:53:30 +08:00
owen
fa710b560d 营销：增加商城装修组件【图片展示】 2023-11-05 20:42:50 +08:00
YunaiV
65d85e30ca Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-11-05 20:23:56 +08:00
owen
434aa864da 营销：优化装修编辑器 2023-11-05 12:40:32 +08:00
owen
0b0ba1f313 营销：优化装修编辑器样式 2023-11-05 10:08:03 +08:00
owen
aedf014407 营销：装修页面适配搜索框 2023-11-04 22:06:40 +08:00
owen
3c0f3ceed5 营销：装修模板，底部导航适配APP 2023-11-03 06:47:46 +08:00
owen
9bd33355e2 营销：装修编辑器样式优化 2023-10-31 17:17:46 +08:00
owen
881c4f3a29 营销：完善商城装修 
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器，默认选中组件判断
 2023-10-31 16:01:22 +08:00
xingyu
10483577b7 fix: types 2023-10-31 14:26:17 +08:00
xingyu
52755b38a9 fix: props 2023-10-31 14:25:49 +08:00
xingyu
4365ca6177 fix: title name 2023-10-31 14:10:05 +08:00
xingyu
ce93c8d4e9 fix: name warn 2023-10-31 14:04:43 +08:00
xingyu
7321ff2136 chore: wh-full 2023-10-31 10:20:39 +08:00
xingyu
f26a4cae10 feat: unocss add shortcuts 2023-10-31 10:04:31 +08:00
owen
e9ff8d3237 商城装修 2023-10-29 22:03:24 +08:00
owen
ff01effd45 Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 23:26:08 +08:00
owen
431fff28ce 统计卡片修改为全局组件 2023-10-17 23:25:49 +08:00
YunaiV
aa99c53729 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 
# Conflicts:
#	src/views/mall/statistics/member/index.vue
 2023-10-17 19:02:37 +08:00
芋道源码
0242c84196
!267 【工作流】加签和减签 
Merge pull request !267 from Youkehai/feature/addSignAndSubSign
 2023-10-17 11:01:18 +00:00
xingyu
1a1b70a350 style: stylelint 2023-10-16 15:04:05 +08:00
owen
3802fee661 商城：增加商城首页 2023-10-16 09:51:19 +08:00
kehaiyou
683e319c72 fix: 【工作流】--加签减签 2023-10-08 22:35:50 +08:00
owen
4c077711a1 对齐面包屑的图标和文字 2023-10-02 11:03:46 +08:00
owen
6475f81534 Merge remote-tracking branch 'origin/dev' into dev 2023-09-29 21:08:48 +08:00
owen
c322fb3d0d 统计：交易统计 2023-09-29 21:08:14 +08:00
YunaiV
245147223f code review：驳回逻辑 2023-09-24 23:05:33 +08:00
kehaiyou
f40d1de62a fix: 【工作流】--回退的高亮和api地址更换 2023-09-24 19:42:53 +08:00
kehaiyou
de79e79d91 feat: 支持回退按钮 2023-09-23 14:52:40 +08:00
xingyu
2a58e3f691 style: unocss eslint 2023-09-22 17:49:11 +08:00
xingyu
a6b4908f45
!232 update src/components/Dialog/src/Dialog.vue. 
Merge pull request !232 from AKING/N/A
 2023-09-13 11:38:07 +00:00
xingyu
5494756a66 fix: eslint 2023-09-11 17:08:39 +08:00
xingyu
9a6d29b295 fix: avatar 2023-09-11 16:54:34 +08:00
AKING
d74f96fe17
update src/components/Dialog/src/Dialog.vue. 
解决了弹窗默认top为0的问题

Signed-off-by: AKING <2734339436@qq.com>
 2023-09-04 03:31:35 +00:00
xingyu
e6a9dd0e4c fix: 个人中心头像为空时不能修改 2023-08-28 17:53:45 +08:00
YunaiV
9507e2b687 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 
 Conflicts:
	src/views/member/user/detail/UserPointList.vue
 2023-08-27 21:02:52 +08:00
芋道源码
df69c035e6
!213 update src/components/Dialog/src/Dialog.vue. 
Merge pull request !213 from AKING/N/A
 2023-08-27 03:25:00 +00:00
绮梦
afaf7749c2 调整icon的大小 2023-08-26 13:45:59 +08:00
绮梦
4d9ae73211 调整icon的对齐方式为中间居中 2023-08-26 13:24:23 +08:00
YunaiV
1b6c9b2e29 code review：用户详情 2023-08-26 01:59:36 +08:00
AKING
ff8a8e7243
update src/components/Pagination/index.vue. 
解决了当全局size为small的时候分页组件样式太大的问题，当组件为small时，则会显示小的分页组件，具体请参照ep官网：https://element-plus.org/zh-CN/component/pagination.html#%E9%99%84%E5%8A%A0%E5%8A%9F%E8%83%BD

Signed-off-by: AKING <2734339436@qq.com>
 2023-08-23 05:51:24 +00:00
AKING
cba35d698f
update src/components/Dialog/src/Dialog.vue. 
解决了单独使用elementplus diaolog组件时，样式被篡改的问题


Signed-off-by: AKING <2734339436@qq.com>
 2023-08-22 09:06:09 +00:00
xingyu
003751a41c fix: dialog 2023-08-04 21:44:55 +08:00
xingyu
784a1be8a1 chore: stylelint(use pnpm lint:style) 2023-08-04 21:33:00 +08:00
xingyu
29d493e2da fix: style 2023-07-29 15:54:44 +08:00
xingyu
4249465b7c wip: use unocss 2023-07-29 14:40:55 +08:00
xingyu
8e78975521 fix: eslint 2023-07-29 12:55:51 +08:00
芋道源码
f908c12963
!183 同步商城实现 
Merge pull request !183 from 芋道源码/dev
 2023-07-26 04:56:22 +00:00
xingyu
ba1254f397 fix: eslint 2023-07-08 11:13:36 +08:00
芋道源码
13e0ede788
!155 fix: 处理 window.bpmnInstances 有时候为 undefined 问题 
Merge pull request !155 from OlyLis/master
 2023-07-02 15:23:12 +00:00
puhui999
c9ae0fbdbe Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-06-24 01:48:36 +08:00
YunaiV
b159240824 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 
 Conflicts:
	src/views/infra/build/index.vue
	src/views/mall/product/spu/components/DescriptionForm.vue
	src/views/mall/product/spu/components/OtherSettingsForm.vue
	src/views/mall/product/spu/components/ProductPropertyAddForm.vue
	src/views/mall/product/spu/components/SkuList.vue
 2023-06-23 13:54:43 +08:00
xingyu
c1a4edf7b1 refactor: 统一 setup 格式 2023-06-21 19:35:11 +08:00
xingyu
82c51e0c3e fix: eslint 2023-06-21 19:27:16 +08:00
xingyu
d639401646 fix: style lint 2023-06-21 19:26:14 +08:00
xingyu
f2992ce8e8 fix: eslint 2023-06-21 19:18:05 +08:00
xingyu
922f83d99c refactor: vue3.3 defineOptions 2023-06-21 19:14:34 +08:00
puhui999
5064845d4e fix: 使 Dialog 组件支持 Dialog 内部嵌套另一个 Dialog，需要使用 append-to-body 属性 2023-06-21 15:26:43 +08:00
YunaiV
023539b0db Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 
 Conflicts:
	package.json
	src/utils/dict.ts
 2023-06-17 17:40:29 +08:00
puhui999
6a10a81f58 fix: 引入 v-dompurify-html 指令解决 v-html 的安全隐患 2023-05-31 15:58:35 +08:00
芋道源码
fa6bcacaef
!157 合并商城部分功能 
Merge pull request !157 from 芋道源码/dev
 2023-05-29 15:03:34 +00:00
wangding
43f3c67434 add router search 2023-05-29 11:26:51 +08:00
wangding
6768cdea05 新增路由搜索功能 2023-05-29 11:05:46 +08:00
duxz
6b3de50c69 fix: 处理 window.bpmnInstances 有时候为 undefined 问题 2023-05-25 15:34:13 +08:00
xingyu
9f0065f89f fix: echart color 2023-05-19 15:37:01 +08:00
xingyu
45ee4116b7 fix: echart 2023-05-19 15:24:01 +08:00
puhui999
4ddba9d454 fix: 解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记 2023-05-17 18:24:34 +08:00
AhJindeg
9dc361e708 🌈 style(Form/src): Modifying word spelling errors 
- 修改ts类型 PlaceholderModel单词拼写
- 修改initModel方法 FormModel注释拼写
 2023-04-23 11:44:03 +08:00
YunaiV
d32537e3ef 移除 Form、Table、Search、XButton、XTextButton、DictTag、ContentWrap、Descriptions 的全局注册 2023-04-15 21:46:19 +08:00
YunaiV
d5b569eefa 将 BPMNJS 全局引入，改成局部引入 2023-04-15 18:52:35 +08:00
puhui999
ec58321dd8 Merge remote-tracking branch 'yudao/dev' into dev 
# Conflicts:
#	src/views/Login/components/LoginForm.vue
#	src/views/Login/components/MobileForm.vue
#	src/views/mp/components/wx-editor/WxEditor.vue
 2023-04-15 13:38:31 +08:00