2020-11-20 수정

uengine-oss · Nov 20, 2020 · 0e7feed · 0e7feed
1 parent 34fe1a8
commit 0e7feed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/components/designer/k8s-modeling/KubeModelingDesigner.vue b/src/components/designer/k8s-modeling/KubeModelingDesigner.vue
@@ -1126,11 +1126,6 @@
                 }
                 yaml_text = lines.join('\n')
                 yaml_text = yaml_text.replace(/ null/g, ' ')
-                yaml_text = yaml_text.replace(/\"/g, '')
-                // PersistentVolumeClaim의 storageClassName 값이 없으면 "" 처리
-                if(yaml_text.includes('PersistentVolumeClaim') && yaml_text.includes('storageClassName: \n')) {
-                    yaml_text = yaml_text.replace('storageClassName: \n', 'storageClassName: "" \n')
-                }
                 return yaml_text
             },
             async generateZip() {
@@ -1330,6 +1325,8 @@
 
                 if(lastChar == 's') {
                     type += 'es'
+                } else if(lastChar == 'y' && type != 'gateway') {
+                    type = type.slice(0,-1) + 'ies'
                 } else {
                     type += 's'
                 }

diff --git a/src/components/designer/k8s-modeling/element/DeploymentPropertyPanel.vue b/src/components/designer/k8s-modeling/element/DeploymentPropertyPanel.vue
@@ -54,6 +54,7 @@
                             <v-card-text>
                                 <v-text-field                                
                                     label="Name"
+                                    :rules="[rules.required, rules.char]"
                                     v-model="value.object.metadata.name"
                                 ></v-text-field>
                                 <number-field
@@ -117,6 +118,12 @@
                 activeTab: 0,
                 tabItems: [ "status", "property" ],
                 isYamlEdit: false,
+                rules: {
+                    required: value => !!value || 'Required',
+                    char: value => {
+                        return /^[a-z0-9\-]*$/.test(value) || 'Invalid Name'
+                    },
+                }
             }
         },
         watch: {