You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by lg...@apache.org on 2020/01/09 02:18:57 UTC
[incubator-dolphinscheduler] branch dev updated: Fixed some input
box length restrictions and udfs not getting values #109 (#1778)
This is an automated email from the ASF dual-hosted git repository.
lgcareer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new b6d6bb6 Fixed some input box length restrictions and udfs not getting values #109 (#1778)
b6d6bb6 is described below
commit b6d6bb64166716057451526fa7e3daf2eb921a86
Author: break60 <79...@qq.com>
AuthorDate: Thu Jan 9 10:18:45 2020 +0800
Fixed some input box length restrictions and udfs not getting values #109 (#1778)
* Fix api url
* Fixed DAG zoom in and zoom out nodes separated from arrows
* Fix front-end code specifications
* Fix front-end code specifications
* Fix front-end code specifications
* jest unit test demo
* jest unit test demo
* Fix delete operation, no query interface request is made on the list page
* Fix delete operation, no query interface request is made on the list page
* Fixed some input box length restrictions and udfs not getting values
---
.../conf/home/pages/dag/_source/formModel/tasks/_source/sqlType.vue | 1 -
.../js/conf/home/pages/dag/_source/formModel/tasks/_source/udfs.vue | 6 ++++--
.../home/pages/datasource/pages/list/_source/createDataSource.vue | 4 ++++
.../conf/home/pages/projects/pages/list/_source/createProject.vue | 1 +
.../js/conf/home/pages/resource/pages/file/pages/create/index.vue | 1 +
.../home/pages/resource/pages/udf/pages/resource/_source/rename.vue | 1 +
.../js/conf/home/pages/security/pages/queue/_source/createQueue.vue | 2 ++
.../home/pages/security/pages/tenement/_source/createTenement.vue | 2 ++
.../pages/security/pages/warningGroups/_source/createWarning.vue | 1 +
.../home/pages/security/pages/workerGroups/_source/createWorker.vue | 1 +
10 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/sqlType.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/sqlType.vue
index 6cad8f1..49fb4a2 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/sqlType.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/sqlType.vue
@@ -60,7 +60,6 @@
},
created () {
this.$nextTick(() => {
- console.log(this.sqlType)
if (this.sqlType != 0) {
this.sqlTypeId = this.sqlType
} else {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/udfs.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/udfs.vue
index cc81593..87ede38 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/udfs.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/udfs.vue
@@ -53,7 +53,7 @@
* verification
*/
_verifUdfs () {
- this.$emit('on-udfsData', _.map(this.udfsStr, v => v.id).join(','))
+ this.$emit('on-udfsData', this.udfsStr.join(','))
return true
},
/**
@@ -68,7 +68,6 @@
code: v.funcName
}
})
-
let udfs = _.cloneDeep(this.udfs.split(','))
if (udfs.length) {
let arr = []
@@ -87,6 +86,9 @@
}
},
watch: {
+ udfsStr (val) {
+ this._verifUdfs()
+ },
type (a) {
// The props parameter needs to be changed due to the scene.
this.udfs = ''
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue
index 07e0e8d..001535b 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue
@@ -42,6 +42,7 @@
<x-input
type="input"
v-model="name"
+ maxlength="60"
:placeholder="$t('Please enter datasource name')"
autocomplete="off">
</x-input>
@@ -64,6 +65,7 @@
<x-input
type="input"
v-model="host"
+ maxlength="60"
:placeholder="$t('Please enter IP')"
autocomplete="off">
</x-input>
@@ -97,6 +99,7 @@
<x-input
type="input"
v-model="userName"
+ maxlength="60"
:placeholder="$t('Please enter user name')"
autocomplete="off">
</x-input>
@@ -119,6 +122,7 @@
<x-input
type="input"
v-model="database"
+ maxlength="60"
:placeholder="$t('Please enter database name')"
autocomplete="off">
</x-input>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue
index 8b70988..b5a2c52 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue
@@ -24,6 +24,7 @@
<x-input
type="input"
v-model="projectName"
+ maxlength="60"
:placeholder="$t('Please enter name')"
autocomplete="off">
</x-input>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue
index 1e0e373..caa31ed 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue
@@ -24,6 +24,7 @@
<x-input
type="input"
v-model="fileName"
+ maxlength="60"
style="width: 300px;"
:placeholder="$t('Please enter name')"
autocomplete="off">
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue
index c2f65b9..69acdef 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue
@@ -24,6 +24,7 @@
<x-input
type="input"
v-model="name"
+ maxlength="60"
:placeholder="$t('Please enter name')"
autocomplete="off">
</x-input>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue
index 617270b..6afc4d5 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue
@@ -28,6 +28,7 @@
<x-input
type="input"
v-model="queueName"
+ maxlength="60"
:placeholder="$t('Please enter name')"
autocomplete="off">
</x-input>
@@ -39,6 +40,7 @@
<x-input
type="input"
v-model="queue"
+ maxlength="60"
:placeholder="$t('Please enter queue value')"
autocomplete="off">
</x-input>
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 ad93e6b..ebf644c 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
@@ -29,6 +29,7 @@
type="input"
:disabled="item ? true : false"
v-model="tenantCode"
+ maxlength="60"
:placeholder="$t('Please enter name')">
</x-input>
</template>
@@ -39,6 +40,7 @@
<x-input
type="input"
v-model="tenantName"
+ maxlength="60"
:placeholder="$t('Please enter name')"
autocomplete="off">
</x-input>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/createWarning.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/createWarning.vue
index 12dc324..28d53c5 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/createWarning.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/createWarning.vue
@@ -28,6 +28,7 @@
<x-input
type="input"
v-model="groupName"
+ maxlength="60"
:placeholder="$t('Please enter group name')">
</x-input>
</template>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/createWorker.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/createWorker.vue
index a2ca912..dd42565 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/createWorker.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/createWorker.vue
@@ -28,6 +28,7 @@
<x-input
type="input"
v-model="name"
+ maxlength="60"
:placeholder="$t('Please enter group name')">
</x-input>
</template>