zet-lib 1.0.43 → 1.0.45

package/lib/Form.js

@@ -326,7 +326,7 @@ Form.field = (obj) => {
                 arr = typeof value == "string" ? JSON.parse(value) : value;
                 if (Array.isArray(arr)) {
                     arr.forEach(function (item, index) {
-                        spanmulti += `<span class='span${obj.id}'>${index + 1}. <input type='hidden' name='${obj.name}[]' value='${item}' />${obj.multi[item]}<i class='fa fa-trash pointer text-danger pull-right' onclick='$(this).closest("span").remove();'  title='${LANGUAGE['delete']}'></i><br></span>`;
+                        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>`;
                     });
                 }
             }
@@ -342,7 +342,7 @@ Form.field = (obj) => {
             </span>
             </div>`
             return `<div class="input-group">
-					<select ${tabindex} class="form-control"  ${id}  ${placeholder} ${required} ${htmlOptions} >${selects}</select>
+					<select ${tabindex} class="form-control"  ${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

@@ -834,7 +834,7 @@ zRoute.dataTableData = (key, value, MYMODEL, relations) => {
         break;
 
       case "image" :
-        myvalue = Util.fileView("/uploads/" + MYMODEL.routeName + "/", value);
+        myvalue = Util.fileView("/uploads/" + MYMODEL.routeName + "/", value, {width:60});
         break;
 
       case "file" :
@@ -2547,6 +2547,9 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
       hasDateTimePicker = true;
     } else if (widgets[key].name == "table") {
       hasTable = true;
+      hasDateTimePicker = true;
+      hasClockPicker = true;
+      hasDatePicker = true;
     } else if (widgets[key].name == "tags") {
       hasTags = true;
     } else if (widgets[key].name == "lexical") {
@@ -2729,14 +2732,14 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
             return false;
         }
         var count = $(".span${keys}").length;
-        var data = "<span class='span${keys}' > "+(count+1)+". <input type='hidden' name='${MYMODEL.table}[${keys}][]' value='"+val+"' /> " + $("#${keys} option:selected").text()+"   <i class='fa fa-trash pointer text-danger pull-right' onclick='$(this).closest(\`span\`).remove();'  title='Delete'></i><br></span>";
+        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>";
         $("#dropdownbox${keys}").append(data);
         $("#${keys}").val("");
     });${Util.newLine}`;
         break;
 
       case "table" :
-        let MODEL_TABLE = MYMODELS[MYMODEL.widgets[keys].table];
+        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[keys + "TABLE"];
@@ -3288,13 +3291,12 @@ zRoute.modelsCache = async() => {
               const splits = key.split("___") || [];
               let item = splits.length  > 1 ? splits[1] : key;
               let arr = [];
-              if(results.length) {
-                for (const result of results) {
-                  arr.push({id: result.id, zname: result[item]});
-                }
-                const myarray = Util.sortArray(arr, 'zname');
-                myCache.set(`${keys}_${key}_${company.id}`, myarray);
+              for (const result of results) {
+                arr.push({id: result.id, zname: result[item]});
               }
+              const myarray = Util.sortArray(arr, 'zname');
+              myCache.set(`${keys}_${key}_${company.id}`, myarray);
+
             }
           }
         }

package/package.json

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