This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch 1.3.2-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/1.3.2-release by this push:
new 811fd48 Before creating a workflow, clear the canvas (#3388)
811fd48 is described below
commit 811fd48f0a27b3112092b4f8b4fbeb5d55cf2da0
Author: break60 <[email protected]>
AuthorDate: Tue Aug 4 10:22:00 2020 +0800
Before creating a workflow, clear the canvas (#3388)
* Before creating a workflow, clear the canvas
* [Fix-3256][ui] herry pick commit from dev for Fix admin user info update
error (#3306)
Co-authored-by: wuchunfu <[email protected]>
---
.../src/js/conf/home/pages/dag/_source/dag.js | 12 +++++++++---
.../release-1.0.0_schema/mysql/dolphinscheduler_dml.sql | 2 +-
.../release-1.2.0_schema/postgresql/dolphinscheduler_dml.sql | 2 +-
sql/dolphinscheduler-postgre.sql | 2 +-
sql/dolphinscheduler_mysql.sql | 2 +-
5 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js
index ff8a452..5a41091 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js
@@ -52,7 +52,9 @@ Dag.prototype.setConfig = function (o) {
*/
Dag.prototype.create = function () {
const self = this
- jsPlumb.ready(() => {
+ let plumbIns = jsPlumb.getInstance()
+ plumbIns.reset()
+ plumbIns.ready(() => {
JSP.init({
dag: this.dag,
instance: this.instance,
@@ -304,7 +306,9 @@ Dag.prototype.backfill = function (arg) {
locationsValue = dataObject
const self = this
- jsPlumb.ready(() => {
+ let plumbIns = jsPlumb.getInstance()
+ plumbIns.reset()
+ plumbIns.ready(() => {
JSP.init({
dag: this.dag,
instance: this.instance,
@@ -326,7 +330,9 @@ Dag.prototype.backfill = function (arg) {
})
} else {
const self = this
- jsPlumb.ready(() => {
+ let plumbIns = jsPlumb.getInstance()
+ plumbIns.reset()
+ plumbIns.ready(() => {
JSP.init({
dag: this.dag,
instance: this.instance,
diff --git a/sql/create/release-1.0.0_schema/mysql/dolphinscheduler_dml.sql
b/sql/create/release-1.0.0_schema/mysql/dolphinscheduler_dml.sql
index e8c797b..fd65d30 100644
--- a/sql/create/release-1.0.0_schema/mysql/dolphinscheduler_dml.sql
+++ b/sql/create/release-1.0.0_schema/mysql/dolphinscheduler_dml.sql
@@ -16,7 +16,7 @@
*/
-- Records of t_escheduler_user,user : admin , password : dolphinscheduler123
-INSERT INTO `t_escheduler_user` VALUES ('1', 'admin',
'7ad2410b2f4c074479a8937a28a22b8f', '0', '[email protected]', 'xx', '0', '2018-03-27
15:48:50', '2018-10-24 17:40:22');
+INSERT INTO `t_escheduler_user` VALUES ('1', 'admin',
'7ad2410b2f4c074479a8937a28a22b8f', '0', '[email protected]', '', '0', '2018-03-27
15:48:50', '2018-10-24 17:40:22');
INSERT INTO `t_escheduler_alertgroup` VALUES (1, 'default admin warning
group', '0', 'default admin warning group','2018-11-29 10:20:39', '2018-11-29
10:20:39');
INSERT INTO `t_escheduler_relation_user_alertgroup` VALUES ('1', '1', '1',
'2018-11-29 10:22:33', '2018-11-29 10:22:33');
diff --git
a/sql/create/release-1.2.0_schema/postgresql/dolphinscheduler_dml.sql
b/sql/create/release-1.2.0_schema/postgresql/dolphinscheduler_dml.sql
index 4b83d78..d075cab 100644
--- a/sql/create/release-1.2.0_schema/postgresql/dolphinscheduler_dml.sql
+++ b/sql/create/release-1.2.0_schema/postgresql/dolphinscheduler_dml.sql
@@ -16,7 +16,7 @@
*/
-- Records of t_ds_user，user : admin , password : dolphinscheduler123
-INSERT INTO
t_ds_user(user_name,user_password,user_type,email,phone,tenant_id,create_time,update_time)
VALUES ('admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', '[email protected]', 'xx',
'0', '2018-03-27 15:48:50', '2018-10-24 17:40:22');
+INSERT INTO
t_ds_user(user_name,user_password,user_type,email,phone,tenant_id,create_time,update_time)
VALUES ('admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', '[email protected]', '',
'0', '2018-03-27 15:48:50', '2018-10-24 17:40:22');
-- Records of t_ds_alertgroup，dolphinscheduler warning group
INSERT INTO
t_ds_alertgroup(group_name,group_type,description,create_time,update_time)
VALUES ('dolphinscheduler warning group', '0', 'dolphinscheduler warning
group','2018-11-29 10:20:39', '2018-11-29 10:20:39');
diff --git a/sql/dolphinscheduler-postgre.sql b/sql/dolphinscheduler-postgre.sql
index b16965a..df93c1b 100644
--- a/sql/dolphinscheduler-postgre.sql
+++ b/sql/dolphinscheduler-postgre.sql
@@ -750,7 +750,7 @@ ALTER TABLE t_ds_worker_server ALTER COLUMN id SET DEFAULT
NEXTVAL('t_ds_worker_
-- Records of t_ds_user?user : admin , password : dolphinscheduler123
-INSERT INTO
t_ds_user(user_name,user_password,user_type,email,phone,tenant_id,create_time,update_time)
VALUES ('admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', '[email protected]', 'xx',
'0', '2018-03-27 15:48:50', '2018-10-24 17:40:22');
+INSERT INTO
t_ds_user(user_name,user_password,user_type,email,phone,tenant_id,state,create_time,update_time)
VALUES ('admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', '[email protected]', '',
'0', 1, '2018-03-27 15:48:50', '2018-10-24 17:40:22');
-- Records of t_ds_alertgroup，dolphinscheduler warning group
INSERT INTO
t_ds_alertgroup(group_name,group_type,description,create_time,update_time)
VALUES ('dolphinscheduler warning group', '0', 'dolphinscheduler warning
group','2018-11-29 10:20:39', '2018-11-29 10:20:39');
diff --git a/sql/dolphinscheduler_mysql.sql b/sql/dolphinscheduler_mysql.sql
index a6e75f5..657014b 100644
--- a/sql/dolphinscheduler_mysql.sql
+++ b/sql/dolphinscheduler_mysql.sql
@@ -814,4 +814,4 @@ INSERT INTO `t_ds_relation_user_alertgroup` VALUES ('1',
'1', '1', '2018-11-29 1
-- ----------------------------
-- Records of t_ds_user
-- ----------------------------
-INSERT INTO `t_ds_user` VALUES ('1', 'admin',
'7ad2410b2f4c074479a8937a28a22b8f', '0', '[email protected]', 'xx', '0', '2018-03-27
15:48:50', '2018-10-24 17:40:22', null);
+INSERT INTO `t_ds_user` VALUES ('1', 'admin',
'7ad2410b2f4c074479a8937a28a22b8f', '0', '[email protected]', '', '0', '2018-03-27
15:48:50', '2018-10-24 17:40:22', null, 1);
