@@ -31,7 +31,10 @@
| {{$index+1}} |
- {{item.value}} |
+
+ {{item.value}}
+ {{item.value}}
+ |
{{item.key}} |
@@ -49,6 +52,8 @@
import { mapActions } from 'vuex'
import { pie } from './chartConfig'
import Chart from '@/module/ana-charts'
+ import echarts from 'echarts'
+ import store from '@/conf/home/store'
import mNoData from '@/module/components/noData/noData'
import { stateType } from '@/conf/home/pages/projects/pages/_source/instanceConditions/common'
export default {
@@ -57,7 +62,8 @@
return {
isSpin: true,
msg: '',
- processStateList: []
+ processStateList: [],
+ currentName: ''
}
},
props: {
@@ -83,7 +89,7 @@
value: v.count
}
})
- const myChart = Chart.pie('#process-state-pie', this.processStateList, { title: '' })
+ const myChart = Chart.pie('#process-state-pie', this.processStateList, { title: '' })
myChart.echart.setOption(pie)
// 首页不允许跳转
if (this.searchParams.projectId) {
@@ -108,11 +114,15 @@
this.isSpin = false
})
}
+ },
+ '$store.state.projects.sideBar': function() {
+ echarts.init(document.getElementById('process-state-pie')).resize()
}
},
beforeCreate () {
},
created () {
+ this.currentName = this.$router.currentRoute.name
},
beforeMount () {
},
@@ -132,7 +142,4 @@
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue
index 3e56c344f7..60e9413b2e 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue
@@ -19,7 +19,7 @@
@@ -32,8 +32,9 @@
| {{$index+1}} |
-
- {{item.value}}
+ {{item.value}}
+
+ {{item.value}}
|
{{item.key}} |
@@ -53,6 +54,8 @@
import { mapActions } from 'vuex'
import { pie } from './chartConfig'
import Chart from '@/module/ana-charts'
+ import echarts from 'echarts'
+ import store from '@/conf/home/store'
import mNoData from '@/module/components/noData/noData'
import { stateType } from '@/conf/home/pages/projects/pages/_source/instanceConditions/common'
@@ -62,7 +65,8 @@
return {
isSpin: true,
msg: '',
- taskCtatusList: []
+ taskCtatusList: [],
+ currentName: ''
}
},
props: {
@@ -115,11 +119,15 @@
this.isSpin = false
})
}
+ },
+ '$store.state.projects.sideBar': function() {
+ echarts.init(document.getElementById('task-status-pie')).resize()
}
},
beforeCreate () {
},
created () {
+ this.currentName = this.$router.currentRoute.name
},
beforeMount () {
},
@@ -139,7 +147,4 @@
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
index a6c7de1a1f..9ad0938009 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
@@ -108,6 +108,7 @@
data-toggle="tooltip"
:title="$t('View log')"
icon="ans-icon-log"
+ :disabled="item.taskType==='SUB_PROCESS'? true: false"
@click="_refreshLog(item)">
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue
index b4ee720d12..06626b6dcf 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue
@@ -232,7 +232,7 @@
position: absolute;
right: 0;
top: 0;
- >i {
+ >em {
font-size: 20px;
color: #2d8cf0;
cursor: pointer;
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
index d77f55722e..8320a17516 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
@@ -94,11 +94,11 @@ v-ps
+ width="190">
{{$t('Delete?')}}
{{$t('Cancel')}}
- {{$t('Confirm')}}
+ {{spinnerLoading ? 'Loading' : $t('Confirm')}}
name: 'udf-manage-list',
data () {
return {
- list: []
+ list: [],
+ spinnerLoading: false
}
},
props: {
@@ -139,15 +140,18 @@ v-ps
this.$refs[`poptip-${i}`][0].doClose()
},
_delete (item, i) {
+ this.spinnerLoading = true
this.deleteUdf({
id: item.id
}).then(res => {
this.$refs[`poptip-${i}`][0].doClose()
this.$emit('on-update')
this.$message.success(res.msg)
+ this.spinnerLoading = false
}).catch(e => {
this.$refs[`poptip-${i}`][0].doClose()
this.$message.error(e.msg || '')
+ this.spinnerLoading = false
})
},
_edit (item) {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
index eb20ff99b7..a26862a9b5 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
@@ -30,7 +30,7 @@
:disabled="item ? true : false"
v-model="tenantCode"
maxlength="60"
- :placeholder="$t('Please enter name')">
+ :placeholder="$t('Please enter tenant code')">
@@ -41,7 +41,7 @@
type="input"
v-model="tenantName"
maxlength="60"
- :placeholder="$t('Please enter name')"
+ :placeholder="$t('Please enter tenant Name')"
autocomplete="off">
@@ -88,7 +88,7 @@
store,
queueList: [],
queueId: '',
- tenantCode: '',
+ tenantCode: null,
tenantName: '',
description: '',
}
@@ -138,12 +138,14 @@
this.$message.warning(`${i18n.$t('Please enter the tenant code in English')}`)
return false
}
+
if (!isEn.test(this.tenantCode) || _.startsWith(this.tenantCode, '_', 0) || _.startsWith(this.tenantCode, '.', 0)) {
this.$message.warning(`${i18n.$t('Please enter tenant code in English')}`)
return false
}
+
if (!this.tenantName.replace(/\s*/g,"")) {
- this.$message.warning(`${i18n.$t('Please enter name')}`)
+ this.$message.warning(`${i18n.$t('Please enter tenant Name')}`)
return false
}
// Verify tenant name cannot contain special characters
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue
index 5cc1ca8d8f..57aa660d0c 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue
@@ -23,7 +23,7 @@
- *{{$t('Failure time')}}
+ *{{$t('Expiration time')}}
Token
|
- {{$t('Failure time')}}
+ {{$t('Expiration time')}}
|
{{$t('Create Time')}}
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/projects/mutations.js b/dolphinscheduler-ui/src/js/conf/home/store/projects/mutations.js
index e84c864c3c..17e92fd258 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/projects/mutations.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/projects/mutations.js
@@ -16,4 +16,10 @@
*/
export default {
+ /**
+ * set sideBar
+ * */
+ setSideBar (state, payload) {
+ state.sideBar = payload
+ },
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/projects/state.js b/dolphinscheduler-ui/src/js/conf/home/store/projects/state.js
index ddcb8e289d..40b7b38ddb 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/projects/state.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/projects/state.js
@@ -15,5 +15,5 @@
* limitations under the License.
*/
export default {
-
+ sideBar: 1
}
diff --git a/dolphinscheduler-ui/src/js/module/components/fileUpdate/fileChildReUpdate.vue b/dolphinscheduler-ui/src/js/module/components/fileUpdate/fileChildReUpdate.vue
new file mode 100644
index 0000000000..5e048bcb6e
--- /dev/null
+++ b/dolphinscheduler-ui/src/js/module/components/fileUpdate/fileChildReUpdate.vue
@@ -0,0 +1,336 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+
+
+
+
+
+
+
diff --git a/dolphinscheduler-ui/src/js/module/components/fileUpdate/fileReUpload.vue b/dolphinscheduler-ui/src/js/module/components/fileUpdate/fileReUpload.vue
new file mode 100644
index 0000000000..c0ea678470
--- /dev/null
+++ b/dolphinscheduler-ui/src/js/module/components/fileUpdate/fileReUpload.vue
@@ -0,0 +1,335 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+
+
+
+
+
+
+
diff --git a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteProjectTest.java b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteProjectTest.java
new file mode 100644
index 0000000000..dc45b6e573
--- /dev/null
+++ b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteProjectTest.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dolphinscheduler.testcase.deleteData;
+
+import org.apache.dolphinscheduler.base.BaseTest;
+import org.apache.dolphinscheduler.page.project.CreateProjectPage;
+import org.testng.annotations.Test;
+
+public class DeleteProjectTest extends BaseTest {
+ private CreateProjectPage createProjectPage;
+
+ @Test(groups={"functionTests"},dependsOnGroups = { "login","project"},description = "DeleteProjectTest",priority=7)
+ public void testDeleteProject() throws InterruptedException {
+ createProjectPage = new CreateProjectPage(driver);
+ //jump to project manage page
+ System.out.println("jump to the project manage page to delete project");
+ createProjectPage.jumpProjectManagePage();
+
+ //assert tenant manage page
+ System.out.println("start delete project");
+ assert createProjectPage.deleteProject();
+ System.out.println("end delete project");
+ System.out.println("===================================");
+ }
+}
diff --git a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteTenantTest.java b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteTenantTest.java
new file mode 100644
index 0000000000..067bc4a973
--- /dev/null
+++ b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteTenantTest.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dolphinscheduler.testcase.deleteData;
+
+import org.apache.dolphinscheduler.base.BaseTest;
+import org.apache.dolphinscheduler.page.security.TenantManagePage;
+import org.testng.annotations.Test;
+
+public class DeleteTenantTest extends BaseTest {
+ private TenantManagePage tenantManagePage;
+
+ @Test(groups={"functionTests"},dependsOnGroups = { "login","createTenant"},description = "DeleteTenantTest",priority=9)
+ public void testDeleteTenant() throws InterruptedException {
+ tenantManagePage = new TenantManagePage(driver);
+ //assert tenant manage page
+ System.out.println("jump to security to delete tenant");
+ tenantManagePage.jumpSecurity();
+
+ System.out.println("start delete tenant");
+ assert tenantManagePage.deleteTenant();
+ System.out.println("end delete tenant");
+ System.out.println("===================================");
+ }
+}
diff --git a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteUserTest.java b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteUserTest.java
new file mode 100644
index 0000000000..4507192217
--- /dev/null
+++ b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteUserTest.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dolphinscheduler.testcase.deleteData;
+
+import org.apache.dolphinscheduler.base.BaseTest;
+import org.apache.dolphinscheduler.page.security.TenantManagePage;
+import org.apache.dolphinscheduler.page.security.UserManagePage;
+import org.testng.annotations.Test;
+
+public class DeleteUserTest extends BaseTest {
+ private UserManagePage userManagePage;
+ private TenantManagePage tenantManagePage;
+
+ @Test(groups={"functionTests"},dependsOnGroups = { "login","user" },description = "DeleteUserTest",priority=8)
+ public void testDeleteUser() throws InterruptedException {
+ tenantManagePage = new TenantManagePage(driver);
+ System.out.println("jump to security to delete user");
+ tenantManagePage.jumpSecurity();
+
+ userManagePage = new UserManagePage(driver);
+ //assert user manage page
+ System.out.println("start delete user");
+ assert userManagePage.deleteUser();
+ System.out.println("end delete user");
+ System.out.println("===================================");
+ }
+}
+
diff --git a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteWorkflowTest.java b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteWorkflowTest.java
new file mode 100644
index 0000000000..48eb0912fe
--- /dev/null
+++ b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteWorkflowTest.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dolphinscheduler.testcase.deleteData;
+
+import org.apache.dolphinscheduler.base.BaseTest;
+import org.apache.dolphinscheduler.page.project.CreateProjectPage;
+import org.apache.dolphinscheduler.page.project.CreateWorkflowPage;
+import org.testng.annotations.Test;
+
+public class DeleteWorkflowTest extends BaseTest {
+ private CreateWorkflowPage createWorkflowPage;
+ private CreateProjectPage createProjectPage;
+
+ @Test(groups={"functionTests"},dependsOnGroups = { "login","workflow"},description = "DeleteWorkflowTest",priority=6)
+ public void testDeleteWorkflow() throws InterruptedException {
+ createProjectPage = new CreateProjectPage(driver);
+ //jump to project manage page
+ System.out.println("jump to the project manage page to delete workflow");
+ createProjectPage.jumpProjectManagePage();
+
+ createWorkflowPage = new CreateWorkflowPage(driver);
+ createWorkflowPage.jumpWorkflowPage();
+ //assert tenant manage page
+ System.out.println("start delete workflow");
+ assert createWorkflowPage.deleteWorkflow();
+ System.out.println("end delete workflow");
+ System.out.println("===================================");
+ }
+}
diff --git a/sql/upgrade/1.3.2_schema/mysql/dolphinscheduler_dml.sql b/sql/upgrade/1.3.2_schema/mysql/dolphinscheduler_dml.sql
new file mode 100644
index 0000000000..383d8a4407
--- /dev/null
+++ b/sql/upgrade/1.3.2_schema/mysql/dolphinscheduler_dml.sql
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+SET sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''));
+SET FOREIGN_KEY_CHECKS=0;
+UPDATE t_ds_user SET phone = '' WHERE phone = 'xx';
\ No newline at end of file
diff --git a/sql/upgrade/1.3.2_schema/postgresql/dolphinscheduler_dml.sql b/sql/upgrade/1.3.2_schema/postgresql/dolphinscheduler_dml.sql
new file mode 100644
index 0000000000..bf043ad469
--- /dev/null
+++ b/sql/upgrade/1.3.2_schema/postgresql/dolphinscheduler_dml.sql
@@ -0,0 +1,17 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+UPDATE t_ds_user SET phone = '' WHERE phone = 'xx';
\ No newline at end of file
|