zet-lib 1.0.66 → 1.0.68

package/lib/Form.js

@@ -350,7 +350,7 @@ Form.field = (obj) => {
             </span>
             </div>`
       return `<div class="input-group">
-					<select ${tabindex} class="form-control"  ${id}  ${placeholder} ${htmlOptions} >${selects}</select>
+					<select ${tabindex} class="form-control  ${obj.class} dropdown-multi"  ${id}  ${placeholder} ${htmlOptions} >${selects}</select>
 					<span id="dropdownadd${obj.id}" class="input-group-text dropdownadd" data-id="${obj.id}" style="cursor: pointer;" title=" ${LANGUAGE['form_add_data']} ">+</span>
 				</div>
 				<div id="dropdownbox${obj.id}" class="boxy mb-3">${spanmulti}</div>`

package/lib/zRoute.js

@@ -2543,7 +2543,7 @@ zRoute.moduleLib = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
     Util.writeFile(`${path_script}/${time}.js`, uglifyJS.minify(jsObj.script))
     Util.writeFile(`${path_head}/head.txt`, jsObj.head)
     Util.writeFile(`${path_end}/end.txt`, jsObj.end)
-    end += `<script src="/runtime/script/${table}/${time}/.js"></script>`
+    end += `<script src="/runtime/script/${table}/${time}.js"></script>`
     if (jsObj.head) {
       head += jsObj.head
     }
@@ -2555,8 +2555,25 @@ zRoute.moduleLib = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
   if (head) {
     res.locals.moduleHead = head
   }
+
+  //add script for dropdown multi in table type
+  //stupid way temporary
+  let scriptTemp = '';
+  for(let keys in MYMODEL.widgets) {
+    if(MYMODEL.widgets[keys].name == "table") {
+      let MODEL_TABLE = require(`${dirRoot}/models/${MYMODEL.widgets[keys].table}`);
+      for(let key in MODEL_TABLE.widgets) {
+        if(MODEL_TABLE.widgets[key].name == "dropdown_multi") {
+          let relObject = relations[keys+'Row'][key+'Object'];
+          scriptTemp += `<script>var ${key}Object = ${JSON.stringify(relObject)};</script>${Util.newLine}`;
+        }
+      }
+    }
+  }
+
+  //end
   if (end) {
-    res.locals.moduleEnd = end
+    res.locals.moduleEnd = scriptTemp + end
   }
 }
 
@@ -2861,16 +2878,18 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
         for (let qq in MODEL_TABLE.widgets) {
           //check if have dropdown_multi
           if (MODEL_TABLE.widgets[qq].name == 'dropdown_multi') {
-            scriptForm += ` $("#body-${keys}").on("click", "#dropdownadd${qq}",function () {
+            dropdownMultis.push(qq);
+            scriptForm += `$("#body-${keys}").on("click", "#dropdownadd${qq}",function () {
         let elm =  $(this).siblings("#${qq}");
         var val = elm.val();
         if(val == ""){
             alert("Please select data");
             return false;
         }
+        var lengthOfItem = $(this).closest("tr").attr("data-id");
         let text = elm.find("option:selected").text();
         var count = $(this).parent().parent().find(".span${qq}").length;
-        var data = "<span class='span${qq}' > "+(count+1)+". <input type='hidden' name='${MODEL_TABLE.table}[${qq}][]' value='"+val+"' /> " + text +"   <img class='tabler-icons icons-filter-danger pull-right' src='/assets/icons/trash-filled.svg' onclick='$(this).closest(\`span\`).remove();'  title='Delete' /> <br></span>";
+        var data = "<span class='span${qq}' > "+(count+1)+". <input type='hidden' name='${MYMODEL.table}[${keys}]["+lengthOfItem+"][${qq}]["+count+"]' value='"+val+"' /> " + text +"   <img class='tabler-icons icons-filter-danger pull-right' src='/assets/icons/trash-filled.svg' onclick='$(this).closest(\`span\`).remove();'  title='Delete' /> <br></span>";
         $(this).parent().parent().find("#dropdownbox${qq}").append(data);
         $(this).siblings("#${qq}").val("");
     });${Util.newLine}`
@@ -2904,7 +2923,7 @@ $("#body-${keys}>tr").each(function (index, tr) {
                     $(input).attr("name",dataname+"["+index+"]["+$(input).data("name")+"]");
                 }
             });
-
+            
             var textareas = $(tr).find("textarea");
             textareas.each(function (i,input) {
                 if($(input).data("name")){
@@ -2942,6 +2961,17 @@ $("#body-${keys}>tr").each(function (index, tr) {
                             $(".${subname}_" + key).eq(index).closest("TD").find("img").attr("src",filename).addClass("boxy");
                             $(".${subname}_" + key).eq(index).closest("TD").append('<a href="'+filenamex+'" target="_blank" style="font-size: 12px">'+myimg+'</a>');
                         }
+                    }  else if($(".${subname}_" + key).eq(index).hasClass("dropdown-multi")){
+                        var dropdownsData = ''; 
+                        var mydropdowns = myobj[key] || [];
+                        mydropdowns = mydropdowns.filter((item) => item.length > 0);
+                        
+                        mydropdowns.map((item, i) => {
+                            var text = ${dropdownMultis[0]}Object[item];
+                            dropdownsData += "<span class='span"+key+"' > "+(i+1)+". <input type='hidden' name='${MYMODEL.table}[${keys}]["+index+"]["+key+"]["+i+"]' value='"+item+"' /> " + text +"   <img class='tabler-icons icons-filter-danger pull-right' src='/assets/icons/trash-filled.svg' onclick='$(this).closest(\`span\`).remove();'  title='Delete' /> <br></span>";
+                                   
+                        });
+                        $(".${subname}_" + key).eq(index).closest("TD").find("#dropdownboxparameter_income").html(dropdownsData);
                     } else {
                         $(".${subname}_" + key).eq(index).val(myobj[key] ? myobj[key] : '');
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.0.66",
+  "version": "1.0.68",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"