glib-web 0.11.13 → 0.11.17

package/components/fields/radio.vue

@@ -1,26 +1,31 @@
 <template>
-  <v-tooltip
-    :disabled="tooltip.disabled"
-    :top="tooltipPositionMatches('top')"
-    :right="tooltipPositionMatches('right')"
-    :bottom="tooltipPositionMatches('bottom')"
-    :left="tooltipPositionMatches('left')"
-  >
-    <template v-slot:activator="{ on }">
-      <v-radio
-        :label="spec.label"
-        :value="spec.value.presence() || vuetifyEmptyString"
-        :class="$classes()"
-        :disabled="spec.readOnly"
-        :on-icon="spec.onIcon"
-        :off-icon="spec.offIcon"
-        v-on="on"
-        @click="$onClick()"
-      >
-      </v-radio>
-    </template>
-    <span>{{ tooltip.text }}</span>
-  </v-tooltip>
+  <div :class="$classes()">
+    <v-tooltip
+      :disabled="tooltip.disabled"
+      :top="tooltipPositionMatches('top')"
+      :right="tooltipPositionMatches('right')"
+      :bottom="tooltipPositionMatches('bottom')"
+      :left="tooltipPositionMatches('left')"
+    >
+      <template v-slot:activator="{ on }">
+        <v-radio
+          :label="spec.label"
+          :value="spec.value.presence() || vuetifyEmptyString"
+          :disabled="spec.readOnly"
+          :on-icon="spec.onIcon"
+          :off-icon="spec.offIcon"
+          v-on="on"
+          @click="$onClick()"
+        />
+        <div v-if="spec.childViews" class="radio-childviews">
+          <div v-for="(item, i) in spec.childViews" :key="i">
+            <glib-component :spec="item" />
+          </div>
+        </div>
+      </template>
+      <span>{{ tooltip.text }}</span>
+    </v-tooltip>
+  </div>
 </template>
 
 <script>

package/components/fields/radioGroup.vue

@@ -7,8 +7,10 @@
     :row="spec.row"
     @change="onChange"
   >
-    <div v-for="(item, index) in spec.childViews" :key="index">
-      <ui-component :spec="item" />
+    <div v-for="(childView, index) in spec.childViews" :key="index">
+      <div :class="activeClass(childView)" @click="updateValue(childView)">
+        <glib-component :spec="childView" />
+      </div>
     </div>
 
     <input
@@ -32,6 +34,21 @@ export default {
           GLib.action.execute(onChange, this);
         });
       });
+    },
+    updateValue(variable) {
+      if (variable.value) {
+        this.fieldModel = variable.value;
+      }
+    },
+    activeClass(childView) {
+      if (
+        childView.view.includes("fields/radio") &&
+        this.fieldModel == childView.value
+      ) {
+        return "radio--active";
+      } else {
+        return "";
+      }
     }
   }
 };

package/components/fields/textarea.vue

@@ -13,6 +13,7 @@
       :rules="$validation()"
       counter
       :outlined="$classes().includes('outlined')"
+      :no-resize="$classes().includes('no-resize')"
       validate-on-blur
       @keyup="$onTyping"
     ></v-textarea>

package/nav/dialog.vue

@@ -60,6 +60,7 @@ export default {
       footer: null,
       model: null,
       url: null,
+      urlLoaded: false,
       showClose: false
     };
   },
@@ -74,8 +75,9 @@ export default {
     $ready() {
       this.$root.vueApp = this.vueApp;
 
-      this.show();
+      this.show(false);
       this.stack.push(this);
+      console.log("DIALOG READY1", this.stack.length);
     },
     $tearDown() {
       console.log("Dialog destroyed");
@@ -91,23 +93,31 @@ export default {
     },
     reload(newSpec) {
       this.spec = newSpec;
-      this.show();
+      this.urlLoaded = false;
+      this.show(true);
     },
-    show() {
+    show(reload) {
       const spec = this.spec;
       this.url = spec.url;
       this.showClose = Utils.type.isString(this.url);
 
       if (Utils.type.isString(this.url)) {
-        this.message = "Loading...";
-        const url = Utils.url.appendParams(this.url, { _dialog: "v1" });
-        Http.execute({ url: url }, "GET", this, response => {
-          this.title = response.title;
-          this.message = "";
-          this.body = response.body;
-          this.footer = response.footer;
-          this.showClose = this.spec.showClose || false;
-        });
+        if (!this.urlLoaded) {
+          if (!reload) {
+            this.message = "Loading...";
+          }
+          const url = Utils.url.appendParams(this.url, { _dialog: "v1" });
+          Http.execute({ url: url }, "GET", this, response => {
+            Utils.http.forceComponentUpdate(() => {
+              this.urlLoaded = true;
+              this.title = response.title;
+              this.message = "";
+              this.body = response.body;
+              this.footer = response.footer;
+              this.showClose = this.spec.showClose || false;
+            });
+          });
+        }
       } else {
         this.title = this.spec.title;
         this.message = this.spec.message;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glib-web",
-  "version": "0.11.13",
+  "version": "0.11.17",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -44,4 +44,4 @@
     "eslint-plugin-vuetify": "^1.0.0-beta.3",
     "prettier": "^1.18.2"
   }
-}
+}