From b6d6bb64166716057451526fa7e3daf2eb921a86 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Thu, 9 Jan 2020 10:18:45 +0800
Subject: [PATCH] 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
---
 .../pages/dag/_source/formModel/tasks/_source/sqlType.vue   | 1 -
 .../home/pages/dag/_source/formModel/tasks/_source/udfs.vue | 6 ++++--
 .../datasource/pages/list/_source/createDataSource.vue      | 4 ++++
 .../pages/projects/pages/list/_source/createProject.vue     | 1 +
 .../home/pages/resource/pages/file/pages/create/index.vue   | 1 +
 .../resource/pages/udf/pages/resource/_source/rename.vue    | 1 +
 .../home/pages/security/pages/queue/_source/createQueue.vue | 2 ++
 .../security/pages/tenement/_source/createTenement.vue      | 2 ++
 .../security/pages/warningGroups/_source/createWarning.vue  | 1 +
 .../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 6cad8f1292..49fb4a2525 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 cc81593538..87ede38b73 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 07e0e8d83e..001535b8fb 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 8b709885f3..b5a2c526de 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 1e0e373f57..caa31ed4d8 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 c2f65b908b..69acdef4a5 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 617270b0f6..6afc4d55f1 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 ad93e6b6f6..ebf644c016 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 12dc324898..28d53c5b8e 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 a2ca912f05..dd42565475 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>