Unverified Commit 5ccd742a authored by qiaozhanwei's avatar qiaozhanwei Committed by GitHub
Browse files

Merge branch 'dev' into fixbug-#2439

parents 8b00582e f5a8b566

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

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ 
    <m-list-box>

      <div slot="text">{{$t('Resources')}}</div>

      <div slot="content">

        <treeselect v-model="resourceList" :multiple="true" :options="mainJarList" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :placeholder="$t('Please select resources')">

        <treeselect v-model="resourceList" :multiple="true" :options="mainJarList" :normalizer="normalizer" :disabled="isDetails" :value-consists-of="valueConsistsOf" :placeholder="$t('Please select resources')">

          <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>

        </treeselect>

      </div>

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

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ 
    <m-list-box>

      <div slot="text">{{$t('Resources')}}</div>

      <div slot="content">

        <treeselect v-model="resourceList" :multiple="true" :options="mainJarList" :normalizer="normalizer" :placeholder="$t('Please select resources')">

        <treeselect v-model="resourceList" :multiple="true" :options="mainJarList" :normalizer="normalizer" :disabled="isDetails" :placeholder="$t('Please select resources')">

          <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>

        </treeselect>

      </div>

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

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
    <m-list-box>

      <div slot="text">{{$t('Resources')}}</div>

      <div slot="content">

        <treeselect v-model="resourceList" :multiple="true" :options="resourceOptions" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :placeholder="$t('Please select resources')">

        <treeselect v-model="resourceList" :multiple="true" :options="resourceOptions" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :disabled="isDetails" :placeholder="$t('Please select resources')">

          <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>

        </treeselect>

        <!-- <m-resources

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

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
    <m-list-box>

      <div slot="text">{{$t('Resources')}}</div>

      <div slot="content">

        <treeselect v-model="resourceList" :multiple="true" :options="options" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :placeholder="$t('Please select resources')">

        <treeselect  v-model="resourceList" :multiple="true" :options="options" :normalizer="normalizer" :disabled="isDetails" :value-consists-of="valueConsistsOf" :placeholder="$t('Please select resources')">

          <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>

        </treeselect>

      </div>

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

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ 
    <m-list-box>

      <div slot="text">{{$t('Resources')}}</div>

      <div slot="content">

        <treeselect v-model="resourceList" :multiple="true" :options="mainJarList" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :placeholder="$t('Please select resources')">

        <treeselect v-model="resourceList" :multiple="true" :options="mainJarList" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :disabled="isDetails" :placeholder="$t('Please select resources')">

          <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>

        </treeselect>

      </div>