@simitgroup/simpleapp-generator 1.0.47 → 1.0.49

package/templates/nuxt/components/SimpleAppForm.vue.eta

@@ -6,7 +6,7 @@
 </template>
 <script setup lang="ts" >
 import type {SimpleAppFieldSetting} from './type'    
-import { SimpleAppClient } from  '../generate/docs/SimpleAppClient' //'../SimpleAppClient';
+import { SimpleAppClient } from  '../simpleapp/generate/clients/SimpleAppClient'
 import type { JSONSchema7,JSONSchema7Definition } from 'json-schema';
 
     const props = defineProps<{

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

@@ -4,7 +4,7 @@
     <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>
+            <Button icon="pi pi-plus" @click="addNew()" class="simpleapp-datatable-add btn-primary" type="button">Add</Button>
         </div>
     </template>
     <slot>
@@ -39,7 +39,7 @@
             </Column>
             <Column v-if="!readonly">
                 <template #body="{data,field,index}">
-                    <button class="simpleapp-inputtable-delrow button-danger" @click="deleteRow(index)" type="button">X</button>
+                    <Button class="simpleapp-inputtable-delrow button-danger" @click="deleteRow(index)" type="button">X</Button>
                 </template>
             </Column> -->
     </DataTable>

package/templates/nuxt/components/SimpleFieldContainer.vue.eta

@@ -5,8 +5,8 @@
         <label v-else  :for="uuid">{{ fieldlabel }} <span v-if="props.setting.isrequired && fieldlabel" class="input-error">*</span></label>        
         
         
-        <div v-if="readonly && typeof modelValue =='object' && typeof modelValue['_id']!='undefined' && typeof modelValue['label']!='undefined' " :uuid="uuid" class="simpleapp-value-readonly">{{ modelValue['label'] }}</div>
-        <div v-else-if="readonly" :uuid="uuid" class="simpleapp-value-readonly">{{ 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>
+        <div v-else-if="readonly==true" :uuid="uuid" class="simpleapp-value-readonly">{{ modelValue }}</div>
         <slot v-else name="default" :uuid="uuid" :error="error"></slot>
 
         <small v-if="error" class="error-text">{{ error }}</small>
@@ -25,7 +25,7 @@ import {computed,setBlockTracking,watch} from 'vue'
 import {ref} from 'vue'
 const uuid =  crypto.randomUUID();
 const fieldlabel = ref('')
-const fielddesc = ref('')
+// const fielddesc = ref('')
 const defaultcssclass='simpleapp-input-container'
 const fieldcontainerclass = ref(defaultcssclass)
 let instancepath = ref('')
@@ -39,17 +39,23 @@ const props = defineProps<{
     setting:any
 }>()
 
-const readonly = ref(false)
-if(props.readonly !== undefined){
-    readonly.value=props.readonly
-}else if(props.setting.readonly !==undefined){
-    readonly.value=props.readonly
-}
+const readonly = computed(()=>{
+   return props.readonly ??  props.setting.readonly ?? false
+})
+// if(props.readonly !== undefined){
+//     readonly.value=props.readonly
+// }else if(props.setting.readonly !==undefined){
+//     readonly.value=props.readonly
+// }
 // console.log("props.setting.format",props.setting.format)
 const modelValue = defineModel()
 const readonlyclass="simpleapp-value-readonly"
 // console.log('props.setting',modelValue.value,props.setting)
 let schema:any 
+
+const fielddesc = computed(()=>{
+    return props.description ?? schema.description ?? ''
+})
 if(props.setting.fieldsetting && props.setting.fieldsetting.type){
     
     schema = props.setting.fieldsetting
@@ -65,9 +71,9 @@ if(props.setting.fieldsetting && props.setting.fieldsetting.type){
     else if (schema.title ) fieldlabel.value=schema.title
     else fieldlabel.value=fieldname
     
-    if(props.description)fielddesc.value = props.description 
-    else if (schema?.description != 'undefined') fielddesc.value=schema.description
-    else fielddesc.value=''
+    // if(props.description)fielddesc.value = props.description 
+    // else if (schema?.description != 'undefined') fielddesc.value=schema.description
+    // else fielddesc.value=''
 
    
 

package/templates/nuxt/components/Spinner.vue.eta

@@ -0,0 +1,9 @@
+<template>
+    <div role="status">
+        <svg aria-hidden="true" class="w-8 h-8 mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
+            <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
+        </svg>
+        <span class="sr-only">Loading...</span>
+    </div>
+</template>

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

@@ -5,11 +5,12 @@
  * author: Ks Tan
  */
 import _ from 'lodash'
+import {MenuData} from '~/types'
 import {alldocuments} from '../simpleapp/generate/commons/documents'
 export const getDocTypes = ()=>{
   return alldocuments.filter(item=>item.page!='')
 }
-export const getMenus =()=>{
+export const getMenus =() :MenuData[]=>{
     const logout = async () => {
         const { signOut } = useAuth();
         const { data } = await <any>useFetch('/api/auth/logout');
@@ -22,16 +23,16 @@ export const getMenus =()=>{
   const xorg = route.params.xorg
   let data =[];
   //sss
-  let allmenus:string[] = alldocuments.filter(item=>item.page!='').map(item=>item.docName)
+  let allmenus = alldocuments.filter(item=>item.page!='')
 
  const roles = $userstore.getUserInfo().roles
   let allowmenus=[]
   for(let i=0; i< allmenus.length;i++){
-    const keyword = allmenus[i]
+    const keyword = allmenus[i].docName
     // if(m.label)
    
     if($userstore.haveAccess(keyword)){
-      const m = {label: keyword, to:`/${xorg}/${keyword}`}
+      const m:MenuData = {label: keyword, url:`/${xorg}/${keyword}`, isolationType:allmenus[i].isolationType}
       allowmenus.push(m)
     }     
   }

package/templates/nuxt/layouts/default.vue.eta

@@ -1,19 +1,10 @@
 <script lang="ts" setup>
-/**
- * This file was automatically generated by simpleapp generator during initialization.
- * You may modify it
- * last change 2023-09-09
- * author: Ks Tan
- */
- 
-
-import Menus from '~/components/Menus.vue'
-
+// import Menus from '~/components/Menus.vue'
 </script>
 <template>
     <div>
-        <Menus />
+        <HeaderBar />
         <Invitation/>
         <slot></slot>
     </div>
-</template>
+</template>

package/templates/nuxt/middleware/{10.acl.global.ts.eta → 30.acl.global.ts.eta}

@@ -1,3 +1,9 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
 import { getUserProfile } from './../composables/getUserStore.generate';
 export default defineNuxtRouteMiddleware((to, from) => {  
   

package/templates/nuxt/nuxt.config.ts.eta

@@ -1,3 +1,10 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
+import path from 'path'
 export default defineNuxtConfig({
   // colorMode: {}  ,  
   runtimeConfig:{    
@@ -21,12 +28,30 @@ tailwindcss: {
   },
   modules: [
     '@sidebase/nuxt-auth',
-    "nuxt-security",    
-    '@vueuse/nuxt',
+    'nuxt-primevue',
+    // "nuxt-security",     //temporary avoid nuxt-security cause cors
+    '@vueuse/nuxt', 
     '@nuxt/ui',
     '@nuxtjs/tailwindcss',
     '@pinia/nuxt'
   ],  
+  primevue: {
+    options: {
+      unstyled: true,
+      ripple: true,
+      inputStyle: 'filled'
+    }, 
+    components: {
+      include: '*',      
+    }, 
+    directives: {
+      include: ['Ripple', 'Tooltip']
+    },
+    cssLayerOrder: 'tailwind-base, primevue, tailwind-utilities',
+    importPT: { as: 'SimpleAppPT', from:  path.resolve(__dirname,'./assets/primevue/passthrough.ts') },
+    
+
+  },
   pinia: {
     autoImports: [
       // automatically imports `defineStore`
@@ -37,19 +62,37 @@ tailwindcss: {
   auth: {
     globalAppMiddleware: true
   },
-  security: {
+  // security: {
+    // corsHandler:{
+      //  origin: '*' //| 'null' | (string | RegExp)[] | ((origin: string) => boolean);
+      // methods?: '*' | HTTPMethod[];
+      // allowHeaders?: '*' | string[];
+      // exposeHeaders?: '*' | string[];
+      // credentials?: boolean;
+      // maxAge?: string | false;
+      // preflight?: {
+      //     statusCode?: number;
+      // };
+    // },
+    // headers: {      
+    //   contentSecurityPolicy: {
+    //     'img-src': ["'self'", 'data:', 'https://www.gravatar.com'],
+    //   },
+    // },
     //csrf: true,   // been force to off csrf cash it crash with nuxt-auth
-  },
+  // },
   ssr: false,
-  
-  css: [
-    "primevue/resources/themes/lara-light-blue/theme.css",
-    'primeicons/primeicons.css'
+  content: [
+      "./index.html",
+      "./src/**/*.{vue,js,ts,jsx,tsx}",
+      "./node_modules/primevue/**/*.{vue,js,ts,jsx,tsx}"
   ],
-  devtools: { enabled: true },
-  build: {
-                transpile: ["primevue"]
-        },
+  css: [ path.resolve(__dirname,'./assets/css/style.css')],
+
+  // devtools: { enabled: true },
+  // build: {
+  //               // transpile: ["primevue"]
+  //       },
   
   
 

package/templates/nuxt/pages/[xorg]/branch/{index.vue.eta → index.vue.etax}

@@ -7,10 +7,7 @@
  * author: Ks Tan
  */
 
-import {
-  InputTableColumnType,
-  InputTableColumn,
-} from "@simitgroup/simpleapp-vue-component/src/type";
+
 import Column from "primevue/column";
 const { $BranchDoc } = useNuxtApp();
 const doc = $BranchDoc();

package/templates/nuxt/pages/[xorg]/docnoformat/index.vue.eta

@@ -1,29 +1,29 @@
 <template>
-  <button class="btn-primary" @click="newRecord">New</button>
+  <Button class="btn-primary" @click="newRecord">New</Button>
   <ConfirmPopup></ConfirmPopup>
   <DebugDocumentData v-model="data"></DebugDocumentData>
   <SimpleAppDatatable
     v-model="recordlist"
     :setting="{}"
     :columns="[
+      'branch.label',
       'docNoFormatNo',
       'docNoFormatName',
       'active',
       'docNoPattern',
       'nextNumber',
-      'isMonthly',
     ]"
   >
     <Column header="action">
       <template #body="{ data, index }">
-        <button
+        <Button
           class="pi pi-pencil btn-primary"
           @click="triggerEdit(data)"
-        ></button>
-        <button
+        ></Button>
+        <Button
           class="pi pi-times btn-danger"
           @click="triggerDelete(data)"
-        ></button>
+        ></Button>
       </template>
     </Column>
   </SimpleAppDatatable>
@@ -36,7 +36,7 @@
     :style="{ zIndex: 100, width: '80vw' }"
   >
     <div class="simpleapp-tool-bar col-span-4 text-left gap-4">
-      <button
+      <Button
         class="btn-default"
         :disabled="disabled"
         @click="newRecord"
@@ -44,8 +44,8 @@
         v-if="canPerform(resourcename, 'create')"
       >
         New
-      </button>
-      <button
+      </Button>
+      <Button
         class="btn-primary"
         :disabled="disabled"
         @click="createData"
@@ -53,8 +53,8 @@
         v-if="canPerform(resourcename, 'create') && data.created == ''"
       >
         Create
-      </button>
-      <button
+      </Button>
+      <Button
         class="btn-primary"
         :disabled="disabled"
         @click="updateData"
@@ -62,8 +62,8 @@
         v-if="canPerform(resourcename, 'update') && data.created != ''"
       >
         Update
-      </button>
-      <button
+      </Button>
+      <Button
         class="btn-danger"
         :disabled="disabled"
         @click="deleteData($event)"
@@ -71,7 +71,7 @@
         v-if="canPerform(resourcename, 'delete') && data.created != ''"
       >
         Delete
-      </button>
+      </Button>
       <ProgressSpinner
         v-if="disabled == true"
         style="width: 2rem; height: 2rem"
@@ -79,7 +79,7 @@
       <ConfirmPopup></ConfirmPopup>
     </div>
     <SimpleAppForm :document="doc" #default="o" title="Document No">
-      <div class="grid grid-cols-4">
+      <div class="grid grid-cols-4 gap-4">
         <SimpleAppText
           autofocus
           :setting="o.getField('#/properties/docNoFormatNo')"
@@ -90,6 +90,12 @@
           :setting="o.getField('#/properties/docNoFormatName')"
           v-model="data.docNoFormatName"
         />
+        <SimpleAppAutocomplete
+            v-model="data.branch"
+            :setting="o.getField('#/properties/branch')"
+            :remoteSrc="getAutocomplete('branch')"
+            optionLabel="label"                        
+          />
         <SimpleAppCheckbox
           autofocus
           :setting="o.getField('#/properties/active')"
@@ -106,12 +112,9 @@
           autofocus
           :setting="o.getField('#/properties/docNoPattern')"
           v-model="data.docNoPattern"
-        />
-
-        <SimpleAppCheckbox
-          autofocus
-          :setting="o.getField('#/properties/isMonthly')"
-          v-model="data.isMonthly"
+          @change="updateSample"
+          :description="sample"
+          v-tooltip="'Examples: PO-<00000>, SI{YY}/<000>, SI{YYMM}/<000>'"
         />
 
         <SimpleAppNumber
@@ -119,101 +122,17 @@
           :setting="o.getField('#/properties/nextNumber')"
           v-model="data.nextNumber"
         />
-
-        <SimpleAppValue :setting="o.getField('#/properties/monthlySetting')">
-          <SimpleAppNumber
-            autofocus
-            :setting="o.getField('#/properties/monthlySetting/properties/jan')"
-            instancePath="#/monthlySetting/jan"
-            v-model="data.monthlySetting.jan"
-          />
-
-          <SimpleAppNumber
-            autofocus
-            :setting="o.getField('#/properties/monthlySetting/properties/feb')"
-            instancePath="#/monthlySetting/feb"
-            v-model="data.monthlySetting.feb"
-          />
-
-          <SimpleAppNumber
-            autofocus
-            :setting="o.getField('#/properties/monthlySetting/properties/mar')"
-            instancePath="#/monthlySetting/mar"
-            v-model="data.monthlySetting.mar"
-          />
-
-          <SimpleAppNumber
-            autofocus
-            :setting="o.getField('#/properties/monthlySetting/properties/apr')"
-            instancePath="#/monthlySetting/apr"
-            v-model="data.monthlySetting.apr"
-          />
-
-          <SimpleAppNumber
-            autofocus
-            :setting="o.getField('#/properties/monthlySetting/properties/may')"
-            instancePath="#/monthlySetting/may"
-            v-model="data.monthlySetting.may"
-          />
-
-          <SimpleAppNumber
-            autofocus
-            :setting="o.getField('#/properties/monthlySetting/properties/jun')"
-            instancePath="#/monthlySetting/jun"
-            v-model="data.monthlySetting.jun"
-          />
-
-          <SimpleAppNumber
-            autofocus
-            :setting="o.getField('#/properties/monthlySetting/properties/jul')"
-            instancePath="#/monthlySetting/jul"
-            v-model="data.monthlySetting.jul"
-          />
-
-          <SimpleAppNumber
-            autofocus
-            :setting="o.getField('#/properties/monthlySetting/properties/aug')"
-            instancePath="#/monthlySetting/aug"
-            v-model="data.monthlySetting.aug"
-          />
-
-          <SimpleAppNumber
-            autofocus
-            :setting="o.getField('#/properties/monthlySetting/properties/sep')"
-            instancePath="#/monthlySetting/sep"
-            v-model="data.monthlySetting.sep"
-          />
-
-          <SimpleAppNumber
-            autofocus
-            :setting="o.getField('#/properties/monthlySetting/properties/oct')"
-            instancePath="#/monthlySetting/oct"
-            v-model="data.monthlySetting.oct"
-          />
-
-          <SimpleAppNumber
-            autofocus
-            :setting="o.getField('#/properties/monthlySetting/properties/nov')"
-            instancePath="#/monthlySetting/nov"
-            v-model="data.monthlySetting.nov"
-          />
-
-          <SimpleAppNumber
-            autofocus
-            :setting="o.getField('#/properties/monthlySetting/properties/dec')"
-            instancePath="#/monthlySetting/dec"
-            v-model="data.monthlySetting.dec"
-          />
-        </SimpleAppValue>
       </div>
     </SimpleAppForm>
   </Dialog>
 </template>
 <script setup lang="ts">
 import _ from "lodash";
+import moment from "moment";
 import Dialog from "primevue/dialog";
 import Column from "primevue/column";
 import { ListItem } from "@/types/listview";
+import ProgressSpinner from "primevue/progressspinner";
 import ConfirmPopup from "primevue/confirmpopup";
 import { useConfirm } from "primevue/useconfirm";
 const { $event, $listen, $DocnoformatDoc } = useNuxtApp();
@@ -225,12 +144,16 @@ const disabled = ref(false);
 const popuptitle = ref("edit");
 const recordlist = ref();
 const selectedDoctype = ref("");
+const havedocdate = ref(false);
 const confirm = useConfirm();
 // This will work in both `<script setup>` and `<script>`
-definePageMeta({
+if(data.value.created==''){
+  definePageMeta({
   layout: "sidelistcrud",
 });
+}
 
+const sample = ref("");
 const resourcename = ref(_.upperFirst(doc.getDocName()));
 
 const refresh = async () => {
@@ -238,20 +161,27 @@ const refresh = async () => {
 
   console.log("selectedDoctype", selectedDoctype.value);
 
-  const results = await doc.search(filter);
+  const results = await doc.search({ filter: filter });
   recordlist.value = results;
 };
 $listen("itemselected", (item: ListItem) => {
   selectedDoctype.value = item.code;
+  havedocdate.value = item.data.documentDate != "";
   refresh();
 });
 
+const updateSample = () => {
+  sample.value = "Example: " + previewDocNo();
+};
 onMounted(() => {
   const doclist = getDocTypes();
   console.log(doclist);
-  const listdata: ListItem[] = getDocTypes().map(
-    (item) => ({ name: item.docName, code: item.docType }) as ListItem,
-  );
+  const listdata: ListItem[] = getDocTypes()
+    .filter((item) => item.docNumber)
+    .map(
+      (item) =>
+        ({ name: item.docName, code: item.docType, data: item }) as ListItem,
+    );
   $event("listloaded", listdata);
 });
 const newRecord = () => {
@@ -321,6 +251,46 @@ const triggerEdit = async (event: any) => {
   await doc.getById(id);
   console.log(id);
   visible.value = true;
-  useRouter().push({ path: `/${useRoute().params.xorg}/docnoformat/${id}` });
+  // useRouter().push({ path: `/${useRoute().params.xorg}/docnoformat/${id}` });
+};
+
+const previewDocNo = (): string => {
+  const pattern = data.value.docNoPattern;
+  if (pattern) {
+    const numberReg: RegExp = /\[(.*?)\]/g;
+    const dateReg: RegExp = /\{(.*?)\}/g;
+    let newvalue = pattern;
+    const numberpattern = pattern.match(numberReg);
+    const datepattern = pattern.match(dateReg);
+
+    if (numberpattern && numberpattern.length > 0) {
+      const numberlength = numberpattern[0]
+        .replace("[", "")
+        .replace("]", "").length;
+
+      let nextnumber = (data.value.nextNumber ?? 0).toString();
+
+      const numberdiff = numberlength - nextnumber.length;
+
+      for (let n = 0; n < numberdiff; n++) {
+        nextnumber = "0" + nextnumber;
+      }
+      newvalue = newvalue.replace(numberpattern[0], nextnumber);
+    }
+
+    if (datepattern && datepattern.length > 0) {
+      for (let d = 0; d < datepattern.length; d++) {
+        const dpattern = datepattern[d];
+        const date = new Date();
+        const formatteddate = moment().format(
+          dpattern.replace("{", "").replace("}", ""),
+        );
+        newvalue = newvalue.replace(dpattern, formatteddate);
+      }
+    }
+    return newvalue;
+  } else {
+    return "";
+  }
 };
 </script>

package/templates/nuxt/pages/[xorg]/index.vue._eta

@@ -0,0 +1,13 @@
+<script lang="ts" setup>
+/**
+ * This file was automatically generated by simpleapp generator. 
+ * YOU ALLOWED TO CHANGE THIS FILE, IT WONT OVERRIDE BY GENERATOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
+</script>
+<template>
+  <div class="frontpage-container" >          
+    <h1 class="border text-3xl text-center  m-20 p-20">Create your front page here</h1>              
+  </div>
+</template>