web-mojo 2.1.46 → 2.1.70

package/dist/chunks/{FormView-DqUBMPJ9.js → FormView-DWR9Albb.js}

@@ -1,4 +1,4 @@
-import { M as Mustache, h as MOJOUtils, V as View } from "./WebApp-B6mgbNn2.js";
+import { M as Mustache, h as MOJOUtils, V as View } from "./WebApp-No-qysKc.js";
 class FormBuilder {
   constructor(config = {}) {
     this.fields = config.fields || [];
@@ -2481,7 +2481,7 @@ class CollectionSelectView extends View {
     this.debounceMs = options.debounceMs || 1e3;
     this.name = options.name || "collection_select";
     this.emptyFetch = options.emptyFetch !== false;
-    this.selectedValue = options.value || "";
+    this.selectedValue = options.value || "0";
     this.selectedLabel = "";
     this.searchValue = "";
     this.showDropdown = false;
@@ -2490,6 +2490,10 @@ class CollectionSelectView extends View {
     this.focusedIndex = -1;
     this.hasError = false;
     this.errorMessage = "";
+    if (this.selectedValue && typeof this.selectedValue === "object") {
+      this.selectedLabel = this.selectedValue[this.labelField] || "";
+      this.selectedValue = this.selectedValue[this.valueField] || "0";
+    }
     this.searchTimer = null;
     this.dropdownView = null;
     this.defaultParams = {};
@@ -2541,7 +2545,8 @@ class CollectionSelectView extends View {
       }
       let model = await this.collection.fetchOne(this.selectedValue);
       if (model) {
-        this.selectedLabel = model.get(this.labelField);
+        this.selectedLabel = model.get(this.labelField, `${model.constructor.name} #${model.id}`);
+        this.render();
       }
     } catch (error) {
       console.error("Error loading selected item:", error);
@@ -2559,7 +2564,7 @@ class CollectionSelectView extends View {
       placeholder: this.placeholder,
       displayValue,
       selectedValue: this.selectedValue,
-      showClear: !!(this.selectedValue && this.selectedLabel),
+      showClear: !!(this.selectedValue && this.selectedValue !== "0" && this.selectedLabel),
       hasError: this.hasError,
       errorMessage: this.errorMessage
     };
@@ -2622,9 +2627,9 @@ class CollectionSelectView extends View {
       this.hasSearched = true;
       this.focusedIndex = -1;
       if (this.searchValue !== this.selectedLabel) {
-        this.selectedValue = "";
+        this.selectedValue = "0";
         this.selectedLabel = "";
-        this.emit("change", { value: "", label: "" });
+        this.emit("change", { value: "0", label: "" });
       }
       if (this.searchTimer) {
         clearTimeout(this.searchTimer);
@@ -2641,7 +2646,7 @@ class CollectionSelectView extends View {
     this.clearSelection();
   }
   clearSelection() {
-    this.selectedValue = "";
+    this.selectedValue = "0";
     this.selectedLabel = "";
     this.searchValue = "";
     this.showDropdown = false;
@@ -2655,11 +2660,11 @@ class CollectionSelectView extends View {
     }
     const hiddenInput = this.getHiddenInput();
     if (hiddenInput) {
-      hiddenInput.value = "";
+      hiddenInput.value = "0";
     }
     this.updateDropdown();
     this.render();
-    this.emit("change", { value: "", label: "" });
+    this.emit("change", { value: "0", label: "" });
   }
   async performSearch() {
     if (!this.collection) return;
@@ -2803,25 +2808,29 @@ class CollectionSelectView extends View {
     return this.selectedValue;
   }
   setFormValue(value) {
-    if (value && value[this.valueField]) {
-      if (value[this.valueField] == this.selectedValue) return;
-      this.selectedValue = value[this.valueField];
-      this.selectedLabel = value[this.labelField];
-      this.searchValue = value[this.labelField];
-      this.hasSearched = false;
-      this.showDropdown = false;
-      this.hasError = false;
+    let newValue = value;
+    let newLabel = "";
+    if (newValue && typeof newValue === "object") {
+      newLabel = newValue[this.labelField] || "";
+      newValue = newValue[this.valueField];
+    }
+    newValue = newValue || "0";
+    if (newValue == this.selectedValue) {
+      return;
+    }
+    this.selectedValue = newValue;
+    this.selectedLabel = newLabel;
+    this.searchValue = "";
+    this.hasSearched = false;
+    this.showDropdown = false;
+    this.hasError = false;
+    if (this.selectedValue && this.selectedValue !== "0") {
+      if (!this.selectedLabel) {
+        this.selectedLabel = `${this.collection.getModelName()} #${this.selectedValue}`;
+      }
       this.loadSelectedItem();
-      this.setValue(this.selectedValue, this.selectedLabel);
-    } else if (value !== this.selectedValue) {
-      this.selectedValue = value;
-      this.selectedLabel = `${this.collection.getModelName()} #${value}`;
-      this.searchValue = `${this.collection.getModelName()} #${value}`;
-      this.hasSearched = false;
-      this.showDropdown = false;
-      this.hasError = false;
-      if (this.selectedValue) this.loadSelectedItem();
-      this.setValue(this.selectedValue, this.selectedLabel);
+    } else {
+      this.render();
     }
   }
 }
@@ -4118,7 +4127,7 @@ class FormView extends View {
    */
   handleFieldChange(fieldName, value) {
     this.data[fieldName] = value;
-    if (this.model && typeof this.model.set === "function") {
+    if (this.model && this.options.allowModelChange) {
       this.model.set(fieldName, value);
     }
     this.emit("field:change", { field: fieldName, value });
@@ -4613,7 +4622,7 @@ class FormView extends View {
         }
       }
       if (this.model && typeof this.model.save === "function") {
-        const result = await this.saveModel();
+        const result = await this.saveModel(formData);
         if (result && result.success !== false) {
           return {
             success: true,
@@ -4646,11 +4655,11 @@ class FormView extends View {
    * Only saves changed data for efficiency
    * @returns {Promise<Object>} Save result from model
    */
-  async saveModel() {
+  async saveModel(formData = null) {
     if (!this.model || typeof this.model.save !== "function") {
       throw new Error("No model available for saving");
     }
-    const formData = await this.getFormData();
+    if (!formData) formData = await this.getFormData();
     const changes = this.getChangedData(formData);
     if (!changes || Object.keys(changes).length === 0) {
       console.log("No changes detected, skipping save");
@@ -4757,7 +4766,7 @@ class FormView extends View {
       const newValue = currentData[key];
       const originalValue = resolveDotNotation(originalData, key);
       const fieldType = fieldConfig.type || "text";
-      if (this.valuesAreDifferent(newValue, originalValue, fieldType)) {
+      if (this.valuesAreDifferent(newValue, originalValue, fieldType, fieldConfig)) {
         changedData[key] = newValue;
         hasChanges = true;
       }
@@ -4769,15 +4778,27 @@ class FormView extends View {
    * @param {*} newValue - New value from form
    * @param {*} originalValue - Original value from model
    * @param {string} fieldType - The type of the field from the form config
+   * @param {object} fieldConfig - The configuration of the field from the form config
    * @returns {boolean} True if values are different
    */
-  valuesAreDifferent(newValue, originalValue, fieldType = "text") {
+  valuesAreDifferent(newValue, originalValue, fieldType = "text", fieldConfig = {}) {
     if (newValue instanceof File) {
       return newValue.size > 0 && newValue.name !== "" && newValue.name !== "blob";
     }
     if (typeof newValue === "string" && newValue.startsWith("data:image/")) {
       return true;
     }
+    if (fieldType === "collection") {
+      if (typeof originalValue === "object" && typeof newValue === "string") {
+        if (newValue === "0") {
+          return originalValue !== null;
+        }
+        const valueField = fieldConfig.valueField || "id";
+        if (originalValue[valueField] == newValue) {
+          return false;
+        }
+      }
+    }
     if (fieldType === "switch" || fieldType === "checkbox") {
       const newBool = !!newValue;
       const originalBool = !!originalValue;
@@ -5051,4 +5072,4 @@ export {
   applyFileDropMixin as a,
   FormView$1 as b
 };
-//# sourceMappingURL=FormView-DqUBMPJ9.js.map
+//# sourceMappingURL=FormView-DWR9Albb.js.map