Merge pull request #502 from blackholll/v2.0.19

V2.0.19

frontend/src/components/Footer/index.tsx

@@ -4,7 +4,7 @@ import { DefaultFooter } from '@ant-design/pro-layout';
 
 export default () => (
   <DefaultFooter
-    copyright="2018-2023 loonflow 2.0.18"
+    copyright="2018-2023 loonflow 2.0.19"
     links={[
 
       {

frontend/src/pages/Ticket/TicketDetail/index.tsx

@@ -901,7 +901,7 @@ class TicketDetail extends Component<TicketDetailProps, TicketDetailState> {
 
     }
 
-    if (this.state.ticketDetailInfoData !== []) {
+    if (this.props.ticketId) {
       buttonItems.push(
         <Button type="dashed"  onClick={this.showCommentModal}>
           留言

loonflow2.0.0_init.sql

@@ -153,10 +153,9 @@ VALUES
 	(10,'pbkdf2_sha256$150000$i9YkFw57LRVg$zJiYWU6YU8BzHqTpZa2AZmAGe1ROrz41xnCnUcepnn4=',NULL,'test1111','haha','sss@111.com','',0,'admin','2020-07-21 06:54:03.944318','2020-07-21 06:54:03.944392',0,1),
 	(11,'pbkdf2_sha256$150000$IMpPp4THtW7n$QLv4QH89daAWF+D1XUNNJNm9PdyQuRmmBqjtwSJeyXE=',NULL,'fdsfds','fdsfs','fsdfsfsf@13.com','',1,'admin','2020-09-21 07:25:49.543211','2020-09-21 07:25:49.543231',0,0),
 	(12,'pbkdf2_sha256$150000$uhhAEFyioVD2$c2WHSiLpGS8HBivopq0zphvgek+Wnuak1dwyi2S+iyM=',NULL,'23424','3242342','dfsdf@121.com','',1,'admin','2020-09-21 07:26:19.688074','2020-09-21 07:26:19.688095',0,0),
-	(13,'!uce2gIID0ESM0uf6MVcdauuhadTH460pWWYHvgpl',NULL,'c\'x\'z','z\'x\'c\'z','ssss','sdfds',0,'admin','2020-09-27 07:16:53.923734','2020-09-27 07:16:53.924260',0,0),
-	(15,'!CbDPN3BTa6NrPHyYaoQoBaB5SGho9sUNFCEdZk3R',NULL,'d','sd','sd','sd',0,'admin','2020-09-28 07:05:57.676251','2020-09-28 07:05:57.676582',0,1),
-	(16,'!YUKXMECfKP2otWhQD3NQpCYD0cCBfAs35stuA1Sh',NULL,'fewf','fwd','fewf','dwf',1,'admin','2020-09-28 07:08:34.885110','2020-09-28 07:08:34.885428',0,1),
-	(17,'!AZoAGIvCwPtUJU1yzXfNDwSCrBjTKbTnZSAF2CMX',NULL,'fdsfwe','fes','dfsd','21222',1,'admin','2020-09-29 07:41:14.245816','2020-09-29 07:41:14.246100',0,1);
+	(13,'pbkdf2_sha256$150000$nex53BPJ3f0T$jsJjWHmpVp11aIt7F8eyKVK2l+YjH8k0GP4oOQf8Jw4=',NULL,'zhangsan','zhangsan','zhangsan@121.com','',1,'admin','2020-09-21 07:26:19.688074','2020-09-21 07:26:19.688095',0,0),
+	(14,'pbkdf2_sha256$150000$nex53BPJ3f0T$jsJjWHmpVp11aIt7F8eyKVK2l+YjH8k0GP4oOQf8Jw4=',NULL,'lisi','lisi','lisi@121.com','',1,'admin','2020-09-21 07:26:19.688074','2020-09-21 07:26:19.688095',0,0),
+	(15,'pbkdf2_sha256$150000$nex53BPJ3f0T$jsJjWHmpVp11aIt7F8eyKVK2l+YjH8k0GP4oOQf8Jw4=',NULL,'wangwu','wangwu','wangwu@121.com','',1,'admin','2020-09-21 07:26:19.688074','2020-09-21 07:26:19.688095',0,0);
 
 /*!40000 ALTER TABLE `account_loonuser` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -1190,7 +1189,7 @@ LOCK TABLES `workflow_customfield` WRITE;
 
 INSERT INTO `workflow_customfield` (`id`, `workflow_id`, `field_type_id`, `field_key`, `field_name`, `order_id`, `default_value`, `description`, `field_template`, `boolean_field_display`, `creator`, `gmt_created`, `gmt_modified`, `is_deleted`, `field_choice`, `label`, `placeholder`)
 VALUES
-	(1,1,30,'leave_start12','开始时间',20,'','','','{}','admin','2018-04-23 20:56:25.940486','2018-05-11 07:31:11.133782',0,'{}','{}',''),
+	(1,1,30,'leave_start','开始时间',20,'','','','{}','admin','2018-04-23 20:56:25.940486','2018-05-11 07:31:11.133782',0,'{}','{}',''),
 	(2,1,30,'leave_end','结束时间',25,NULL,'','','{}','admin','2018-05-10 07:41:03.717540','2018-05-11 07:31:19.923554',0,'{}','{}',''),
 	(4,1,60,'leave_proxy','代理人',35,NULL,'请假期间的代理人','','{}','admin','2018-05-11 07:31:01.068850','2018-05-11 07:31:35.323117',0,'{}','',''),
 	(5,1,35,'leave_type','请假类型',40,NULL,'','','{}','admin','2018-05-11 07:34:29.608579','2018-05-23 22:38:57.324916',0,'{\"1\": \"年假\", \"2\": \"调休\", \"3\": \"病假\", \"4\": \"婚假\"}','{}',''),
@@ -1387,7 +1386,7 @@ LOCK TABLES `workflow_workflow` WRITE;
 
 INSERT INTO `workflow_workflow` (`id`, `name`, `description`, `display_form_str`, `creator`, `gmt_created`, `gmt_modified`, `is_deleted`, `view_permission_check`, `limit_expression`, `notices`, `title_template`, `content_template`)
 VALUES
-	(1,'请假申请','请假申请','[\"sn\", \"title\", \"leave_start\", \"leave_end\", \"leave_days\", \"leave_proxy\",  \"leave_type\", \"creator\", \"gmt_created\", \"leave_reason\"]','admin','2018-04-23 20:49:32.229386','2018-10-22 08:05:15.574860',0,1,'{}','1,2','你有一个待办工单:{title22}','标题:{title}, 创建时间:{gmt_created222'),
+	(1,'请假申请','请假申请','[\"sn\", \"title\", \"leave_start\", \"leave_end\", \"leave_days\", \"leave_proxy\",  \"leave_type\", \"creator\", \"gmt_created\", \"leave_reason\"]','admin','2018-04-23 20:49:32.229386','2018-10-22 08:05:15.574860',0,1,'{}','1,2','你有一个待办工单:{title}','标题:{title}, 创建时间:{gmt_created}'),
 	(2,'vpn申请','vpn权限申请','[\"sn\", \"title\", \"model\", \"gmt_created\",\"participant.participant_alias\",\"vpn_reason\"]','admin','2018-05-06 12:32:36.690665','2018-11-05 23:32:57.667206',0,1,'{}','','','');
 
 /*!40000 ALTER TABLE `workflow_workflow` ENABLE KEYS */;

service/ticket/ticket_base_service.py

@@ -1729,6 +1729,10 @@ def deliver_ticket(cls, ticket_id: int, username: str, target_username: str, sug
                                     participant=username, state_id=ticket_obj.state_id, creator=username,
                                     ticket_data=all_ticket_data_json)
         cls.add_ticket_flow_log(ticket_flow_log_dict)
+
+        from tasks import send_ticket_notice
+        send_ticket_notice.apply_async(args=[ticket_id], queue='loonflow')
+
         return True, ''
 
     @classmethod
@@ -1766,6 +1770,8 @@ def add_node_ticket(cls, ticket_id: int, username: str, target_username: str, su
                                     participant=username, state_id=ticket_obj.state_id, creator=username,
                                     ticket_data=all_ticket_data_json)
         cls.add_ticket_flow_log(ticket_flow_log_dict)
+        from tasks import send_ticket_notice
+        send_ticket_notice.apply_async(args=[ticket_id], queue='loonflow')
         return True, ''
 
     @classmethod
@@ -1804,6 +1810,9 @@ def add_node_ticket_end(cls, ticket_id: int, username: str, suggestion: str):
                                     participant=username, state_id=ticket_obj.state_id, creator=username,
                                     ticket_data=all_ticket_data_json)
         cls.add_ticket_flow_log(ticket_flow_log_dict)
+
+        from tasks import send_ticket_notice
+        send_ticket_notice.apply_async(args=[ticket_id], queue='loonflow')
         return True, ''
 
     @classmethod

settings/common.py

@@ -14,7 +14,7 @@
 import platform
 
 
-VERSION = '2.0.18'
+VERSION = '2.0.19'
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

sphinx_docs/source/about/get_source.rst

@@ -6,10 +6,10 @@
 ::
 
   # loonflow
-  git clone git@github.com:blackholll/loonflow.git
-  git checkout vx.x.x  #(具体的版本号，如v0.3.15）拉取代码
+  https://github.com/blackholll/loonflow/releases 中下载最新版本
+  loonflow自带react版本前端，支持创建，处理工单，支持配置工作流等功能
 
-  # howflow-open: vue.js版本前端+django后端的调用方，基于钉钉生态，移动端审批
+  # howflow-open: vue.js版本前端+django后端的调用方demo，基于钉钉生态，移动端审批
   https://gitee.com/shihow/howflow-open
 
   # shutongflow: vue.js版本前端+django后端的调用方demo

sphinx_docs/source/others/release_note.rst

@@ -4,16 +4,24 @@
 
 
 
+---------
+r2.0.19
+---------
+- 修复: 新建工单时不应该出现留言的按钮
+- 修复: 初始sql中示例工作流配置信息错误
+- 修复: 转交工单，加签工单未触发通知hook
+
+
 ---------
 r2.0.18
 ---------
-- 修复: 【用户管理】添加用户时候必填项标记缺失
+- 修复:【用户管理】添加用户时候必填项标记缺失
 - 优化:【部署】docker compose部署新增media目录配置
-- 优化: 【管理后台】svg背景文件迁移到本地
-- 修复：【用户管理】部门管理页面新增记录时上级部门只能选择当前页列表中的部门
-- 修复： 【用户管理】用户角色页面无法切换当前页
-- 修复: 【工单详情】当日期或日期时间字段为空时直接退回工单，会导致后续此字段无法编辑
-- 修复： 【工单详情】处理工单时文件类型字段的必填校验不生效
+- 优化:【管理后台】svg背景文件迁移到本地
+- 修复:【用户管理】部门管理页面新增记录时上级部门只能选择当前页列表中的部门
+- 修复:【用户管理】用户角色页面无法切换当前页
+- 修复:【工单详情】当日期或日期时间字段为空时直接退回工单，会导致后续此字段无法编辑
+- 修复:【工单详情】处理工单时文件类型字段的必填校验不生效
 
 
 ---------