Commit Graph
179 Commits
Author SHA1 Message Date
wangyuting 2303495cdb * Fix flow is empty bug. 2024-03-22 16:59:11 +08:00
wangyuting 64ffd72817 * Fix workflow extra editor submit bug. 2024-03-22 15:08:11 +08:00
wangyuting 959b393b64 * Fix submit workflow extra form bug. 2024-03-22 14:38:07 +08:00
王怡栋 4b2976a1aa * Code for task #113950. 2024-03-22 11:20:19 +08:00
wangyuting 32db461b43 * Add extra form config. 2024-03-21 16:57:21 +08:00
wangyuting df37b53c9f * Add extra workflow field to edit page. 2024-03-21 15:47:43 +08:00
xieqiyu 17239defb6 * Fix the bug of form fields. 2024-03-21 15:09:45 +08:00
wangyuting 5313f0aed4 * Add workflow js and css to formPanel wg. 2024-03-21 10:15:35 +08:00
wangyuting 1eab431aa4 * Add workflow fields to formpanel. 2024-03-21 09:01:37 +08:00
liugang f144b7df18 * framework: check the property before calling it. 2024-02-20 16:20:55 +08:00
hufangzhou a60622d4e4 * Merge: 18.4 version's framework and lib directory. 2023-11-14 16:58:03 +08:00
朱金勇 640e8f4482 * Use helper::setcookie. 2023-07-11 07:28:39 +00:00
朱金勇 ad288b3f1d * Use isServing() instead of IN_USE. 2023-07-10 05:56:05 +00:00
wangyuting d501327cec * Add afterCreate function from create bug. 2023-05-31 15:02:58 +08:00
dingguodong b03b41760e * Replace the "die()" call. 2023-05-31 10:36:00 +08:00
朱金勇 894118767e - Remove unused local variable. 2023-05-28 22:42:30 +00:00
朱金勇 cb5b5bb2c5 - Remove unused local variable. 2023-05-25 03:00:16 +00:00
hufangzhou dc8fcc9484 * Merge 18.4 into master. 2023-05-05 09:26:04 +08:00
wangyidong 901fc68f3c * adjust for change bizVersion to edition. 2023-04-24 17:00:52 +08:00
Hao Sun ed31bffa6c Merge branch 'zin_merge'
# Conflicts:
#	framework/base/control.class.php
#	framework/control.class.php
2023-04-23 19:44:40 +08:00
鲁飞 045289d4c7 * Support PHP8.1. 2023-04-23 11:21:09 +00:00
Hao Sun 2bcc9bdbf4 Merge branch 'zin_dev'
# Conflicts:
#	module/common/lang/zh-cn.php
#	module/product/lang/de.php
#	module/product/lang/en.php
#	module/product/lang/fr.php
#	module/product/lang/zh-cn.php
#	module/program/js/browse.js
#	module/program/lang/de.php
#	module/program/lang/en.php
#	module/program/lang/fr.php
#	module/program/lang/zh-cn.php
#	module/project/config.php
#	module/project/lang/de.php
#	module/project/lang/en.php
#	module/project/lang/fr.php
#	module/project/lang/zh-cn.php
#	module/search/view/buildform.html.php
#	module/task/control.php
2023-04-23 19:20:45 +08:00
wangyuting2 e4c3846cca * Fix bug #30351. 2023-02-09 14:47:26 +08:00
tianshujie 15b9176f8d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2023-01-03 16:52:49 +08:00
tianshujie c201a0e478 * Finish task #79634. 2022-12-13 14:47:28 +08:00
liugang 08748eb7d4 Merge branch 'guanxiying/zentaopms-master' 2022-11-23 10:09:31 +08:00
tianshujie c9c2927202 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2022-11-08 08:32:35 +08:00
鲁飞 95d10ea6d3 * Fix call api error. 2022-11-04 02:51:20 +00:00
Guan Xiying ec23b692df * Extend the loadZen function to be compatible with the codes merged
from ZDOO.
2022-10-26 11:19:50 +08:00
Guan Xiying 646e61e3db * Revert the loadModel function. 2022-10-26 11:07:19 +08:00
Guan Xiying 5498c0872b * Cann't call the member variables of a class in the magic method. 2022-10-20 11:00:11 +08:00
Guan Xiying 86df3868fb * Refactor the magic method to support call static method. Only static
methods of classes declared in a zen file or an ext zen file or a tao
file or an ext tao file can be called.
2022-10-20 10:28:35 +08:00
Guan Xiying 1cbb4546fd * If the method is callable return its result else trigger error. 2022-10-20 10:25:46 +08:00
Guan Xiying eb43521900 * Add the loadExtension function to load the extension of zen. 2022-10-20 10:18:48 +08:00
Guan Xiying 12ad262e1d * Rename the $taoClass to the $zenClass. 2022-10-19 16:40:22 +08:00
Guan Xiying f84694aa7c Simplify the codes to load the zen file by the loadModel function. 2022-10-19 16:39:54 +08:00
Guan Xiying 66d76e5d65 * Fix error if the zen file doesn't exist. 2022-10-19 10:15:59 +08:00
zhujinyong f507abf379 * Init zin. 2022-10-19 10:15:30 +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 3e953772b9 * Refactor codes to extend the export fields and the editor fields by workflow. 2022-10-18 16:01:56 +08:00
wangyuting2 964e64efe1 * Finish task #63892. 2022-08-10 14:14:56 +08:00
daitingting e06b64e997 * Add fetchModule to distinguish rawModule. 2022-07-06 08:42:21 +00:00
tanghucheng 72d05c14df * Fix bug #23228. 2022-06-09 16:40:16 +08:00
wangyuting2 58c08b95a6 * Fix print extend fields bug. 2022-05-12 14:10:10 +08:00
wangyuting2 d4ed89e64a * Finish task #53548. 2022-05-11 15:05:13 +08:00
daitingting 0fba3427af * Build operate menu for productplan module. 2022-05-11 01:39:53 +00:00
王怡栋 d9d331c38e Merge branch 'master' into 'sprint/wangyuting_workflow'
# Conflicts:
#   framework/control.class.php
2022-05-10 08:46:32 +00:00