Commit Graph
52348 Commits
Author SHA1 Message Date
liumengyi eeb106132c * Fix bug of task #87014. 2023-03-15 00:19:22 +00:00
liumengyi 6a5966d8ca * Fix bug of task #87013. 2023-03-14 09:20:55 +00:00
liumengyi 1d16c63d87 * Fix bug of task #87013. 2023-03-14 08:57:00 +00:00
liumengyi a33306bf90 * Fix bug #32881. 2023-03-14 05:05:46 +00:00
liumengyi 0955f65414 * Finish task #87014. 2023-03-14 03:09:15 +00:00
liumengyi 9728298427 * Fix bug of task #87014. 2023-03-13 07:37:04 +00:00
liumengyi 637b0912a7 * Finish task #87013. 2023-03-13 07:07:13 +00:00
王怡栋 e291cd91f5 Merge branch 'dev/gfl_fix_bug' into 'master'
* Adjust code for func formStash .

See merge request easycorp/zentaopms!7179
2023-03-13 05:05:04 +00:00
guofeilong b1cfef2043 * Adjust code for func formStash . 2023-03-13 13:03:41 +08:00
王怡栋 a776b3897f Merge branch 'dev/gfl_fix_bug' into 'master'
Dev/gfl fix bug

See merge request easycorp/zentaopms!7178
2023-03-13 03:18:59 +00:00
guofeilong d9bb39cc2e * Adjust code / 2023-03-13 11:10:25 +08:00
王怡栋 0b48104c02 Merge branch 'master_xieqiyu_fixbug' into 'master'
* Code for bug#32835.

See merge request easycorp/zentaopms!7177
2023-03-13 02:57:25 +00:00
guofeilong d8c287a123 * Adjust code . 2023-03-13 10:57:23 +08:00
xieqiyu 84e8ea04f5 * Code for bug#32835. 2023-03-13 02:50:03 +00:00
guofeilong ee5375cd49 * Adjust code . 2023-03-13 10:41:41 +08:00
tianshujie 6993263249 Merge branch 'dev/gfl_fix_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_fix_bug 2023-03-13 10:38:03 +08:00
tianshujie cd7195892c * Fix bug 32831. 2023-03-13 10:37:30 +08:00
guofeilong 3713cf59ba * Adjust code . 2023-03-13 10:30:48 +08:00
caoyanyi 4ee37b3d63 * Modify input section id value. 2023-03-13 10:24:15 +08:00
tianshujie a6e4d22524 * Fix bug 32815. 2023-03-13 10:23:46 +08:00
tianshujie 00a69ba40e * Fix bug 32821. 2023-03-13 09:58:51 +08:00
caoyanyi 709d489a0b * Ignore onlybody page. 2023-03-13 09:54:44 +08:00
王怡栋 56cab36e20 Merge branch 'tsj_fixbug' into 'master'
* Add test case for dev module.

See merge request easycorp/zentaopms!7176
2023-03-13 01:54:20 +00:00
guofeilong 855b1a4d76 * Adjust code for bug #32811 . 2023-03-13 09:53:13 +08:00
tianshujie 6e90ea6cab * Fix bug 32749. 2023-03-13 09:51:18 +08:00
tianshujie 7dcb0300df * Fix bug 32826. 2023-03-13 09:34:44 +08:00
tianshujie b7ab8ae8f3 * Fix bug 32819. 2023-03-13 09:06:31 +08:00
tianshujie d0ecdd9b65 * Add test case for dev module. 2023-03-13 08:55:13 +08:00
王怡栋 f0cce961ee Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug

See merge request easycorp/zentaopms!7175
2023-03-13 00:17:58 +00:00
tianshujie 5a64c96a2b * Modify the module tree on the left side of the editor. 2023-03-11 18:08:40 +08:00
tianshujie 7551bc06c8 * Modify comment for dev model. 2023-03-10 19:26:58 +08:00
tianshujie fdd3d83e69 * Modify the module tree on the left side of the editor. 2023-03-10 17:25:10 +08:00
tianshujie 0cd791fd4f * Modify the module tree on the left side of the editor. 2023-03-10 17:16:34 +08:00
caoyanyi f8202098de Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-10 17:14:44 +08:00
tianshujie 10e304792e * Modify the module tree on the left of the data dictionary. 2023-03-10 16:54:01 +08:00
王怡栋 db46122825 Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug

See merge request easycorp/zentaopms!7173
2023-03-10 08:43:45 +00:00
王怡栋 1462e085e6 Merge branch 'cyy_optimize' into 'master'
Cyy optimize

See merge request easycorp/zentaopms!7170
2023-03-10 08:43:03 +00:00
王怡栋 0562bbda0e Merge branch 'dev/gfl_fixbug' into 'master'
Dev/gfl fixbug

See merge request easycorp/zentaopms!7174
2023-03-10 08:42:43 +00:00
tianshujie 2a728e1b87 * Example Modify the interface document module tree. 2023-03-10 16:35:14 +08:00
guofeilong b580d616ba * Adjust code . 2023-03-10 16:33:55 +08:00
caoyanyi e49cdded94 * Add change event. 2023-03-10 16:15:32 +08:00
caoyanyi b82a6b8297 * Adjust codes. 2023-03-10 16:12:06 +08:00
tianshujie ccba4f20cd * Remove useless code. 2023-03-10 15:54:53 +08:00
tianshujie c949c811b9 * Fix bug 32751. 2023-03-10 15:44:48 +08:00
tianshujie 8554b81018 * IE compatible. 2023-03-10 15:26:00 +08:00
tianshujie 7803c98fe7 Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-10 15:17:47 +08:00
tianshujie cb56526939 * Fix bug 32751. 2023-03-10 15:17:33 +08:00
caoyanyi eccb2b8368 * Compatible with IE browser. 2023-03-10 15:12:13 +08:00
guofeilong 648eed01ab * Adjust code . 2023-03-10 15:05:16 +08:00
caoyanyi d05f771ad7 * Optimize monaco scrollbar style. 2023-03-10 14:57:01 +08:00