@ditojs/admin 2.97.0 → 2.99.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/admin",
-  "version": "2.97.0",
+  "version": "2.99.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/main/packages/admin",
@@ -40,8 +40,8 @@
     "not ie_mob > 0"
   ],
   "dependencies": {
-    "@ditojs/ui": "^2.97.0",
-    "@ditojs/utils": "^2.97.0"
+    "@ditojs/ui": "^2.99.0",
+    "@ditojs/utils": "^2.99.0"
   },
   "peerDependencies": {
     "@kyvg/vue3-notification": "^3.4.2",
@@ -89,9 +89,9 @@
     "vue-upload-component": "^3.1.17"
   },
   "devDependencies": {
-    "@ditojs/build": "^2.97.0",
+    "@ditojs/build": "^2.99.0",
     "typescript": "^6.0.3",
     "vite": "^8.0.10"
   },
-  "gitHead": "a15b3aa1474b88b4dbefd114491605b5715a6526"
+  "gitHead": "ba1ce26d349a74e8143faa614488182b67416db1"
 }

package/src/components/DitoForm.vue

@@ -359,6 +359,14 @@ export default DitoComponent.component('DitoForm', {
       this.setData(null)
     },
 
+    // @override ResourceMixin.shouldApplyLoadedData()
+    shouldApplyLoadedData() {
+      // Drop a GET response if the user has made local edits while the
+      // request was in flight — applying it would wholesale-replace
+      // `loadedData` and silently clobber those edits.
+      return !this.isDirty
+    },
+
     // @override ResourceMixin.setData()
     setData(data) {
       // setData() is called after submit when data has changed.

package/src/mixins/ItemMixin.js

@@ -6,7 +6,7 @@ import {
   isListSource
 } from '../utils/schema.js'
 import { appendDataPath } from '../utils/data.js'
-import { isObject, isString, isFunction } from '@ditojs/utils'
+import { isObject, isString, isNumber, isFunction } from '@ditojs/utils'
 
 // @vue/component
 export default {
@@ -114,7 +114,10 @@ export default {
           isListSource(sourceSchema) && columns && Object.keys(columns)[0] ||
           'name'
         )
-        text = item[key]
+        const value = item[key]
+        // Only primitives display as a label. If the property holds an array
+        // or object, fall through to the auto-generated label.
+        text = isString(value) || isNumber(value) ? value : null
       }
       const hadLabel = !!text
       // If no label was found so far, try to produce one from the index.

package/src/mixins/ResourceMixin.js

@@ -160,6 +160,13 @@ export default {
       this.loadedData = null
     },
 
+    // @overridable
+    // Subclasses override this to skip applying response data when local
+    // state would be overwritten — see DitoForm, which checks `isDirty`.
+    shouldApplyLoadedData() {
+      return true
+    },
+
     // @overridable
     setData(data) {
       this.loadedData = data
@@ -217,7 +224,13 @@ export default {
             }
           }
         } else {
-          this.setData(response.data)
+          // Skip applying response data when the consumer (e.g. a dirty
+          // DitoForm) reports it would overwrite local edits made while the
+          // GET was in flight. The 'load' event still fires — the GET *did*
+          // complete; we just chose not to apply it.
+          if (this.shouldApplyLoadedData()) {
+            this.setData(response.data)
+          }
           this.emitSchemaEvent('load')
         }
       })