Commit Graph
55542 Commits
Author SHA1 Message Date
lanzongjun 9589645a1c Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-26 16:42:30 +08:00
lanzongjun d3823282cd * TODO create function split. 2023-04-26 16:42:22 +08:00
guanxiying dea188b446 * Merge old doc contents. 2023-04-26 08:26:24 +00:00
sunguangming e14f27d887 * Add project-start unit-test. 2023-04-26 16:23:38 +08:00
sunguangming bf759ade76 * Refactor project-start. 2023-04-26 16:15:18 +08:00
Lufei ee5e2339cc * Rename form use method to data. 2023-04-26 15:58:11 +08:00
綦新志 ab4a2bf3cd Merge pull request '* Modify bug getbyid.' (#18) from sprint/scx_bug_getbyid into master
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/18
2023-04-26 15:44:55 +08:00
宋辰轩 820ae9ae64 * Modify public to protected. 2023-04-26 15:42:39 +08:00
Wangyuting 661a6f895b * Optimize block create and edit function. 2023-04-26 15:34:42 +08:00
宋辰轩 5503cc95fc * Modify bug getbyid. 2023-04-26 15:07:52 +08:00
王 于听 d5a237bdbd Merge pull request '* Reconstruct getbylist function.' (#17) from master_xieqiyu_getbylist into master
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/17
2023-04-26 14:55:34 +08:00
liyang 9c49654a14 * Shielding mysql note message. 2023-04-26 14:22:34 +08:00
xieqiyu e2975d26aa * Reconstruct getbylist function. 2023-04-26 06:07:24 +00:00
Wangyuting 8b939f7fbe * Fix welcome page bug. 2023-04-26 11:27:02 +08:00
dingguodong 2ff6a7c584 * Ignore all my.php file . 2023-04-26 11:04:23 +08:00
liyang 7458284ecd + Add unittest config dir. 2023-04-26 10:43:57 +08:00
liyang 670ffc33b4 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-26 10:37:44 +08:00
liyang 753ca8b04f * Fix untest db config. 2023-04-26 10:37:24 +08:00
guanxiying 5830f50762 * Add git usage rule. 2023-04-26 02:33:57 +00:00
孔令茂 0bb33c054d * Optimize test case getbyid of block. 2023-04-26 10:26:44 +08:00
sunhao 05629e94a4 * zin: optimize zin tool 2023-04-26 10:24:28 +08:00
sunhao 78ebe67fae * zin: fix checked prop not set to checkbox 2023-04-26 10:24:28 +08:00
Guan Xiying a4ce4c3149 * Add append path. 2023-04-26 02:07:50 +00:00
Guan Xiying f676e6fa90 * Move xuanxuan to extension. 2023-04-26 01:38:13 +00:00
Guan Xiying 2c47043b5b * Move roadrunner to bin path. 2023-04-26 01:36:55 +00:00
Guan Xiying ee7f1f005c Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-26 01:33:30 +00:00
Guan Xiying 0b17ed1b3f * Mv api/v1 to module/api/v1. 2023-04-26 01:32:34 +00:00
zhaoke c7789d94b6 Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-04-26 09:21:32 +08:00
zhaoke 19ad7a06cc * Fix notice. 2023-04-26 09:20:28 +08:00
Guan Xiying 4bcef166a9 * Rename tools. 2023-04-26 01:19:17 +00:00
Guan Xiying 55fd37d884 * Add plan of renaming api,zin,sdk. 2023-04-26 01:16:26 +00:00
Guan Xiying d19c3936ac * Remove one empty line. 2023-04-26 01:15:13 +00:00
Lufei 0f48e14200 * form uses the parent class' get. 2023-04-26 09:00:07 +08:00
Guan Xiying 71e96b7467 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-26 00:59:23 +00:00
Guan Xiying bd092adca1 * Split php codes and comments. 2023-04-26 00:58:10 +00:00
王怡栋 2f3f608f74 Merge pull request '* Remove check workflow.' (#12) from sprint/removeworkflow into master
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/12
2023-04-26 08:53:18 +08:00
王怡栋 5b9cc70e72 Merge pull request '* Code for manage priv package.' (#15) from fixbug_liumengyi_manageprivpackage into master
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/15
2023-04-26 08:52:30 +08:00
zhaoke df2e9dd68e * Generate steps for ztf. 2023-04-26 08:50:24 +08:00
Guan Xiying b141103535 * Add standard.php . 2023-04-26 00:40:43 +00:00
sunhao b2949cd027 * zin: fix number 0 not render as expected 2023-04-25 18:32:19 +08:00
Lufei 640cd1cbfe * Change form create method to get. 2023-04-25 16:45:30 +08:00
Wangyuting ba533b4f1f * Optimize block model function. 2023-04-25 15:47:52 +08:00
sunhao 20236fea31 * zin: support to include page js and css in fragment 2023-04-25 15:29:46 +08:00
sunhao 6fc4fbed04 * zin: fix control not render picker 2023-04-25 15:29:26 +08:00
Hao Sun 2829a3acb0 * zin: zin tool support to export template for form page 2023-04-25 13:31:24 +08:00
Hao Sun a732daccf6 * zin: add hidden prop to formRow. 2023-04-25 13:31:24 +08:00
liyang f99114c811 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-25 13:27:35 +08:00
liyang 9ca1792e77 * Add unit db env in init file. 2023-04-25 13:27:02 +08:00
dingguodong ba16f45992 * Check whether user is locked and reset locked datetime. 2023-04-25 13:25:03 +08:00
dingguodong f8d08dd5a9 * Turn on the strict mode od MySQL. 2023-04-25 13:07:04 +08:00