Commit Graph
53392 Commits
Author SHA1 Message Date
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
tianshujie 1a3ce097fd * Code for task #89906. 2023-04-05 13:58:53 +08:00
tianshujie e90d2c0d66 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-04 20:52:39 +08:00
tianshujie 6682974d6d Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-04 17:30:04 +08:00
tianshujie b87a68b349 * Code for task #89906. 2023-04-04 17:29:13 +08:00
caoyanyi eeeb68e41e * Add data app attr. 2023-04-04 17:23:45 +08:00
caoyanyi 43c80f5268 * Modify tree style. 2023-04-04 16:58:29 +08:00
caoyanyi 081cec516e * Modify page style. 2023-04-04 16:44:22 +08:00
caoyanyi 8084793317 * Modify api doc view. 2023-04-04 16:43:10 +08:00
caoyanyi 2b552d4fca Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-04 16:24:03 +08:00
caoyanyi 6bf6d020e6 * Add pager for release. 2023-04-04 16:23:34 +08:00
tianshujie 6950f375d1 * Code for task #89907. 2023-04-04 16:18:51 +08:00
liugang 9339533b7a * Display the main navagator if user has permission to access any menu under it. 2023-04-04 08:13:08 +00:00
liugang 4a1be481d9 * Format code. 2023-04-04 07:53:03 +00: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
王怡栋 9e05683f67 Merge branch 'zentaobiz37_bi_wangyuting' into 'master'
* Do task #90109.

See merge request easycorp/zentaopms!7310
2023-04-04 07:21:03 +00:00
王怡栋 3f8ff00846 Merge branch 'daitingting_task_#89953' into 'master'
* Finish task #89953.

See merge request easycorp/zentaopms!7307
2023-04-04 07:20:17 +00: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
王怡栋 ed28a97f54 Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3

See merge request easycorp/zentaopms!7312
2023-04-04 07:16:42 +00:00
tianshujie e1eaf74466 * Add space. 2023-04-04 15:16:29 +08:00
guofeilong 4d9a87026e * Adjust code . 2023-04-04 15:13:17 +08:00
tianshujie 93e6eb0b1e * Code for task #89915. 2023-04-04 15:11:16 +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
wangyuting2 545058e753 * Do task #90109. 2023-04-04 14:51:50 +08:00
孙广明 68b851d650 Merge branch 'sprint/scx_arrow_svg' into 'master'
* Add arrow svg to bi.

See merge request easycorp/zentaopms!7309
2023-04-04 06:49:14 +00:00
宋辰轩 4c376874cf * Add arrow svg to bi. 2023-04-04 14:45:11 +08:00
tianshujie 1bd3209351 * Code for task #89915. 2023-04-04 14:37:45 +08:00
王怡栋 fa746e5b0e Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3

See merge request easycorp/zentaopms!7308
2023-04-04 06:37:18 +00:00
guofeilong 3d4798a32a * Adjust code . 2023-04-04 14:29:59 +08:00
daitingting b368f38d57 * Finish task #89953. 2023-04-04 13:53:25 +08:00
guofeilong 4a2fd21040 * Adjust code . 2023-04-04 13:27:12 +08:00
tianshujie f5448921c6 * The search criteria are preserved when the list is sorted. 2023-04-04 13:26:59 +08:00
孙广明 db3c302f1d Merge branch 'feedback_zhouxin_2257' into 'master'
* Resolve feedback 2257.

See merge request easycorp/zentaopms!7306
2023-04-04 05:26:13 +00:00
tianshujie 49666e311e * Code for task #89927. 2023-04-04 13:24:18 +08:00
liugang fcfa648c7e * Fix bug the variable $screenID in browse page isn't the real id. 2023-04-04 05:24:07 +00:00
liugang 5282f9407f * Sort sqls and fix bug 3 screens' status are draft. 2023-04-04 05:18:02 +00:00
guofeilong b2000c4403 * Adjust code . 2023-04-04 13:10:24 +08:00
caoyanyi 16a94c471b * Modify page style. 2023-04-04 13:07:53 +08:00
zhouxin e3ca141890 * Resolve feedback 2257. 2023-04-04 12:35:35 +08:00
caoyanyi ff5509e5d5 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-04 11:57:50 +08:00
caoyanyi 308c12095b * Optimize page style. 2023-04-04 11:57:29 +08:00
wangyidong b65f7996a8 * code for task #89905. 2023-04-04 11:29:59 +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
caoyanyi bf4de54980 * Code for bug #33706. 2023-04-04 11:21:39 +08:00
wangyidong 5983e62864 * code for task #89905. 2023-04-04 11:16:39 +08:00