Commit Graph
127 Commits
Author SHA1 Message Date
tianshujie dd8fa67a12 * Fix bug #34359. 2023-04-19 09:10:42 +08:00
tianshujie c2d8da46ee Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-19 09:07:21 +08:00
caoyanyi 4396f3d1b4 * Adjust code. 2023-04-19 08:57:37 +08:00
caoyanyi 692fb9e6cc * Adjust code. 2023-04-19 08:47:44 +08:00
caoyanyi e15e696e8d * Modify catalog sort. 2023-04-19 08:44:27 +08:00
tianshujie f7d94114cb * Fixed a scrollbar style problem. 2023-04-18 16:27:13 +08:00
caoyanyi 75ba8174da * Modify tree catalog sort. 2023-04-18 16:05:25 +08:00
tianshujie 338599b562 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-18 14:16:36 +08:00
tianshujie 0f49022d88 * Fix bug #34260. 2023-04-18 13:49:55 +08:00
王怡栋 70a1625a13 Merge branch 'cyy_fixbug' into 'master'
* Fix bug #34288, Modify bottom height.

See merge request easycorp/zentaopms!7450
2023-04-18 05:49:05 +00:00
wangyidong dcc3fd9331 * fix bug #34278. 2023-04-18 13:33:09 +08:00
caoyanyi 77605330f2 * Modify catalog select style. 2023-04-18 11:16:24 +08:00
caoyanyi ab7bfba897 * Fix bug #34185, Modify sidebar-toggle. 2023-04-18 11:09:19 +08:00
tianshujie 9df90e87a5 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_sort 2023-04-18 10:44:37 +08:00
tianshujie 4a46d918b1 * Code for task #91391. 2023-04-18 10:43:03 +08:00
tianshujie 7605903fe9 * Fix bug #34274. 2023-04-18 10:29:48 +08:00
tianshujie 32161d8d66 * Code for task #91391. 2023-04-18 10:23:03 +08:00
wangyidong 0ef2c25165 * fix bug. 2023-04-18 09:16:34 +08:00
tianshujie fb521320e0 * Code for task #91391. 2023-04-17 17:21:06 +08:00
tianshujie 7a8d7ace0b * Code for task #91391. 2023-04-17 16:41:36 +08:00
tianshujie c689f25199 * Code for task #91391. 2023-04-17 14:07:09 +08:00
tianshujie 8fc7ca7525 * Code for task #91391. 2023-04-17 13:56:21 +08:00
guofeilong 3f3799eae8 * Adjust code for css in tree-item . 2023-04-14 16:50:34 +08:00
王怡栋 368fbe6f57 Merge branch 'cyy_fixbug' into 'master'
* Add edited by me doc list.

See merge request easycorp/zentaopms!7421
2023-04-14 07:49:35 +00:00
guofeilong 8062513f54 * Adjust code for lefttree refactors . 2023-04-14 15:13:24 +08:00
guofeilong 487214058b * Adjust code for icon replace img . 2023-04-14 15:07:34 +08:00
caoyanyi bc6888da5e * Add edited by me doc list. 2023-04-14 14:36:10 +08:00
tianshujie f14efad6ac * Optimized jump link. 2023-04-14 10:32:08 +08:00
tianshujie 9180c13a89 * Optimized jump logic. 2023-04-14 10:16:42 +08:00
tianshujie 4f80045c48 * Modify method name. 2023-04-14 10:02:08 +08:00
王怡栋 e6be417612 Merge branch 'master' into 'tsj_task'
# Conflicts:
#   module/doc/view/lefttree.html.php
2023-04-13 09:03:14 +00:00
guofeilong c7bd3087d2 * Add position to focus input . 2023-04-13 16:56:13 +08:00
guofeilong 0991e685b1 * Code for add scroll func to lefttree while add child . 2023-04-13 16:56:13 +08:00
tianshujie 0c935c7eea * Modify jump link. 2023-04-13 15:45:51 +08:00
王怡栋 5ac6adcb09 Merge branch 'master' into 'cyy_fixbug'
# Conflicts:
#   module/doc/view/lefttree.html.php
2023-04-13 05:30:11 +00:00
caoyanyi 7fca60ca3a * Modify doc icon size. 2023-04-13 13:01:31 +08:00
guofeilong cddd2ee040 * Code for adjust positon in tree-item img . 2023-04-13 11:08:39 +08:00
caoyanyi d69a0b7caf * Fix bug #34036. 2023-04-13 11:08:05 +08:00
guofeilong 15392a7c8e * Adjust code for fix icon-name error . 2023-04-12 09:57:00 +08:00
wangyidong 36910d7cb4 * fix bug #34030. 2023-04-12 08:44:11 +08:00
guofeilong 804ebdd5d3 * Code for adjust style in tree . 2023-04-11 14:39:53 +08:00
王怡栋 18dc5f2d59 Merge branch 'master' into 'release/zentaopms_18.3'
# Conflicts:
#   module/doc/control.php
#   module/doc/css/view.css
#   module/doc/js/view.js
2023-04-11 01:17:43 +00:00
wangyidong 18a60f895c * code for task #89909. 2023-04-10 16:06:01 +08:00
guofeilong b71539aadc * Code for fix scroll Func while init tree . 2023-04-10 13:21:07 +08:00
guofeilong e02bdda701 * Code for fix bug while change scroll . 2023-04-10 11:09:57 +08:00
wangyidong ced89c0a0d * code for task #89909. 2023-04-10 11:05:21 +08:00
guofeilong 25c91f0658 * Code for fix bug by func scrollIntoView . 2023-04-10 10:21:38 +08:00
guofeilong 2ef5e58779 * Code for bug #33411 . 2023-04-10 09:53:58 +08:00
guofeilong bb91a63695 * Adjust code for bug in method addCata . 2023-04-07 16:55:37 +08:00
guofeilong 0b3d379106 * Adjust code for css in view . 2023-04-07 15:40:25 +08:00