[dolphinscheduler] branch dev updated: worked out this issue (#14438)

[kerwin]

This is an automated email from the ASF dual-hosted git repository.

kerwin pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new babb8d9d85 worked out this issue (#14438)
babb8d9d85 is described below

commit babb8d9d85f24f3ee2ae06929a158acd9e093cd7
Author: calvin <jianghuachina...@163.com>
AuthorDate: Mon Jul 3 20:50:42 2023 +0800

    worked out this issue (#14438)
---
 .../projects/task/components/node/fields/use-hive-cli.ts    | 13 +++++++++++--
 .../projects/task/components/node/fields/use-resources.ts   |  6 +++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git 
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-hive-cli.ts
 
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-hive-cli.ts
index ed842f3bdc..6cb32680a9 100644
--- 
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-hive-cli.ts
+++ 
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-hive-cli.ts
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { computed } from 'vue'
+import { computed, watch, Ref, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useCustomParams, useResources } from '.'
 import type { IJsonItem } from '../types'
@@ -24,13 +24,22 @@ export function useHiveCli(model: { [field: string]: any 
}): IJsonItem[] {
   const hiveSqlScriptSpan = computed(() =>
     model.hiveCliTaskExecutionType === 'SCRIPT' ? 24 : 0
   )
-  const resourcesRequired = computed(() =>
+  const resourcesRequired = ref(
     model.hiveCliTaskExecutionType === 'SCRIPT' ? false : true
   )
+
   const resourcesLimit = computed(() =>
     model.hiveCliTaskExecutionType === 'SCRIPT' ? -1 : 1
   )
 
+  watch(
+    () => model.hiveCliTaskExecutionType,
+    () => {
+      resourcesRequired.value =
+        model.hiveCliTaskExecutionType === 'SCRIPT' ? false : true
+    }
+  )
+
   return [
     {
       type: 'select',
diff --git 
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-resources.ts
 
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-resources.ts
index 671d8c6c8a..2ec431bcbe 100644
--- 
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-resources.ts
+++ 
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-resources.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ref, onMounted, Ref } from 'vue'
+import { ref, onMounted, Ref, isRef } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { queryResourceList } from '@/service/modules/resources'
 import { useTaskNodeStore } from '@/store/project/task-node'
@@ -75,8 +75,8 @@ export function useResources(
       trigger: ['input', 'blur'],
       required: required,
       validator(validate: any, value: IResource[]) {
-        if (required) {
-          if (!value) {
+        if (isRef(required) ? required.value : required) {
+          if (!value || value.length == 0) {
             return new Error(t('project.node.resources_tips'))
           }