zet-lib 1.0.64 → 1.0.66

package/lib/zGeneratorRouter.js

@@ -269,7 +269,7 @@ router.post('/save_and_generate', csrfProtection, async (req, res) => {
     res.json(json)
   } catch (e) {
     console.log(e)
-    res.status(400).json({ message: e.toString() })
+    res.status(200).json({ message: e + '' })
   }
 })
 

package/lib/zRoute.js

@@ -2850,12 +2850,32 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
         let MODEL_TABLE = MYMODELS[MYMODEL.widgets[keys].table] || require(`${dirRoot}/models/${MYMODEL.widgets[keys].table}`)
         //let MODEL_TABLE_RELATIONS = await zRoute.relations(req, res, MODEL_TABLE.table);
         //relations[key + "TABLE"]
-        let MODEL_TABLE_RELATIONS = relations && relations.hasOwnProperty(keys + 'TABLE') ? relations[keys + 'TABLE'] : {}
-        let zForm = zRoute.formField(req, res, MODEL_TABLE, MODEL_TABLE_RELATIONS)
-        zRoute.moduleLib(req, res, MODEL_TABLE, MODEL_TABLE_RELATIONS, zForms)
+        let RELATIONS_MODEL_TABLE = relations && relations.hasOwnProperty(keys + 'TABLE') ? relations[keys + 'TABLE'] : {}
+        let zForm = zRoute.formField(req, res, MODEL_TABLE, RELATIONS_MODEL_TABLE)
+        zRoute.moduleLib(req, res, MODEL_TABLE, RELATIONS_MODEL_TABLE, zForms)
         let trash = `trash_${keys}_${MYMODEL.widgets[keys].table}`
         let subname = MYMODEL.table + '_' + keys
         let relationsWithKeys = relations ? relations[keys] : {}
+        let dropdownMultis = []
+
+        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 () {
+        let elm =  $(this).siblings("#${qq}");
+        var val = elm.val();
+        if(val == ""){
+            alert("Please select data");
+            return false;
+        }
+        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>";
+        $(this).parent().parent().find("#dropdownbox${qq}").append(data);
+        $(this).siblings("#${qq}").val("");
+    });${Util.newLine}`
+          }
+        }
 
         scriptForm += `var append${keys} = (increment, callback) => { buildform(increment,'${MYMODEL.table}','${keys}','${JSON.stringify(relationsWithKeys)}', (data) => callback(data)) } `
         scriptForm += Util.newLine
@@ -2931,6 +2951,7 @@ $("#body-${keys}>tr").each(function (index, tr) {
     });
     
 });${Util.newLine}`
+
         break
 
       case 'ide_editor':

package/package.json

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