From 25da337d3e00c55bd2c71909dddc5bdd5b8c1139 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 18 Jun 2021 10:59:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/datasource/DsTree.vue    | 40 ++++++++++++++++---
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/frontend/src/views/system/datasource/DsTree.vue b/frontend/src/views/system/datasource/DsTree.vue
index 085cacbca5..5739985dcc 100644
--- a/frontend/src/views/system/datasource/DsTree.vue
+++ b/frontend/src/views/system/datasource/DsTree.vue
@@ -2,19 +2,31 @@
   <el-col style="padding: 0 5px 0 5px;">
     <el-col>
       <el-row>
-        <span class="header-title">
-          {{ $t('commons.datasource') }}
-          <el-button style="float: right;padding-right: 7px;margin-top: -8px" icon="el-icon-plus" type="text" @click="addFolder" />
+        <span v-show="!showSearchInput" class="header-title">
+          <div class="de-input" style="margin-top: 7px !important;">
+            {{ $t('commons.datasource') }}
+            <el-button style="float: right;padding-right: 7px;margin-top: -8px" icon="el-icon-plus" type="text" @click="addFolder" />
+            <el-button style="float: right;padding-right: 15px;margin-top: -8px" icon="el-icon-search" type="text" @click="showSearchWidget" />
+          </div>
+        </span>
+        <span v-show="showSearchInput" class="header-title">
+          <div class="de-input" style="margin-top: 0px !important;margin-bottom: 12px !important">
+            <el-input v-model="key">
+              <el-button slot="append" icon="el-icon-close" @click="closeSearchWidget" />
+            </el-input>
+          </div>
         </span>
       </el-row>
       <el-col class="custom-tree-container">
         <div class="block">
           <el-tree
-            ref="panel_list_tree"
+            ref="myDsTree"
             :default-expanded-keys="expandedArray"
             :data="tData"
             node-key="id"
+            default-expand-all
             :expand-on-click-node="true"
+            :filter-node-method="filterNode"
             @node-click="nodeClick"
           >
             <span slot-scope="{ node, data }" class="custom-tree-node-list father">
@@ -74,13 +86,31 @@ export default {
   data() {
     return {
       expandedArray: [],
-      tData: []
+      tData: [],
+      showSearchInput: false,
+      key: ''
+    }
+  },
+  watch: {
+    key(val) {
+      this.$refs.myDsTree.filter(val)
     }
   },
   mounted() {
     this.queryTreeDatas()
   },
   methods: {
+    filterNode(value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
+    },
+    showSearchWidget() {
+      this.showSearchInput = true
+    },
+    closeSearchWidget() {
+      this.key = ''
+      this.showSearchInput = false
+    },
     queryTreeDatas() {
       listDatasource().then(res => {
         this.tData = this.buildTree(res.data)

From d77d6197cadc2e40537a7fab236a4f2280552fdb Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Fri, 18 Jun 2021 11:07:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(fix):cron=E8=AE=BE=E7=BD=AE=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0week=E8=AF=B4=E6=98=8E=EF=BC=9Bcron=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/cron/cron/week.vue     | 3 +++
 frontend/src/lang/en.js                        | 3 ++-
 frontend/src/lang/tw.js                        | 3 ++-
 frontend/src/lang/zh.js                        | 3 ++-
 frontend/src/views/dataset/data/UpdateInfo.vue | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/cron/cron/week.vue b/frontend/src/components/cron/cron/week.vue
index 951f5739a3..e54986f5cc 100644
--- a/frontend/src/components/cron/cron/week.vue
+++ b/frontend/src/components/cron/cron/week.vue
@@ -39,6 +39,9 @@
         <el-checkbox v-for="i in 7" :key="i" :label="i+''" @change="type = '4'" />
       </el-checkbox-group>
     </div>
+    <div>
+      <span style="font-size: 12px;">{{ $t('cron.week_tips') }}</span>
+    </div>
   </div>
 </template>
 
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 906dbb0188..de9dcab5d1 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1099,6 +1099,7 @@ export default {
     every_week: 'Every week',
     week_start: 'From week',
     week_end: 'to week',
-    every_year: 'Every year'
+    every_year: 'Every year',
+    week_tips: 'Tips：1-7 mapping SUN-SAT'
   }
 }
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index cf95db7d2d..eeda4a8ed0 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1099,6 +1099,7 @@ export default {
     every_week: '每周',
     week_start: '從星期',
     week_end: '至星期',
-    every_year: '每年'
+    every_year: '每年',
+    week_tips: '說明：1-7 分別對應 周日-周六'
   }
 }
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 8e7ee2d1dd..3675ede7a0 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1100,6 +1100,7 @@ export default {
     every_week: '每周',
     week_start: '从星期',
     week_end: '至星期',
-    every_year: '每年'
+    every_year: '每年',
+    week_tips: '说明：1-7 分别对应 周日-周六'
   }
 }
diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue
index 75f6884f33..049771d47b 100644
--- a/frontend/src/views/dataset/data/UpdateInfo.vue
+++ b/frontend/src/views/dataset/data/UpdateInfo.vue
@@ -547,7 +547,7 @@ export default {
         this.taskForm.endTime = ''
         this.taskForm.cron = ''
       } else {
-        this.taskForm.cron = '0 0 * ? * * *'
+        this.taskForm.cron = '00 00 * ? * * *'
       }
     },
     listTaskLog(loading = true) {