glib-web 3.0.11 → 3.0.12

package/nav/dialog.vue

@@ -5,17 +5,16 @@
       <!-- <v-card-title v-if="title || showClose" class="text-h5" primary-title> -->
 
       <panels-responsive v-if="header" :spec="header" />
-      <div class="flex flex-wrap justify-between" v-if="title && showClose">
-        <div v-if="title" class="dialogs-title theme--light v-subheader">
+      <div class="dialog-title flex flex-wrap justify-between" v-if="title">
+        <div class="theme--light v-subheader">
           {{ title }}
         </div>
+      </div>
 
-        <v-btn size="small" v-if="showClose" text icon @click="close" class="mr-2 mt-2" variant="flat">
+      <div class="dialogs-body relative">
+        <v-btn size="small" v-if="showClose" text icon @click="close" class="mr-3 mt-2 close-btn" variant="flat">
           <v-icon>close</v-icon>
         </v-btn>
-      </div>
-
-      <div class="dialogs-body">
         <component :is="containerComponent" :spec="formSpec">
           <div v-if="message" class="dialog-message">
             <common-message :spec="{ message: message }" />
@@ -65,7 +64,7 @@ export default {
       model: null,
       url: null,
       urlLoaded: false,
-      showClose: false,
+      showClose: true,
       isFormDirty: false,
       isFormSubmitted: false,
       isMobile: false,
@@ -149,7 +148,7 @@ export default {
     show(reload) {
       const spec = this.spec;
       this.url = spec.url;
-      this.showClose = Utils.type.isString(this.url);
+      this.showClose = this.spec.showClose || Utils.type.isString(this.url);
 
       if (Utils.type.isString(this.url)) {
         if (!this.urlLoaded) {
@@ -167,7 +166,7 @@ export default {
               this.header = response.header;
               this.body = response.body;
               this.footer = response.footer;
-              this.showClose = this.spec.showClose || false;
+              this.showClose = this.spec.showClose || true;
 
               Action.execute(response.onLoad, this);
             });
@@ -177,7 +176,7 @@ export default {
         this.title = this.spec.title;
         this.message = this.spec.message;
         this.body = this.spec.body;
-        this.showClose = this.spec.showClose || false;
+        this.showClose = this.spec.showClose || true;
         Action.execute(spec.onLoad, this);
       }
 
@@ -200,6 +199,12 @@ export default {
   /* white-space: pre-wrap; */
 }
 
+.close-btn {
+  top: 0;
+  right: 0;
+  position: absolute;
+}
+
 .dialog-close {
   right: 16px;
   top: 12px;
@@ -216,6 +221,7 @@ export default {
   justify-content: space-between;
   height: 100%;
   padding: 0;
+  position: relative;
 }
 
 .dialogs-body {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glib-web",
-  "version": "3.0.11",
+  "version": "3.0.12",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -45,4 +45,4 @@
     "prettier": "^1.18.2",
     "typescript": "^4.9.5"
   }
-}
+}