From 480ab0e36bd0870be7c31724f333cf03264568ad Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 28 Sep 2022 16:51:40 +0800
Subject: [PATCH 1/4] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=20excel=20?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js | 4 ++--
 frontend/src/lang/tw.js | 4 ++--
 frontend/src/lang/zh.js | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index cce695692c..7f651aa463 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1602,8 +1602,8 @@ export default {
     merge_msg: 'If the fields in the data table are consistent, merge them into one data set?',
     merge_title: 'Merge data',
     field_name_less_50: 'Field name can not more 50 chars.',
-    excel_info_1: '1、Merged cells cannot exist in the file；',
-    excel_info_2: '2、The first line of the file is the title line, which cannot be empty or date；',
+    excel_info_1: '1、Merged cells cannot exist in the Excel file；',
+    excel_info_2: '2、The first line of the Excel file is the title line, which cannot be empty or date；',
     excel_info_3: '3、The file size shall not exceed 500m。',
     sync_field: 'Sync Field',
     confirm_sync_field: 'Confirm Sync',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index abd48e4d4a..970adeaf9c 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1602,8 +1602,8 @@ export default {
     merge_msg: '數據表中存在字段一致的情況，是否合並到一個數據集中?',
     merge_title: '合並數據',
     field_name_less_50: '字段名不能超過50個字符',
-    excel_info_1: '1、文件終不能存在合併單元格；',
-    excel_info_2: '2、文件的第一行為標題行，不能為空，不能為日期；',
+    excel_info_1: '1、Excel 文件終不能存在合併單元格；',
+    excel_info_2: '2、Excel 文件的第一行為標題行，不能為空，不能為日期；',
     excel_info_3: '3、文件不超過500M。',
     sync_field: '同步字段',
     confirm_sync_field: '確認同步',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 62976c8d72..099fff30fc 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1601,9 +1601,9 @@ export default {
     merge_msg: '数据表中存在字段一致的情况，是否合并到一个数据集中?',
     merge_title: '合并数据',
     field_name_less_50: '字段名不能超过50个字符',
-    excel_info_1: '1、文件中不能存在合并单元格；',
-    excel_info_2: '2、文件的第一行为标题行，不能为空，不能为日期型；',
-    excel_info_3: '3、Excel文件大小请确保在500M以内。',
+    excel_info_1: '1、Excel 文件中不能存在合并单元格；',
+    excel_info_2: '2、Excel 文件的第一行为标题行，不能为空，不能为日期型；',
+    excel_info_3: '3、文件大小请确保在500M以内。',
     sync_field: '同步字段',
     confirm_sync_field: '确认同步',
     confirm_sync_field_tips: '同步字段可能会导致已编辑字段发生变更，请确认',

From 575929f69aa06be13be4e5bfba005b9ba7ef7e4e Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 28 Sep 2022 17:10:23 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/dataset/group/Group.vue | 81 ++++++++++++----------
 1 file changed, 44 insertions(+), 37 deletions(-)

diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index bbab6be283..3788236869 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -12,11 +12,11 @@
           @command="(type) => clickAddData(type)"
         >
           <span class="el-dropdown-link">
-            <i @click.stop class="el-icon-plus"></i>
+            <i class="el-icon-plus" @click.stop />
           </span>
           <el-dropdown-menu
-            class="de-dataset-dropdown de-card-dropdown"
             slot="dropdown"
+            class="de-dataset-dropdown de-card-dropdown"
           >
             <el-dropdown-item command="db">
               <svg-icon icon-class="ds-db" class="ds-icon-db" />
@@ -58,12 +58,12 @@
           class="main-area-input"
         >
           <el-select
-            v-model="searchType"
             slot="append"
+            v-model="searchType"
             :placeholder="searchMap[searchType]"
           >
-            <el-option :label="$t('commons.all')" value="all"></el-option>
-            <el-option :label="$t('commons.folder')" value="folder"></el-option>
+            <el-option :label="$t('commons.all')" value="all" />
+            <el-option :label="$t('commons.folder')" value="folder" />
           </el-select>
         </el-input>
       </el-row>
@@ -71,7 +71,7 @@
         <div class="block">
           <div v-if="!tData.length && !treeLoading" class="no-tdata">
             {{ $t('deDataset.no_dataset_click') }}
-            <span @click="() => clickAdd()" class="no-tdata-new">{{
+            <span class="no-tdata-new" @click="() => clickAdd()">{{
               $t('deDataset.create')
             }}</span>
           </div>
@@ -105,8 +105,7 @@
                     text-overflow: ellipsis;
                   "
                   :title="data.name"
-                  >{{ data.name }}</span
-                >
+                >{{ data.name }}</span>
               </span>
               <span
                 v-if="hasDataPermission('manage', data.privileges)"
@@ -119,11 +118,11 @@
                     @command="(type) => clickAddData(type, data)"
                   >
                     <span class="el-dropdown-link">
-                      <i @click.stop class="el-icon-plus"></i>
+                      <i class="el-icon-plus" @click.stop />
                     </span>
                     <el-dropdown-menu
-                      class="de-dataset-dropdown de-card-dropdown"
                       slot="dropdown"
+                      class="de-dataset-dropdown de-card-dropdown"
                     >
                       <el-dropdown-item command="db">
                         <svg-icon icon-class="ds-db" class="ds-icon-db" />
@@ -165,11 +164,11 @@
                     <span class="el-dropdown-link">
                       <el-button icon="el-icon-more" type="text" size="small" />
                     </span>
-                    <el-dropdown-menu class="de-card-dropdown" slot="dropdown">
+                    <el-dropdown-menu slot="dropdown" class="de-card-dropdown">
                       <el-dropdown-item
                         command="rename"
                       >
-                      <svg-icon icon-class="de-ds-rename" />
+                        <svg-icon icon-class="de-ds-rename" />
                         {{ $t('dataset.rename') }}
                       </el-dropdown-item>
                       <el-dropdown-item command="move">
@@ -224,11 +223,17 @@
                   />
                 </span>
                 <span v-if="['db', 'sql'].includes(data.modelInnerType)">
-                  <span v-if="data.mode === 0" style="margin-left: 6px"
-                    ><i class="el-icon-s-operation"
+                  <span
+                    v-if="data.mode === 0"
+                    style="margin-left: 6px"
+                  ><i
+                    class="el-icon-s-operation"
                   /></span>
-                  <span v-if="data.mode === 1" style="margin-left: 6px"
-                    ><i class="el-icon-alarm-clock"
+                  <span
+                    v-if="data.mode === 1"
+                    style="margin-left: 6px"
+                  ><i
+                    class="el-icon-alarm-clock"
                   /></span>
                 </span>
                 <span
@@ -246,8 +251,7 @@
                     }
                   ]"
                   :title="data.name"
-                  >{{ data.name }}</span
-                >
+                >{{ data.name }}</span>
               </span>
               <span
                 v-if="hasDataPermission('manage', data.privileges)"
@@ -263,21 +267,21 @@
                     <span class="el-dropdown-link">
                       <el-button icon="el-icon-more" type="text" size="small" />
                     </span>
-                    <el-dropdown-menu class="de-card-dropdown" slot="dropdown">
+                    <el-dropdown-menu slot="dropdown" class="de-card-dropdown">
                       <el-dropdown-item
                         command="editTable"
                       >
-                      <svg-icon icon-class="de-ds-rename" />
+                        <svg-icon icon-class="de-ds-rename" />
                         {{ $t('dataset.rename') }}
                       </el-dropdown-item>
                       <el-dropdown-item command="moveDs">
-                         <svg-icon icon-class="de-ds-move" />
+                        <svg-icon icon-class="de-ds-move" />
                         {{ $t('dataset.move_to') }}
                       </el-dropdown-item>
                       <el-dropdown-item
                         command="deleteTable"
                       >
-                      <svg-icon icon-class="de-ds-trash" />
+                        <svg-icon icon-class="de-ds-trash" />
                         {{ $t('dataset.delete') }}
                       </el-dropdown-item>
                     </el-dropdown-menu>
@@ -305,13 +309,15 @@
           @keypress.enter.native="saveGroup(groupForm)"
         >
           <el-form-item :label="$t('deDataset.folder_name')" prop="name">
-            <el-input placeholder="请输入文件夹名称" v-model="groupForm.name" />
+            <el-input v-model.trim="groupForm.name" placeholder="请输入文件夹名称" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <deBtn secondary @click="close()">{{ $t('dataset.cancel') }}</deBtn>
-          <deBtn type="primary" @click="saveGroup(groupForm)"
-            >{{ $t('dataset.confirm') }}
+          <deBtn
+            type="primary"
+            @click="saveGroup(groupForm)"
+          >{{ $t('dataset.confirm') }}
           </deBtn>
         </div>
       </el-dialog>
@@ -339,23 +345,25 @@
         <deBtn secondary @click="closeTable()">{{
           $t('dataset.cancel')
         }}</deBtn>
-        <deBtn type="primary" @click="saveTable(tableForm)"
-          >{{ $t('dataset.confirm') }}
+        <deBtn
+          type="primary"
+          @click="saveTable(tableForm)"
+        >{{ $t('dataset.confirm') }}
         </deBtn>
       </div>
     </el-dialog>
 
     <!--移动分组-->
     <el-drawer
+      v-closePress
       :title="moveDialogTitle"
       :visible.sync="moveGroup"
       custom-class="user-drawer sql-dataset-drawer"
       size="600px"
-      v-closePress
       direction="rtl"
     >
       <group-move-selector
-        moveDir
+        move-dir
         :item="groupForm"
         @targetGroup="targetGroup"
       />
@@ -367,18 +375,18 @@
           :disabled="groupMoveConfirmDisabled"
           type="primary"
           @click="saveMoveGroup(tGroup)"
-          >{{ $t('dataset.confirm') }}
+        >{{ $t('dataset.confirm') }}
         </deBtn>
       </div>
     </el-drawer>
 
     <!--移动数据集-->
     <el-drawer
+      v-closePress
       :title="moveDialogTitle"
       :visible.sync="moveDs"
       custom-class="user-drawer sql-dataset-drawer"
       size="600px"
-      v-closePress
       direction="rtl"
     >
       <group-move-selector :item="groupForm" @targetGroup="targetDs" />
@@ -390,7 +398,7 @@
           :disabled="dsMoveConfirmDisabled"
           type="primary"
           @click="saveMoveDs(tDs)"
-          >{{ $t('dataset.confirm') }}
+        >{{ $t('dataset.confirm') }}
         </deBtn>
       </div>
     </el-drawer>
@@ -431,7 +439,7 @@ export default {
     currentNodeId: {
       type: String,
       default: ''
-    },
+    }
   },
   data() {
     return {
@@ -526,7 +534,7 @@ export default {
     }
   },
   computed: {
-    hideCustomDs: function () {
+    hideCustomDs: function() {
       return this.$store.getters.hideCustomDs
     }
   },
@@ -629,7 +637,7 @@ export default {
       this.groupForm.pid = param.id
       this.groupForm.level = param.level + 1
     },
-    loadTree: _.debounce(function () {
+    loadTree: _.debounce(function() {
       this.searchPids = []
       this.$refs.datasetTreeRef.filter(this.filterText)
     }, 600),
@@ -876,7 +884,6 @@ export default {
           sceneId: param.id
         }
       })
-      
     },
     addData(name) {
       this.$emit('switchComponent', { name: name, param: this.currGroup })
@@ -1179,4 +1186,4 @@ export default {
     border-top: 1px solid rgba(31, 35, 41, 0.15);
   }
 }
-</style>
\ No newline at end of file
+</style>

From c752f9c889fe72a1c64a6ae0e372ec5de44493fe Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 28 Sep 2022 17:50:35 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E6=A0=A1=E9=AA=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E6=97=B6=E9=97=B4=E9=97=B4=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/SysParam/BasicSetting.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/system/SysParam/BasicSetting.vue b/frontend/src/views/system/SysParam/BasicSetting.vue
index da530395c5..4e0f1852d7 100644
--- a/frontend/src/views/system/SysParam/BasicSetting.vue
+++ b/frontend/src/views/system/SysParam/BasicSetting.vue
@@ -343,14 +343,16 @@ export default {
     },
     onSimpleCronChange() {
       if (this.formInline.dsCheckIntervalType === 'minute') {
-        if (this.formInline.dsCheckInterval < 1 || this.formInline.dsCheckInterval > 59) {
+        const pattern = '^([1-9]|[1-5][0-9])$'
+        if (!new RegExp(pattern).test(this.formInline.dsCheckInterval)) {
           this.$message({ message: this.$t('cron.minute_limit'), type: 'warning', showClose: true })
           this.formInline.dsCheckInterval = 1
         }
         return
       }
       if (this.formInline.dsCheckIntervalType === 'hour') {
-        if (this.formInline.dsCheckInterval < 1 || this.formInline.dsCheckInterval > 23) {
+        const pattern = '^([1-9]|[1-2][0-3])$'
+        if (!new RegExp(pattern).test(this.formInline.dsCheckInterval)) {
           this.$message({ message: this.$t('cron.hour_limit'), type: 'warning', showClose: true })
           this.formInline.dsCheckInterval = 1
         }

From 020b221435e347db952522fa68f01b2e90e61456 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 28 Sep 2022 17:54:41 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E5=9B=BD=E9=99=85=E5=8C=96=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/tw.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 970adeaf9c..afbcb185ce 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1602,7 +1602,7 @@ export default {
     merge_msg: '數據表中存在字段一致的情況，是否合並到一個數據集中?',
     merge_title: '合並數據',
     field_name_less_50: '字段名不能超過50個字符',
-    excel_info_1: '1、Excel 文件終不能存在合併單元格；',
+    excel_info_1: '1、Excel 文件中不能存在合併單元格；',
     excel_info_2: '2、Excel 文件的第一行為標題行，不能為空，不能為日期；',
     excel_info_3: '3、文件不超過500M。',
     sync_field: '同步字段',