zet-lib 1.0.42 → 1.0.44
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/Form.js +1 -1
- package/lib/connection.js +0 -1
- package/lib/zRoute.js +7 -3
- package/package.json +1 -1
package/lib/Form.js
CHANGED
|
@@ -326,7 +326,7 @@ Form.field = (obj) => {
|
|
|
326
326
|
arr = typeof value == "string" ? JSON.parse(value) : value;
|
|
327
327
|
if (Array.isArray(arr)) {
|
|
328
328
|
arr.forEach(function (item, index) {
|
|
329
|
-
spanmulti += `<span class='span${obj.id}'>${index + 1}. <input type='hidden' name='${obj.name}[]' value='${item}' />${obj.multi[item]}<
|
|
329
|
+
spanmulti += `<span class='span${obj.id}'>${index + 1}. <input type='hidden' name='${obj.name}[]' value='${item}' />${obj.multi[item]}<img class='tabler-icons icons-filter-danger pull-right' src='/assets/icons/trash-filled.svg' onclick='$(this).closest("span").remove();' title='${LANGUAGE['delete']}' /><br></span>`;
|
|
330
330
|
});
|
|
331
331
|
}
|
|
332
332
|
}
|
package/lib/connection.js
CHANGED
package/lib/zRoute.js
CHANGED
|
@@ -834,7 +834,7 @@ zRoute.dataTableData = (key, value, MYMODEL, relations) => {
|
|
|
834
834
|
break;
|
|
835
835
|
|
|
836
836
|
case "image" :
|
|
837
|
-
myvalue = Util.fileView("/uploads/" + MYMODEL.routeName + "/", value);
|
|
837
|
+
myvalue = Util.fileView("/uploads/" + MYMODEL.routeName + "/", value, {width:60});
|
|
838
838
|
break;
|
|
839
839
|
|
|
840
840
|
case "file" :
|
|
@@ -2547,6 +2547,9 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
|
|
|
2547
2547
|
hasDateTimePicker = true;
|
|
2548
2548
|
} else if (widgets[key].name == "table") {
|
|
2549
2549
|
hasTable = true;
|
|
2550
|
+
hasDateTimePicker = true;
|
|
2551
|
+
hasClockPicker = true;
|
|
2552
|
+
hasDatePicker = true;
|
|
2550
2553
|
} else if (widgets[key].name == "tags") {
|
|
2551
2554
|
hasTags = true;
|
|
2552
2555
|
} else if (widgets[key].name == "lexical") {
|
|
@@ -2729,14 +2732,14 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
|
|
|
2729
2732
|
return false;
|
|
2730
2733
|
}
|
|
2731
2734
|
var count = $(".span${keys}").length;
|
|
2732
|
-
var data = "<span class='span${keys}' > "+(count+1)+". <input type='hidden' name='${MYMODEL.table}[${keys}][]' value='"+val+"' /> " + $("#${keys} option:selected").text()+" <
|
|
2735
|
+
var data = "<span class='span${keys}' > "+(count+1)+". <input type='hidden' name='${MYMODEL.table}[${keys}][]' value='"+val+"' /> " + $("#${keys} option:selected").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>";
|
|
2733
2736
|
$("#dropdownbox${keys}").append(data);
|
|
2734
2737
|
$("#${keys}").val("");
|
|
2735
2738
|
});${Util.newLine}`;
|
|
2736
2739
|
break;
|
|
2737
2740
|
|
|
2738
2741
|
case "table" :
|
|
2739
|
-
let MODEL_TABLE = MYMODELS[MYMODEL.widgets[keys].table];
|
|
2742
|
+
let MODEL_TABLE = MYMODELS[MYMODEL.widgets[keys].table] || require(`${dirRoot}/models/${MYMODEL.widgets[keys].table}`);
|
|
2740
2743
|
//let MODEL_TABLE_RELATIONS = await zRoute.relations(req, res, MODEL_TABLE.table);
|
|
2741
2744
|
//relations[key + "TABLE"]
|
|
2742
2745
|
let MODEL_TABLE_RELATIONS = relations[keys + "TABLE"];
|
|
@@ -3293,6 +3296,7 @@ zRoute.modelsCache = async() => {
|
|
|
3293
3296
|
}
|
|
3294
3297
|
const myarray = Util.sortArray(arr, 'zname');
|
|
3295
3298
|
myCache.set(`${keys}_${key}_${company.id}`, myarray);
|
|
3299
|
+
|
|
3296
3300
|
}
|
|
3297
3301
|
}
|
|
3298
3302
|
}
|