@ditojs/admin 1.8.0 → 1.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/admin",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "type": "module",
   "description": "Dito.js Admin is a schema based admin interface for Dito.js Server, featuring auto-generated views and forms and built with Vue.js",
   "repository": "https://github.com/ditojs/dito/tree/master/packages/admin",
@@ -35,35 +35,35 @@
     "not ie_mob > 0"
   ],
   "dependencies": {
-    "@ditojs/ui": "^1.8.0",
-    "@ditojs/utils": "^1.8.0",
+    "@ditojs/ui": "^1.10.0",
+    "@ditojs/utils": "^1.10.0",
     "axios": "^0.27.2",
     "codeflask": "^1.4.1",
-    "filesize": "^8.0.7",
+    "filesize": "^9.0.11",
     "filesize-parser": "^1.5.0",
-    "nanoid": "^3.3.4",
+    "nanoid": "^4.0.0",
     "tinycolor2": "^1.4.2",
     "tiptap": "^1.32.2",
     "tiptap-commands": "^1.17.1",
     "tiptap-extensions": "^1.35.2",
     "to-pascal-case": "^1.0.0",
-    "vue": "^2.6.14",
+    "vue": "^2.7.8",
     "vue-color": "^2.8.1",
     "vue-js-modal": "^1.3.35",
     "vue-multiselect": "^2.1.6",
     "vue-notification": "^1.3.20",
-    "vue-router": "^3.5.3",
+    "vue-router": "^3.5.4",
     "vue-spinner": "^1.0.4",
-    "vue-template-compiler": "^2.6.14",
+    "vue-template-compiler": "^2.7.8",
     "vue-upload-component": "^2.8.22",
     "vuedraggable": "^2.24.3"
   },
   "devDependencies": {
-    "@ditojs/build": "^1.8.0",
+    "@ditojs/build": "^1.10.0",
     "pug": "^3.0.2",
-    "sass": "1.52.1",
-    "vite": "^2.9.9",
-    "vite-plugin-vue2": "^2.0.1"
+    "sass": "1.53.0",
+    "vite": "^3.0.2",
+    "vite-plugin-vue2": "^2.0.2"
   },
-  "gitHead": "bb2c9e85083eabc51d1f4b1fd0bffd6b306b0e47"
+  "gitHead": "0b044d649e0fe1bcbcd3603bcdc9c6168058fb6d"
 }

package/src/components/DitoDialog.vue

@@ -1,5 +1,5 @@
 <template lang="pug">
-  form.dito-dialog(@submit.prevent="")
+  form.dito-dialog(@submit.prevent="submit")
     dito-schema.dito-scroll(
       :schema="schema"
       :data="dialogData"
@@ -67,38 +67,34 @@ export default DitoComponent.component('dito-dialog', {
     },
 
     buttonSchemas() {
-      return Object.entries(getButtonSchemas(this.buttons)).reduce(
-        // Process the button schemas to add default click events
-        // for both 'submit' and 'cancel' buttons:
-        (schemas, [key, schema]) => {
-          const { type, events } = schema
-          if (!events) {
-            const click = type === 'submit' ? () => this.accept()
-              : key === 'cancel' ? () => this.cancel()
-              : null
-            if (click) {
+      return Object.fromEntries(
+        Object.entries(getButtonSchemas(this.buttons)).map(
+          // Process the button schemas to add default click events
+          // for both 'submit' and 'cancel' buttons:
+          ([key, schema]) => {
+            if (key === 'cancel' && !schema.events) {
               schema = {
                 ...schema,
-                events: { click }
+                events: {
+                  click: () => this.cancel()
+                }
               }
             }
+            return [key, schema]
           }
-          schemas[key] = schema
-          return schemas
-        },
-        {}
+        )
       )
     },
 
     hasCancel() {
-      return Object.keys(this.buttonSchemas).includes('cancel')
+      return !!this.buttonSchemas.cancel
     }
   },
 
   mounted() {
     this.windowEvents = addEvents(window, {
       keyup: () => {
-        if (event.keyCode === 27) {
+        if (this.hasCancel && event.keyCode === 27) {
           this.cancel()
         }
       }
@@ -124,14 +120,12 @@ export default DitoComponent.component('dito-dialog', {
       this.hide()
     },
 
-    accept() {
+    submit() {
       this.resolve(this.dialogData)
     },
 
     cancel() {
-      if (this.hasCancel) {
-        this.resolve(null)
-      }
+      this.resolve(null)
     }
   }
 })

package/src/types/TypeLabel.vue

@@ -13,6 +13,7 @@ import TypeComponent from '../TypeComponent.js'
 
 // @vue/component
 export default TypeComponent.register('label', {
+  excludeValue: true,
   generateLabel: false
 })
 </script>

package/src/utils/schema.js

@@ -87,7 +87,9 @@ export async function resolveSchema(schema, unwrapModule = false) {
       if (keys.length === 1) {
         const name = keys[0]
         schema = schema[name]
-        schema.name = name
+        if (name !== 'default') {
+          schema.name = name
+        }
       }
     }
   }