Commit Graph
93 Commits
Author SHA1 Message Date
王怡栋 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
guofeilong 1c34103699 * Adjust code for style refactors in tree . 2023-04-07 14:41:43 +08:00
guofeilong 3931fd7fcf * Adjust code for fix bug in scrollIntoView . 2023-04-07 14:26:54 +08:00
caoyanyi 4ee58be39e * Add priv check. 2023-04-07 11:15:01 +08:00
guofeilong 09339199c1 * Adjust code for module view . 2023-04-07 11:12:19 +08:00
caoyanyi ea55ca8c33 * Add api priv and switch api doc release locate. 2023-04-07 09:30:02 +08:00
tianshujie 639e36d34c Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-06 17:03:16 +08:00
tianshujie bb84c7a731 * Change the name of my spatial function. 2023-04-06 16:57:14 +08:00
guofeilong c846da6bf3 * Adjust code for hover in tree . 2023-04-06 16:15:58 +08:00
guofeilong d840e25da5 * Adjust code for show-icon in left-tree . 2023-04-06 16:09:22 +08:00
tianshujie fc3accb1b0 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-06 16:02:02 +08:00
tianshujie 8dcb58fdc3 * Add a jump and highlight to the left tree. 2023-04-06 16:01:39 +08:00
guofeilong a882f21348 * Add pd-r to class hover in a . 2023-04-06 15:33:11 +08:00
tianshujie 8be6397778 * Fixed an issue where the document was not clickable. 2023-04-06 15:32:45 +08:00
guofeilong f709a48323 * Adjust code . 2023-04-06 11:29:42 +08:00
guofeilong fbae4bca3a * Adjust code . 2023-04-06 11:04:47 +08:00
guofeilong 16e4454805 * Adjust code . 2023-04-06 11:00:03 +08:00
guofeilong 9484c73fba * Adjust code . 2023-04-06 09:28:51 +08:00
tianshujie 75d07972ab * Code for task #89915. 2023-04-06 09:14:00 +08:00
tianshujie c5d2bc5c17 * Code for task #89915. 2023-04-05 17:02:03 +08:00
tianshujie 1e77c10378 * Code for task #89915. 2023-04-05 15:54:25 +08:00
caoyanyi 43c80f5268 * Modify tree style. 2023-04-04 16:58:29 +08:00
tianshujie d5677a6690 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-04 15:45:41 +08:00
tianshujie 0d77839340 * Code for task #89915. 2023-04-04 15:45:25 +08:00
guofeilong ec6221a2eb * Adjust code . 2023-04-04 15:41:46 +08:00
王怡栋 712b3dd345 Merge branch 'tsj_authority' into 'master'
* Modify the document navigation and links.

See merge request easycorp/zentaopms!7311
2023-04-04 07:18:48 +00:00
guofeilong 4d9a87026e * Adjust code . 2023-04-04 15:13:17 +08:00
guofeilong a36b1f7606 * Adjust code . 2023-04-04 15:08:13 +08:00
tianshujie f5d2c3a093 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_authority 2023-04-04 14:59:09 +08:00
tianshujie f1c6a240f0 * Code for task #89915. 2023-04-04 14:58:07 +08:00
guofeilong 3d4798a32a * Adjust code . 2023-04-04 14:29:59 +08:00
guofeilong 4a2fd21040 * Adjust code . 2023-04-04 13:27:12 +08:00
guofeilong b2000c4403 * Adjust code . 2023-04-04 13:10:24 +08:00
caoyanyi 308c12095b * Optimize page style. 2023-04-04 11:57:29 +08:00
王怡栋 3824aecf9e Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3

See merge request easycorp/zentaopms!7305
2023-04-04 03:23:33 +00:00