hhyykk/ipms-sjy-ui
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy-ui.git synced 2025-11-04 20:28:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
974 Commits 8 Branches 0 Tags
eea285b1410a79846f0dbefb280906554b055604
Commit Graph

107 Commits

Author SHA1 Message Date
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
puhui999
02d98f2ce7 Merge remote-tracking branch 'yudao/dev' into dev 
# Conflicts:
#	src/views/mp/components/wx-editor/WxEditor.vue
#	src/views/mp/tag/TagForm.vue
 2023-04-14 21:58:49 +08:00
puhui999
b93491579c 给所有组件添加name属性预防未知bug!!! 2023-04-14 21:32:11 +08:00
dhb52
0b055b5db4 fix: type='text' => type='primary' link 2023-04-14 15:26:06 +08:00
dhb52
813e7d2776 refactor: 使用Editor组件替换WxEditor 2023-04-14 14:49:19 +08:00
YunaiV
f436490165 修复 IconSelect 报错 2023-04-13 21:11:55 +08:00
YunaiV
afc16706a9 Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-04-13 08:00:45 +08:00
芋道源码
b131320cc1 Merge pull request #2 from koutianyu/dev 
修复新增或修改菜单时，无法选择菜单图标的bug
 2023-04-13 07:58:15 +08:00
YunaiV
ebbf47f509 正式移除 VXE 表格 2023-04-11 23:47:59 +08:00
YunaiV
8863d1d080 REVIEW 支付应用、支付订单 2023-04-11 20:41:20 +08:00
dhb52
75750c1bd3 Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vue3 into dev 
Signed-off-by: dhb52 <dhb52@126.com>
 2023-04-09 05:16:23 +00:00
dhb52
4465220ed7 fix: size="mini" & type="text"过时 2023-04-09 13:08:19 +08:00
YunaiV
d16ff6ff1c REVIEW 公众号素材管理 2023-04-09 09:56:42 +08:00
YunaiV
4404554cfc 1. 统一化代码 
2. 增加 DocAlert 关联文档
 2023-04-05 20:13:35 +08:00
puhui999
dc1393411c 项目全局使用formatDate方法移除parseTime方法 2023-04-04 11:19:58 +08:00