Commit Graph
203 Commits
Author SHA1 Message Date
sunguangming 2531cfc487 * [task#130096,doing,0.5h] code for task. 2024-10-10 09:32:02 +08:00
sunguangming 8d18d978b9 * [task#129303,done,0.2h] rename func. 2024-09-26 09:26:35 +08:00
sunguangming 007599012f * [task#127607,done,0.5h] finish task. 2024-09-09 15:57:14 +08:00
hufangzhou 17209f247b * [bug#54836,done,0.3h] Open-source version does not follow extended field logic. 2024-09-04 03:26:26 +00:00
wangyidong 86766740b0 * [refac] merge from feature/workflow branch. 2024-08-28 14:09:20 +08:00
wangyidong c610fdc5b1 * [perf story #63514] change matchUIByData method name to getUIByData. 2024-08-27 08:52:33 +08:00
wangyidong bcda8593a7 * [perf story #63514] Adjust for get uiID in framework. 2024-08-27 08:52:33 +08:00
wangyuting 112415606f * [bug#53039,done,2h,0h] append workflow extension fields to requiredFields. 2024-07-25 16:03:55 +08:00
wangyuting d89166f784 * [task#123679,done,1h,0h] Add common js to extension flow action. 2024-07-24 17:00:18 +08:00
dingguodong 8a318a66d0 + [task#121999] Enable redis. 2024-06-28 16:59:08 +08:00
liugang a4d2de38f0 * [misc] replace COUNT(*) with COUNT(1) in sql. 2024-06-27 14:07:27 +08:00
sunguangming f83f00f61f Merge branch 'main' into feature/epic 2024-06-20 07:04:51 +00:00
wangyidong cf5fbd878f * [perf bug #50860] ignore fetch flow when upgrade or install. 2024-06-11 16:49:23 +08:00
sunguangming 797896f3ec * Modify moduleName to rawModule. 2024-06-03 09:09:18 +08:00
wangyuting 6f68dec824 * Fix show extended fields when workflow extensionType is none bug. bug #47769. 2024-04-12 14:44:36 +08:00
liugang b5ad48d13f * control: fix error of creating an instance of the extension class. 2024-04-03 15:58:42 +08:00
liugang 40f7a488ca + control: validate view file before include it. 2024-04-03 15:50:40 +08:00
wangyuting 8cacbb5052 * Fix unit test bug. 2024-03-27 15:35:09 +08:00
wangyuting 7a7bcc3332 * Optimize workflow function. 2024-03-27 09:43:45 +08:00
wangyuting 07f89106a8 * Fix workflow extra editor field bug. 2024-03-26 16:54:39 +08:00
tianshujie 6f2d0e4940 * Fix an error when the property did not exist. 2024-03-26 13:55:33 +08:00
xieqiyu 663588dcfe * Fix the bug of appendExtendCssAndJS. 2024-03-26 13:55:00 +08:00
王怡栋 612334eb6a * Code for task #114066. 2024-03-26 10:55:16 +08:00
王怡栋 145463f1d8 * Code for task #113950. 2024-03-25 11:08:14 +08:00
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