Merge branch 'dev' of github.com:dataease/dataease into dev

frontend/src/components/canvas/components/Editor/DateFormat.vue

@@ -14,6 +14,7 @@
             v-model="formatInfo.openMode"
             :placeholder="$t('deshowdate.select_openMode')"
             style="width: 100%;"
+            @change="modelChange"
           >
             <el-option
               v-for="item in modelOptions"
@@ -130,6 +131,15 @@ export default {
     },
     popoverClose() {
       this.$refs.popover.showPopper = false
+    },
+    modelChange(val) {
+      if (val === '0') {
+        this.curComponent.style.height = 100
+      } else if (val === '1') {
+        this.curComponent.style.height = 150
+      } else {
+        this.curComponent.style.height = 300
+      }
     }
   }
 }

frontend/src/lang/en.js

@@ -611,6 +611,8 @@ export default {
     msg_time_out: 'Message retention time(unit: day)',
     empty_front: 'If empty then default value is 10s',
     empty_msg: 'If empty then default value is 30 days',
+    front_error: 'Valid ranger [0 - 100]',
+    msg_error: 'Valid ranger [1 - 365]',
     SMTP_port: 'SMTP Port',
     SMTP_account: 'SMTP Account',
     SMTP_password: 'SMTP Password',

frontend/src/lang/tw.js

@@ -613,6 +613,8 @@ export default {
     msg_time_out: '消息保留時間(單位:天)',
     empty_front: '為空則默認取值10秒',
     empty_msg: '為空則默認取值30天',
+    front_error: '請填寫0-100正整數',
+    msg_error: '請填寫1-365正整數',
     SMTP_port: 'SMTP端口',
     SMTP_account: 'SMTP賬戶',
     SMTP_password: 'SMTP密碼',

frontend/src/lang/zh.js

@@ -617,7 +617,7 @@ export default {
     empty_front: '为空则默认取10秒',
     empty_msg: '为空则默认取30天',
     front_error: '请填写0-100正整数',
-    msg_error: '请填写正整数',
+    msg_error: '请填写1-365正整数',
     SMTP_port: 'SMTP端口',
     SMTP_account: 'SMTP账户',
     SMTP_password: 'SMTP密码',

frontend/src/views/system/SysParam/BasicSetting.vue

@@ -70,7 +70,7 @@ export default {
         ],
         msgTimeOut: [
           {
-            pattern: '^[0-9]*$',
+            pattern: '^([1-9]|[1-9]\\d|365)$',
             message: this.$t('system_parameter_setting.msg_error'),
             trigger: 'blur'
           }
@@ -101,10 +101,6 @@ export default {
       this.show = false
     },
     save(formInline) {
-      this.showEdit = true
-      this.showCancel = false
-      this.showSave = false
-      this.show = true
       const param = [
         { paramKey: 'basic.frontTimeOut', paramValue: this.formInline.frontTimeOut, type: 'text', sort: 1 },
         { paramKey: 'basic.msgTimeOut', paramValue: this.formInline.msgTimeOut, type: 'text', sort: 2 }
@@ -117,6 +113,10 @@ export default {
             const flag = response.success
             if (flag) {
               this.$success(this.$t('commons.save_success'))
+              this.showEdit = true
+              this.showCancel = false
+              this.showSave = false
+              this.show = true
               window.location.reload()
             } else {
               this.$message.error(this.$t('commons.save_failed'))