Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x

db/update20.0.sql

@@ -58,7 +58,7 @@ INSERT INTO `zt_stage` (`name`,`percent`,`type`,`createdBy`,`createdDate`,`edite
 ('发布','10','release','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'),
 ('总结评审','5','review','admin','2020-02-08 21:08:45','admin','2020-02-12 13:50:27','0');
 
--- DROP TABLE IF EXISTS `zt_flow_design`;
+-- DROP TABLE IF EXISTS `zt_design`;
 CREATE TABLE `zt_design` (
   `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
   `program` varchar(255) NOT NULL,
@@ -249,7 +249,7 @@ CREATE TABLE IF NOT EXISTS `zt_holiday` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 ALTER TABLE `zt_task` 
-ADD `design` mediumint(8) unsigned NOT NULL AFTER `story`,
+ADD `design` mediumint(8) unsigned NOT NULL AFTER `module`,
 ADD `version` smallint(6) NOT NULL AFTER `desc`,
 ADD `activatedDate` date NOT NULL AFTER `lastEditedDate`,
 ADD `planDuration` int(11) NOT NULL AFTER `closedDate`,
@@ -289,7 +289,7 @@ CREATE TABLE `zt_weeklyreport`(
 ALTER TABLE `zt_project` ADD `path` varchar(255) NOT NULL AFTER `parent`;
 ALTER TABLE `zt_project` ADD `grade` tinyint unsigned NOT NULL AFTER `path`;
 
-INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system','custom','','URAndSR','1'),('system','custom','','URSRName','{\"urCommon\":{\"zh-cn\":\"\\u7528\\u6237\\u9700\\u6c42\"},\"srCommon\":{\"zh-cn\":\"\\u8f6f\\u4ef6\\u9700\\u6c42\"}}'),('system','custom','','storyPoint','1');
+INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system','custom','','storyPoint','1');
 
 ALTER TABLE `zt_block` ADD `type` char(30) NOT NULL AFTER `module`;
 ALTER TABLE `zt_block` ADD UNIQUE `account_module_type_order` (`account`, `module`, `type`, `order`), DROP INDEX `accountModuleOrder`;

db/zentao.sql

@@ -22,6 +22,7 @@ CREATE TABLE IF NOT EXISTS `zt_block` (
   `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
   `account` char(30) NOT NULL,
   `module` varchar(20) NOT NULL,
+  `type` char(30) NOT NULL,
   `title` varchar(100) NOT NULL,
   `source` varchar(20) NOT NULL,
   `block` varchar(20) NOT NULL,
@@ -31,7 +32,7 @@ CREATE TABLE IF NOT EXISTS `zt_block` (
   `height` smallint(5) unsigned NOT NULL DEFAULT '0',
   `hidden` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
-  UNIQUE KEY `accountModuleOrder` (`account`,`module`,`order`),
+  UNIQUE KEY `account_module_type_order` (`account`,`module`,`type`,`order`),
   KEY `account` (`account`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_branch`;
@@ -111,6 +112,22 @@ CREATE TABLE IF NOT EXISTS `zt_bug` (
   KEY `case` (`case`),
   KEY `assignedTo` (`assignedTo`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_budget`;
+CREATE TABLE `zt_budget` (
+  `id` int(8) NOT NULL AUTO_INCREMENT,
+  `program` mediumint(8) NOT NULL,
+  `stage` char(30) NOT NULL,
+  `subject` mediumint(8) NOT NULL,
+  `amount` char(30) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `desc` text NOT NULL,
+  `createdBy` char(30) NOT NULL,
+  `createdDate` date NOT NULL,
+  `lastEditedBy` char(30) NOT NULL,
+  `lastEditedDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_build`;
 CREATE TABLE IF NOT EXISTS `zt_build` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
@@ -134,6 +151,7 @@ CREATE TABLE IF NOT EXISTS `zt_build` (
 -- DROP TABLE IF EXISTS `zt_burn`;
 CREATE TABLE IF NOT EXISTS `zt_burn` (
   `project` mediumint(8) unsigned NOT NULL,
+  `product` mediumint(8) unsigned NOT NULL,
   `task` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `date` date NOT NULL,
   `estimate` float NOT NULL,
@@ -290,6 +308,42 @@ CREATE TABLE IF NOT EXISTS `zt_dept` (
   KEY `parent` (`parent`),
   KEY `path` (`path`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_design`;
+CREATE TABLE `zt_design` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `program` varchar(255) NOT NULL,
+  `product` varchar(255) NOT NULL,
+  `commit` varchar(30) NOT NULL,
+  `project` mediumint(9) NOT NULL DEFAULT '0',
+  `name` varchar(255) NOT NULL,
+  `parent` mediumint(8) unsigned NOT NULL,
+  `status` varchar(30) NOT NULL,
+  `subStatus` varchar(30) NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `commitBy` varchar(30) NOT NULL,
+  `commitDate` datetime NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `assignedBy` varchar(30) NOT NULL,
+  `assignedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  `story` char(30) NOT NULL,
+  `desc` text NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `type` char(30) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_designspec`;
+CREATE TABLE `zt_designspec` (
+  `design` mediumint(8) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `desc` text NOT NULL,
+  `files` varchar(255) NOT NULL,
+  UNIQUE KEY `design` (`design`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_doc`;
 CREATE TABLE IF NOT EXISTS `zt_doc` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
@@ -348,6 +402,23 @@ CREATE TABLE IF NOT EXISTS `zt_doclib` (
   KEY `product` (`product`),
   KEY `project` (`project`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_durationestimation`;
+CREATE TABLE `zt_durationestimation` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `program` mediumint(8) unsigned NOT NULL,
+  `stage` mediumint(9) NOT NULL,
+  `workload` varchar(255) NOT NULL,
+  `worktimeRate` varchar(255) NOT NULL,
+  `people` varchar(255) NOT NULL,
+  `startDate` date NOT NULL,
+  `endDate` date NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_effort`;
 CREATE TABLE IF NOT EXISTS `zt_effort` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
@@ -432,6 +503,54 @@ CREATE TABLE IF NOT EXISTS `zt_history` (
   PRIMARY KEY (`id`),
   KEY `action` (`action`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_holiday`;
+CREATE TABLE IF NOT EXISTS `zt_holiday` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(30) NOT NULL DEFAULT '',
+  `type` enum('holiday', 'working') NOT NULL DEFAULT 'holiday',
+  `desc` text NOT NULL,
+  `year` char(4) NOT NULL,
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `year` (`year`),
+  KEY `name` (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_issue`;
+CREATE TABLE `zt_issue` (
+  `id` mediumint(8) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `resolvedBy` varchar(30) NOT NULL,
+  `program` varchar(255) NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `desc` text NOT NULL,
+  `pri` char(30) NOT NULL,
+  `severity` char(30) NOT NULL,
+  `type` char(30) NOT NULL,
+  `activity` varchar(255) NOT NULL,
+  `effectedArea` varchar(255) NOT NULL,
+  `deadline` date NOT NULL,
+  `resolution` char(30) NOT NULL,
+  `resolutionComment` text NOT NULL,
+  `objectID` varchar(255) NOT NULL,
+  `resolvedDate` date NOT NULL,
+  `status` varchar(30) NOT NULL,
+  `owner` varchar(255) NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `activateBy` varchar(30) NOT NULL,
+  `activateDate` date NOT NULL,
+  `closeBy` varchar(30) NOT NULL,
+  `closedDate` date NOT NULL,
+  `commitBy` varchar(30) NOT NULL,
+  `commitDate` datetime NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `assignedBy` varchar(30) NOT NULL,
+  `assignedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+   PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_jenkins`;
 CREATE TABLE IF NOT EXISTS `zt_jenkins` (
   `id` smallint(8) unsigned NOT NULL AUTO_INCREMENT,
@@ -563,7 +682,6 @@ CREATE TABLE IF NOT EXISTS `zt_project` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
   `isCat` enum('1','0') NOT NULL default '0',
   `catID` mediumint(8) unsigned NOT NULL,
-  `type` varchar(20) NOT NULL default 'sprint',
   `template` char(30) NOT NULL,
   `category` char(30) NOT NULL,
   `program` mediumint(8) NOT NULL DEFAULT '0',
@@ -572,9 +690,12 @@ CREATE TABLE IF NOT EXISTS `zt_project` (
   `percent` float unsigned NOT NULL DEFAULT '0',
   `privway` char(30) NOT NULL,
   `milestone` enum('0','1') NOT NULL default '0',
-  `output` text NOT NULL,
   `attribute` varchar(30) NOT NULL DEFAULT '',
+  `output` text NOT NULL,
+  `type` varchar(20) NOT NULL default 'sprint',
   `parent` mediumint(8) unsigned NOT NULL default '0',
+  `path` varchar(255) NOT NULL,
+  `grade` tinyint unsigned NOT NULL,
   `name` varchar(90) NOT NULL,
   `code` varchar(45) NOT NULL,
   `begin` date NOT NULL,
@@ -615,6 +736,16 @@ CREATE TABLE IF NOT EXISTS `zt_project` (
   KEY `acl` (`acl`),
   KEY `order` (`order`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_projectspec`;
+CREATE TABLE `zt_projectspec` (
+  `project` mediumint(8) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `milestone` enum('0','1') NOT NULL DEFAULT '0',
+  `begin` date NOT NULL,
+  `end` date NOT NULL,
+  UNIQUE KEY `project` (`project`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_projectproduct`;
 CREATE TABLE IF NOT EXISTS `zt_projectproduct` (
   `project` mediumint(8) unsigned NOT NULL,
@@ -711,6 +842,44 @@ CREATE TABLE IF NOT EXISTS `zt_repohistory` (
   KEY `repo` (`repo`),
   KEY `revision` (`revision`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_risk`;
+CREATE TABLE `zt_risk` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `program` varchar(255) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `source` char(30) NOT NULL,
+  `category` char(30) NOT NULL,
+  `strategy` char(30) NOT NULL,
+  `status` varchar(30) NOT NULL DEFAULT 'active',
+  `impact` char(30) NOT NULL,
+  `probability` char(30) NOT NULL,
+  `riskindex` char(30) NOT NULL,
+  `pri` char(30) NOT NULL,
+  `identifiedDate` date NOT NULL,
+  `prevention` text NOT NULL,
+  `remedy` text NOT NULL,
+  `plannedClosedDate` date NOT NULL,
+  `actualClosedDate` date NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `resolution` text NOT NULL,
+  `resolvedBy` varchar(30) NOT NULL,
+  `activateBy` varchar(30) NOT NULL,
+  `activateDate` date NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `cancelBy` varchar(30) NOT NULL,
+  `cancelDate` date NOT NULL,
+  `cancelReason` char(30) NOT NULL,
+  `hangupBy` varchar(30) NOT NULL,
+  `hangupDate` date NOT NULL,
+  `trackedBy` varchar(30) NOT NULL,
+  `trackedDate` date NOT NULL,
+  `assignedDate` date NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+   PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_story`;
 CREATE TABLE IF NOT EXISTS `zt_story` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
@@ -774,6 +943,19 @@ CREATE TABLE IF NOT EXISTS `zt_storystage` (
   UNIQUE KEY `story_branch` (`story`,`branch`),
   KEY `story` (`story`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_stage`;
+CREATE TABLE `zt_stage` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL,
+  `percent` varchar(255) NOT NULL,
+  `type` varchar(255) NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_suitecase`;
 CREATE TABLE IF NOT EXISTS `zt_suitecase` (
   `suite` mediumint(8) unsigned NOT NULL,
@@ -789,8 +971,10 @@ CREATE TABLE IF NOT EXISTS `zt_task` (
   `parent` mediumint(8) NOT NULL DEFAULT '0',
   `project` mediumint(8) unsigned NOT NULL default '0',
   `module` mediumint(8) unsigned NOT NULL default '0',
+  `design` mediumint(8) unsigned NOT NULL,
   `story` mediumint(8) unsigned NOT NULL default '0',
   `storyVersion` smallint(6) NOT NULL default '1',
+  `designVersion` smallint(6) unsigned NOT NULL,
   `fromBug` mediumint(8) unsigned NOT NULL default '0',
   `name` varchar(255) NOT NULL,
   `type` varchar(20) NOT NULL,
@@ -804,6 +988,7 @@ CREATE TABLE IF NOT EXISTS `zt_task` (
   `color` char(7) NOT NULL,
   `mailto` text,
   `desc` text NOT NULL,
+  `version` smallint(6) NOT NULL,
   `openedBy` varchar(30) NOT NULL,
   `openedDate` datetime NOT NULL,
   `assignedTo` varchar(30) NOT NULL,
@@ -817,15 +1002,27 @@ CREATE TABLE IF NOT EXISTS `zt_task` (
   `canceledDate` datetime NOT NULL,
   `closedBy` varchar(30) NOT NULL,
   `closedDate` datetime NOT NULL,
+  `planDuration` int(11) NOT NULL,
+  `realDuration` int(11) NOT NULL,
   `closedReason` varchar(30) NOT NULL,
   `lastEditedBy` varchar(30) NOT NULL,
   `lastEditedDate` datetime NOT NULL,
+  `activatedDate` date NOT NULL,
   `deleted` enum('0','1') NOT NULL default '0',
    PRIMARY KEY (`id`),
   KEY `project` (`project`),
   KEY `story` (`story`),
   KEY `assignedTo` (`assignedTo`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_taskspec`;
+CREATE TABLE `zt_taskspec` (
+  `task` mediumint(8) NOT NULL,
+  `version` smallint(6) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `estStarted` date NOT NULL,
+  `deadline` date NOT NULL,
+  UNIQUE KEY `task` (`task`,`version`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_taskestimate`;
 CREATE TABLE IF NOT EXISTS `zt_taskestimate` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
@@ -984,6 +1181,7 @@ CREATE TABLE IF NOT EXISTS `zt_todo` (
 -- DROP TABLE IF EXISTS `zt_user`;
 CREATE TABLE IF NOT EXISTS `zt_user` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
+  `type` char(30) NOT NULL,
   `dept` mediumint(8) unsigned NOT NULL default '0',
   `account` char(30) NOT NULL default '',
   `password` char(32) NOT NULL default '',
@@ -1109,6 +1307,41 @@ CREATE TABLE IF NOT EXISTS `zt_webhook` (
   `deleted` enum('0', '1') NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_weeklyreport`;
+CREATE TABLE `zt_weeklyreport`(
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `program` mediumint(8) unsigned NOT NULL,
+  `weekStart` date NOT NULL,
+  `pv` float(9,2) NOT NULL,
+  `ev` float(9,2) NOT NULL,
+  `ac` float(9,2) NOT NULL,
+  `sv` float(9,2) NOT NULL,
+  `cv` float(9,2) NOT NULL,
+  `staff` smallint(5) unsigned NOT NULL,
+  `progress` varchar(255) NOT NULL,
+  `workload` varchar(255) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `week` (`program`,`weekStart`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_workestimation`;
+CREATE TABLE `zt_workestimation` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `program` mediumint(8) unsigned NOT NULL,
+  `scale` mediumint(8) unsigned NOT NULL,
+  `productivity` smallint(3) unsigned NOT NULL,
+  `duration` mediumint(8) unsigned NOT NULL,
+  `unitLaborCost` mediumint(8) unsigned NOT NULL,
+  `totalLaborCost` mediumint(8) unsigned NOT NULL,
+  `createdBy` varchar(30) NOT NULL,
+  `createdDate` datetime NOT NULL,
+  `editedBy` varchar(30) NOT NULL,
+  `editedDate` datetime NOT NULL,
+  `assignedTo` varchar(30) NOT NULL,
+  `assignedDate` datetime NOT NULL,
+  `deleted` enum('0','1') NOT NULL DEFAULT '0',
+  `dayHour` float(5,2) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_log`;
 CREATE TABLE IF NOT EXISTS `zt_log` (
   `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
@@ -3823,3 +4056,13 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (11, 'user', 'todo'),
 (11, 'user', 'view'),
 (12, 'my', 'limited');
+
+INSERT INTO `zt_stage` (`name`,`percent`,`type`,`createdBy`,`createdDate`,`editedBy`,`editedDate`,`deleted`) VALUES 
+('需求','10','request','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'),
+('设计','10','design','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'), 
+('开发','50','dev','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'),
+('测试','15','qa','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'), 
+('发布','10','release','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'),
+('总结评审','5','review','admin','2020-02-08 21:08:45','admin','2020-02-12 13:50:27','0');
+
+INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system','custom','','storyPoint','1');

module/design/lang/zh-cn.php

@@ -20,7 +20,7 @@ $lang->design->type          = '设计类型';
 $lang->design->name          = '设计名称';
 $lang->design->create        = '创建设计';
 $lang->design->batchCreate   = '批量创建';
-$lang->design->view          = '查看设计';
+$lang->design->view          = '设计概况';
 $lang->design->desc          = '设计描述';
 $lang->design->product       = '所属产品';
 $lang->design->basicInfo     = '基础信息';

module/group/lang/resource.php

@@ -17,10 +17,13 @@ $lang->moduleOrder[10]  = 'todo';
 
 $lang->moduleOrder[11]  = 'program';
 $lang->moduleOrder[12]  = 'design';
+$lang->moduleOrder[13]  = 'programplan';
 $lang->moduleOrder[15]  = 'product';
 $lang->moduleOrder[20]  = 'story';
 $lang->moduleOrder[25]  = 'productplan';
 $lang->moduleOrder[30]  = 'release';
+$lang->moduleOrder[31]  = 'issue';
+$lang->moduleOrder[32]  = 'risk';
 
 $lang->moduleOrder[35]  = 'project';
 $lang->moduleOrder[40]  = 'task';
@@ -36,14 +39,22 @@ $lang->moduleOrder[80]  = 'caselib';
 
 $lang->moduleOrder[85]  = 'doc';
 $lang->moduleOrder[90]  = 'report';
+$lang->moduleOrder[91]  = 'workestimation';
+$lang->moduleOrder[92]  = 'durationestimation';
+$lang->moduleOrder[93]  = 'budget';
 
 $lang->moduleOrder[95]  = 'company';
+$lang->moduleOrder[96]  = 'milestone';
+$lang->moduleOrder[97]  = 'stage';
+$lang->moduleOrder[98]  = 'weekly';
 $lang->moduleOrder[100] = 'dept';
 $lang->moduleOrder[105] = 'group';
 $lang->moduleOrder[110] = 'user';
 
 $lang->moduleOrder[115] = 'admin';
 $lang->moduleOrder[120] = 'extension';
+$lang->moduleOrder[121] = 'subject';
+$lang->moduleOrder[122] = 'holiday';
 $lang->moduleOrder[125] = 'custom';
 $lang->moduleOrder[140] = 'action';
 
@@ -88,6 +99,7 @@ $lang->resource->my->changePassword = 'changePassword';
 $lang->resource->my->manageContacts = 'manageContacts';
 $lang->resource->my->deleteContacts = 'deleteContacts';
 $lang->resource->my->score          = 'score';
+$lang->resource->my->unbind         = 'unbind';
 
 $lang->my->methodOrder[0]  = 'index';
 $lang->my->methodOrder[5]  = 'todo';
@@ -106,6 +118,7 @@ $lang->my->methodOrder[65] = 'changePassword';
 $lang->my->methodOrder[75] = 'manageContacts';
 $lang->my->methodOrder[80] = 'deleteContacts';
 $lang->my->methodOrder[85] = 'score';
+$lang->my->methodOrder[90] = 'unbind';
 
 /* Todo. */
 $lang->resource->todo = new stdclass();
@@ -180,6 +193,32 @@ $lang->program->methodOrder[60] = 'setPlanduration';
 $lang->program->methodOrder[65] = 'manageMembers';
 $lang->program->methodOrder[70] = 'export';
 
+/* Issue . */
+$lang->resource->issue = new stdclass();
+$lang->resource->issue->browse        = 'browse';
+$lang->resource->issue->create        = 'create';
+$lang->resource->issue->batchCreate   = 'batchCreate';
+$lang->resource->issue->delete        = 'delete';
+$lang->resource->issue->edit          = 'edit';
+$lang->resource->issue->assignTo      = 'assignTo';
+$lang->resource->issue->close         = 'close';
+$lang->resource->issue->cancel        = 'cancel';
+$lang->resource->issue->activate      = 'activate';
+$lang->resource->issue->resolve       = 'resolve';
+$lang->resource->issue->view          = 'view';
+
+$lang->issue->methodOrder[5]  = 'browse';
+$lang->issue->methodOrder[10] = 'create';
+$lang->issue->methodOrder[15] = 'batchCreate';
+$lang->issue->methodOrder[20] = 'delete';
+$lang->issue->methodOrder[25] = 'edit';
+$lang->issue->methodOrder[30] = 'assignTo';
+$lang->issue->methodOrder[35] = 'close';
+$lang->issue->methodOrder[40] = 'cancel';
+$lang->issue->methodOrder[45] = 'activate';
+$lang->issue->methodOrder[50] = 'resolve';
+$lang->issue->methodOrder[60] = 'view';
+
 /* Risk . */
 $lang->resource->risk = new stdclass();
 $lang->resource->risk->browse      = 'browse';
@@ -193,6 +232,7 @@ $lang->resource->risk->batchCreate = 'batchCreate';
 $lang->resource->risk->cancel      = 'cancel';
 $lang->resource->risk->track       = 'track';
 $lang->resource->risk->view        = 'view';
+$lang->resource->risk->assignTo    = 'assignTo';
 
 $lang->risk->methodOrder[5]  = 'browse';
 $lang->risk->methodOrder[10] = 'create';
@@ -205,6 +245,7 @@ $lang->risk->methodOrder[40] = 'batchCreate';
 $lang->risk->methodOrder[45] = 'cancel';
 $lang->risk->methodOrder[50] = 'track';
 $lang->risk->methodOrder[55] = 'view';
+$lang->risk->methodOrder[60] = 'assignTo';
 
 /* Product. */
 $lang->resource->product = new stdclass();
@@ -279,6 +320,7 @@ $lang->resource->story->batchChangeBranch = 'batchChangeBranch';
 $lang->resource->story->batchChangeStage  = 'batchChangeStage';
 $lang->resource->story->batchAssignTo     = 'batchAssignTo';
 $lang->resource->story->batchChangeModule = 'batchChangeModule';
+$lang->resource->story->track             = 'track';
 
 $lang->story->methodOrder[5]   = 'create';
 $lang->story->methodOrder[10]  = 'batchCreate';
@@ -304,6 +346,7 @@ $lang->story->methodOrder[105] = 'report';
 $lang->story->methodOrder[110] = 'linkStory';
 $lang->story->methodOrder[115] = 'batchChangeBranch';
 $lang->story->methodOrder[120] = 'batchChangeModule';
+$lang->story->methodOrder[125] = 'track';
 
 /* Product plan. */
 $lang->resource->productplan = new stdclass();
@@ -462,22 +505,36 @@ $lang->project->methodOrder[225] = 'storySort';
 
 /* Design. */
 $lang->resource->design = new stdclass();
-$lang->resource->design->browse   = 'browse';
-$lang->resource->design->create   = 'create';
-$lang->resource->design->edit     = 'edit';
-$lang->resource->design->commit   = 'commit';
-$lang->resource->design->revision = 'revision';
-$lang->resource->design->delete   = 'delete';
-$lang->resource->design->view     = 'view';
+$lang->resource->design->browse      = 'browse';
+$lang->resource->design->create      = 'create';
+$lang->resource->design->batchCreate = 'batchCreate';
+$lang->resource->design->edit        = 'edit';
+$lang->resource->design->commit      = 'commit';
+$lang->resource->design->revision    = 'revision';
+$lang->resource->design->delete      = 'delete';
+$lang->resource->design->view        = 'view';
 
 $lang->design->methodOrder[5]     = 'browse';
 $lang->design->methodOrder[10]    = 'create';
+$lang->design->methodOrder[11]    = 'batchCreate';
 $lang->design->methodOrder[15]    = 'edit';
 $lang->design->methodOrder[20]    = 'commit';
 $lang->design->methodOrder[25]    = 'revision';
 $lang->design->methodOrder[30]    = 'delete';
 $lang->design->methodOrder[35]    = 'view';
 
+/* Program plan. */
+$lang->resource->programplan = new stdclass();
+$lang->resource->programplan->browse = 'browse';
+$lang->resource->programplan->create = 'create';
+$lang->resource->programplan->edit   = 'edit';
+$lang->resource->programplan->delete = 'delete';
+
+$lang->programplan->methodOrder[5]  = 'browse';
+$lang->programplan->methodOrder[10] = 'create';
+$lang->programplan->methodOrder[15] = 'edit';
+$lang->programplan->methodOrder[20] = 'delete';
+
 /* Task. */
 $lang->resource->task = new stdclass();
 $lang->resource->task->create             = 'create';
@@ -876,7 +933,7 @@ $lang->doc->methodOrder[65] = 'sort';
 $lang->doc->methodOrder[70] = 'collect';
 //$lang->doc->methodOrder[55] = 'diff';
 
-/* mail. */
+/* Mail. */
 $lang->resource->mail = new stdclass();
 $lang->resource->mail->index  = 'index';
 $lang->resource->mail->detect = 'detectAction';
@@ -904,7 +961,25 @@ $lang->mail->methodOrder[50] = 'resend';
 $lang->mail->methodOrder[55] = 'sendCloud';
 $lang->mail->methodOrder[60] = 'sendcloudUser';
 
-/* custom. */
+/* Subject. */
+$lang->resource->subject = new stdclass();
+$lang->resource->subject->browse = 'browse';
+
+$lang->subject->methodOrder[5]  = 'browse';
+
+/* Holiday. */
+$lang->resource->holiday = new stdclass();
+$lang->resource->holiday->browse = 'browse';
+$lang->resource->holiday->create = 'create';
+$lang->resource->holiday->edit   = 'edit';
+$lang->resource->holiday->delete = 'delete';
+
+$lang->holiday->methodOrder[5]  = 'browse';
+$lang->holiday->methodOrder[10] = 'create';
+$lang->holiday->methodOrder[15] = 'edit';
+$lang->holiday->methodOrder[20] = 'delete';
+
+/* Custom. */
 $lang->resource->custom = new stdclass();
 $lang->resource->custom->index     = 'index';
 $lang->resource->custom->set       = 'set';
@@ -913,6 +988,11 @@ $lang->resource->custom->flow      = 'flow';
 $lang->resource->custom->working   = 'working';
 $lang->resource->custom->setPublic = 'setPublic';
 $lang->resource->custom->timezone  = 'timezone';
+$lang->resource->custom->estimate  = 'estimate';
+$lang->resource->custom->plan      = 'plan';
+$lang->resource->custom->concept   = 'concept';
+$lang->resource->custom->setcmmi   = 'setcmmi';
+$lang->resource->custom->setscrum  = 'setscrum';
 
 $lang->custom->methodOrder[5]  = 'index';
 $lang->custom->methodOrder[10] = 'set';
@@ -921,6 +1001,11 @@ $lang->custom->methodOrder[20] = 'flow';
 $lang->custom->methodOrder[25] = 'working';
 $lang->custom->methodOrder[30] = 'setPublic';
 $lang->custom->methodOrder[35] = 'timezone';
+$lang->custom->methodOrder[40] = 'estimate';
+$lang->custom->methodOrder[45] = 'plan';
+$lang->custom->methodOrder[50] = 'concept';
+$lang->custom->methodOrder[55] = 'setcmmi';
+$lang->custom->methodOrder[60] = 'setscrum';
 
 $lang->resource->datatable = new stdclass();
 $lang->resource->datatable->setGlobal = 'setGlobal';
@@ -947,6 +1032,36 @@ $lang->git->methodOrder[5]  = 'diff';
 $lang->git->methodOrder[10] = 'cat';
 $lang->git->methodOrder[15] = 'apiSync';
 
+/* Milestone. */
+$lang->resource->milestone = new stdclass();
+$lang->resource->milestone->index            = 'index';
+$lang->resource->milestone->saveOtherProblem = 'saveOtherProblem';
+
+$lang->milestone->methodOrder[0] = 'index';
+$lang->milestone->methodOrder[5] = 'saveOtherProblem';
+
+/* Weekly. */
+$lang->resource->weekly = new stdclass();
+$lang->resource->weekly->index = 'index';
+
+$lang->weekly->methodOrder[0]  = 'index';
+
+/* Stage. */
+$lang->resource->stage = new stdclass();
+$lang->resource->stage->browse      = 'browse';
+$lang->resource->stage->create      = 'create';
+$lang->resource->stage->batchCreate = 'batchCreate';
+$lang->resource->stage->edit        = 'edit';
+$lang->resource->stage->setType     = 'setType';
+$lang->resource->stage->delete      = 'delete';
+
+$lang->stage->methodOrder[5]  = 'browse';
+$lang->stage->methodOrder[10] = 'create';
+$lang->stage->methodOrder[15] = 'batchCreate';
+$lang->stage->methodOrder[20] = 'edit';
+$lang->stage->methodOrder[25] = 'setType';
+$lang->stage->methodOrder[30] = 'delete';
+
 /* Company. */
 $lang->resource->company = new stdclass();
 $lang->resource->company->index  = 'index';
@@ -960,6 +1075,38 @@ $lang->company->methodOrder[5]  = 'browse';
 $lang->company->methodOrder[15] = 'edit';
 $lang->company->methodOrder[25] = 'dynamic';
 
+/* Work estimation. */
+$lang->resource->workestimation = new stdclass();
+$lang->resource->workestimation->index  = 'index';
+
+$lang->workestimation->methodOrder[0] = 'index';
+
+/* Duration estimation. */
+$lang->resource->durationestimation = new stdclass();
+$lang->resource->durationestimation->index  = 'index';
+$lang->resource->durationestimation->create = 'create';
+
+$lang->durationestimation->methodOrder[0] = 'index';
+$lang->durationestimation->methodOrder[5] = 'create';
+
+/* Budget. */
+$lang->resource->budget = new stdclass();
+$lang->resource->budget->browse       = 'browse';
+$lang->resource->budget->summary      = 'summary';
+$lang->resource->budget->create       = 'create';
+$lang->resource->budget->batchCreate  = 'batchCreate';
+$lang->resource->budget->edit         = 'edit';
+$lang->resource->budget->view         = 'view';
+$lang->resource->budget->delete       = 'delete';
+
+$lang->budget->methodOrder[5]  = 'browse';
+$lang->budget->methodOrder[10] = 'summary';
+$lang->budget->methodOrder[15] = 'create';
+$lang->budget->methodOrder[20] = 'batchCreate';
+$lang->budget->methodOrder[25] = 'edit';
+$lang->budget->methodOrder[30] = 'view';
+$lang->budget->methodOrder[35] = 'delete';
+
 /* Department. */
 $lang->resource->dept = new stdclass();
 $lang->resource->dept->browse      = 'browse';

module/issue/lang/zh-cn.php

@@ -35,9 +35,16 @@ $lang->issue->search            = '搜索';
 $lang->issue->basicInfo         = '基本信息';
 $lang->issue->active            = '激活';
 $lang->issue->assign            = '指派';
+$lang->issue->assignTo          = '指派问题';
 $lang->issue->create            = '新建问题';
 $lang->issue->edit              = '编辑问题';
 $lang->issue->batchCreate       = '批量新建';
+$lang->issue->close             = '关闭问题';
+$lang->issue->cancel            = '取消问题';
+$lang->issue->activate          = '激活问题';
+$lang->issue->resolve           = '解决问题';
+$lang->issue->resolve           = '解决问题';
+$lang->issue->view              = '问题概况';
 
 $lang->issue->labelList['all']       = '全部';
 $lang->issue->labelList['open']      = '开放';