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/03/03 09:21:02 UTC
[incubator-dolphinscheduler] branch dev-resource-tree updated:
Change crumb position (#2068)
This is an automated email from the ASF dual-hosted git repository.
lgcareer pushed a commit to branch dev-resource-tree
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev-resource-tree by this push:
new a581f74 Change crumb position (#2068)
a581f74 is described below
commit a581f7434c85bdb3a1a6437f0f1d0bc49e02474b
Author: break60 <79...@qq.com>
AuthorDate: Tue Mar 3 17:20:53 2020 +0800
Change crumb position (#2068)
---
.../pages/file/pages/subdirectory/index.vue | 28 ++++++++++----------
.../pages/udf/pages/subUdfDirectory/index.vue | 30 +++++++++++-----------
2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue
index 77d6881..43e53cf 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue
@@ -15,23 +15,23 @@
* limitations under the License.
*/
<template>
- <m-list-construction :title="$t('File Manage')">
- <template slot="conditions">
+ <div class="home-main list-construction-model">
+ <div class="content-title">
+ <a class="bread" style="padding-left: 15px;" @click="() => $router.push({path: `/resource/file`})">{{$t('File Manage')}}</a>
+ <a class="bread" v-for="(item,$index) in breadList" :key="$index" @click="_ckOperation($index)">{{'>'+item}}</a>
+ </div>
+ <div class="conditions-box">
<m-conditions @on-conditions="_onConditions">
<template slot="button-group">
<x-button-group size="small" >
<x-button type="ghost" @click="() => $router.push({path: `/resource/file/subFileFolder/${searchParams.id}`})">{{$t('Create folder')}}</x-button>
<x-button type="ghost" @click="() => $router.push({path: `/resource/file/subFile/${searchParams.id}`})">{{$t('Create File')}}</x-button>
<x-button type="ghost" @click="_uploading">{{$t('Upload Files')}}</x-button>
- <span class="bread">(</span>
- <a class="bread" @click="() => $router.push({path: `/resource/file`})">{{$t('File Manage')}}</a>
- <a class="bread" v-for="(item,$index) in breadList" :key="$index" @click="_ckOperation($index)">{{'>'+item}}</a>
- <span class="bread">)</span>
</x-button-group>
</template>
</m-conditions>
- </template>
- <template slot="content">
+ </div>
+ <div class="list-box">
<template v-if="fileResourcesList.length || total>0">
<m-list @on-update="_onUpdate" @on-updateList="_updateList" :file-resources-list="fileResourcesList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize">
</m-list>
@@ -44,8 +44,8 @@
</template>
<m-spin :is-spin="isLoading">
</m-spin>
- </template>
- </m-list-construction>
+ </div>
+ </div>
</template>
<script>
import _ from 'lodash'
@@ -174,10 +174,10 @@
</script>
<style lang="scss" rel="stylesheet/scss">
.bread {
- padding: 7px 0;
- line-height: 14px;
- position: relative;
- float: left;
+ font-size: 22px;
+ padding-top: 10px;
+ color: #2a455b;
+ display: inline-block;
cursor: pointer;
}
</style>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/index.vue
index a97fc87..91be50d 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/index.vue
@@ -15,22 +15,22 @@
* limitations under the License.
*/
<template>
- <m-list-construction :title="$t('UDF Resources')">
- <template slot="conditions">
+ <div class="home-main list-construction-model">
+ <div class="content-title">
+ <a class="bread" style="padding-left: 15px;" @click="() => $router.push({path: `/resource/udf`})">{{$t('Resource manage')}}</a>
+ <a class="bread" v-for="(item,$index) in breadList" :key="$index" @click="_ckOperation($index)">{{'>'+item}}</a>
+ </div>
+ <div class="conditions-box">
<m-conditions @on-conditions="_onConditions">
<template slot="button-group">
- <x-button-group size="small">
+ <x-button-group size="small" >
<x-button type="ghost" @click="() => $router.push({name: 'resource-udf-subCreateUdfFolder'})">{{$t('Create folder')}}</x-button>
<x-button type="ghost" size="small" @click="_uploading">{{$t('Upload UDF Resources')}}</x-button>
- <span class="bread">(</span>
- <a class="bread" @click="() => $router.push({path: `/resource/udf`})">{{$t('Resource manage')}}</a>
- <a class="bread" v-for="(item,$index) in breadList" :key="$index" @click="_ckOperation($index)">{{'>'+item}}</a>
- <span class="bread">)</span>
</x-button-group>
</template>
</m-conditions>
- </template>
- <template slot="content">
+ </div>
+ <div class="list-box">
<template v-if="udfResourcesList.length || total>0">
<m-list @on-update="_onUpdate" :udf-resources-list="udfResourcesList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize">
</m-list>
@@ -43,8 +43,8 @@
</template>
<m-spin :is-spin="isLoading">
</m-spin>
- </template>
- </m-list-construction>
+ </div>
+ </div>
</template>
<script>
import _ from 'lodash'
@@ -174,10 +174,10 @@
</script>
<style lang="scss" rel="stylesheet/scss">
.bread {
- padding: 7px 0;
- line-height: 14px;
- position: relative;
- float: left;
+ font-size: 22px;
+ padding-top: 10px;
+ color: #2a455b;
+ display: inline-block;
cursor: pointer;
}
</style>