xieqiyu
|
25fa87248f
|
* [bug#63354] Change the tip of has no template edit.
|
2025-06-15 11:48:46 +08:00 |
|
刘刚
|
b391e24d96
|
Merge branch dev/story-74909 of zentao/zentaopms (#9527)
|
2025-06-14 17:36:01 +08:00 |
|
刘刚
|
5e97fc4acb
|
Merge branch dev/bug-63310 of zentao/zentaopms (#9526)
|
2025-06-14 17:33:31 +08:00 |
|
刘刚
|
e69b5d4108
|
Merge branch ztflow-xieqiyu-dev/story-74909#xieqiyu of zentao/zentaopms (#9525)
|
2025-06-14 17:33:23 +08:00 |
|
刘刚
|
9a1d2c1969
|
Merge branch ztflow-daitingting-dev/bug-63310#daitingting of zentao/zentaopms (#9523)
|
2025-06-14 17:10:43 +08:00 |
|
daitingting
|
371523f869
|
* [bug#63310,done,0.5h] Adjust type to category.
|
2025-06-14 16:50:47 +08:00 |
|
xieqiyu
|
2a2367463d
|
* [task#144985,doing,0.1h] Change the tip of delete built-in doc template.
|
2025-06-14 08:45:57 +00:00 |
|
刘刚
|
8943e4d670
|
Merge branch ztflow-daitingting-dev/story-74909#daitingting of zentao/zentaopms (#9520)
|
2025-06-14 16:45:29 +08:00 |
|
daitingting
|
cbcf4b79fd
|
* [task#143873,done,4h] Set gantt config.
|
2025-06-14 16:16:17 +08:00 |
|
daitingting
|
d43e4675b0
|
* [task#143873,doing,1h] Set showFields and ganttFields in document block.
|
2025-06-14 16:14:49 +08:00 |
|
daitingting
|
a0b1b58111
|
* [task#143873,doing,1h] Set ganttFields and showFields in block.
|
2025-06-14 16:14:00 +08:00 |
|
daitingting
|
d911b08a9e
|
* [task#143873,doing,0.5h] Adjust gantt text in document.
|
2025-06-14 16:12:28 +08:00 |
|
刘刚
|
3b3434f25c
|
Merge branch dev/task-144985 of zentao/zentaopms (#9519)
|
2025-06-14 14:38:04 +08:00 |
|
刘刚
|
b4f7210cd4
|
Merge branch ztflow-xieqiyu-dev/task-144985#xieqiyu of zentao/zentaopms (#9518)
|
2025-06-14 14:31:38 +08:00 |
|
xieqiyu
|
fb0cccad94
|
* [task#144513,doing,0.5h] Fix the bug of upgrade doc template.
|
2025-06-14 06:05:20 +00:00 |
|
xieqiyu
|
b07517cca8
|
* [task#144513,doing,1h] Record the upgrade time when upgrade doc template.
|
2025-06-14 05:18:22 +00:00 |
|
xieqiyu
|
2768aa3e27
|
* [task#144511,doing,0.5h] Modify the judgment of has built-in doc template.
|
2025-06-14 01:49:20 +00:00 |
|
xieqiyu
|
4eeaf80212
|
* [task#145140,doing,0.5h] Delete the tip of add template type.
|
2025-06-14 00:45:26 +00:00 |
|
xieqiyu
|
758a9c81df
|
* [task#144985,doing,1h] Add the tip when delete template of use project review.
|
2025-06-14 00:40:05 +00:00 |
|
刘刚
|
9e63eac613
|
Merge branch dev/task-144514 of zentao/zentaopms (#9510)
|
2025-06-13 15:39:03 +08:00 |
|
刘刚
|
a4334f2a8a
|
Merge branch ztflow-xieqiyu-feature/doctemplate#xieqiyu of zentao/zentaopms (#9504)
|
2025-06-13 14:56:33 +08:00 |
|
刘刚
|
92f8aa95f8
|
Merge branch ztflow-daitingting-dev/task-144514#daitingting of zentao/zentaopms (#9502)
|
2025-06-13 14:56:14 +08:00 |
|
xieqiyu
|
c5d6609bb9
|
Merge branch 'dev/task-144512' into feature/doctemplate
|
2025-06-13 06:21:59 +00:00 |
|
daitingting
|
f3ada57178
|
* [task#144514,done,0.5h] Check edit priviledge.
|
2025-06-13 06:13:55 +00:00 |
|
xieqiyu
|
d868d1f681
|
* [unittest] Modify the unit test file of docModel::upgradeTemplateLibAndModule.
|
2025-06-13 05:54:04 +00:00 |
|
xieqiyu
|
a96caf8fe9
|
* [unittest] Modify the unit test file of template yaml.
|
2025-06-13 05:39:44 +00:00 |
|
xieqiyu
|
57651cf498
|
* [task#144512,doing,0.5h] Format time field when upgrade doc template.
|
2025-06-13 02:03:07 +00:00 |
|
刘刚
|
7a8c571076
|
Merge branch ztflow-daitingting-feature/doctemplate#daitingting of zentao/zentaopms (#9491)
|
2025-06-13 09:43:06 +08:00 |
|
daitingting
|
73664f87b8
|
Merge branch 'dev/task-144514' into feature/doctemplate
|
2025-06-13 01:26:07 +00:00 |
|
刘刚
|
9f709a95a0
|
Merge branch dev/task-144522 of zentao/zentaopms (#9483)
|
2025-06-13 08:54:53 +08:00 |
|
刘刚
|
b490813bf5
|
Merge branch dev/task-144644 of zentao/zentaopms (#9479)
|
2025-06-12 17:30:03 +08:00 |
|
刘刚
|
720c088dd3
|
Merge branch ztflow-daitingting-dev/task-144644#daitingting of zentao/zentaopms (#9477)
|
2025-06-12 17:26:22 +08:00 |
|
daitingting
|
658570a1b8
|
* [task#144644,done,2h] Set showWhen for zentao list menus.
|
2025-06-12 16:51:43 +08:00 |
|
daitingting
|
9b9355ef7c
|
* [task#144644,doing,2h] Get project review templates.
|
2025-06-12 16:51:09 +08:00 |
|
刘刚
|
390b6e7610
|
Merge branch ztflow-xieqiyu-dev/task-144522#xieqiyu of zentao/zentaopms (#9452)
|
2025-06-12 14:33:17 +08:00 |
|
xieqiyu
|
765990a94c
|
* [task#144522,doing,1h] Show the template from review.
|
2025-06-12 14:16:04 +08:00 |
|
刘刚
|
66ba325e4e
|
Merge branch dev/task-144513 of zentao/zentaopms (#9400)
|
2025-06-11 13:38:24 +08:00 |
|
刘刚
|
af264a33e3
|
Merge branch ztflow-xieqiyu-dev/task-144513#xieqiyu of zentao/zentaopms (#9390)
|
2025-06-11 13:18:01 +08:00 |
|
xieqiyu
|
84e73fdaa9
|
* [task#144513,doing,0.5h] Modify the fail unit test of docModel::upgradeTemplateTypes.
|
2025-06-11 10:45:07 +08:00 |
|
xieqiyu
|
bfa830d21b
|
* [task#144513,doing,0.5h] Move the sql to 21.7.2.
|
2025-06-11 10:33:46 +08:00 |
|
xieqiyu
|
3953fb3ae1
|
* [task#144513,doing,0.5h] Modify the fail unit test of docModel::upgradeTemplateTypes.
|
2025-06-11 10:15:32 +08:00 |
|
xieqiyu
|
9d8ab44fcf
|
* [task#144513,doing,0.5h] Modify the fail unit test of upgradeModel::addBuiltInDocTemplate.
|
2025-06-11 09:47:46 +08:00 |
|
xieqiyu
|
a2f2ce7e31
|
* [task$144513,doing,0.5h] Modify the fail unit test of docModel::addBuiltInDocTemplateByType.
|
2025-06-11 09:40:16 +08:00 |
|
xieqiyu
|
73648d9501
|
* [task#144513,doing,0.5h] Optimize the code for setItem and getItem.
|
2025-06-11 09:06:03 +08:00 |
|
xieqiyu
|
35329dee3f
|
* [task#144513,doing,2h] Save the template with blocks into projectReviewDocTemplate for project review.
|
2025-06-11 09:05:44 +08:00 |
|
刘刚
|
99804defcf
|
Merge branch dev/task-144512 of zentao/zentaopms (#9363)
|
2025-06-11 08:54:47 +08:00 |
|
刘刚
|
7a7d99a184
|
Merge branch ztflow-xieqiyu-dev/task-144512#xieqiyu of zentao/zentaopms (#9355)
|
2025-06-10 16:24:02 +08:00 |
|
xieqiyu
|
74045b98cc
|
* [misc] Delete unused code.
|
2025-06-10 15:23:50 +08:00 |
|
刘刚
|
7d3ba4533a
|
Merge branch ztflow-daitingting-dev/task-144514#daitingting of zentao/zentaopms (#9351)
|
2025-06-10 15:13:47 +08:00 |
|
daitingting
|
5e2d3af396
|
* [task#144514,done,0.5h] Adjust checkpriv test.
|
2025-06-10 07:01:05 +00:00 |
|