glib-web 2.6.9 → 2.6.10

package/components/_chip.vue

@@ -11,7 +11,10 @@
           @click="$onClick()"
           v-on="on"
         >
-          {{ spec.text }}
+          <div v-if="spec.icon" class="icon-wrapper">
+            <common-icon :spec="spec.icon" />
+          </div>
+          <div>{{ spec.text }}</div>
         </v-chip>
         <v-chip
           v-else
@@ -20,7 +23,13 @@
           :small="$classes().includes('small')"
           v-on="on"
         >
-          {{ spec.text }}
+          <!-- <span v-if="spec.icon" class="icon-wrapper"
+            ><common-icon :spec="spec.icon"
+          /></span> -->
+          <div v-if="spec.icon" class="icon-wrapper">
+            <common-icon :spec="spec.icon" />
+          </div>
+          <div>{{ spec.text }}</div>
         </v-chip>
       </common-badge>
     </template>
@@ -53,4 +62,8 @@ export default {
 .v-chip:not(.v-chip--clickable).theme--light:hover:before {
   opacity: 0;
 }
+.icon-wrapper {
+  display: flex;
+  padding-right: 2px;
+}
 </style>

package/components/fields/check.vue

@@ -30,6 +30,31 @@ export default {
   },
   methods: {
     $ready() {
+      this.updateData()
+    },
+    changed(event) {
+      // Execute later to ensure the checkbox's checked state has been updated.
+      setTimeout(() => {
+        this.$type.ifObject(this.groupElement, val =>
+          val.dispatchEvent(new Event("change"))
+        );
+      }, 100);
+
+      // setTimeout(() => {
+      this.$executeOnChange();
+      // }, 500);
+    },
+    $internalizeValue(val) {
+      if (val == this.spec.checkValue) {
+        return val;
+      }
+      return this.spec.uncheckValue;
+    },
+    action_merge(mergedSpec) {
+      Object.assign(this.spec, mergedSpec);
+      this.updateData()
+    },
+    updateData() {
       this.groupElement = this.$el.closest("[data-component=checkGroup]");
 
       let groupName = null;
@@ -49,24 +74,7 @@ export default {
           this.fieldType = "switch";
         }
       });
-    },
-    changed(event) {
-      // Execute later to ensure the checkbox's checked state has been updated.
-      setTimeout(() => {
-        this.$type.ifObject(this.groupElement, val =>
-          val.dispatchEvent(new Event("change"))
-        );
-      }, 100);
-
-      // setTimeout(() => {
-      this.$executeOnChange();
-      // }, 500);
-    },
-    $internalizeValue(val) {
-      if (val == this.spec.checkValue) {
-        return val;
-      }
-      return this.spec.uncheckValue;
+      // this.fieldModel = this.spec.value;
     }
   }
 };

package/components/fields/submit.vue

@@ -1,5 +1,5 @@
 <template>
-  <common-button :spec="spec" type="submit" :disabled="$isBusy" />
+  <common-button :spec="spec" type="submit" :disabled="spec.disabled || $isBusy" />
 </template>
 
 <script>
@@ -15,7 +15,10 @@ export default {
   methods: {
     $ready() {
       this.$dispatchEvent("forms/addSubmit", this.$data);
-    }
+    },
+    action_merge(mergedSpec) {
+      Object.assign(this.spec, mergedSpec);
+    },
   }
 };
 </script>

package/nav/dialog.vue

@@ -178,6 +178,8 @@ export default {
               this.body = response.body;
               this.footer = response.footer;
               this.showClose = this.spec.showClose || false;
+
+              Action.execute(response.onLoad, this);
             });
           });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glib-web",
-  "version": "2.6.9",
+  "version": "2.6.10",
   "description": "",
   "main": "index.js",
   "scripts": {