Merge pull request #334 from TaiBIF/feature/show-more-error-message

Feature/show more error message
TaiBIF · Oct 9, 2019 · eed4830 · eed4830
2 parents 404666f + e2cf4d5
commit eed4830
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 28 deletions.
diff --git a/src/components/StudyAreaSidebar/StudyAreaSidebar.vue b/src/components/StudyAreaSidebar/StudyAreaSidebar.vue
@@ -44,7 +44,8 @@
                 type="text"
                 :id="`addArea_${studyArea.id}`"
                 placeholder="新增子樣區"
-                @keydown="addNewArea"
+                v-model="newSubStudyArea"
+                @keydown.enter="addNewSubStudyArea"
                 :data-parent-id="studyArea.id"
               />
             </div>
@@ -62,8 +63,8 @@
             type="text"
             id="addParentArea"
             placeholder="新增樣區"
-            v-model="newArea"
-            @keydown.enter="addNewArea"
+            v-model="newStudyArea"
+            @keydown.enter="addNewStudyArea"
           />
         </div>
       </div>
@@ -102,7 +103,8 @@ export default {
   data() {
     return {
       expandId: null,
-      newArea: '',
+      newStudyArea: '',
+      newSubStudyArea: '',
     };
   },
   methods: {
@@ -126,19 +128,24 @@ export default {
       }
       return `/project/${this.projectId}/study-areas/${studyArea.id}`;
     },
-    addNewArea({ target }) {
-      if (!this.newArea) {
+    addNewSubStudyArea() {
+      const value = this.newSubStudyArea;
+      if (!value) {
         return;
       }
-
-      const value = this.newArea;
-      const parentId = target.getAttribute('data-parent-id');
-
+      const parentId = event.target.getAttribute('data-parent-id');
       this.$emit('addArea', value, parentId);
       this.$emit('handleSubmitBtnState', true);
-
-      // reset new area value
-      this.newArea = '';
+      this.newSubStudyArea = '';
+    },
+    addNewStudyArea() {
+      const value = this.newStudyArea;
+      if (!value) {
+        return;
+      }
+      this.$emit('addArea', value);
+      this.$emit('handleSubmitBtnState', true);
+      this.newStudyArea = '';
     },
     editArea(name, id) {
       this.$emit('editArea', name, id);

diff --git a/src/pages/Project/ProjectInfo/ProjectInfo.vue b/src/pages/Project/ProjectInfo/ProjectInfo.vue
@@ -23,7 +23,7 @@
                         projectId,
                       },
                     }"
-                    class="float-right btn btn-green-border btn-sm"
+                    class="float-right btn btn-green-border"
                   >
                     <i class="fa fa-pencil-alt mr-2"></i>
                     <span class="text" style="white-space: nowrap;"

diff --git a/src/pages/Project/ProjectStudyAreas/index.vue b/src/pages/Project/ProjectStudyAreas/index.vue
@@ -26,7 +26,7 @@
       <!-- Overview mode -->
       <div v-else class="search-content">
         <a
-          class="btn btn-green-border btn-sm float-right"
+          class="btn btn-green-border float-right"
           v-tooltip.bottom="'將目前頁面或篩選範圍之資料輸出為 CSV 檔並下載'"
           :href="canSearch ? exportCSVLink : undefined"
           target="_blank"
@@ -136,21 +136,21 @@
                     hide-clear-button
                   ></vue-timepicker>
                 </div>
-                <a
-                  @click="clickSearch"
-                  class="btn btn-sm btn-green"
+                <button
+                  @click.prevent="clickSearch"
+                  class="btn btn-green"
                   :style="{ margin: '4px' }"
                   :disabled="!canSearch"
                 >
                   篩選
-                </a>
+                </button>
               </div>
             </div>
           </div>
         </form>
         <div>
           <button
-            class="btn btn-sm btn-block btn-green"
+            class="btn btn-block btn-green"
             @click="setEdit(true)"
             :disabled="disabledEdit"
           >

diff --git a/src/pages/UploadHistory/index.vue b/src/pages/UploadHistory/index.vue
@@ -187,9 +187,7 @@
         <span v-else-if="errorType === 'missing-fields'">
           缺少欄位: {{ errorMessage }}
         </span>
-        <span v-else-if="errorType === 'others'">
-          其他錯誤
-        </span>
+        <span v-else>其他錯誤: {{ errorMessage }}</span>
       </p></info-modal
     >
   </div>

diff --git a/src/sass/components/_navbar.sass b/src/sass/components/_navbar.sass
@@ -60,9 +60,6 @@ nav.navbar
       background: #30936F
       border-right: 1px solid #1E5C45
 
-  .navbar-nav .btn
-    line-height: 40px !important
-
   form.search 
     position: relative
     margin-right: 1rem

diff --git a/src/sass/globals/_page.sass b/src/sass/globals/_page.sass
@@ -4,8 +4,7 @@
         width: 100%
         max-width: 360px
         font-size: 24px
-        height: 60px
-        line-height: 60px
+        line-height: 48px
 
     section
         min-height: 680px