Commit Graph
69916 Commits
Author SHA1 Message Date
caoyanyi 16aac76dd0 * Adjust ci model methods. 2023-12-01 10:55:31 +08:00
xieqiyu 29a4cc3dcb * Add the test file for the method of getRows. 2023-12-01 10:53:30 +08:00
songchenxuan 7d895c922a * Fix common bug. 2023-12-01 10:48:23 +08:00
songchenxuan 7d66afbccc * Fix dao redeclear bug. 2023-12-01 10:46:06 +08:00
songchenxuan 9570e8252c * Fix dao redeclare bug. 2023-12-01 10:45:06 +08:00
朱金勇 2aebcabe27 Merge pull request 'Merge 'Merge184' branch into 'Master'.' (#88) from Merge184 into master
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/88
2023-12-01 10:41:31 +08:00
wangyuting 9b576777f6 * Optimize api create function and finish unit test script. 2023-12-01 10:39:42 +08:00
tanghucheng 132ea6a2bc Merge remote-tracking branch 'origin/master' into Merge184 2023-11-30 21:33:21 -05:00
sunguangming d9963d2b5d * Remove useless code. 2023-12-01 10:29:20 +08:00
liumengyi ba6005f0cf * Refactor reportModel::getAllTimeStatusStat, and modify its unit test. 2023-12-01 10:25:46 +08:00
liumengyi cc30dbd829 + Declare strict type. 2023-12-01 10:22:13 +08:00
tanghucheng 3d94eac50a Merge branch 'Merge184' into c07e4a71eb 2023-11-30 21:21:55 -05:00
songchenxuan 2174adcedc * Fix bug #40792. 2023-12-01 10:11:20 +08:00
tianshujie a7ba0d0289 * Refactor doc::getLibTree method. 2023-12-01 10:02:09 +08:00
tianshujie 01f77650b3 * Refactor doc::getLibTree unit test. 2023-12-01 10:02:09 +08:00
tianshujie 01aa6bd745 + Add doc::processObjectTree unit test. 2023-12-01 10:02:09 +08:00
tianshujie cbe11ffdc2 + Add doc::getObjectTree unit test. 2023-12-01 10:02:09 +08:00
tianshujie 20f5bb381c + Add doc::buildLibItem unit test. 2023-12-01 10:02:08 +08:00
wangyuting d48b03defb * Optimize api deleteRelease function and finish unit test script. 2023-12-01 09:49:44 +08:00
liumengyi c2fd1b8309 * Modify unit test of reportModel::getUserYearExecutions. 2023-12-01 09:46:30 +08:00
liumengyi 47005fee50 * Refactor reportModel::getUserYearExecutions, and modify its unit test. 2023-12-01 09:44:34 +08:00
qixinzhi 12c063babf * Fix chart data with stage is empty string. 2023-12-01 09:31:18 +08:00
songchenxuan ad31dd4d46 * Fix bug #40793. 2023-12-01 09:25:06 +08:00
caoyanyi 08ddfcb200 * Adjust execution error. 2023-12-01 09:18:45 +08:00
caoyanyi 49f7424fdf * Adjust ci control methods. 2023-12-01 09:08:51 +08:00
liumengyi 9b39774f70 * Fix bug #41004, fix bug of parameter type error. 2023-12-01 09:02:10 +08:00
wangyuting 95638ee313 * Optimize api publishLib function and finish unit test script. 2023-12-01 09:01:14 +08:00
caoyanyi 7585ae3831 * Revert form input id attribute. 2023-12-01 08:51:46 +08:00
sunhao aff51a4205 Revert "* zin: set default name for static control."
This reverts commit cf2700f41a.

# Conflicts:
#	lib/zin/wg/control/v1.php
2023-12-01 08:50:01 +08:00
tanghucheng c52e925ed9 Merge remote-tracking branch 'origin/master' into Merge184 2023-11-30 19:28:10 -05:00
chaideqing 62a6da42db * Add uploadDocs of module doc. 2023-11-30 15:19:28 +00:00
chaideqing 1d74990eeb * Add doc create attachmen icon. 2023-11-30 09:21:42 +00:00
chaideqing db383de60c * Merge module-doc 18.8-18.x to Merge184. 2023-11-30 17:15:28 +08:00
tanghucheng 738c71eba9 Merge remote-tracking branch 'origin/master' into Merge184 2023-11-30 03:44:21 -05:00
wangxuepeng b43ab6be28 + Add unit test for screenModel::completeComponent. 2023-11-30 16:36:59 +08:00
liugang 34a80378ca * docUI: call users widget to simplify code. 2023-11-30 16:35:22 +08:00
liugang 60bc93554a * product: implement whitelist function with whitelist widget. 2023-11-30 16:32:36 +08:00
tanghucheng e3fe0d3bb9 * Merge 18.x story. 2023-11-30 03:30:47 -05:00
liugang 3880b71031 * zin: add id and label attributes to users widget. 2023-11-30 16:30:37 +08:00
liugang 2596b9c6ce * zin: refactor the loadContactUsers function of contactList widget. 2023-11-30 16:29:31 +08:00
hufangzhou f8f6bdc8bb * Merge 18.9 bug module. 2023-11-30 16:17:09 +08:00
hufangzhou 478128ee02 * Merge 18.9 caselib module. 2023-11-30 15:56:51 +08:00
chaideqing d61330787d Merge branch 'master' into Merge184 2023-11-30 07:57:51 +00:00
liumengyi 1281719f5f + Add effort yaml. 2023-11-30 15:56:18 +08:00
liumengyi 9648ed71d8 + Declare strict type. 2023-11-30 15:55:35 +08:00
sunhao ada77d88f7 * index: fix preserve last opened app code not work as expected. 2023-11-30 15:50:37 +08:00
sunhao a6500c2f1a * zin/sidebar: add dragToResize to sidebar. 2023-11-30 15:50:37 +08:00
liumengyi 23fc88d572 * Refactor reportModel::getUserYearTodos, and modify its unit test. 2023-11-30 15:44:15 +08:00
daitingting a679094a18 * Test getQueryList. 2023-11-30 07:38:08 +00:00
wangyuting 88c19b2064 * Optimize api control. 2023-11-30 15:35:46 +08:00