From 5b1e771d4a7734cd226fea7415b3e15bf7ed0047 Mon Sep 17 00:00:00 2001
From: zxj <782803291@qq.com>
Date: Thu, 29 Jul 2021 10:45:34 +0800
Subject: [PATCH] fix: fix custom label require error (#778)

---
 shell/app/common/components/render-formItem.tsx        |  6 ++++++
 shell/app/modules/cmp/pages/networks/common/config.tsx |  2 +-
 shell/app/styles/util.scss                             | 10 ----------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/shell/app/common/components/render-formItem.tsx b/shell/app/common/components/render-formItem.tsx
index 51ff17ca53..f747e50774 100644
--- a/shell/app/common/components/render-formItem.tsx
+++ b/shell/app/common/components/render-formItem.tsx
@@ -207,6 +207,11 @@ export const RenderFormItem = ({
         required,
         message: `${i18n.t('common:please')}${action}${hasColon ? label.slice(0, label.length - 1) : label}`,
       });
+    } else {
+      rules.push({
+        required,
+        message: i18n.t('can not be empty'),
+      });
     }
   }
   if (pattern && !rules.some((r) => r.pattern && r.pattern.source === pattern.source)) {
@@ -240,6 +245,7 @@ export const RenderFormItem = ({
   ) : (
     label
   );
+
   return (
     <FormItem
       label={_label}
diff --git a/shell/app/modules/cmp/pages/networks/common/config.tsx b/shell/app/modules/cmp/pages/networks/common/config.tsx
index a41bf4af36..d9d0403d15 100644
--- a/shell/app/modules/cmp/pages/networks/common/config.tsx
+++ b/shell/app/modules/cmp/pages/networks/common/config.tsx
@@ -56,7 +56,7 @@ export const formConfig = {
   },
   label: {
     Zone: (
-      <div className="label-with-required">
+      <div>
         {i18n.t('dcos:availability zone')}
         &nbsp;&nbsp;
         <Tooltip
diff --git a/shell/app/styles/util.scss b/shell/app/styles/util.scss
index 39d0d6142d..49fa6117f0 100644
--- a/shell/app/styles/util.scss
+++ b/shell/app/styles/util.scss
@@ -626,16 +626,6 @@
   align-items: flex-start;
 }
 
-.label-with-required::before {
-  content: '*';
-  display: inline-block;
-  margin-right: 4px;
-  color: $red;
-  font-size: 14px;
-  font-family: SimSun, sans-serif;
-  line-height: 1;
-}
-
 .no-prevent {
   .pk-select-arrow {
     pointer-events: all;