Merge branch 'nice_dev' into develop

src/modules/02_organizationalNew/components/mainTree.vue

@@ -604,7 +604,7 @@ watch(
 <style scoped>
 .tree-container {
   overflow: auto;
-  height: 60vh;
+  height: 73vh;
   border: 1px solid #e6e6e7;
   border-radius: 10px;
 }

src/modules/02_organizationalNew/components/structureView.vue

@@ -153,49 +153,47 @@ const breadcrumbsGen = () => {
 </script>
 
 <template>
-  <div class="toptitle text-dark col-12 row items-center">แผนภูมิโครงสร้าง</div>
-  <div class="text-dark">
-    <q-card flat bordered class="col-12 q-mt-sm">
-      <div class="q-pa-sm row wrap items-center">
-        <q-btn flat round color="primary" @click="savePNG()" icon="mdi-image">
-          <q-tooltip> ดาวน์โหลด PNG </q-tooltip>
-        </q-btn>
-        <q-btn
-          flat
-          round
-          color="red-7"
-          @click="savePDF()"
-          icon="mdi-file-pdf-box"
-        >
-          <q-tooltip> ดาวน์โหลด PDF </q-tooltip>
-        </q-btn>
-        <div class="bg-grey-2 q-py-xs q-px-sm rounded-borders">
-          <q-breadcrumbs>
-            <template v-slot:separator>
-              <q-icon size="1.5em" name="chevron_right" color="primary" />
-            </template>
-            <template v-for="link in theBreadcrumb" :key="link.id">
-              <q-breadcrumbs-el
-                :label="link.label"
-                @click="refreshChart(link.id)"
-                class="breadcrumbs-link"
-              />
-            </template>
-          </q-breadcrumbs>
-        </div>
+  <q-card flat bordered class="col-12 q-mt-sm">
+    <div class="q-pa-sm row wrap items-center">
+      <q-btn flat round color="primary" @click="savePNG()" icon="mdi-image">
+        <q-tooltip> ดาวน์โหลด PNG </q-tooltip>
+      </q-btn>
+      <q-btn
+        flat
+        round
+        color="red-7"
+        @click="savePDF()"
+        icon="mdi-file-pdf-box"
+      >
+        <q-tooltip> ดาวน์โหลด PDF </q-tooltip>
+      </q-btn>
+      <div class="bg-grey-2 q-py-xs q-px-sm rounded-borders">
+        <q-breadcrumbs>
+          <template v-slot:separator>
+            <q-icon size="1.5em" name="chevron_right" color="primary" />
+          </template>
+          <template v-for="link in theBreadcrumb" :key="link.id">
+            <q-breadcrumbs-el
+              :label="link.label"
+              @click="refreshChart(link.id)"
+              class="breadcrumbs-link"
+            />
+          </template>
+        </q-breadcrumbs>
       </div>
-      <q-separator />
-      <div style="overflow-x: auto; overflow-y: auto" class="q-pt-md">
-        <StructChart
-          style="height: 70vh"
-          ref="chartRef"
-          class="struct"
-          :dataSource="dataSource"
-          @onElementClick="refreshChart"
-        />
-      </div>
-    </q-card>
-  </div>
+    </div>
+    <q-separator />
+    <div style="overflow-x: auto; overflow-y: auto" class="q-pt-md">
+      <StructChart
+        style="height: 70vh"
+        ref="chartRef"
+        class="struct"
+        :dataSource="dataSource"
+        @onElementClick="refreshChart"
+      />
+    </div>
+  </q-card>
+
   <full-loader :visibility="loader"></full-loader>
 </template>
 
@@ -224,7 +222,7 @@ const breadcrumbsGen = () => {
 .section-secondary,
 .struct .section-list {
   padding: 6px 15px 6px 15px;
-}  
+}
 .struct .section-primary .header {
   font-weight: 600 !important;
 }

src/modules/02_organizationalNew/views/main.vue

@@ -228,8 +228,8 @@ onMounted(async () => {
                   (store.typeOrganizational = 'current'),
                     (labelHistory = 'ประวัติโครงสร้าง')
                 "
-                :disable="ishasActive"
               />
+
               <q-btn
                 dense
                 class="q-px-md"
@@ -243,6 +243,7 @@ onMounted(async () => {
                 :disable="ishasDraft"
               />
               <q-btn-dropdown
+                v-if="itemHistory.length !== 0"
                 dense
                 class="q-px-md"
                 color="blue"