Commit Graph

52316 Commits

Author SHA1 Message Date
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
tianshujie
7bc625ac7e Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-10 14:44:25 +08:00
tianshujie
537d81ba97 * Fix bug 32751. 2023-03-10 14:43:04 +08:00
guofeilong
eaafb20075 * Add class no-stash to save form draft. 2023-03-10 14:40:00 +08:00
王怡栋
c5de3ca3b4 Merge branch 'dev/gfl_fixbug' into 'master'
* Adjust code in js restore form .

See merge request easycorp/zentaopms!7171
2023-03-10 06:27:17 +00:00
guofeilong
b791a69a45 * Adjust code in js restore form . 2023-03-10 14:25:30 +08:00
caoyanyi
95fafae8a9 * Modify content wrap. 2023-03-10 13:24:40 +08:00
caoyanyi
53da364b6b * Add language for dev api. 2023-03-10 13:23:53 +08:00
caoyanyi
229eae7538 * Optimize content wrpa. 2023-03-10 13:06:46 +08:00
tianshujie
88226af4ee Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-10 12:48:23 +08:00
tianshujie
b3f7c73aab * Fix bug 32751. 2023-03-10 12:48:07 +08:00
caoyanyi
d83c6d7289 * Modify editor tips. 2023-03-10 12:21:02 +08:00
王怡栋
d8c221b156 Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug

See merge request easycorp/zentaopms!7167
2023-03-10 03:17:29 +00:00
caoyanyi
faf078cb59 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-10 11:14:53 +08:00
caoyanyi
93b8983cb4 * Fix bug #32745. 2023-03-10 11:12:47 +08:00
tianshujie
140d93ae5d Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-10 10:24:04 +08:00
tianshujie
a0a895be03 * Fix bug 32749. 2023-03-10 10:23:23 +08:00
caoyanyi
7d40afc496 * Fix bug 29433. 2023-03-10 10:16:07 +08:00
caoyanyi
723dec97eb * Fix bug #32759. 2023-03-10 10:15:47 +08:00
王怡栋
a1f06b754c Merge branch 'dev/gfl_theme_refactors' into 'master'
* Code for add important to text-primary .

See merge request easycorp/zentaopms!7169
2023-03-10 02:11:02 +00:00
caoyanyi
ef62dca574 Merge branch 'dev/gfl_theme_refactors' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-10 10:04:06 +08:00
guofeilong
00571440fb * Code for add important to text-primary . 2023-03-10 09:59:57 +08:00
tianshujie
71db1e3c2e * Fix bug 31232. 2023-03-10 09:45:36 +08:00
tianshujie
5c84a44f0d * Fix bug 31232. 2023-03-10 09:42:07 +08:00
王怡栋
53bec70c14 Merge branch 'dev/gfl_bug#32763' into 'master'
* Adjust code for bug #32763 .

See merge request easycorp/zentaopms!7168
2023-03-10 01:03:18 +00:00
guofeilong
071837a855 * Adjust code for bug #32763 . 2023-03-10 08:58:01 +08:00
caoyanyi
3eb831772e * Optimize print kanban page checkbox style. 2023-03-10 08:48:14 +08:00
tianshujie
9ecacd2ad1 * Fix bug 32769. 2023-03-09 17:13:46 +08:00
tianshujie
665422c7ce * Fix bug #32761. 2023-03-09 16:50:22 +08:00
tianshujie
4c944d0ce4 * Fix bug #32766. 2023-03-09 16:42:47 +08:00
孙广明
806e3a4742 Merge branch 'sprint/295_liumengyi_86258' into 'master'
* Finish task #86281 86258.

See merge request easycorp/zentaopms!7166
2023-03-09 08:07:59 +00:00
王怡栋
bae7857455 Merge branch 'gitlab_optimize' into 'master'
Gitlab optimize

See merge request easycorp/zentaopms!7148
2023-03-09 08:05:10 +00:00
曾刚
2da060b171 Gitlab optimize 2023-03-09 08:05:10 +00:00