From 4f8f9080cff6755145e1f3282de4351ece0f1d84 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 20 May 2021 22:14:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E7=BB=91=E5=AE=9A=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/widget/DeWidget/DeDate.vue | 33 +++++++++++++++++++
 frontend/src/utils/index.js                   | 20 +++++++++++
 2 files changed, 53 insertions(+)

diff --git a/frontend/src/components/widget/DeWidget/DeDate.vue b/frontend/src/components/widget/DeWidget/DeDate.vue
index 921e79378a..393f5db8a4 100644
--- a/frontend/src/components/widget/DeWidget/DeDate.vue
+++ b/frontend/src/components/widget/DeWidget/DeDate.vue
@@ -1,6 +1,7 @@
 <template>
   <el-date-picker
     v-if="options!== null && options.attrs!==null"
+    ref="dateRef"
     v-model="options.value"
     :type="options.attrs.type"
     :range-separator="options.attrs.rangeSeparator"
@@ -12,6 +13,7 @@
 </template>
 
 <script>
+import { dateFormat } from '@/utils'
 export default {
 
   props: {
@@ -44,10 +46,41 @@ export default {
         value: Array.isArray(this.options.value) ? this.options.value : [this.options.value],
         operator: this.operator
       }
+      param.value = this.formatValues(param.value)
       this.inDraw && this.$store.dispatch('conditions/add', param)
     },
     dateChange(value) {
+    //   const nvalue = dateFormat(value, this.getFormat())
+    //   console.log(nvalue)
       this.setCondition()
+    },
+    formatValues(values) {
+      if (!values || values.length === 0) {
+        return []
+      }
+      return values.map(value => dateFormat(value, this.getFormat()))
+    },
+    getFormat() {
+      let format = 'yyyy'
+      switch (this.options.attrs.type) {
+        case 'year':
+          format = 'yyyy'
+          break
+        case 'month':
+          format = 'yyyy-MM'
+          break
+        case 'date':
+          format = 'yyyy-MM-dd'
+          break
+        case 'daterange':
+          format = 'yyyy-MM-dd'
+          this.operator = 'in'
+          break
+        default:
+          format = 'yyyy'
+          break
+      }
+      return format
     }
   }
 }
diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index 19ea8da956..7e48bdbfd9 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -2,6 +2,26 @@
  * Created by PanJiaChen on 16/11/18.
  */
 
+export function dateFormat(date, fmt) {
+  let ret
+  const opt = {
+    'y+': date.getFullYear().toString(), // 年
+    'M+': (date.getMonth() + 1).toString(), // 月
+    'd+': date.getDate().toString(), // 日
+    'H+': date.getHours().toString(), // 时
+    'm+': date.getMinutes().toString(), // 分
+    's+': date.getSeconds().toString() // 秒
+    // 有其他格式化字符需求可以继续添加，必须转化成字符串
+  }
+  for (const k in opt) {
+    ret = new RegExp('(' + k + ')').exec(fmt)
+    if (ret) {
+      fmt = fmt.replace(ret[1], (ret[1].length === 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, '0')))
+    }
+  }
+  return fmt
+}
+
 /**
  * Parse the time to string
  * @param {(Object|string|number)} time

From ff24ab3d6ee46052e4154d91ee753a57699e04e9 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Fri, 21 May 2021 10:22:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20license=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=9C=8B=E9=9A=9B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js                   | 3 ++-
 frontend/src/lang/tw.js                   | 3 ++-
 frontend/src/lang/zh.js                   | 3 ++-
 frontend/src/views/system/about/index.vue | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index e11fae5de8..79e36a2519 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -943,6 +943,7 @@ export default {
     version_num: 'Version number',
     standard: 'Standard',
     enterprise: 'Enterprise',
-    suport: 'Get technical support'
+    suport: 'Get technical support',
+    update_success: 'Update Success'
   }
 }
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 54cde526c4..791c4ae3e8 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -942,6 +942,7 @@ export default {
     version_num: '版本號',
     standard: '標準版',
     enterprise: '企業版',
-    suport: '獲取技術支持'
+    suport: '獲取技術支持',
+    update_success: '更新成功'
   }
 }
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 6e43c72bce..023d6fa2ff 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -944,6 +944,7 @@ export default {
     version_num: '版本号',
     standard: '标准版',
     enterprise: '企业版',
-    suport: '获取技术支持'
+    suport: '获取技术支持',
+    update_success: '更新成功'
   }
 }
diff --git a/frontend/src/views/system/about/index.vue b/frontend/src/views/system/about/index.vue
index 836a2c6e33..fe8d02ef42 100644
--- a/frontend/src/views/system/about/index.vue
+++ b/frontend/src/views/system/about/index.vue
@@ -138,7 +138,7 @@ export default {
       const param = { license: this.licenseKey }
       updateInfo(param).then(response => {
         if (response.data.status === 'valid') {
-          this.$success(this.$t('i18n_mc_update_success'))
+          this.$success(this.$t('about.update_success'))
           this.license = this.getLicense(response.data)
         } else {
           this.$warning(response.data.message)