@simitgroup/simpleapp-generator 2.0.1-s-alpha → 2.0.1-u-alpha

package/ReleaseNote.md

@@ -1,3 +1,12 @@
+[2.0.1u-alpha]
+
+1. Allow array string custom field to set input type
+2. Fix multi select input size diff
+
+[2.0.1t-alpha]
+
+1. add more field into queue for track execution time
+
 [2.0.1s-alpha]
 
 1. Fix cron set xorg failed. undefined-undefined-undefined

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simitgroup/simpleapp-generator",
-  "version": "2.0.1s-alpha",
+  "version": "2.0.1u-alpha",
   "description": "frontend nuxtjs and backend nests code generator using jsonschema",
   "main": "dist/index.js",
   "scripts": {

package/templates/nest/src/simple-app/_core/features/queue/queue-base/queue-base.consumer.ts.eta

@@ -74,7 +74,8 @@ export abstract class BaseQueueConsumer extends WorkerHost {
     await handler.call(this, appUser, job, payload);
   }
 
-  protected async updateQueueJobRecord(job: Job, status: 'completed' | 'failed', result: any) {
+  protected async updateQueueJobRecord(job: Job, status: 'completed' | 'failed', result: any) {    
+
     await this.queueJobModel.updateOne(
       {
         'job.id': job.id,
@@ -82,8 +83,11 @@ export abstract class BaseQueueConsumer extends WorkerHost {
         'job.processor': this.processor,
       },
       {
-        'job.status': status,
-        updated: new Date().toISOString(),
+
+        'job.status': status,        
+        initTime: new Date(job.timestamp).toISOString(),
+        startTime: new Date(job.processedOn).toISOString(),
+        endTime: new Date(job.finishedOn).toISOString(),
         result: status === 'completed' ? result : undefined,
         error: status === 'failed' ? result : undefined,
       },

package/templates/nest/src/simple-app/_core/features/queue/queue.type.ts.eta

@@ -10,9 +10,9 @@ export namespace QueuePayload {
       currency: string;
       country: string;
       offsetMinute: number;
-      tenantId:number;
-      orgId:number;
-      branchId:number;
+      tenantId: number;
+      orgId: number;
+      branchId: number;
     };
     xOrg: string;
   };
@@ -23,8 +23,6 @@ export namespace QueuePayload {
   };
 }
 
-
-
 export type QueuejobJob = {
   id: string; // {"type":"string","required":true,"default":""}
   processor: string; // {"type":"string","required":true,"default":""}
@@ -57,7 +55,9 @@ export type Queuejob = {
   orgId?: number; // {"type":"number","required":false,"default":1}
   branchId?: number; // {"type":"number","required":false,"default":1}
   job: QueuejobJob; //child object
-
+  initTime?: string;
+  startTime?: string;
+  endTime?: string;
   payload?: QueuejobPayload; //child object
 
   result?: QueuejobResult; //child object
@@ -65,7 +65,6 @@ export type Queuejob = {
   error?: QueuejobError; //child object
 };
 
-
 /***************************************** Start Auto Complete *****************************************/
 export type QueuejobAutoComplete = {
   _id: string;

package/templates/nuxt/components/simpleApp/SimpleAppInput.vue.eta

@@ -117,7 +117,13 @@
     <MultiSelect
       v-else-if="SimpleAppInputType.selectmultiple == inputType"
       v-model="modelValue"
-      :pt="pt"
+      :pt="
+        pt ?? {
+          label: {
+            class: '!text-sm !py-1.5',
+          },
+        }
+      "
       :input-id="slotprops.uuid"
       :path="setting.instancepath"
       :readonly="isReadonly"
@@ -162,13 +168,13 @@
       @change="onChange"
     >
       <template #header>
-        <slot name="header"/>
+        <slot name="header" />
       </template>
       <template #content>
-        <slot name="content"/>
+        <slot name="content" />
       </template>
       <template #option="{ index, option }">
-        <slot name="option" :index="index" :option="option"/>
+        <slot name="option" :index="index" :option="option" />
       </template>
     </SimpleAppUserPicker>
 
@@ -188,13 +194,13 @@
       @change="onChange"
     >
       <template #header>
-        <slot name="header"/>
+        <slot name="header" />
       </template>
       <template #content>
-        <slot name="content"/>
+        <slot name="content" />
       </template>
       <template #option="{ index, option }">
-        <slot name="option" :index="index" :option="option"/>
+        <slot name="option" :index="index" :option="option" />
       </template>
     </SimpleAppAutocomplete>
     <!-- v-bind:attributes="componentProps" -->
@@ -346,7 +352,7 @@
     />
     <!-- component require special treatment -->
 
-    <slot name="footer"/>
+    <slot name="footer" />
   </SimpleAppFieldContainer>
 </template>
 

package/templates/nuxt/plugins/10.simpleapp-event.ts.eta

@@ -25,7 +25,7 @@ export default defineNuxtPlugin( async(nuxtApp) => {
     // useNuxtApp().vueApp.use(DialogService)
     //const { csrf } = useCsrf()    
     //axios.defaults.headers.common = {"CSRF-TOKEN": csrf};
-    const myaxios = axios.create({timeout:5000})
+    const myaxios = axios.create({timeout:10000})
     myaxios.interceptors.response.use(
       (response) => {        
         return  response

package/templates/nuxt/simpleapp/generate/features/customField/components/CustomFieldFormFieldInput.vue.eta

@@ -66,7 +66,10 @@
       <SimpleAppInput
         v-if="fieldPath"
         :setting="handleGetField(fieldPath)"
-        :inputType="SimpleAppInputType.chip"
+        :inputType="
+          (jsonSchema?.inputType as SimpleAppInputType) ??
+          SimpleAppInputType.chip
+        "
         :hidelabel="isParentIsArray"
         v-model="model"
       />