Merge remote-tracking branch 'origin/dev' into dev

frontend/.env.development

@@ -1,6 +1,6 @@
 # just a flag
 ENV = 'development'
-
+EDITOR=code
 # base api
 # VUE_APP_BASE_API = '/dev-api'
 VUE_APP_BASE_API = 'http://localhost:8081/'

frontend/src/components/deCustomCm/DeDatePick.vue

@@ -26,7 +26,8 @@ export default {
   },
   methods: {
     handleChange(val) {
-      this.$emit('input', val)
+      const [ pre, next ] = val
+      this.$emit('input', [pre, next ? new Date(+new Date(next) + (23 * 3600 + 59 * 61) * 1000) : ''])
     }
   }
 }

frontend/src/lang/en.js

@@ -41,6 +41,10 @@ export default {
       finish: 'Finish'
     }
   },
+  track: {
+    upload_limit_format: 'The image format is incorrect. It supports JPG and PNG',
+    upload_limit_size: 'Picture size shall not exceed',
+  },
   route: {
     dashboard: 'Dashboard',
     documentation: 'Documentation',

frontend/src/lang/tw.js

@@ -41,6 +41,10 @@ export default {
       finish: '完成'
     }
   },
+  track: {
+    upload_limit_format: '圖片格式錯誤，支持JPG，PNG',
+    upload_limit_size: '圖片大小不超過',
+  },
   route: {
     dashboard: '首頁',
     documentation: '文檔',

frontend/src/lang/zh.js

@@ -41,6 +41,10 @@ export default {
       finish: '完成'
     }
   },
+  track: {
+    upload_limit_format: '图片格式错误，支持JPG，PNG',
+    upload_limit_size: '图片大小不超过',
+  },
   route: {
     dashboard: '首页',
     documentation: '文档',

frontend/src/views/dataset/add/AddUnion.vue

@@ -218,7 +218,6 @@ export default {
   },
   watch: {
     'param.tableId': function() {
-      this.resetComponent()
       this.initTableData()
     }
   },
@@ -389,11 +388,6 @@ export default {
         mode: this.dataset[0].currentDs.mode,
         info: '{"union":' + JSON.stringify(this.dataset) + '}'
       }
-    },
-
-    resetComponent() {
-      this.dataset = []
-      this.param.name = '关联数据集'
     }
   }
 }

frontend/src/views/dataset/data/FieldEdit.vue

@@ -809,9 +809,6 @@ export default {
     },
     getPopPosition(val) {
       if (!val) return
-      // setTimeout(() => {
-
-      // }, 50)
       this.$nextTick(() => {
         const list = document.querySelectorAll('body > .select-date-resolution-format')
         const ele = list[list.length - 1]
@@ -1203,7 +1200,7 @@ span {
     display: inline-block;
     height: 30px;
     background: #dfe6ec;
-    width: 192px;
+    width: 180px;
     padding-left: 30px;
   }
 }