@simitgroup/simpleapp-generator 1.1.24 → 1.1.26

package/templates/nest/src/simpleapp/generate/types/index.ts.eta

@@ -5,29 +5,55 @@
  * Author: Ks Tan
  */
 export type ForeignKey = {
-    _id: string
-    label: string
-}
+  _id: string;
+  label: string;
+};
 export type ModifiedCollection = {
-    [key:string]:string[]
-}
+  [key: string]: string[];
+};
 export type ModifiedRecords = {
-    createds: ModifiedCollection
-    updateds: ModifiedCollection
-    deleteds: ModifiedCollection
-}
+  createds: ModifiedCollection;
+  updateds: ModifiedCollection;
+  deleteds: ModifiedCollection;
+};
 export type DocNumberFormatResult = {
-    formatId: string
-    formatName: string 
-    result: string
-}
-
+  formatId: string;
+  formatName: string;
+  result: string;
+};
 
 export type SearchBody = {
-    
-    filter?:Object;
-    
-    fields?: any[];
-    
-    sorts?: any[];
-}
+  filter?: Object;
+
+  fields?: any[];
+
+  sorts?: any[];
+};
+
+
+export enum IsolationType {
+  'none' = 'none',
+  'org' = 'org',
+  'tenant' = 'tenant',
+  'branch' = 'branch',
+}
+export enum HookType {
+  'init' = 'init',
+  'beforeSearch' = 'beforeSearch',
+  'afterSearch' = 'afterSearch',
+  'beforeValidation' = 'beforeValidation',
+  'afterValidation' = 'afterValidation',
+  'beforeCreate' = 'beforeCreate',
+  'afterCreate' = 'afterCreate',
+  'beforeUpdate' = 'beforeUpdate',
+  'afterUpdate' = 'afterUpdate',
+  'beforeDelete' = 'beforeDelete',
+  'afterDelete' = 'afterDelete',
+  'beforeFetchRecord' = 'beforeFetchRecord',
+  'afterFetchRecord' = 'afterFetchRecord',
+  'beforeSetStatus'='beforeSetStatus',
+  'afterSetStatus'='afterSetStatus'
+}
+export type MoreProjectionType = {
+  [key: string]: string;
+};

package/templates/nuxt/assets/css/style.css._eta

@@ -30,7 +30,9 @@ input {
     @apply  bg-primary-100  dark:bg-gray-800  block
 }
 
-
+.invisible{
+    display: none;
+}
 .title-text{
     @apply text-xl font-bold text-gray-700
 }
@@ -54,3 +56,7 @@ input {
 .btn-warn {
     @apply btn bg-warning-600 hover:bg-warning-400 
 }
+
+.simpleapp-input-label{
+    @apply  text-left
+}

package/templates/nuxt/components/list/ListView.vue.eta

@@ -31,9 +31,9 @@ import {ListItem} from '~/types/listview'
 const props = withDefaults(defineProps<{
     list:any[],
     url?:string,
-    titleField:string
+    titleField?:string
     idField?:string
-    subTitleField:string
+    subTitleField?:string
     withFilter?:boolean
 }>(),{
     idField:'_id'

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

@@ -6,7 +6,8 @@
                 :readonly="readonly"
                 v-model="modelValue"    
                 :placeholder="placeholder"
-                :class="'flex-1 w-full rounded-lg  '+ ( props.readonly?'':'dark:!bg-gray-700 rounded-tr-none rounded-br-none')"
+                :pt="pt"
+                :class=" !pt ? 'flex-1 w-full rounded-lg  '+ ( props.readonly?'':'dark:!bg-gray-700 rounded-tr-none rounded-br-none') : ''"
             />
             <span class="" v-if="!readonly">
                 <button  type="button" @click="toggle"  tabindex="-1"
@@ -39,6 +40,7 @@ import {DocNoFormat} from "~/types"
 const props = defineProps<{
     setting:any    
     readonly?:boolean
+    pt?:any
 }>()
 const op = ref();
 const placeholder = ref('')

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

@@ -1,8 +1,8 @@
 <template>
     <div v-if="schema" class="flex flex-col">          
         <div v-if="hidelabel"></div>
-        <label v-else-if="error" class="text-danger-600 overflow-hidden" :for="uuid">{{ fieldlabel }} <span v-if="props.setting.isrequired && fieldlabel" class="text-danger-600">*</span></label>        
-        <label v-else  :for="uuid" class="whitespace-nowrap	text-gray-500 truncate">{{ fieldlabel }} <span v-if="props.setting.isrequired && fieldlabel" class="text-danger-600">*</span></label>        
+        <label v-else-if="error" class="simpleapp-input-label text-danger-600 overflow-hidden" :for="uuid">{{ fieldlabel }} <span v-if="props.setting.isrequired && fieldlabel" class="text-danger-600">*</span></label>        
+        <label v-else  :for="uuid" class="simpleapp-input-label whitespace-nowrap	text-gray-500 truncate">{{ fieldlabel }} <span v-if="props.setting.isrequired && fieldlabel" class="text-danger-600">*</span></label>        
         
         <!-- <div :uuid="uuid" >{{ modelValue }}</div> -->
         <!-- <div v-if="typeof modelValue =='object' && typeof modelValue['_id']!='undefined' && typeof modelValue['label']!='undefined' &&  readonly ==true " :uuid="uuid" class="simpleapp-value-readonly">{{ modelValue['label'] }}</div> -->

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

@@ -1,31 +1,41 @@
 <template>
     <SimpleAppFieldContainer :hidelabel="hidelabel" v-model="modelValue" 
-                :label="label" :description="description" 
+                :label="label" :description="description" :pt="pt"
                 :setting="setting" :instancepath="instancepath" :error="error" #default="slotprops">        
         <!-- binary input -->
         <component :is="inputComponent" :readonly="isReadonly" :pt="pt"
                 v-if="[SimpleAppInputType.checkbox,SimpleAppInputType.switch ].includes(inputType)" 
                 :inputId="slotprops.uuid" :path="setting.instancepath"
-                v-model="modelValue" :binary="true"/>
+                v-model="modelValue" :binary="true"
+                v-bind="componentProps"/>
 
         <!-- date component -->        
         <component :is="inputComponent" type="date" :pt="pt" 
             v-else-if="inputType == SimpleAppInputType.date"            
             :inputId="slotprops.uuid" :path="setting.instancepath"
-            v-model="datevalue" @update:modelValue="updateDate" :readonly="isReadonly"/>
+            v-model="datevalue" @update:modelValue="updateDate" :readonly="isReadonly"
+            v-bind="componentProps"/>
         <!-- calendar component -->        
-        <component :is="inputComponent" type="date" :pt="pt" class="flex flex-col"
+        <component :is="inputComponent" type="date" :pt="pt" :class="'flex flex-col yyy-'+modelValue+ ' xxx-'+datevalue"
             v-else-if="SimpleAppInputType.calendar==inputType"
             :inputId="slotprops.uuid" :path="setting.instancepath"
-            v-model="datevalue" @update:modelValue="updateDate" :readonly="isReadonly"/>
-        
+            v-model="datevalue" @update:modelValue="updateDate" :readonly="isReadonly"
+            v-bind="componentProps"/>
+        <!-- time component -->        
+        <component :is="inputComponent" :pt="pt" 
+            v-else-if="inputType == SimpleAppInputType.time"            
+            :inputId="slotprops.uuid" :path="setting.instancepath"
+            v-model="modelValue" :readonly="isReadonly"
+            v-bind="componentProps"/>
         <!-- select/list component -->                
         <component :is="inputComponent" v-model="modelValue"  :pt="pt"
             v-else-if="[SimpleAppInputType.select,SimpleAppInputType.list].includes(inputType)"
             :inputId="slotprops.uuid" :path="setting.instancepath"  
             :readonly="isReadonly"
+            class="w w-full lg:w-full"
             :disabled="isReadonly"
-            :options="getListOptions()" optionLabel="label" optionValue="value"/>
+            :options="getListOptions()" optionLabel="label" optionValue="value"
+            v-bind="componentProps"/>
         
         <!-- radio component -->                
         <div v-else-if="inputType == SimpleAppInputType.radio" >
@@ -46,15 +56,16 @@
                 :disabled="isReadonly"                                                             
                 :inputId="slotprops.uuid"
                 :path="setting.instancepath"
-                :readonly="isReadonly"
+                :readonly="isReadonly"                
                  />
-                 
+        <!-- v-bind:attributes="componentProps" -->
         <!--  document no input-->
         <SimpleAppDocumentNo v-else-if="inputType == SimpleAppInputType.documentno" 
             :setting="setting" v-model="modelValue" :inputId="slotprops.uuid"
             :readonly="isReadonly" @update:docNoFormat="triggerDocNoFormatChange"     
             :pt="pt"
-             :path="setting.instancepath"/>
+             :path="setting.instancepath"
+             v-bind:attributes="componentProps"/>
            
         
         <!-- password -->
@@ -62,35 +73,44 @@
                 v-else-if="inputType == SimpleAppInputType.password" 
                 :type="type" v-model="modelValue" :pt="pt" 
                 :readonly="isReadonly" class="flex flex-col"
-                :inputId="slotprops.uuid" :path="setting.instancepath"/>
+                :inputId="slotprops.uuid" :path="setting.instancepath"
+                v-bind="componentProps"/>
 
         <!-- rating -->
-        <Rating v-else-if="inputType == SimpleAppInputType.rating" 
-         :is="inputComponent" :type="type" v-model="modelValue" :pt="pt" 
+        <component v-else-if="inputType == SimpleAppInputType.rating" 
+          :type="type" v-model="modelValue" :pt="pt" 
                 :readonly="isReadonly"                 
-                :inputId="slotprops.uuid" :path="setting.instancepath"/>
+                :inputId="slotprops.uuid" :path="setting.instancepath"
+                v-bind="componentProps"/>
             
         <!-- chip -->
         <component  v-else-if="inputType == SimpleAppInputType.chip" 
          :is="inputComponent" :type="type" v-model="modelValue"
                  :pt="pt" 
                 :disabled="isReadonly"                                 
-                :inputId="slotprops.uuid" :path="setting.instancepath"/>
+                :inputId="slotprops.uuid" :path="setting.instancepath"
+                v-bind="componentProps"
+                />
         <!-- simple component -->        
         <InputNumber v-else-if="inputType == SimpleAppInputType.number" 
                 :type="type" v-model="modelValue"
                 :readonly="isReadonly"        
                 :pt="pt"
-                class="w-full flex flex-col"                
-                :inputId="slotprops.uuid" :path="setting.instancepath"/>
+                :class="!pt ? 'w-full flex flex-col' :''"
+                :inputId="slotprops.uuid" :path="setting.instancepath"
+                v-bind="componentProps"
+                />
 
         <component v-else
             v-model="modelValue"
-            :is="inputComponent"
+                :is="inputComponent"
                 :readonly="isReadonly"        
                 :pt="pt"
+                :type="type"
                 class="w-full flex flex-col"
-                :inputId="slotprops.uuid" :path="setting.instancepath"/>
+                :inputId="slotprops.uuid" :path="setting.instancepath"
+                v-bind="componentProps"
+                />
             
         
         <!-- component require special treatment -->
@@ -100,23 +120,23 @@
 
 <script lang="ts" setup>
 import moment from 'moment'
-import AutoComplete from 'primevue/autocomplete';
-import Calendar from 'primevue/calendar';
-import Checkbox from 'primevue/checkbox';
-import Chips from 'primevue/chips';
+import AutoComplete,{ AutoCompleteProps } from 'primevue/autocomplete';
+import Calendar,{ CalendarProps } from 'primevue/calendar';
+import Checkbox,{ CheckboxProps } from 'primevue/checkbox';
+import Chips,{ ChipsProps } from 'primevue/chips';
 import SimpleAppDocumentNo from './SimpleAppDocumentNo.vue';
 import SimpleAppAutocomplete from './SimpleAppAutocomplete.vue'
-import Dropdown from 'primevue/dropdown';
-import InputNumber from 'primevue/inputnumber';
-import InputSwitch from 'primevue/inputswitch';
-import InputText from 'primevue/inputtext';
-import Listbox from 'primevue/listbox';
-import MultiSelect from 'primevue/multiselect';
-import Password from 'primevue/password';
-import RadioButton from 'primevue/radiobutton';
-import Rating from 'primevue/rating';
-import Slider from 'primevue/slider';
-import Textarea from 'primevue/textarea';
+import Dropdown,{ DropdownProps } from 'primevue/dropdown';
+import InputNumber, { InputNumberProps } from 'primevue/inputnumber';
+import InputSwitch, { InputSwitchProps } from 'primevue/inputswitch';
+import InputText, { InputTextProps } from 'primevue/inputtext';
+import Listbox,{ ListboxProps } from 'primevue/listbox';
+import MultiSelect,{ MultiSelectProps } from 'primevue/multiselect';
+import Password,{ PasswordProps } from 'primevue/password';
+import RadioButton,{ RadioButtonProps } from 'primevue/radiobutton';
+import Rating,{ RatingProps } from 'primevue/rating';
+import Slider,{ SliderProps }  from 'primevue/slider';
+import Textarea, { TextareaProps } from 'primevue/textarea';
 import {SimpleAppInputType} from '~/types'
 
 
@@ -125,6 +145,12 @@ let inputComponent :Component
 
 const datevalue = ref('')
 const modelValue = defineModel()
+
+if(modelValue.value){
+    datevalue.value = moment(modelValue.value as string ).format('YYYY-MM-DD')
+}else{
+    datevalue.value = ''
+}
 const props = withDefaults( defineProps<{
     inputType:SimpleAppInputType,
     label?:string,
@@ -135,7 +161,9 @@ const props = withDefaults( defineProps<{
     instancepath?:string,
     hidelabel?: boolean
     readonly?: boolean
-    pt?:any
+    pt?:any,
+    componentProps?: InputNumberProps | InputSwitchProps | InputTextProps | TextareaProps | DropdownProps | CalendarProps | RatingProps
+
 }>(),{type:'text'})
 
 
@@ -152,6 +180,9 @@ switch(props.inputType){
     case SimpleAppInputType.date:
         inputComponent = InputText
     break;
+    case SimpleAppInputType.time:
+        inputComponent = InputText
+    break;
     case SimpleAppInputType.calendar:
         inputComponent = Calendar
         break;
@@ -208,7 +239,13 @@ const isReadonly = computed(()=>{
 })
 
 const updateDate = (value:any)=>{
-    modelValue.value = moment(value).format('YYYY-MM-DD')
+    
+    if(value){
+        modelValue.value = moment(value).format('YYYY-MM-DD')
+    }else{
+        modelValue.value=''
+    }
+    
 }
 
 
@@ -232,7 +269,12 @@ const emits = defineEmits(['change','update:modelValue','update:docNoFormat'])
 watch(modelValue ,(newvalue:any)=>{
 
     if([SimpleAppInputType.date,SimpleAppInputType.calendar].includes(props.inputType)){
-        datevalue.value = moment(modelValue.value as string ).format('YYYY-MM-DD')
+        if(modelValue.value){
+            datevalue.value = moment(modelValue.value as string ).format('YYYY-MM-DD')
+        }else{
+            datevalue.value = ''
+        }
+        
     }
     // else if(props.inputType==SimpleAppInputType.autocomplete){            
     //         modelValue.value=autocompleteitem.value                

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

@@ -3,8 +3,8 @@
      class="simpleapp-datatable p-datatable-sm" :value="modelValue">
     <template #empty> <div class="text-center">No record found.</div> </template>
     <template #header >
-        <div>
-            <Button icon="pi pi-plus" @click="addNew()" class="simpleapp-datatable-add btn-primary" type="button">Add</Button>
+        <div>        
+            <Button v-if="!setting.readonly"  icon="pi pi-plus" @click="addNew()" class="simpleapp-datatable-add btn-primary" type="button">Add</Button>
         </div>
     </template>
     <slot>

package/templates/nuxt/composables/getOpenApi.generate.ts.eta

@@ -16,32 +16,26 @@ const getAxiosConfig = () => {
   };
   return config
 }
-export const getDocumentApi = (apiname: string): any => {
+export const getDocumentApi = (documentName: string): any => {
   //const { csrf } = useCsrf()    
   //axios.defaults.headers.common = {"CSRF-TOKEN": csrf};
   const route = useRoute();
 
   const config = getAxiosConfig()
   const docsOpenapi: any = {
-                            'tenant': new o.TENANTApi(config),                
-                              'organization': new o.ORGApi(config),                
-                              'branch': new o.BRANCHApi(config),                
-                              'permission': new o.PERMApi(config),                
-                              'user': new o.USERApi(config),                
-                              'autoincreament': new o.AUTOINCApi(config),                
-                              'docnoformat': new o.DOCNOApi(config),                
-                              'category': new o.CATApi(config),                
-                              'customer': new o.CUSTApi(config),                
-                              'invoice': new o.INVApi(config),                
-                              'product': new o.PRDApi(config),                
-                        };
-  if (!docsOpenapi[apiname]) {
+    <%for(let i=0; i<it.modules.length;i++){ %>
+    <% const d = it.modules[i] %>
+    '<%= d['docname'].toLowerCase() %>': new o.<%= d['doctype'].toUpperCase() %>Api(config),
+
+    <%}%>              
+    };
+  if (!docsOpenapi[documentName]) {
     console.error(
-      `api for '${apiname}' does not exists, most probably define wrong x-foreignkey`,
+      `api for '${documentName}' does not exists, most probably define wrong x-foreignkey`,
     );
     return undefined;
   } else {
-    return docsOpenapi[apiname];
+    return docsOpenapi[documentName];
   }
 };
 

package/templates/nuxt/composables/stringHelper.generate.ts.eta

@@ -1,6 +1,6 @@
 import plugin from 'primevue/config';
 import {Md5} from 'ts-md5'
-
+import moment from "moment";
 export const camelCaseToWords = (s: string) =>{
     const result = s.replace(/([A-Z])/g, ' $1');
     return result.charAt(0).toUpperCase() + result.slice(1);
@@ -16,5 +16,5 @@ export const getAvatarLink = (email:string, size:number):string=>{
 
 export const toLocalDate = (dateiso8601:string)=> new Date(String(dateiso8601)).toLocaleDateString()
 export const t = (txt:string,options?:any):string => useNuxtApp().$i18n.t(txt,options)
-
+export const today = () => moment().format('YYYY-MM-DD')
  

package/templates/nuxt/simpleapp/generate/clients/SimpleAppClient.ts.eta

@@ -46,7 +46,7 @@ export class SimpleAppClient<
   getDocType = () => this.doctype;
   getDocName = () => this.docname;
   setNew = ()=>{}
-  isNew = () => this.data.value['created']==''
+  isNew = () => this.data.value?.created==''
   setSchema = (schema: SchemaType) => (this.schema = schema);
   getSchema = ():SchemaType=> this.schema;
   getErrors = () => this.errorlist;
@@ -135,8 +135,7 @@ export class SimpleAppClient<
             status:NotificationStatus.success,
             data:errors
           })        
-          this.data.value = res.data
-          console.log("save ok ", this.data.value)
+          this.data.value = res.data          
           return res.data;
         }).catch((errors:any)=>{
           $event('Notification',{

package/templates/nuxt/simpleapp/generate/commons/roles.ts.eta

@@ -21,6 +21,16 @@ const allroles:roletype[] = [
         {resource: '<%=m.docname%>', action:'<%=api.action%>'},
         
         
+            <%}%>
+        <%}%>
+
+        <% if(m.schema['x-simpleapp-config']['allStatus'] && m.schema['x-simpleapp-config']['allStatus'].length >0) {%>
+            <%let allstatus = m.schema['x-simpleapp-config']['allStatus']%>
+            <% for(let j=0;j<allstatus.length; j++){ %>
+                <%let setting = allstatus[j]%>
+        {resource: '<%=m.docname%>', action:'<%=setting.status%>'},
+        
+        
             <%}%>
         <%}%>
     <%}%>

package/templates/nuxt/simpleapp/generate/types/index.ts.eta

@@ -0,0 +1,7 @@
+export type {<%for(let i=0; i<it.modules.length;i++){ %>
+    <% const d = it.modules[i] %>      
+    <% const conf =  d.schema["x-simpleapp-config"] %>
+    <%= d['docname'] %>,
+<%}%>} from "~/simpleapp/generate/openapi";
+
+

package/templates/nuxt/types/simpleappinput.ts.eta

@@ -3,6 +3,7 @@ export enum SimpleAppInputType  {
     'textarea'='textarea',
 
     'date'='date',
+    'time'='time',
     'calendar'='calendar',