@unvired/turboforms-embed-sdk 2.0.35 → 2.0.36

package/dist/turboforms.html

@@ -35962,14 +35962,60 @@ class SmartSelectComponent extends SmartSelectList {
 
     if (this.component.filter) {
       try {
-        const filterStr = this.interpolate(this.component.filter);
-        let [key, val] = filterStr.split('=').map(s => decodeURIComponent(s.trim()));
+        let val;
+        let isTemplate = false;
+        if (this.component.filter.includes('={{')) {
+          const match = this.component.filter.match(/\{\{([^}]+)\}\}/);
+          if (match) {
+            isTemplate = true;
+            const path = match[1].trim();
+            let contextVal = _.get(this.evalContext ? this.evalContext() : { data: this.data }, path);
+            if (contextVal === undefined) {
+              const cleanPath = path.startsWith('data.') ? path.replace('data.', '') : path;
+              contextVal = _.get(this.data, cleanPath);
+            }
+            if (contextVal && typeof contextVal === 'object') {
+              if (contextVal.value !== undefined) {
+                val = contextVal.value;
+              } else if (contextVal.id !== undefined) {
+                val = contextVal.id;
+              } else if (contextVal.data && contextVal.data.value !== undefined) {
+                val = contextVal.data.value;
+              } else {
+                val = contextVal;
+              }
+            } else {
+              val = contextVal;
+            }
+          }
+        }
+        
+        if (!isTemplate || val === undefined) {
+          const filterStr = this.interpolate(this.component.filter, this.evalContext ? this.evalContext() : { data: this.data });
+          let [k, v] = filterStr.split('=').map(s => decodeURIComponent(s.trim()));
+          val = v;
+        }
+
+        let key = this.component.filter.split('=')[0].trim();
+        let originalKey = key;
         if (key && key.startsWith('data.')) {
           key = key.replace('data.', '');
-
         }
+
         items = items.filter((row) => {
-          return String(row[key]).toLowerCase() === String(val).toLowerCase();
+          let rowVal;
+          if (row) {
+            if (row.hasOwnProperty(originalKey)) {
+              rowVal = row[originalKey];
+            } else if (row.data && row.data.hasOwnProperty(key)) {
+              rowVal = row.data[key];
+            } else if (row.hasOwnProperty(key)) {
+              rowVal = row[key];
+            } else {
+              rowVal = _.get(row, originalKey) !== undefined ? _.get(row, originalKey) : _.get(row, key);
+            }
+          }
+          return rowVal !== undefined && val !== undefined && String(rowVal).toLowerCase() === String(val).toLowerCase();
         });
       } catch (e) {
         console.warn('[TF_SDK:153] ⚠️ Filter error:', e);
@@ -36048,16 +36094,19 @@ class SmartSelectComponent extends SmartSelectList {
         // }
         console.log("[TF_SDK:159] ✅ this.data =" + this.data[this.key]);
         if (!this.isFromSearch && !this.isScrollLoading && !this.component.dropdownOpened) {
-          if (this.component.masterdata && this.defaultDownloadedResources && this.defaultDownloadedResources.length > 0 && (this.defaultDownloadedResources.length < this.component.masterdata.length)) {
+          const masterdataList = this.filteredMasterdata;
+          if (masterdataList && this.defaultDownloadedResources && this.defaultDownloadedResources.length > 0 && (this.defaultDownloadedResources.length < masterdataList.length)) {
             this.setItems(this.defaultDownloadedResources);
           } else {
-            // if (!this.component.dropdownOpened && this.data[this.key] && String(this.data[this.key]).length > 0 && this.component.masterdata) {
-            if (!this.component.dropdownOpened && this.component.masterdata) {
-              console.log("[TF_SDK:160] ✅ Masterdata found for component:", this.component.key, "Length:", this.component.masterdata.length);
-              console.log("[TF_SDK:161] ✅ Masterdata first item:", this.component.masterdata[0]);
+            // if (!this.component.dropdownOpened && this.data[this.key] && String(this.data[this.key]).length > 0 && masterdataList) {
+            if (!this.component.dropdownOpened && masterdataList) {
+              console.log("[TF_SDK:160] ✅ Masterdata found for component:", this.component.key, "Length:", masterdataList.length);
+              if (masterdataList.length > 0) {
+                console.log("[TF_SDK:161] ✅ Masterdata first item:", masterdataList[0]);
+              }
               if (this.data && this.data[this.key]) {
                 console.log("[TF_SDK:162] ✅ Filtering masterdata with search term:", this.data[this.key]);
-                let result = this.component.masterdata.filter((value) => {
+                let result = masterdataList.filter((value) => {
                   if (value) {
                     let propVal = _.get(value, this.component.valueProperty);
                     let data = propVal ? propVal.toString().toLowerCase() : '';
@@ -36069,10 +36118,10 @@ class SmartSelectComponent extends SmartSelectList {
                 this.setItems(result);
               } else {
                 console.log("[TF_SDK:164] ✅ No search term, passing all masterdata to setItems.");
-                this.setItems(this.component.masterdata);
+                this.setItems(masterdataList);
               }
             } else {
-              console.log("[TF_SDK:165] ✅ Condition failed. dropdownOpened:", this.component.dropdownOpened, "masterdata:", !!this.component.masterdata);
+              console.log("[TF_SDK:165] ✅ Condition failed. dropdownOpened:", this.component.dropdownOpened, "masterdata:", !!masterdataList);
             }
           }
         }
@@ -42821,7 +42870,7 @@ window.CommentOnBack = CommentOnBack;
 
     
     <div id="sticky-footer">
-        <div class="build-version">SDK v2.0.35</div>
+        <div class="build-version">SDK v2.0.36</div>
         <div class="relative-position">
             <button id="unvired-more-btn" class="ui button primary dataGrid-addRow" onclick="toggleTooltip()">
                 <i class="icon options"></i>