Commit Graph
53575 Commits
Author SHA1 Message Date
liugang 6c3600ec2d + Display a link to show more function in biz. 2023-04-10 07:19:50 +00:00
liugang 29d7292aa2 * Use the biz-version style instead of the proversion style. 2023-04-10 07:12:26 +00:00
liugang 6442713ef2 * Declare $lang->bizVersion instead of $lang->pivot->proVersion.
* Declare $lang->bizVersionINT instead of $lang->pivot->proVersionEn.
2023-04-10 07:11:11 +00:00
wangyidong 7e3b1a1881 * fix bug for global create doc. 2023-04-10 13:52:08 +08:00
wangyidong 36f455e28b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-04-10 13:20:45 +08:00
wangyidong 0d6ca29488 Merge branch 'release/zentaopms_18.3' 2023-04-10 13:19:50 +08:00
wangyidong 511ceb9022 * code for task #89909. 2023-04-10 12:32:13 +08:00
wangyidong cfcff7243f * code for task #89909. 2023-04-10 11:30:19 +08:00
王怡栋 607f1262c4 Merge branch 'tsj_doc' into 'master'
* Code for task #89910.

See merge request easycorp/zentaopms!7341
2023-04-10 03:29:59 +00:00
王怡栋 df4ef423cc Merge branch 'sprint/cyy_89912' into 'master'
* Code for task #89912.

See merge request easycorp/zentaopms!7340
2023-04-10 03:29:09 +00:00
孙广明 ef70bb3982 Merge branch 'sprint/scx_chart_selectdropmenu' into 'master'
* Finish chart result query select dropmenu.

See merge request easycorp/zentaopms!7338
2023-04-10 03:28:37 +00:00
王怡栋 87bcecd08e Merge branch 'tsj_fixbug' into 'master'
* Compatible Swift Edition create documentation.

See merge request easycorp/zentaopms!7339
2023-04-10 03:28:09 +00:00
tianshujie a669f56285 * Code for task #89910. 2023-04-10 11:24:09 +08:00
caoyanyi 9dc6d2a5ab * Add actions for api view. 2023-04-10 11:19:51 +08:00
宋辰轩 a9470cb411 * Modify for commit . 2023-04-10 11:17:44 +08:00
朱金勇 75a3485f47 * Fix order in dmdb. 2023-04-10 03:13:24 +00:00
guofeilong e02bdda701 * Code for fix bug while change scroll . 2023-04-10 11:09:57 +08:00
wangyidong ced89c0a0d * code for task #89909. 2023-04-10 11:05:21 +08:00
wangyidong 7aa7c4285d * fix bug #33916. 2023-04-10 11:05:21 +08:00
wangyidong dc53b8f931 * fix bug #33910. 2023-04-10 11:05:21 +08:00
caoyanyi c9d6d86ac1 * Modify release page title. 2023-04-10 11:05:20 +08:00
caoyanyi 09168e505f * Code for task #90790. 2023-04-10 10:38:25 +08:00
guofeilong 25c91f0658 * Code for fix bug by func scrollIntoView . 2023-04-10 10:21:38 +08:00
caoyanyi 9f99ad89e2 * Code for task #89912. 2023-04-10 10:00:08 +08:00
guofeilong 2ef5e58779 * Code for bug #33411 . 2023-04-10 09:53:58 +08:00
Yagami 9bc7941349 * Code for feedback drop menu link error. 2023-04-10 09:12:23 +08:00
tianshujie 1fc100acc0 * Compatible Swift Edition create documentation. 2023-04-10 08:54:55 +08:00
朱金勇 6e27c59147 * Fix importing demo data. 2023-04-08 15:01:22 +00:00
liugang 941bcc94aa * Remove unused code. 2023-04-07 09:53:14 +00:00
王怡栋 4790c73eb6 Merge branch 'update_goview' into 'master'
* Update go-view dist.

See merge request easycorp/zentaopms!7336
2023-04-07 09:40:14 +00:00
王怡栋 a1fc931700 Merge branch 'daitingting_delete_uselessfiles' into 'master'
* Remove useless files.

See merge request easycorp/zentaopms!7337
2023-04-07 09:39:24 +00:00
王怡栋 852c816439 Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3

See merge request easycorp/zentaopms!7334
2023-04-07 09:39:10 +00:00
wangyidong 6042806e2a * fix bug #33916. 2023-04-07 17:38:21 +08:00
wangyidong 56d2615fb4 * fix bug #33910. 2023-04-07 17:38:21 +08:00
caoyanyi 2f226e4107 * Modify release page title. 2023-04-07 17:18:54 +08:00
宋辰轩 a11e5a6bd8 * Finish chart result query select dropmenu. 2023-04-07 17:17:33 +08:00
daitingting 2e25f4819a * Remove useless files. 2023-04-07 17:09:16 +08:00
qixinzhi 34bda40e8e * Update go-view dist. 2023-04-07 17:04:31 +08:00
caoyanyi 9522872d72 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-07 17:03:49 +08:00
caoyanyi fd558085ee * Modify module root data. 2023-04-07 17:03:29 +08:00
guofeilong bb91a63695 * Adjust code for bug in method addCata . 2023-04-07 16:55:37 +08:00
caoyanyi 5a0138a19c * Code for bug #33790. 2023-04-07 16:36:18 +08:00
王怡栋 9cb70b22a5 Merge branch 'release/zentaopms_18.3' into 'master'
Fix bug.

See merge request easycorp/zentaopms!7332
2023-04-07 08:32:19 +00:00
guofeilong f6114edda0 * Adjut code for js in doc . 2023-04-07 16:27:32 +08:00
caoyanyi 643ed3793d * Code for bug #33800. 2023-04-07 16:26:55 +08:00
wangyidong 37f33ac3b8 * fix bug #33910. 2023-04-07 16:23:34 +08:00
guofeilong 0cfc3d8426 * Code for adjust class in actions icon . 2023-04-07 16:08:30 +08:00
caoyanyi e90e7b9160 * Mofify api struct page locate. 2023-04-07 16:07:28 +08:00
caoyanyi 5be38b3c6d * Modify api struct page product locate. 2023-04-07 16:03:55 +08:00
guofeilong 37a6ad5a0b * Add mr to swapper dom in tableContent . 2023-04-07 15:54:57 +08:00