From 448dccdcbd0475946b88d380070c5a5b81968750 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 27 May 2020 17:05:01 +0800
Subject: [PATCH] =?UTF-8?q?bug=20fix=20=E5=88=9B=E5=BB=BA=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E7=A9=BA=E9=97=B4=E6=97=B6=E5=AF=B9=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E5=92=8C=E6=8F=8F=E8=BF=B0=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/components/settings/system/Organization.vue   | 2 +-
 .../components/settings/system/SystemWorkspace.vue         | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/settings/system/Organization.vue b/frontend/src/business/components/settings/system/Organization.vue
index 025f45c51b..0150c7e10c 100644
--- a/frontend/src/business/components/settings/system/Organization.vue
+++ b/frontend/src/business/components/settings/system/Organization.vue
@@ -218,7 +218,7 @@
         rule: {
           name: [
             {required: true, message: this.$t('organization.input_name'), trigger: 'blur'},
-            {min: 2, max: 50, message: this.$t('commons.input_limit', [2, 50]), trigger: 'blur'},
+            {min: 2, max: 20, message: this.$t('commons.input_limit', [2, 20]), trigger: 'blur'},
             {
               required: true,
               pattern: /^[\u4e00-\u9fa5_a-zA-Z0-9.·-]+$/,
diff --git a/frontend/src/business/components/settings/system/SystemWorkspace.vue b/frontend/src/business/components/settings/system/SystemWorkspace.vue
index cb3d60961a..622ece7f40 100644
--- a/frontend/src/business/components/settings/system/SystemWorkspace.vue
+++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue
@@ -33,7 +33,7 @@
         <el-form-item :label="$t('commons.name')" prop="name">
           <el-input v-model="form.name" autocomplete="off"/>
         </el-form-item>
-        <el-form-item :label="$t('commons.description')">
+        <el-form-item :label="$t('commons.description')" prop="description">
           <el-input type="textarea" v-model="form.description"></el-input>
         </el-form-item>
         <el-form-item :label="$t('workspace.organization_name')" prop="organizationId">
@@ -447,7 +447,7 @@
         rules: {
           name: [
             {required: true, message: this.$t('workspace.input_name'), trigger: 'blur'},
-            {min: 2, max: 50, message: this.$t('commons.input_limit', [2, 50]), trigger: 'blur'},
+            {min: 2, max: 20, message: this.$t('commons.input_limit', [2, 20]), trigger: 'blur'},
             {
               required: true,
               pattern: /^(?!-)(?!.*?-$)[a-zA-Z0-9\u4e00-\u9fa5-]+$/,
@@ -455,6 +455,9 @@
               trigger: 'blur'
             }
           ],
+          description: [
+            {max: 50, message: this.$t('commons.input_limit', [0, 50]), trigger: 'blur'}
+          ],
           organizationId: [
             {required: true, message: this.$t('organization.select_organization'), trigger: ['blur']}
           ]