zet-lib 1.0.65 → 1.0.67
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/zRoute.js +26 -4
- package/package.json +1 -1
package/lib/zRoute.js
CHANGED
|
@@ -2850,12 +2850,33 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
|
|
|
2850
2850
|
let MODEL_TABLE = MYMODELS[MYMODEL.widgets[keys].table] || require(`${dirRoot}/models/${MYMODEL.widgets[keys].table}`)
|
|
2851
2851
|
//let MODEL_TABLE_RELATIONS = await zRoute.relations(req, res, MODEL_TABLE.table);
|
|
2852
2852
|
//relations[key + "TABLE"]
|
|
2853
|
-
let
|
|
2854
|
-
let zForm = zRoute.formField(req, res, MODEL_TABLE,
|
|
2855
|
-
zRoute.moduleLib(req, res, MODEL_TABLE,
|
|
2853
|
+
let RELATIONS_MODEL_TABLE = relations && relations.hasOwnProperty(keys + 'TABLE') ? relations[keys + 'TABLE'] : {}
|
|
2854
|
+
let zForm = zRoute.formField(req, res, MODEL_TABLE, RELATIONS_MODEL_TABLE)
|
|
2855
|
+
zRoute.moduleLib(req, res, MODEL_TABLE, RELATIONS_MODEL_TABLE, zForms)
|
|
2856
2856
|
let trash = `trash_${keys}_${MYMODEL.widgets[keys].table}`
|
|
2857
2857
|
let subname = MYMODEL.table + '_' + keys
|
|
2858
2858
|
let relationsWithKeys = relations ? relations[keys] : {}
|
|
2859
|
+
let dropdownMultis = []
|
|
2860
|
+
|
|
2861
|
+
for (let qq in MODEL_TABLE.widgets) {
|
|
2862
|
+
//check if have dropdown_multi
|
|
2863
|
+
if (MODEL_TABLE.widgets[qq].name == 'dropdown_multi') {
|
|
2864
|
+
scriptForm += `$("#body-${keys}").on("click", "#dropdownadd${qq}",function () {
|
|
2865
|
+
let elm = $(this).siblings("#${qq}");
|
|
2866
|
+
var val = elm.val();
|
|
2867
|
+
if(val == ""){
|
|
2868
|
+
alert("Please select data");
|
|
2869
|
+
return false;
|
|
2870
|
+
}
|
|
2871
|
+
var lengthOfItem = $(this).closest("tr").attr("data-id");
|
|
2872
|
+
let text = elm.find("option:selected").text();
|
|
2873
|
+
var count = $(this).parent().parent().find(".span${qq}").length;
|
|
2874
|
+
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>";
|
|
2875
|
+
$(this).parent().parent().find("#dropdownbox${qq}").append(data);
|
|
2876
|
+
$(this).siblings("#${qq}").val("");
|
|
2877
|
+
});${Util.newLine}`
|
|
2878
|
+
}
|
|
2879
|
+
}
|
|
2859
2880
|
|
|
2860
2881
|
scriptForm += `var append${keys} = (increment, callback) => { buildform(increment,'${MYMODEL.table}','${keys}','${JSON.stringify(relationsWithKeys)}', (data) => callback(data)) } `
|
|
2861
2882
|
scriptForm += Util.newLine
|
|
@@ -2883,7 +2904,7 @@ $("#body-${keys}>tr").each(function (index, tr) {
|
|
|
2883
2904
|
$(input).removeAttr("name");
|
|
2884
2905
|
$(input).attr("name",dataname+"["+index+"]["+$(input).data("name")+"]");
|
|
2885
2906
|
}
|
|
2886
|
-
});
|
|
2907
|
+
});
|
|
2887
2908
|
|
|
2888
2909
|
var textareas = $(tr).find("textarea");
|
|
2889
2910
|
textareas.each(function (i,input) {
|
|
@@ -2931,6 +2952,7 @@ $("#body-${keys}>tr").each(function (index, tr) {
|
|
|
2931
2952
|
});
|
|
2932
2953
|
|
|
2933
2954
|
});${Util.newLine}`
|
|
2955
|
+
|
|
2934
2956
|
break
|
|
2935
2957
|
|
|
2936
2958
|
case 'ide_editor':
|