Commit Graph
291 Commits
Author SHA1 Message Date
Hao Sun 29ae8cb398 * fix kanban lane height with auto height option. 2022-06-06 06:58:38 +00:00
tianshujie 653e681ed2 * Fix bug #23213. 2022-06-02 16:02:19 +08:00
李玉春 88da2f7565 Merge branch 'sprint/197_tianshujie_fixbug' into 'master'
Sprint/197 tianshujie fixbug

See merge request easycorp/zentaopms!3714
2022-06-02 05:27:06 +00:00
李玉春 d36ec41688 Merge branch 'master' into 'sprint/sunhao/fix_kanban_fullscreen'
# Conflicts:
#   www/js/zui/kanban/min.js
2022-06-02 05:20:38 +00:00
tianshujie fb239cfa06 * Fix bug #23194. 2022-06-02 12:22:58 +08:00
Hao Sun c1abc19882 * fix virtual rendering not work when kanban enter fullscreen 2022-06-02 04:11:59 +00:00
李玉春 fd269a4777 Merge branch 'master' into 'sprint/sunhao/fix_kanban'
# Conflicts:
#   www/js/zui/kanban/min.css
#   www/js/zui/kanban/min.js
2022-06-02 03:29:40 +00:00
Hao Sun 96454565b2 * adjust cards size in kanban. 2022-06-02 03:02:45 +00:00
tianshujie 095c9b5501 * Finish task #55681. 2022-06-01 15:07:35 +08:00
tianshujie 7a70ae8481 * Finish task #55675. 2022-06-01 13:50:53 +08:00
tianshujie b076635c79 * Finish task #55675. 2022-06-01 13:32:34 +08:00
tianshujie 5d62ed5900 * Finish task #55675. 2022-06-01 13:06:26 +08:00
tianshujie 2fb1cc0032 * Finish task #55675. 2022-06-01 10:57:07 +08:00
tianshujie 0665817eb8 * Finish task #55675. 2022-05-31 17:20:22 +08:00
王怡栋 2c4bbef9a6 Merge branch 'sprint/master_zhouxudong_54981' into 'master'
Sprint/master zhouxudong 54981

See merge request easycorp/zentaopms!3578
2022-05-25 02:33:04 +00:00
zhouxudong 55ab5ee69d * Finish task #54981 #54982. 2022-05-25 02:31:02 +00:00
liumengyi 7baafc5ca0 * Code format. 2022-05-25 10:07:06 +08:00
zhouxudong ff0edfa042 * Finish task #54981 #54982. 2022-05-24 08:53:51 +00:00
孙广明 57a7f0bcef Merge branch 'sprint/sunhao/optimize_kanban' into 'master'
* task #54187, optimize kanban with a lot of cards with virtualList.

See merge request easycorp/zentaopms!3511
2022-05-19 07:43:19 +00:00
Hao Sun 4bcdcce53a * task #54187, optimize perf for page execution/kanban and kanban/view 2022-05-19 07:41:17 +00:00
李玉春 6b667195b1 Merge branch 'sprint/191_tianshujie_54329' into 'master'
Sprint/191 tianshujie 54329

See merge request easycorp/zentaopms!3496
2022-05-19 02:22:36 +00:00
tianshujie ae9264e2db * Fix bug #22644. 2022-05-18 17:11:28 +08:00
xieqiyu b223f55900 * Code for task#54467. 2022-05-18 14:00:29 +08:00
xieqiyu a68cf385bb * Finish task#54467. 2022-05-18 09:45:11 +08:00
tianshujie 5bdb7f521c * Finish task #53668. 2022-05-10 17:05:49 +08:00
tianshujie c3fdb74a24 * Finish task #53668. 2022-05-10 10:12:48 +08:00
zhouxudong 89bfe585c8 * Fix bug #20867. 2022-04-18 15:31:00 +08:00
tianshujie 534783603f Modify the popup style of the popup window. 2022-04-07 17:22:26 +08:00
tianshujie 14fd19d50b * Fix bug #18781. 2022-04-07 16:58:07 +08:00
tianshujie 2af6c7df8b * Fix bug #20977. 2022-04-07 14:38:41 +08:00
tianshujie 479c647cf5 * Fix code style issues. 2022-04-02 15:01:16 +08:00
tianshujie 9d03df55de * Fix bug #19950. 2022-04-02 13:46:49 +08:00
tianshujie 8b2c7f1288 * Fix bug #21158. 2022-04-02 13:41:52 +08:00
王怡栋 4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
孙广明 4e2f0a3d86 Merge branch 'master_xieqiyu_19273' into 'master'
* Fix bug#19273.

See merge request easycorp/zentaopms!2666
2022-03-31 07:24:15 +00:00
xieqiyu 2ed1eedfcf * Fix bug#19273. 2022-03-31 13:42:28 +08:00
Hao Sun 123aec72c4 * bug #18424, optimize d-n-d UI for kanban, finish drag action when mouse leave document. 2022-03-31 08:42:36 +08:00
tianshujie 0e3779ca1b * Fix Kanban related issues. 2022-03-30 10:45:01 +08:00
tianshujie 63e915a555 * Modify the code judgment logic. 2022-03-30 10:10:19 +08:00
tianshujie b638bd1c83 * Fix bug #21282. 2022-03-30 09:40:23 +08:00
王怡栋 15a3516aca Merge branch 'master' into 165_package 2022-03-28 08:50:18 +08:00
王怡栋 e504d28044 Merge branch 'sprint/master_lanzongjun_fixbug_lite' into 'sprint/165_package'
* fix bug #21088,#21077

See merge request easycorp/zentaopms!2507
2022-03-24 08:39:06 +00:00
tianshujie a5db3ca766 * optimize UI for kanban and fix drop rules not work. 2022-03-24 14:54:11 +08:00
Hao Sun 5c17d72ca9 * fix kanban drop rules not work. 2022-03-24 14:34:17 +08:00
Zongjun Lan e3fe57931f * fix bug #21088 2022-03-24 14:21:29 +08:00
tianshujie 82e7beb7a0 * Fix bug #20923. 2022-03-23 10:20:55 +08:00
李玉春 2b1fee6181 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2433
2022-03-22 05:43:55 +00:00
tianshujie 303c546348 * Fix bug #20915. 2022-03-22 13:25:13 +08:00
王怡栋 792501cf85 Merge branch 'sprint/master_lanzongjun_version_lite' into 'master'
* fix task #51347,#51307

See merge request easycorp/zentaopms!2429
2022-03-22 03:09:56 +00:00
Zongjun Lan 4d7ee95c09 * fix task #51347,#51307 2022-03-22 10:56:21 +08:00