Browse Source

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
pull/2/head
break60 5 years ago committed by lgcareer
parent
commit
b6d6bb6416
  1. 1
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/sqlType.vue
  2. 6
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/udfs.vue
  3. 4
      dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue
  4. 1
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue
  5. 1
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue
  6. 1
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue
  7. 2
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue
  8. 2
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
  9. 1
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/createWarning.vue
  10. 1
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/createWorker.vue

1
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/sqlType.vue

@ -60,7 +60,6 @@
}, },
created () { created () {
this.$nextTick(() => { this.$nextTick(() => {
console.log(this.sqlType)
if (this.sqlType != 0) { if (this.sqlType != 0) {
this.sqlTypeId = this.sqlType this.sqlTypeId = this.sqlType
} else { } else {

6
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/udfs.vue

@ -53,7 +53,7 @@
* verification * verification
*/ */
_verifUdfs () { _verifUdfs () {
this.$emit('on-udfsData', _.map(this.udfsStr, v => v.id).join(',')) this.$emit('on-udfsData', this.udfsStr.join(','))
return true return true
}, },
/** /**
@ -68,7 +68,6 @@
code: v.funcName code: v.funcName
} }
}) })
let udfs = _.cloneDeep(this.udfs.split(',')) let udfs = _.cloneDeep(this.udfs.split(','))
if (udfs.length) { if (udfs.length) {
let arr = [] let arr = []
@ -87,6 +86,9 @@
} }
}, },
watch: { watch: {
udfsStr (val) {
this._verifUdfs()
},
type (a) { type (a) {
// The props parameter needs to be changed due to the scene. // The props parameter needs to be changed due to the scene.
this.udfs = '' this.udfs = ''

4
dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue

@ -42,6 +42,7 @@
<x-input <x-input
type="input" type="input"
v-model="name" v-model="name"
maxlength="60"
:placeholder="$t('Please enter datasource name')" :placeholder="$t('Please enter datasource name')"
autocomplete="off"> autocomplete="off">
</x-input> </x-input>
@ -64,6 +65,7 @@
<x-input <x-input
type="input" type="input"
v-model="host" v-model="host"
maxlength="60"
:placeholder="$t('Please enter IP')" :placeholder="$t('Please enter IP')"
autocomplete="off"> autocomplete="off">
</x-input> </x-input>
@ -97,6 +99,7 @@
<x-input <x-input
type="input" type="input"
v-model="userName" v-model="userName"
maxlength="60"
:placeholder="$t('Please enter user name')" :placeholder="$t('Please enter user name')"
autocomplete="off"> autocomplete="off">
</x-input> </x-input>
@ -119,6 +122,7 @@
<x-input <x-input
type="input" type="input"
v-model="database" v-model="database"
maxlength="60"
:placeholder="$t('Please enter database name')" :placeholder="$t('Please enter database name')"
autocomplete="off"> autocomplete="off">
</x-input> </x-input>

1
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue

@ -24,6 +24,7 @@
<x-input <x-input
type="input" type="input"
v-model="projectName" v-model="projectName"
maxlength="60"
:placeholder="$t('Please enter name')" :placeholder="$t('Please enter name')"
autocomplete="off"> autocomplete="off">
</x-input> </x-input>

1
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue

@ -24,6 +24,7 @@
<x-input <x-input
type="input" type="input"
v-model="fileName" v-model="fileName"
maxlength="60"
style="width: 300px;" style="width: 300px;"
:placeholder="$t('Please enter name')" :placeholder="$t('Please enter name')"
autocomplete="off"> autocomplete="off">

1
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue

@ -24,6 +24,7 @@
<x-input <x-input
type="input" type="input"
v-model="name" v-model="name"
maxlength="60"
:placeholder="$t('Please enter name')" :placeholder="$t('Please enter name')"
autocomplete="off"> autocomplete="off">
</x-input> </x-input>

2
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue

@ -28,6 +28,7 @@
<x-input <x-input
type="input" type="input"
v-model="queueName" v-model="queueName"
maxlength="60"
:placeholder="$t('Please enter name')" :placeholder="$t('Please enter name')"
autocomplete="off"> autocomplete="off">
</x-input> </x-input>
@ -39,6 +40,7 @@
<x-input <x-input
type="input" type="input"
v-model="queue" v-model="queue"
maxlength="60"
:placeholder="$t('Please enter queue value')" :placeholder="$t('Please enter queue value')"
autocomplete="off"> autocomplete="off">
</x-input> </x-input>

2
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue

@ -29,6 +29,7 @@
type="input" type="input"
:disabled="item ? true : false" :disabled="item ? true : false"
v-model="tenantCode" v-model="tenantCode"
maxlength="60"
:placeholder="$t('Please enter name')"> :placeholder="$t('Please enter name')">
</x-input> </x-input>
</template> </template>
@ -39,6 +40,7 @@
<x-input <x-input
type="input" type="input"
v-model="tenantName" v-model="tenantName"
maxlength="60"
:placeholder="$t('Please enter name')" :placeholder="$t('Please enter name')"
autocomplete="off"> autocomplete="off">
</x-input> </x-input>

1
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/createWarning.vue

@ -28,6 +28,7 @@
<x-input <x-input
type="input" type="input"
v-model="groupName" v-model="groupName"
maxlength="60"
:placeholder="$t('Please enter group name')"> :placeholder="$t('Please enter group name')">
</x-input> </x-input>
</template> </template>

1
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/createWorker.vue

@ -28,6 +28,7 @@
<x-input <x-input
type="input" type="input"
v-model="name" v-model="name"
maxlength="60"
:placeholder="$t('Please enter group name')"> :placeholder="$t('Please enter group name')">
</x-input> </x-input>
</template> </template>

Loading…
Cancel
Save