Commit Graph

558 Commits

Author SHA1 Message Date
Zheng Jie
3739071bd6 update axios version 2024-01-02 14:02:18 +08:00
Zheng Jie
2c876a2a11 update 2023-07-26 14:06:46 +08:00
Zheng Jie
d2f0af59b1 Merge branch 'master' into deploy
# Conflicts:
#	README.md
2023-07-11 10:22:04 +08:00
Zheng Jie
543afadea4 移除无用组件 2023-07-11 10:21:49 +08:00
Zheng Jie
95290a4ecb update README.md 2023-07-07 18:09:25 +08:00
Zheng Jie
8089e8b193 Merge branch 'master' into deploy 2023-07-07 17:50:12 +08:00
Zheng Jie
9e874e9b5f 代码优化,避免【部门】移动节点时出现PID数据环形问题 2023-07-07 17:49:42 +08:00
Zheng Jie
66e24cfea0 代码优化:修改错别字 2023-07-07 17:36:38 +08:00
Zheng Jie
170d309978 Merge branch 'master' into deploy 2023-07-06 14:30:41 +08:00
Zheng Jie
1f09f74e61 新增重置用户密码功能 2023-07-06 14:24:44 +08:00
Zheng Jie
ba64fcba11 v2.7 版本发布 v2.7 2023-07-05 14:00:20 +08:00
Zheng Jie
e353708dee 代码优化 2023-07-05 11:29:16 +08:00
Zheng Jie
10a53bf8c7 更新WangEditor 版本,支持v-model方式绑定 2023-07-05 11:24:59 +08:00
Zheng Jie
9edc5df08d Merge branch 'master' into deploy 2023-07-05 11:08:58 +08:00
Zheng Jie
fd2a35e262 更新WangEditor 版本,支持v-model方式绑定 2023-07-05 11:00:25 +08:00
rikugun
95ee84574b Feat/wangeditor for vue (#127)
* 修复系统工具-代码生成-预览功能,生成预览页面右侧出现双滚动条问题 (#124)

Co-authored-by: shusf <shusf@asiainfo.com>

* 底部遮挡 (#125)

header 84px,footer 22px,94.5px会导致底部存在遮挡

* feat:
   更新WangEditor 版本,支持v-model方式绑定

* feat:
   修改组件页面,使用新版编辑器

* feat:
   更新WangEditor 版本,支持v-model方式绑定

---------

Co-authored-by: shusufen <108729835+shusufen@users.noreply.github.com>
Co-authored-by: shusf <shusf@asiainfo.com>
Co-authored-by: Schwi <39186981+cyb233@users.noreply.github.com>
2023-07-05 10:34:39 +08:00
Zheng Jie
8f729abf61 代码优化:https://github.com/elunez/eladmin-web/pull/116 2023-07-05 10:32:30 +08:00
Zheng Jie
7ea91bebb6 Merge branch 'master' into deploy 2023-07-04 22:34:39 +08:00
Zheng Jie
b2f0f5248c 在线用户查询优化 2023-07-04 22:31:33 +08:00
Zheng Jie
ba00fd21ed Merge branch 'master' into deploy
# Conflicts:
#	README.md
2023-07-04 20:55:43 +08:00
Zheng Jie
de47dc438e Fix https://github.com/elunez/eladmin/issues/625
close https://github.com/elunez/eladmin/issues/625
2023-07-04 20:55:22 +08:00
Zheng Jie
62ea1e831b update xlsx version 2023-06-30 15:29:16 +08:00
Zheng Jie
a35550fc35 update README.md 2023-06-28 15:49:24 +08:00
Zheng Jie
d4736aaa77 Merge branch 'master' into deploy 2023-06-19 16:12:40 +08:00
Zheng Jie
63007a0214 修复运维管理服务器查询问题 2023-06-19 16:12:22 +08:00
Zheng Jie
13ddb22e1c Merge branch 'master' into deploy 2023-05-26 14:44:39 +08:00
Zheng Jie
8e1f46c26f update 2023-05-26 14:43:50 +08:00
Zheng Jie
65c85de7ec update 2023-05-26 14:42:40 +08:00
Zheng Jie
97383cc86f update 2023-05-26 14:39:49 +08:00
Zheng Jie
eedf463e8e update 2023-05-26 14:38:47 +08:00
Zheng Jie
f339e2a5d8 update 2023-05-26 14:36:21 +08:00
Zheng Jie
6dc44b74a4 update 2023-05-26 14:34:47 +08:00
Zheng Jie
3b84681c4b 广告优化 2023-05-06 11:10:45 +08:00
Zheng Jie
97c8066dbb Merge branch 'master' into deploy 2023-04-27 13:24:54 +08:00
Zheng Jie
72a88e1b6d 代码优化 2022-11-24 15:31:44 +08:00
Zheng Jie
18437610b7 test ad 2022-10-25 11:19:07 +08:00
Zheng Jie
ea203cfa10 test ad 2022-10-25 11:17:30 +08:00
Zheng Jie
11662dcd46 test ad 2022-10-25 11:15:29 +08:00
Zheng Jie
792c05306a test ad 2022-10-25 11:13:20 +08:00
Zheng Jie
20af998dfe test ad 2022-10-25 11:11:05 +08:00
Zheng Jie
159e24537f update 2022-08-24 13:51:59 +08:00
Zheng Jie
5a71ef7e0d test 2022-08-24 13:45:21 +08:00
Zheng Jie
972cb5f85f test 2022-08-24 13:43:13 +08:00
Zheng Jie
f0c82679bf Merge remote-tracking branch 'origin/deploy' into deploy
# Conflicts:
#	src/components/Ad/index.vue
2022-08-24 13:39:37 +08:00
Zheng Jie
4c50a23279 test 2022-08-24 13:38:22 +08:00
Zheng Jie
0551231c45 update 2022-08-22 09:43:25 +08:00
Zheng Jie
f744856aff update 2022-08-22 09:34:51 +08:00
Zheng Jie
d9090877c6 树形表格取消父级选择时,删除按钮还能删除子节点问题。
e4e72887ba
2022-08-09 16:13:24 +08:00
Zheng Jie
dd112fec77 Merge remote-tracking branch 'origin/deploy' into deploy 2022-08-09 16:11:11 +08:00
Zheng Jie
cda3adca93 Merge branch 'master' of github.com:elunez/eladmin-web 2022-08-09 16:08:54 +08:00