@simitgroup/simpleapp-generator 1.6.2-alpha → 1.6.3-alpha

package/README.md

@@ -104,7 +104,7 @@ simpleapp-generator -g init
 
 5. prepare backend
 ```sh
-bash build.sh backend
+./build.sh backend
 ```
 6. update backend configurations file by modify `~/project1/backend/.env`, change mongodb, keycloak settings according your requirements
 7. start backend:
@@ -115,12 +115,13 @@ pnpm start:dev
 
 8. prepare frontend (i use pnpm cause faster)
 ```sh
-sh build.sh frontend
+./build.sh frontend
 ```
 9. modify frontend configuration by modify `~/project1/frontend/.env`, change keycloak settings
 ```sh
 OAUTH2_BASEURL=https://server-url    #keycloak server url
-OAUTH2_CONFIGURL=https://server-url/realms/testing
+OAUTH2_CONFIGURL=https://server-url/realms/testingrealm
+OAUTH2_REALM=testingrealm
 OAUTH2_CLIENTID=client1
 OAUTH2_CLIENTSECRET=aaaa-xxxxx-yyyy-zzzzz-www
 ADMIN_EMAIL=your@ykeycloakemail.com    #if you have multiple, separate by ','
@@ -140,8 +141,8 @@ nuxi preview
 1. add some schemas at `~/project1/schemas`
 2. then run 
 ```sh
-sh build.sh updatebackend
-sh build.sh updatefrontend
+./build.sh updatebackend
+./build.sh updatefrontend
 ```
 3. to add different user group permission, you may change `project1/groups`
 

package/dist/buildinschemas/branch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"branch.d.ts","sourceRoot":"","sources":["../../src/buildinschemas/branch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAA2B,MAAM,SAAS,CAAA;AAE5D,eAAO,MAAM,MAAM,EAAC,UA+CnB,CAAA"}
+{"version":3,"file":"branch.d.ts","sourceRoot":"","sources":["../../src/buildinschemas/branch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAA2B,MAAM,SAAS,CAAA;AAE5D,eAAO,MAAM,MAAM,EAAC,UA6CnB,CAAA"}

package/dist/buildinschemas/branch.js

@@ -37,8 +37,6 @@ exports.branch = {
         branchName: { type: "string", minLength: 1 },
         street1: { type: "string" },
         street2: { type: "string" },
-        street3: { type: "string" },
-        street4: { type: "string" },
         city: { type: "string" },
         region: { type: "string" },
         postcode: { type: "string" },

package/dist/buildinschemas/branch.js.map

@@ -1 +1 @@
-{"version":3,"file":"branch.js","sourceRoot":"","sources":["../../src/buildinschemas/branch.ts"],"names":[],"mappings":";;;AAAA,kCAA4D;AAE/C,QAAA,MAAM,GAAa;IAC5B,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAC;QACjB,aAAa,EAAC,oBAAa,CAAC,GAAG;QAC/B,YAAY,EAAC,QAAQ;QACrB,YAAY,EAAC,QAAQ;QACrB,oBAAoB;QACpB,SAAS,EAAC,YAAY;QACtB,UAAU,EAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QACzB,aAAa,EAAC,YAAY;QAC1B,4BAA4B,EAAE,CAAC,UAAU,CAAC;KAC7C;IACD,YAAY,EAAE;QACV,GAAG,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACnB,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACvB,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACvB,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACzB,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACzB,QAAQ,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC/C,KAAK,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC5C,QAAQ,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC/C,YAAY,EAAC;YACX,IAAI,EAAC,QAAQ;YACb,cAAc,EAAC,cAAc;YAC7B,UAAU,EAAC;gBACP,KAAK,EAAC,EAAC,MAAM,EAAC,QAAQ,EAAC;gBACvB,MAAM,EAAC,EAAC,MAAM,EAAC,QAAQ,EAAC;gBACxB,OAAO,EAAC,EAAC,MAAM,EAAC,QAAQ,EAAC;gBACzB,OAAO,EAAC,EAAC,MAAM,EAAC,SAAS,EAAC;aAC7B;SACF;QACD,UAAU,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC,SAAS,EAAC,CAAC,EAAC;QACxC,UAAU,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC,SAAS,EAAC,CAAC,EAAC;QACxC,OAAO,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC;QACzB,OAAO,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC;QACzB,OAAO,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC;QACzB,OAAO,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC;QACzB,IAAI,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC;QACtB,MAAM,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC;QACxB,QAAQ,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC;QAC1B,OAAO,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC;QACzB,GAAG,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC;QACrB,KAAK,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC;QACvB,MAAM,EAAE,EAAC,IAAI,EAAE,SAAS,EAAC,OAAO,EAAC,IAAI,EAAC;QACtC,WAAW,EAAE,EAAC,IAAI,EAAE,QAAQ,GAAE;KAC/B;CAEN,CAAA"}
+{"version":3,"file":"branch.js","sourceRoot":"","sources":["../../src/buildinschemas/branch.ts"],"names":[],"mappings":";;;AAAA,kCAA4D;AAE/C,QAAA,MAAM,GAAa;IAC5B,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAC;QACjB,aAAa,EAAC,oBAAa,CAAC,GAAG;QAC/B,YAAY,EAAC,QAAQ;QACrB,YAAY,EAAC,QAAQ;QACrB,oBAAoB;QACpB,SAAS,EAAC,YAAY;QACtB,UAAU,EAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QACzB,aAAa,EAAC,YAAY;QAC1B,4BAA4B,EAAE,CAAC,UAAU,CAAC;KAC7C;IACD,YAAY,EAAE;QACV,GAAG,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACnB,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACvB,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACvB,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACzB,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACzB,QAAQ,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC/C,KAAK,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC5C,QAAQ,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC/C,YAAY,EAAC;YACX,IAAI,EAAC,QAAQ;YACb,cAAc,EAAC,cAAc;YAC7B,UAAU,EAAC;gBACP,KAAK,EAAC,EAAC,MAAM,EAAC,QAAQ,EAAC;gBACvB,MAAM,EAAC,EAAC,MAAM,EAAC,QAAQ,EAAC;gBACxB,OAAO,EAAC,EAAC,MAAM,EAAC,QAAQ,EAAC;gBACzB,OAAO,EAAC,EAAC,MAAM,EAAC,SAAS,EAAC;aAC7B;SACF;QACD,UAAU,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC,SAAS,EAAC,CAAC,EAAC;QACxC,UAAU,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC,SAAS,EAAC,CAAC,EAAC;QACxC,OAAO,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC;QACzB,OAAO,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC;QACzB,IAAI,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC;QACtB,MAAM,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC;QACxB,QAAQ,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC;QAC1B,OAAO,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC;QACzB,GAAG,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC;QACrB,KAAK,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC;QACvB,MAAM,EAAE,EAAC,IAAI,EAAE,SAAS,EAAC,OAAO,EAAC,IAAI,EAAC;QACtC,WAAW,EAAE,EAAC,IAAI,EAAE,QAAQ,GAAE;KAC/B;CAEN,CAAA"}

package/dist/index.js

@@ -27,6 +27,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const console_1 = require("console");
 const fw = __importStar(require("./framework"));
 const generate = __importStar(require("./generate"));
+const fs_1 = require("fs");
 const program = require("commander"); // add this line
 const Fieldtypes = require('./type');
 // const generate= require( './generate')
@@ -54,7 +55,9 @@ let continueexecute = true;
 if (options.generateType && options.generateType == 'init') {
     continueexecute = false;
     fw.prepareProject(() => {
-        process.exit(1);
+        (0, fs_1.chmod)(process.cwd() + '/build.sh', 0o755, () => {
+            process.exit(1);
+        });
     });
 }
 else if (!options.configFile) {

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/buildinschemas/branch.ts

@@ -35,8 +35,6 @@ export const branch:SchemaType ={
         branchName: {type: "string",minLength:1},
         street1: {type: "string"},
         street2: {type: "string"},
-        street3: {type: "string"},
-        street4: {type: "string"},
         city: {type: "string"},
         region: {type: "string"},
         postcode: {type: "string"},

package/src/index.ts

@@ -2,6 +2,7 @@
 import { error } from "console"
 import * as fw from  './framework'
 import * as generate from './generate'
+import { chmod } from "fs"
 const program =  require("commander") // add this line
 const Fieldtypes= require( './type')
 // const generate= require( './generate')
@@ -33,9 +34,13 @@ console.log(figlet.textSync(`${version}`));
 let continueexecute = true
 if(options.generateType && options.generateType=='init'){
   continueexecute=false
-  fw.prepareProject(()=>{
-    process.exit(1)
-  })  
+  
+    fw.prepareProject(()=>{
+      chmod(process.cwd()+'/build.sh',0o755,()=>{
+        process.exit(1)
+    })  
+  })
+  
   
 }
 else if(!options.configFile){

package/templates/basic/nuxt/pages.form.vue.eta

@@ -13,8 +13,8 @@
         <%}%> 
     <SimpleAppForm #default="o" :document="doc">                    
         <SimpleAppFormToolBar  :document="doc" @on="actionListener"></SimpleAppFormToolBar>        
-        <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-4 p-2">
-    <% let isautofocus='' %>
+            <div class="grid grid-cols-1 lg:grid-cols-2 gap-4 p-2">
+          <% let isautofocus='' %>
      <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
       
         <% let obj=it.jsonschema.properties[key] %>

package/templates/basic/nuxt/pages.landing.vue.eta

@@ -44,7 +44,7 @@ import { <%= it.typename %> } from '~/simpleapp/generate/openapi';
   type <%= it.typename %>Key = keyof <%= it.typename %> 
 
   definePageMeta({
-    menuPath:'nocategory/<%= it.name %>'    
+    menuPath:'general/nocategory/<%= it.name %>'    
   });
 
   const columns:<%= it.typename %>Key[] = [<%Object.keys(it.jsonschema.properties).forEach(function(key) { %>

package/templates/nest/src/simpleapp/generate/commons/docnogenerator.service.ts.eta

@@ -7,39 +7,39 @@
 import { UserContext } from './user.context';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
-import {DocNumberFormatResult} from '../types'
-import { Docnoformat } from '../types/docno.type'
-import { Injectable, InternalServerErrorException,BadRequestException } from '@nestjs/common';
-import moment from 'moment';
-import {ForeignKey} from '../types'
+import { DocNumberFormatResult } from '../types';
+import { Docnoformat } from '../types/docno.type';
+import {  Injectable, InternalServerErrorException, BadRequestException} from '@nestjs/common';
+// import moment from 'moment';
+import dayjs from 'dayjs'
+import { ForeignKey } from '../types';
 
-export class DocNumberFormatGenerator{
-  constructor(@InjectModel('Docnoformat') private docformat: Model<Docnoformat>) {}
+export class DocNumberFormatGenerator {
+  constructor(@InjectModel('Docnoformat') private docformat: Model<Docnoformat>,) {}
 
 
-  async generateNextNumberFromDocument(appuser:UserContext,docType:string,data:any){
-    let formatId = ''
-    if(data.docNoFormat && data.docNoFormat._id){
-      formatId=data.docNoFormat._id
+  async generateNextNumberFromDocument( appuser: UserContext, docType: string, data: any,) {
+    let formatId = '';
+    if (data.docNoFormat && data.docNoFormat._id) {
+      formatId = data.docNoFormat._id;
     }
-    const docnoobj = await this.generateNextNo(appuser,docType,formatId)        
-    const result:ForeignKey = {
-      _id : String(docnoobj.formatId),
-      label: docnoobj.formatName
-    }
-    data.docNoFormat = result
-    return docnoobj.result
+    const docnoobj = await this.generateNextNo(appuser, docType, formatId);
+    const result: ForeignKey = {
+      _id: String(docnoobj.formatId),
+      label: docnoobj.formatName,
+    };
+    data.docNoFormat = result;
+    return docnoobj.result;
   }
 
-
-  generateNextNo = async (appuser: UserContext,doctype: string,id: string = '') => {
+  generateNextNo = async ( appuser: UserContext,doctype: string, id: string = '',) => {
     doctype = doctype.toUpperCase();
     let filter = { docNoType: doctype };
     if (id) {
       filter['_id'] = id;
     }
-    Object.assign(filter,appuser.getBranchFilter())
-    const result = await this.docformat.find(filter)
+    Object.assign(filter, appuser.getBranchFilter());
+    const result = await this.docformat.find(filter);
     //search(appuser, filter);
     if (result && result.length > 0) {
       const d: Docnoformat = result[0];
@@ -47,11 +47,17 @@ export class DocNumberFormatGenerator{
       const newdocno = DocNumberFormatGenerator.previewDocNo(d);
       const newnextnumber = d.nextNumber + 1;
       const updatedata = { nextNumber: newnextnumber } as Docnoformat;
-      const updateresult = await this.docformat.findByIdAndUpdate(recordId,updatedata).session(appuser.getDBSession())
-      
-      if (updateresult) {         
-        const result:DocNumberFormatResult = {formatId:d._id,formatName:d.docNoFormatName,result: newdocno }
-        return result 
+      const updateresult = await this.docformat
+        .findByIdAndUpdate(recordId, updatedata)
+        .session(appuser.getDBSession());
+
+      if (updateresult) {
+        const result: DocNumberFormatResult = {
+          formatId: d._id,
+          formatName: d.docNoFormatName,
+          result: newdocno,
+        };
+        return result;
         //;
       } else {
         throw new InternalServerErrorException(
@@ -86,13 +92,13 @@ export class DocNumberFormatGenerator{
           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(
+          const formatteddate =dayjs().format(
             dpattern.replace('{', '').replace('}', ''),
           );
           newvalue = newvalue.replace(dpattern, formatteddate);
@@ -104,4 +110,4 @@ export class DocNumberFormatGenerator{
       throw new InternalServerErrorException(errors);
     }
   };
-}
+}

package/templates/nest/src/simpleapp/generate/processors/simpleapp.processor.ts.eta

@@ -43,7 +43,7 @@ import {
   WorkflowName,
 } from '../types';
 @Injectable()
-export class SimpleAppService<T extends { _id?: string }> {
+export class SimpleAppService<T extends { _id?: string, __v?:number }> {
   @Inject(EventEmitter2)
   protected eventEmitter: EventEmitter2;
   @Inject(CloudApiService)
@@ -542,6 +542,13 @@ export class SimpleAppService<T extends { _id?: string }> {
 
   findIdThenUpdate = async (appuser: UserContext, id: string, data: T) => {
     const existingdata = await this.findById(appuser, id);
+
+    //version exists, need ensure different only 1
+    if(typeof data.__v=='number' && data.__v != existingdata.__v ){
+      throw new BadRequestException(`You submit older version data "v${data.__v}"" but latest version = "v${existingdata.__v}"`)
+    }
+
+    data.__v = existingdata.__v+1
     if (!existingdata) {
       throw new NotFoundException(`${id} not found`, 'not found');
     }
@@ -592,6 +599,12 @@ export class SimpleAppService<T extends { _id?: string }> {
     if (!existingdata) {
       throw new NotFoundException(`${id} not found`, 'not found');
     }
+    if(typeof data.__v=='number' && data.__v != existingdata.__v ){
+      throw new BadRequestException(`You submit older version data "v${data.__v}"" but latest version = "v${existingdata.__v}"`)
+    }
+
+    data.__v = existingdata.__v+1
+
 
     if (this.hooks.beforeUpdate)
       await this.hooks.beforeUpdate(appuser, id, data, existingdata);
@@ -744,7 +757,7 @@ export class SimpleAppService<T extends { _id?: string }> {
    * @param      {string}       eventName  The event name
    * @param      {any}          data       The data
    */
-  runBackgroundWorker(appuser: UserContext, eventName: string, payloads:any) {
+  runBackgroundWorker(appuser: UserContext, eventName: string, payloads: any) {
     this.eventEmitter.emit(eventName, appuser, payloads);
   }
 
@@ -764,7 +777,7 @@ export class SimpleAppService<T extends { _id?: string }> {
    * @param      {any}          data       The data
    * @return     {Promise}      { description_of_the_return_value }
    */
-  async runWorker(appuser: UserContext, eventName: string, payloads:any) {
+  async runWorker(appuser: UserContext, eventName: string, payloads: any) {
     const res = await this.eventEmitter.emitAsync(eventName, appuser, payloads);
     if (!this.eventEmitter.hasListeners(eventName)) {
       throw new InternalServerErrorException(`${eventName} seems no listener`);

package/templates/nuxt/{app.vue._eta → app.vue.eta}

@@ -1,5 +1,7 @@
 <template>
-  <NuxtLayout :name="getLayout()">      
+  <NuxtLayout :name="getLayout()">     
+    <ConfirmDialog></ConfirmDialog>         
+    <DynamicDialog />
     <SessionBlock/>
     <OverlayHoldscreen/>
     <EventDocumentViewer></EventDocumentViewer>      

package/templates/nuxt/components/button/ButtonAction.vue._eta

@@ -1,25 +1,66 @@
 <template>
-  <ButtonDefault v-if="!actionName" :animate="animate"
-    ><slot></slot>def</ButtonDefault
+  <ButtonDefault v-if="!actionName" :animate="animate">
+    <i :class="getIcon()"/><slot></slot>def</ButtonDefault
   >
   <ButtonPrimary
-    v-else-if="['create', 'update','print'].includes(actionName)"
+    v-else-if="['create', 'update','confirm'].includes(actionName)"
     :animate="animate"
-    ><slot></slot
+    >
+    <i :class="getIcon()"/>
+    <slot></slot
   ></ButtonPrimary>
+  
   <ButtonDanger
     v-else-if="['delete', 'void'].includes(actionName)"
     :animate="animate"
-    ><slot></slot
-  ></ButtonDanger>
-  <ButtonWarning v-else :animate="animate"><slot></slot></ButtonWarning>
+    >
+    <i :class="getIcon()"/>
+    <slot></slot>
+  </ButtonDanger>
+  <ButtonWarning v-else-if="['draft'].includes(actionName)" :animate="animate">
+    <i :class="getIcon()"/>
+    <slot></slot>
+  </ButtonWarning>  
+  <ButtonDefault
+    v-else
+    :animate="animate"
+    >
+    <i :class="getIcon()"/>
+    <slot></slot
+  ></ButtonDefault>
 </template>
 <script setup lang="ts">
 /**
  * This file was automatically generated by simpleapp generator during initialization. It is changable.
- * --remove-this-line-to-prevent-override--
  * last change 2024-03-01
  * author: Ks Tan
  */
+
 const props = defineProps<{ actionName?: string; animate?: boolean }>();
+const getIcon = ()=>{
+  let cssname='mr-1 pi ';
+  switch(props.actionName){
+    case 'create': 
+    case 'update': 
+      cssname+='pi-save';
+    break;
+    case 'delete':
+      cssname+='pi-trash';
+    break;
+    case 'print':
+      cssname+='pi-file-pdf';
+    break;
+    case 'confirm':
+      cssname+='pi-check';
+    break;
+    case 'void':
+      cssname+='pi-file-excel';
+    break;
+    case 'draft':
+      cssname+='pi-file-edit';
+    break;
+  }
+  return cssname
+}
+
 </script>

package/templates/nuxt/components/calendar/CalendarInput.vue.eta

@@ -1,13 +1,14 @@
 <template>
-    <div class="flex flex-col ">
-      <label v-if="label" :for="inputid">{{ label }}</label>
-      <Calendar 
-        v-model="modelValue" 
-        class="w-full" 
-        :inputid="inputid"
-        :date-format="getPrimevueCalendarDateFormat()"
-        />
-    </div>
+  <div class="flex flex-col">
+    <label v-if="label" :for="inputid">{{ label }}</label>
+    <Calendar
+      v-model="modelValue"
+      class="w-full"
+      :inputid="inputid"
+      :date-format="getPrimevueCalendarDateFormat()"
+      @update:modelValue="emits('change',modelValue)"
+    />
+  </div>
 </template>
 <script setup lang="ts">
 /**
@@ -16,9 +17,10 @@
  * last change 2024-04-16
  * author: Ks Tan
  */
-const modelValue = defineModel<Date>({required:true})
-const inputid=randomUUID()
+const modelValue = defineModel<Date>({ required: true });
+const inputid = randomUUID();
+const emits = defineEmits(['change'])
 const props = defineProps<{
-    label?:string
-}>()
-</script>
+  label?: string;
+}>();
+</script>

package/templates/nuxt/components/event/EventDocumentViewer.vue._eta

@@ -1,18 +1,16 @@
 <template>
   <OverlayViewer v-model="visible">
-    <!-- <template #header>
-      
-    </template> -->
+    <template #header>
+      <div class="flex flex-row gap-4">
+        <Chip
+          v-for="(v, k) in allview"
+          :label="v.label"
+          @remove="deleteTab"
+          :removable="lastDocumentName == v.documentName"
+        />
+      </div>
+    </template>
     <div class="w-full h-full">
-      <!-- <div class="flex flex-row gap-4" v-if="allview.length>0">
-            <Chip              
-              v-for="(v, k) in allview"
-              :label="v.label"
-              @remove="deleteTab"
-              :removable="true"
-            />
-          </div> -->
-
       <div
         v-for="(v, k) in allview"
         v-memo="[k]"
@@ -44,10 +42,19 @@
 import { onKeyStroke } from "@vueuse/core";
 import { useDialog } from "primevue/usedialog";
 import { defineAsyncComponent } from "vue";
+
 import { ViewRecord, FormCrudEvent } from "~/types";
 // import TabView from 'primevue/tabview';
 import Chip from "primevue/chip";
+const lastDocumentName = computed(() => {
+  const keys = Object.keys(allview.value);
+
+  if (keys.length == 0) return "";
+
+  const keyname = keys[keys.length - 1];
 
+  return allview.value[keyname].documentName;
+});
 const { $listen } = useNuxtApp();
 const visible = ref(false);
 const allview = ref<{ [key: string]: ViewRecord }>({});
@@ -59,7 +66,7 @@ const after = (
 ) => {
   if (v.after) {
     v.after(eventType, data);
-    
+
     //only after mount consider no remove tab
     if (eventType != "mount") deleteTab();
   }
@@ -104,6 +111,16 @@ $listen("CloseDialog", (documentName: string) => {
 //   visible.value = true;
 //   allview.value[setting.eventId] = setting;
 // });
+//
+const clearView = () => {
+  allview.value = {};
+};
+
+watch(visible, () => {
+  if (visible.value == false) {
+    clearView();
+  }
+});
 </script>
 
 <style scoped>

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

@@ -6,10 +6,15 @@
     :sub-title-field="uniqueKey"
     #default="{ item, index }"
   >
-    <div class="cursor-pointer flex flex-row gap-2" @click="emits('click', item)">
-      <slot name="default" :index="index" :item="item">      
-        <TextTitle class="flex-1">{{ item[(documentTitle as  keyof typeof item) ] }}</TextTitle>
-        <TextSubtitle >{{ item[uniqueKey as  keyof typeof item] }}</TextSubtitle>
+    <div
+      class="cursor-pointer flex flex-row gap-2"
+      @click="emits('click', item)"
+    >
+      <slot name="default" :index="index" :item="item">
+        <TextMain class="flex-1">{{
+          item[documentTitle as keyof typeof item]
+        }}</TextMain>
+        <TextSubsubtitle>{{ item[uniqueKey as keyof typeof item] }}</TextSubsubtitle>
       </slot>
     </div>
   </ListView>
@@ -24,7 +29,7 @@
 import { SearchBody } from "~/types";
 const emits = defineEmits(["click"]);
 const props = defineProps<{
-  recordlist: T[];  
+  recordlist: T[];
   uniqueKey?: string;
   documentTitle?: string;
 }>();

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

@@ -30,11 +30,11 @@
           </slot>
         </div>
         <span class="p-input-icon-left flex-1">
-          <i class="pi pi-search mt-4 ml-2 text-gray-400 absolute" />
+          
           <InputText
             type="search"
             v-model="filters['global'].value"
-            class="text-right"
+            class="w-full dark:text-white text-sm"
             placeholder="Keyword Search"
           />
         </span>

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Sidebar v-model:visible="messagesvisible" :header="t('messages')">
+    <Sidebar v-model:visible="messagesvisible" position="right" :header="t('messages')">
       <ListView :list="list" #default="{ item, index }" @click="openMessage">
         <div class="flex flex-col">
           <TextBold v-if="!item.read">{{ item.messageTitle }}</TextBold>