Commit Graph
45719 Commits
Author SHA1 Message Date
Guan Xiying 50c2fd653c * Simplify the codes to load the tao file by the loadModel function. 2022-10-19 16:36:22 +08:00
Guan Xiying 66d76e5d65 * Fix error if the zen file doesn't exist. 2022-10-19 10:15:59 +08:00
Guan Xiying b0be2cd295 * Remove useless variable. 2022-10-19 10:10:15 +08:00
Guan Xiying 01ac19f6e5 * Fix bug of load zen and tao. 2022-10-18 17:19:18 +08:00
Guan Xiying 8d961926a4 * Adjust the comments. 2022-10-18 16:45:52 +08:00
Guan Xiying b9b8b6e584 * Add functions to call the methods declared in the zen files and the tao files. 2022-10-18 16:32:26 +08:00
Guan Xiying 3008099976 * Load the zen file and the tao file. 2022-10-18 16:31:24 +08:00
Guan Xiying 8dce21799f * Optimize the codes of loadModel function. 2022-10-18 16:28:10 +08:00
Guan Xiying ca19766cbc * Refactor functions to support loading the zen files and the tao files. 2022-10-18 16:14:48 +08:00
Guan Xiying 3e953772b9 * Refactor codes to extend the export fields and the editor fields by workflow. 2022-10-18 16:01:56 +08:00
李玉春 bb90adf795 Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
Sprint/247 tianshujie fixbug

See merge request easycorp/zentaopms!5759
2022-10-17 09:24:39 +00:00
李玉春 90b695432b Merge branch 'sprint/247_tianshujie_72323' into 'master'
* Finish task #72323.

See merge request easycorp/zentaopms!5767
2022-10-17 09:23:58 +00:00
李玉春 8e2a48e581 Merge branch 'sprint/247_tianshujie_tableorder' into 'master'
Sprint/247 tianshujie tableorder

See merge request easycorp/zentaopms!5769
2022-10-17 09:23:47 +00:00
tianshujie bc72a89801 * Finish task #72374. 2022-10-17 16:59:43 +08:00
tianshujie e05f1e7f89 * Finish task #72374. 2022-10-17 16:58:30 +08:00
tianshujie 016125ea7c * Finish task #72324. 2022-10-17 16:55:39 +08:00
tianshujie 4245745bec * Finish task #72351. 2022-10-17 16:31:40 +08:00
tianshujie f4fdd2c320 * Finish task #72323. 2022-10-17 16:19:42 +08:00
tianshujie f9b2fd0aff * Fix bug #28531. 2022-10-17 15:46:56 +08:00
王怡栋 79b98536c1 Merge branch 'bug_28542' into 'master'
* Fix bug#28542

See merge request easycorp/zentaopms!5758
2022-10-17 06:52:40 +00:00
tianshujie bafc9a6020 * Fix bug #28528. 2022-10-17 13:54:11 +08:00
zenggang 3237e4e752 * Fix bug#28542 2022-10-17 05:22:40 +00:00
王怡栋 4a3c7b3587 Merge branch 'sprint/rce' into 'master'
* fix function can rce

See merge request easycorp/zentaopms!5756
2022-10-17 05:21:49 +00:00
柴德庆 ea7eea68d8 * refactor 2022-10-17 05:20:01 +00:00
王怡栋 384e836f7e Merge branch 'master_28532' into 'master'
*Fix bug #28532.

See merge request easycorp/zentaopms!5754
2022-10-17 05:17:46 +00:00
王怡栋 83f79a4874 Merge branch 'sprint/cdq_refactor' into 'master'
* refactor ->loadModel('bug')->lang to ->app->loadLang('bug')

See merge request easycorp/zentaopms!5751
2022-10-17 05:17:05 +00:00
朱金勇 902381fa7b Merge branch 'sprint/scx_testtaskapi' into 'master'
* Finish testtask api create method.

See merge request easycorp/zentaopms!5747
2022-10-17 04:25:52 +00:00
tianshujie 80b66aea5c * Fix bug #28490. 2022-10-17 11:12:48 +08:00
tianshujie a16db808d2 * Fix bug #28488. 2022-10-17 10:56:26 +08:00
chaideqing f01a04b242 * fix function can rce 2022-10-17 10:28:26 +08:00
liuhong 0e77b9f5e9 *Fix bug #28532. 2022-10-17 01:10:49 +00:00
李玉春 ce56365e07 Merge branch 'sprint/wangzemei/fix28395' into 'master'
* Fix the problem that the button is not shown

See merge request easycorp/zentaopms!5753
2022-10-16 23:56:27 +00:00
李玉春 61e06ef72d Merge branch 'cyy_optimize' into 'master'
* Modify dividing line style.

See merge request easycorp/zentaopms!5750
2022-10-16 23:56:11 +00:00
wangzemei 478bbcc87c * Fix bug #28447 2022-10-14 17:21:37 +08:00
wangzemei 6aad1dacac * Fix the problem that the button is not shown 2022-10-14 14:57:17 +08:00
曹延义 1e6ad814be Merge branch 'master' into cyy_optimize 2022-10-14 13:25:38 +08:00
王怡栋 22a5c56590 Merge branch 'bug_28514' into 'master'
* Fix bug#28514

See merge request easycorp/zentaopms!5748
2022-10-14 04:18:07 +00:00
王怡栋 af516229bb Merge branch 'bug_28518' into 'master'
* Fix bug#28518

See merge request easycorp/zentaopms!5749
2022-10-14 04:17:35 +00:00
曹延义 1929b943c2 * Code for story #38730. 2022-10-14 09:58:09 +08:00
chaideqing 361040cc94 * refactor ->loadModel('bug')->lang to ->app->loadLang('bug') 2022-10-14 09:19:28 +08:00
曹延义 8f99d8e1b3 * Modify dividing line style. 2022-10-14 08:44:14 +08:00
王怡栋 900f1f42dc Merge branch 'feedback_1077' into 'master'
* Code for feedback #1077

See merge request easycorp/zentaopms!5743
2022-10-14 00:41:43 +00:00
王怡栋 edf6de9fe9 Merge branch 'sprint/gfl_28499' into 'master'
* fix bug * 28499

See merge request easycorp/zentaopms!5741
2022-10-14 00:39:49 +00:00
王怡栋 72fb595f02 Merge branch 'story_37168' into 'master'
* Finish story#37168.

See merge request easycorp/zentaopms!5738
2022-10-14 00:17:47 +00:00
王怡栋 92b2e2c022 Merge branch 'sprint/feedback_1066' into 'master'
Sprint/feedback 1066

See merge request easycorp/zentaopms!5740
2022-10-14 00:16:16 +00:00
王怡栋 cf5b3319e5 Merge branch 'sprint/feedback_1128' into 'master'
* resolve feedback #1128

See merge request easycorp/zentaopms!5742
2022-10-14 00:08:17 +00:00
zenggang c7086c8d77 * Fix bug#28518 2022-10-13 07:50:54 +00:00
zenggang fa7624efbd * Fix bug#28514 2022-10-13 07:44:06 +00:00
宋辰轩 2c70a8f653 * Add check for testtask post method. 2022-10-13 13:41:48 +08:00
宋辰轩 362264e53d * Add comment. 2022-10-13 13:40:24 +08:00