Merge pull request #1611 from homholueng/V3.4.16_begin

minor: 版本号升级到 3.4.16

app.yml

@@ -6,7 +6,7 @@ is_use_celery: True
 author: 蓝鲸智云
 introduction: 标准运维是通过一套成熟稳定的任务调度引擎，把在多系统间的工作整合到一个流程，助力运维实现跨系统调度自动化的SaaS应用。
 introduction_en: SOPS is a SaaS application that utilizes a set of mature and stable task scheduling engines to help realize cross-system scheduling automation, and integrates the work among multiple systems into a single process.
-version: 3.4.15
+version: 3.4.16
 category: 运维工具
 language_support: 中文
 desktop:

config/default.py

@@ -128,7 +128,7 @@
 # Django模板中：<script src="/a.js?v="></script>
 # mako模板中：<script src="/a.js?v=${ STATIC_VERSION }"></script>
 # 如果静态资源修改了以后，上线前改这个版本号即可
-STATIC_VERSION = '3.4.15'
+STATIC_VERSION = '3.4.16'
 
 STATICFILES_DIRS = [
     os.path.join(BASE_DIR, 'static')

docs/release.md

@@ -1,5 +1,21 @@
 # Release
 
+## 3.4.16
+
+- 新功能
+  - 登陆过期小窗登陆续期支持
+  - 画布支持鼠标滚轮缩放
+  - 节点复制带上参数信息（复用输入变量，新建输出变量，复制分支数据）
+  - 批量选择节点时支持 Ctrl/Command + 鼠标左键点击取消节点选中
+- 优化项
+  - 丰富内部节点回调接口跟踪日志
+- bugfix
+  - 修复流程节点能够有多个输入连线的问题（3.4.13引入）
+  - 修复当流程中包含子流程时获取节点详情可能出错的问题
+  - 修复部分历史数据 template_source 为 business 导致任务无法读取流程名称及周期任务空白的问题
+  - 修复画布出现滚动条时框选判定区域错误问题
+  - 修复执行作业输出参数勾选后，切换作业模板没有删除对应全局变量的问题
+
 ## 3.4.15
 
 - 优化项

locale/en/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-12-06 14:47+0800\n"
+"POT-Creation-Date: 2019-12-20 15:26+0800\n"
 "PO-Revision-Date: 2017-11-17 11:28+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.6.0\n"
+"Generated-By: Babel 2.7.0\n"
 
 #: blueapps/account/admin.py:25
 msgid "Personal info"
@@ -177,7 +177,7 @@ msgid "流程超时时间(分钟)"
 msgstr "Time-out"
 
 #: gcloud/commons/template/models.py:199 gcloud/contrib/appmaker/models.py:272
-#: gcloud/taskflow3/models.py:784 pipeline/models.py:284
+#: gcloud/taskflow3/models.py:790 pipeline/models.py:284
 msgid "是否删除"
 msgstr "Deleted"
 
@@ -290,8 +290,8 @@ msgstr "Mini-App of current operation does not exist or has been deleted!"
 msgid "删除失败：%s"
 msgstr "Delete failed: %s"
 
-#: gcloud/contrib/appmaker/models.py:259 gcloud/periodictask/models.py:83
-#: gcloud/taskflow3/models.py:759 gcloud/tasktmpl3/models.py:363
+#: gcloud/contrib/appmaker/models.py:259 gcloud/periodictask/models.py:84
+#: gcloud/taskflow3/models.py:765 gcloud/tasktmpl3/models.py:363
 msgid "所属项目"
 msgstr "Belong to project"
 
@@ -373,7 +373,7 @@ msgstr "Rejected"
 msgid "已执行"
 msgstr "Executed"
 
-#: gcloud/contrib/function/models.py:27 gcloud/taskflow3/models.py:408
+#: gcloud/contrib/function/models.py:27 gcloud/taskflow3/models.py:409
 #: gcloud/tasktmpl3/models.py:129
 msgid "已完成"
 msgstr "Finished"
@@ -804,7 +804,7 @@ msgstr "FileSystem Path"
 msgid "FS远程包源 FileSystemOriginalSource"
 msgstr "FileSystemOriginalSource"
 
-#: gcloud/external_plugins/models/sync.py:25 gcloud/taskflow3/models.py:402
+#: gcloud/external_plugins/models/sync.py:25 gcloud/taskflow3/models.py:403
 #: gcloud/tasktmpl3/models.py:123
 #: gcloud/tests/external_plugins/models/test_sync_task.py:38
 msgid "执行中"
@@ -830,7 +830,7 @@ msgstr "Deployment Trigger"
 msgid "执行者"
 msgstr "Executor"
 
-#: gcloud/external_plugins/models/sync.py:38 gcloud/taskflow3/models.py:773
+#: gcloud/external_plugins/models/sync.py:38 gcloud/taskflow3/models.py:779
 msgid "创建方式"
 msgstr "Creation method"
 
@@ -856,62 +856,62 @@ msgstr "Sync Details"
 msgid "远程包源同步任务 SyncTask"
 msgstr "SyncTask"
 
-#: gcloud/periodictask/models.py:87
+#: gcloud/periodictask/models.py:88
 msgid "pipeline 层周期任务"
 msgstr "Periodic task in pipeline"
 
-#: gcloud/periodictask/models.py:88 gcloud/taskflow3/models.py:769
+#: gcloud/periodictask/models.py:89 gcloud/taskflow3/models.py:775
 msgid "创建任务所用的模板ID"
 msgstr "Template ID for task creation"
 
-#: gcloud/periodictask/models.py:89 gcloud/taskflow3/models.py:770
+#: gcloud/periodictask/models.py:90 gcloud/taskflow3/models.py:776
 msgid "流程模板来源"
 msgstr "Template source"
 
-#: gcloud/periodictask/models.py:96 gcloud/periodictask/models.py:97
+#: gcloud/periodictask/models.py:97 gcloud/periodictask/models.py:98
 msgid "周期任务 PeriodicTask"
 msgstr "Periodic Task"
 
-#: gcloud/periodictask/models.py:142
+#: gcloud/periodictask/models.py:143
 msgid "流程模板[project={project}, id={template_id}]不存在"
 msgstr "Template[project={project}, id={template_id}] not exists"
 
-#: gcloud/periodictask/models.py:150
+#: gcloud/periodictask/models.py:151
 msgid "公共流程模板[id={template_id}]不存在"
 msgstr "Common template[id={template_id}] not exists"
 
-#: gcloud/periodictask/models.py:179
+#: gcloud/periodictask/models.py:180
 #, python-format
 msgid "获取周期任务历史相关任务实例失败：%s"
 msgstr "Get task history of periodic task failed: %s"
 
-#: gcloud/periodictask/models.py:192
+#: gcloud/periodictask/models.py:193
 msgid "pipeline 层周期任务历史"
 msgstr "Periodic task history in pipeline"
 
-#: gcloud/periodictask/models.py:193 gcloud/periodictask/permissions.py:26
+#: gcloud/periodictask/models.py:194 gcloud/periodictask/permissions.py:26
 #: gcloud/taskflow3/constants.py:23
 #: pipeline/contrib/periodic_task/models.py:395
 msgid "周期任务"
 msgstr "Periodic Task"
 
-#: gcloud/periodictask/models.py:194
+#: gcloud/periodictask/models.py:195
 msgid "流程实例"
 msgstr "Flow Instance"
 
-#: gcloud/periodictask/models.py:195
+#: gcloud/periodictask/models.py:196
 #: pipeline/contrib/periodic_task/models.py:403 pipeline/log/models.py:46
 msgid "异常信息"
 msgstr "Exception"
 
-#: gcloud/periodictask/models.py:196
+#: gcloud/periodictask/models.py:197
 #: pipeline/contrib/periodic_task/models.py:404
 #: pipeline/engine/models/core.py:837 pipeline/engine/models/core.py:931
 #: pipeline/engine/models/loop_activity.py:67
 msgid "开始时间"
 msgstr "Date Started"
 
-#: gcloud/periodictask/models.py:197
+#: gcloud/periodictask/models.py:198
 #: pipeline/contrib/periodic_task/models.py:405
 msgid "是否启动成功"
 msgstr "Start Success"
@@ -974,27 +974,27 @@ msgstr "Task ID"
 msgid "任务名称"
 msgstr "Task Name"
 
-#: gcloud/taskflow3/models.py:397 gcloud/tasktmpl3/models.py:118
+#: gcloud/taskflow3/models.py:398 gcloud/tasktmpl3/models.py:118
 msgid "未执行"
 msgstr "Created"
 
-#: gcloud/taskflow3/models.py:767
+#: gcloud/taskflow3/models.py:773
 msgid "任务类型，继承自模板"
 msgstr "Task type, inherited from flow"
 
-#: gcloud/taskflow3/models.py:777
+#: gcloud/taskflow3/models.py:783
 msgid "创建任务额外信息（App maker ID或者APP CODE）"
 msgstr "Create additional task data (App maker ID or APP CODE)"
 
-#: gcloud/taskflow3/models.py:779
+#: gcloud/taskflow3/models.py:785
 msgid "任务流程类型"
 msgstr "Task flow type"
 
-#: gcloud/taskflow3/models.py:783
+#: gcloud/taskflow3/models.py:789
 msgid "当前任务流程阶段"
 msgstr "Current task flow phase"
 
-#: gcloud/taskflow3/models.py:792 gcloud/taskflow3/models.py:793
+#: gcloud/taskflow3/models.py:798 gcloud/taskflow3/models.py:799
 msgid "流程实例 TaskFlowInstance"
 msgstr "TaskFlowInstance"