Commit Graph
319 Commits
Author SHA1 Message Date
caoyanyi 64d0ac3c6a * Code for task #89912. 2023-04-11 09:54:32 +08:00
王怡栋 bc3daacc3c Merge branch 'tsj_block' into 'master'
* Code for task #90778.

See merge request easycorp/zentaopms!7348
2023-04-11 00:36:04 +00:00
王怡栋 f1bf266118 Merge branch 'sprint/cyy_90971' into 'master'
* Code for task #90971.

See merge request easycorp/zentaopms!7345
2023-04-11 00:35:44 +00:00
tianshujie 66d0694599 * Code for task #90778. 2023-04-10 17:15:26 +08:00
caoyanyi e164c7be4d * Code for task #90971. 2023-04-10 16:13:54 +08:00
tianshujie a3fdbebef5 * Fix bug #33970. 2023-04-10 15:17:14 +08:00
tianshujie a669f56285 * Code for task #89910. 2023-04-10 11:24:09 +08:00
guofeilong f6114edda0 * Adjut code for js in doc . 2023-04-07 16:27:32 +08:00
guofeilong 37a6ad5a0b * Add mr to swapper dom in tableContent . 2023-04-07 15:54:57 +08:00
guofeilong 0b3d379106 * Adjust code for css in view . 2023-04-07 15:40:25 +08:00
wangyidong 56ae0cf008 * code for task #89916. 2023-04-07 12:30:10 +08:00
tianshujie adb4e70bda Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-07 11:30:05 +08:00
tianshujie 3a30a4e65a * Code for task #89910,89911. 2023-04-07 11:29:34 +08:00
guofeilong 09339199c1 * Adjust code for module view . 2023-04-07 11:12:19 +08:00
guofeilong 3cf6f46f62 * Code for task #89913 . 2023-04-07 10:21:57 +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 828cc038ec * Adjust code . 2023-04-06 16:46:47 +08:00
tianshujie 8dcb58fdc3 * Add a jump and highlight to the left tree. 2023-04-06 16:01:39 +08:00
tianshujie 8be6397778 * Fixed an issue where the document was not clickable. 2023-04-06 15:32:45 +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
tianshujie 1bd3209351 * Code for task #89915. 2023-04-04 14:37:45 +08:00
wangyidong e4ac679475 * code for task #89166. 2023-04-03 10:52:16 +08:00
wangyidong 31f4f00d76 * code for task #89523. 2023-03-31 16:00:11 +08:00
tianshujie a93d9724d2 * Modify the position of the Favorites button. 2023-03-31 11:23:14 +08:00
tianshujie 4f0953139c * Code for task #87405. 2023-03-31 10:59:40 +08:00
wangyidong dffd6e5579 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-31 08:27:31 +08:00
wangyidong efc419ca6e * code for task #89166. 2023-03-30 17:36:19 +08:00
tianshujie 82ff6b2e0c Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-30 17:32:38 +08:00
tianshujie 4c5c8dcfb3 * Modifying style problem. 2023-03-30 17:32:23 +08:00
guofeilong 36e9cd3b2c Adjust code . 2023-03-30 17:24:00 +08:00
tianshujie 0b831d3e34 * Code for task #89485. 2023-03-30 17:21:11 +08:00
caoyanyi f34e599ce1 * Modify left tree to common. 2023-03-30 16:54:36 +08:00
tianshujie 42a28e3663 * Change the width of the search box. 2023-03-30 16:12:56 +08:00
tianshujie be1d498c5a * Code for task #87405. 2023-03-30 13:17:43 +08:00
guofeilong f3a6b6ba6d * Adjust code . 2023-03-30 11:27:37 +08:00
tianshujie 028b893345 * Code for task #89485. 2023-03-29 16:22:08 +08:00
wangyidong 0adc8a965e * code for task #89156. 2023-03-29 16:16:56 +08:00
wangyidong 1d27666ded * code for fromGlobal param. 2023-03-29 15:56:42 +08:00
tianshujie 49a8030a86 * Modify the style of the document library. 2023-03-29 15:43:15 +08:00
tianshujie b91c4c1bbb Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-29 15:14:32 +08:00
tianshujie 1cb4e13155 * Code for task #89485. 2023-03-29 15:14:12 +08:00
guofeilong b2a8c60a3a * Adjust code . 2023-03-29 14:45:12 +08:00
wangyidong 502b854f6b * code for task #89155. 2023-03-29 14:01:00 +08:00
liumengyi eb182b1874 * Fix bug #33461. 2023-03-29 13:36:16 +08:00
guofeilong fc6cd65696 * Adjust code . 2023-03-29 13:29:53 +08:00
wangyidong b4c98f78de * code for task #89136. 2023-03-29 10:54:54 +08:00
wangyidong 0677d7b5f5 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-29 10:40:11 +08:00
wangyidong efee93ff21 * code for task #89136. 2023-03-29 10:39:48 +08:00