@simitgroup/simpleapp-generator 1.6.4-alpha → 1.6.4-c-alpha

package/package.json

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

package/templates/basic/nest/controller.ts.eta

@@ -345,7 +345,7 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
 
   <% if(simpleappconfig?.printFormats){%>
   @Get(':id/print/:formatid')
-  @Roles(Role.SuperAdmin, Role.SuperUser, Role.<%= `${it.typename}_print`%>)
+  @Roles(Role.SuperAdmin, Role.SuperUser, Role.<%= `${it.typename}_access`%>)
   @ApiResponse({
     status: 200,
     description: 'return base64 pdf string',

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

@@ -18,6 +18,7 @@ const after = (actionName: string, data: <%= it.typename %>) => {
       break;
     case "create":
       emits("afterCreate", data);
+      refreshDocumentList('<%= it.name %>')
       break;
     case "update":
       break;

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

@@ -9,16 +9,25 @@ 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 {
+  Injectable,
+  InternalServerErrorException,
+  BadRequestException,
+} from '@nestjs/common';
 // import moment from 'moment';
-import dayjs from 'dayjs'
+import dayjs from 'dayjs';
 import { ForeignKey } from '../types';
 
 export class DocNumberFormatGenerator {
-  constructor(@InjectModel('Docnoformat') private docformat: Model<Docnoformat>,) {}
+  constructor(
+    @InjectModel('Docnoformat') private docformat: Model<Docnoformat>,
+  ) {}
 
-
-  async generateNextNumberFromDocument( appuser: UserContext, docType: string, data: any,) {
+  async generateNextNumberFromDocument(
+    appuser: UserContext,
+    docType: string,
+    data: any,
+  ) {
     let formatId = '';
     if (data.docNoFormat && data.docNoFormat._id) {
       formatId = data.docNoFormat._id;
@@ -32,14 +41,18 @@ export class DocNumberFormatGenerator {
     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);
+    const result = await this.docformat.find(filter).session(appuser.getDBSession());
     //search(appuser, filter);
     if (result && result.length > 0) {
       const d: Docnoformat = result[0];
@@ -98,7 +111,7 @@ export class DocNumberFormatGenerator {
         for (let d = 0; d < datepattern.length; d++) {
           const dpattern = datepattern[d];
           const date = new Date();
-          const formatteddate =dayjs().format(
+          const formatteddate = dayjs().format(
             dpattern.replace('{', '').replace('}', ''),
           );
           newvalue = newvalue.replace(dpattern, formatteddate);

package/templates/nest/src/simpleapp/generate/commons/user.context.ts.eta

@@ -90,6 +90,7 @@ export class UserContext {
   getFullname = () => this.fullname;
   getTenantId = () => this.tenantId;
   getOrgId = () => this.orgId;
+  getOrgRecordId = () => this.orgRecordId;
   getBranchId = () => this.branchId;
   getBranchCode = () => this.branchCode;
   getEmail = () => this.email;
@@ -609,6 +610,7 @@ export class UserContext {
                 as: 'org',
               },
             },
+            {$unwind:'$org'},
             {
               $lookup: {
                 from: 'branch',
@@ -617,6 +619,7 @@ export class UserContext {
                 as: 'branch',
               },
             },
+            {$unwind:'$branch'},
           ],
         },
       };
@@ -639,7 +642,7 @@ export class UserContext {
         activeusers.forEach((u) => {
           const permissions = u.permissions
             .filter((item: any) => {
-              return item.org[0].active && item.branch[0].active;
+              return item.org.active && item.branch.active;
             })
             .map((item: any) => {
               return {
@@ -647,10 +650,11 @@ export class UserContext {
                 orgId: item.orgId,
                 branchId: item.branchId,
                 groups: item.groups,
-                orgCode: item.org[0].orgCode,
-                orgName: item.org[0].orgName,
-                branchCode: item.branch[0].branchCode,
-                branchName: item.branch[0].branchName,
+                orgRecordId:item.org._id, 
+                orgCode: item.org.orgCode,
+                orgName: item.org.orgName,
+                branchCode: item.branch.branchCode,
+                branchName: item.branch.branchName,
                 xOrg: this.generateXorg(u.tenantId, item.orgId, item.branchId),
               };
             });

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

@@ -32,8 +32,6 @@ export class OrganizationProcessor extends SimpleAppService<Organization> {
   protected documentIdentityLabel = 'orgName';
   protected strictIsolation = false;
   protected foreignkeys = {};
-  protected defaultlogo =
-    'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAApgAAAKYB3X3/OAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAANCSURBVEiJtZZPbBtFFMZ/M7ubXdtdb1xSFyeilBapySVU8h8OoFaooFSqiihIVIpQBKci6KEg9Q6H9kovIHoCIVQJJCKE1ENFjnAgcaSGC6rEnxBwA04Tx43t2FnvDAfjkNibxgHxnWb2e/u992bee7tCa00YFsffekFY+nUzFtjW0LrvjRXrCDIAaPLlW0nHL0SsZtVoaF98mLrx3pdhOqLtYPHChahZcYYO7KvPFxvRl5XPp1sN3adWiD1ZAqD6XYK1b/dvE5IWryTt2udLFedwc1+9kLp+vbbpoDh+6TklxBeAi9TL0taeWpdmZzQDry0AcO+jQ12RyohqqoYoo8RDwJrU+qXkjWtfi8Xxt58BdQuwQs9qC/afLwCw8tnQbqYAPsgxE1S6F3EAIXux2oQFKm0ihMsOF71dHYx+f3NND68ghCu1YIoePPQN1pGRABkJ6Bus96CutRZMydTl+TvuiRW1m3n0eDl0vRPcEysqdXn+jsQPsrHMquGeXEaY4Yk4wxWcY5V/9scqOMOVUFthatyTy8QyqwZ+kDURKoMWxNKr2EeqVKcTNOajqKoBgOE28U4tdQl5p5bwCw7BWquaZSzAPlwjlithJtp3pTImSqQRrb2Z8PHGigD4RZuNX6JYj6wj7O4TFLbCO/Mn/m8R+h6rYSUb3ekokRY6f/YukArN979jcW+V/S8g0eT/N3VN3kTqWbQ428m9/8k0P/1aIhF36PccEl6EhOcAUCrXKZXXWS3XKd2vc/TRBG9O5ELC17MmWubD2nKhUKZa26Ba2+D3P+4/MNCFwg59oWVeYhkzgN/JDR8deKBoD7Y+ljEjGZ0sosXVTvbc6RHirr2reNy1OXd6pJsQ+gqjk8VWFYmHrwBzW/n+uMPFiRwHB2I7ih8ciHFxIkd/3Omk5tCDV1t+2nNu5sxxpDFNx+huNhVT3/zMDz8usXC3ddaHBj1GHj/As08fwTS7Kt1HBTmyN29vdwAw+/wbwLVOJ3uAD1wi/dUH7Qei66PfyuRj4Ik9is+hglfbkbfR3cnZm7chlUWLdwmprtCohX4HUtlOcQjLYCu+fzGJH2QRKvP3UNz8bWk1qMxjGTOMThZ3kvgLI5AzFfo379UAAAAASUVORK5CYII=';
   protected hooks: OrganizationHooks = {
     beforeCreate: async (appuser: UserContext, data: Organization) =>
       await this.orgBeforeCreate(appuser, data),
@@ -65,23 +63,22 @@ export class OrganizationProcessor extends SimpleAppService<Organization> {
   async runGetlogo(appuser: UserContext) {
     const logo = await this.searchLogo(appuser);
     if (logo) return logo.value;
-    else return this.defaultlogo;
+    else return ''
   }
 
   async searchLogo(appuser: UserContext) {
     const keyvaluepair = await this.kvpairService.search(appuser, {
-      key: 'orglogo',
+      key: 'org-'+appuser.getOrgRecordId(),
     });
     if (keyvaluepair && keyvaluepair.length > 0) return keyvaluepair[0];
     else return null;
   }
-  async runUploadlogo(appuser: UserContext, data: KeyValue) {
-    // this.setDefaultLogo(data.value);
+  async runUploadlogo(appuser: UserContext, data: KeyValue) {    
     const key = data.key;
 
     let kvdata: Keyvaluepair = await this.searchLogo(appuser);
     if (kvdata) {
-      kvdata.value=data.value
+      kvdata.value = data.value;
       const res = await this.kvpairService.findIdThenUpdate(
         appuser,
         kvdata._id,
@@ -95,7 +92,7 @@ export class OrganizationProcessor extends SimpleAppService<Organization> {
     } else {
       kvdata = {
         _id: crypto.randomUUID(),
-        key: 'orglogo',
+        key: 'org-'+appuser.getOrgRecordId(),
         value: data.value,
       };
       const res = await this.kvpairService.create(appuser, kvdata);
@@ -106,10 +103,8 @@ export class OrganizationProcessor extends SimpleAppService<Organization> {
       }
     }
 
-    return this.defaultlogo;
+    return ''
   }
 
-  async setDefaultLogo(data: string) {
-    this.defaultlogo = data;
-  }
+  
 }

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

@@ -230,7 +230,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
         this.polishIsolationFilter(isolationFilter);
 
         Object.assign(pipeline[0]['$match'], isolationFilter);
-        //console.log("final agg",pipeline)
+        this.logger.verbose(pipeline, `${this.documentName} aggregate:`);
         return await this.doc.aggregate(pipeline, {
           session: appuser.getDBSession(),
         });
@@ -576,20 +576,24 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
   // };
 
   findIdThenUpdate = async (appuser: UserContext, id: string, data: T) => {
-    const existingdata = await this.findById(appuser, id);
-
+    
+    try {
     //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}"`,
-      );
-    }
+      const existingdata = await this.findById(appuser, id);
+      if(!existingdata) throw new NotFoundException(`${this.documentName} findIdThenUpdate:  _id:${id} not found`, 'not found');
 
+      this.logger.debug("update id:"+id,this.documentName+' findIdThenUpdate')
+      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}"`,
+        );
+      }
+      this.logger.debug("warn1",existingdata)
     data.__v = existingdata.__v + 1;
-    if (!existingdata) {
-      throw new NotFoundException(`${id} not found`, 'not found');
-    }
-
+    // if (!existingdata) {
+    //   throw new NotFoundException(`${id} not found`, 'not found');
+    // }
+    this.logger.debug("warn2")
     if (this.hooks.beforeUpdate)
       await this.hooks.beforeUpdate(appuser, id, data, existingdata);
 
@@ -611,7 +615,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
     this.polishIsolationFilter(isolationFilter);
     isolationFilter['_id'] = id;
     this.applyNestedDateTime(appuser, data, 'update');
-    try {
+    
       const result = await this.doc.findOneAndReplace(isolationFilter, data, {
         session: dbsession,
         new: true,

package/templates/nest/src/simpleapp/profile/profile.service.ts.eta

@@ -124,6 +124,7 @@ export class ProfileService {
       orgName: tenantName,
       active: true,
       orgCode: 'HQ',
+      registrationNo: '000000',
       timeZone: timeZone,
       offsetMinute: utcOffset,
       currency: currencyCode,
@@ -143,6 +144,13 @@ export class ProfileService {
       branchId: 1,
       branchCode: 'HQ',
       branchName: tenantName,
+      street1: '11,my street 1',
+      street2: 'my street 2',
+      postcode: '11111',
+      city: 'my city',
+      tel: '99999999999',
+      email: 'change-email@email.com',
+      region: 'my region',
       country: countryName,
       active: true,
       orgId: orgResult.orgId,
@@ -246,22 +254,17 @@ export class ProfileService {
     return 'OK';
   }
 
-  
-   async runTourComplete(appuser: UserContext, guideName: string) {
+  async runTourComplete(appuser: UserContext, guideName: string) {
     if (!guideName || guideName == '')
       throw new BadRequestException('undefine guideName');
 
-    const user = await this.usersvc.findById(
-      appuser,
-      appuser.getId(),
-    );
-    if(!Array.isArray(user.completedTours)){
-        user.completedTours=[]
-      }
+    const user = await this.usersvc.findById(appuser, appuser.getId());
+    if (!Array.isArray(user.completedTours)) {
+      user.completedTours = [];
+    }
 
     if (!user.completedTours.includes(guideName)) {
-      
-      user.completedTours.push(guideName);            
+      user.completedTours.push(guideName);
       const res = await this.usersvc.findIdThenUpdate(appuser, user._id, user);
     }
 

package/templates/nest/src/simpleapp/simpleapp.module.ts.eta

@@ -22,11 +22,11 @@ import { <%= obj.docname %>MongoSchema } from './generate/models/<%= obj.doctype
 <%}%>
 import { ProfileController } from './profile/profile.controller';
 import { ProfileService } from './profile/profile.service';
-import { WorkflowController } from './generate/workflow/workflow.controller';
-import { WorkflowDelegate } from './generate/workflow/workflow.delegate';
-import { WorkflowConfig } from './generate/workflow/workflow.config';
-import { WorkflowService } from './generate/workflow/workflow.service';
-import { WorkflowUserService } from './generate/workflow/workflow.userservice';
+//import { WorkflowController } from './generate/workflow/workflow.controller';
+//import { WorkflowDelegate } from './generate/workflow/workflow.delegate';
+//import { WorkflowConfig } from './generate/workflow/workflow.config';
+//import { WorkflowService } from './generate/workflow/workflow.service';
+//import { WorkflowUserService } from './generate/workflow/workflow.userservice';
 import { SimpleAppRobotUserService } from './generate/commons/robotuser.service';
 <%for(let i=0; i<it.allbpmn.length;i++){%>
 <%let bpmn = it.allbpmn[i]%>
@@ -50,14 +50,17 @@ import { <%=capitalizeFirstLetter(bpmn)%>ListenerService } from 'src/simpleapp/w
         <%}%>
       ]),
   ],
-  controllers: [<% for(let i=0;i<it.modules.length; i++){ %><%= it.modules[i].docname %>Controller,<%}%> ProfileController,WorkflowController],
+  controllers: [<% for(let i=0;i<it.modules.length; i++){ %><%= it.modules[i].docname %>Controller,<%}%> ProfileController,
+  //WorkflowController
+  ],
   providers: [
     SimpleAppRobotUserService,
     RunWebhookService,
     AuditTrail,DocNumberFormatGenerator,<% for(let i=0;i<it.modules.length; i++){ %>
       <%= it.modules[i].docname %>Service,
       <%= it.modules[i].docname %>Resolver,
-      <%}%> ProfileService,WorkflowDelegate,WorkflowConfig,WorkflowService,WorkflowUserService,
+      <%}%> ProfileService,
+      //WorkflowDelegate,WorkflowConfig,WorkflowService,WorkflowUserService,
      <%for(let i=0; i<it.allbpmn.length;i++){%>
         <%let bpmn = it.allbpmn[i]%>
         <%=capitalizeFirstLetter(bpmn)%>ListenerService,
@@ -66,6 +69,8 @@ import { <%=capitalizeFirstLetter(bpmn)%>ListenerService } from 'src/simpleapp/w
   exports:[SimpleAppRobotUserService,AuditTrail,DocNumberFormatGenerator,<% for(let i=0;i<it.modules.length; i++){ %>
     <%= it.modules[i].docname %>Service,
     <%= it.modules[i].docname %>Resolver,
-    <%}%> ProfileService,WorkflowDelegate,WorkflowConfig,WorkflowService,WorkflowUserService,UserResolverService,]
+    <%}%> ProfileService,
+    //WorkflowDelegate,WorkflowConfig,WorkflowService,WorkflowUserService,
+    UserResolverService,]
 })
 export class GenerateModule {}

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

@@ -1,51 +1,56 @@
 <template>
-<ClientOnly>
-  <VueCal
-    :id="id"
-    class="w-full"
-    hide-view-selector
-    click-to-navigate
-    :time="false"
-    today-button
-    active-view="month"
-    :disable-views="['week', 'day']"
-    :selected-date="selectedDate"
-    events-count-on-year-view
-    @view-change="viewChange"
-    :events="allevents"
-    @cell-focus="chooseDate"
-    xsmall
-  >
-    <template #today-button>
-      <!-- Using Vuetify (but we prefer Wave UI 🤘) -->
-      <div @click="chooseDate(new Date(), true)">{{ t("today") }}</div>
-    </template>
-    <template #cell-content="{ cell, events }">
-      <div>
+  <ClientOnly>
+    <VueCal
+      :id="id"
+      class="w-full"
+      hide-view-selector
+      click-to-navigate
+      :time="false"
+      today-button
+      active-view="month"
+      :disable-views="['week', 'day']"
+      :selected-date="selectedDate"
+      events-count-on-year-view
+      @view-change="viewChange"
+      :events="allevents"
+      @cell-focus="chooseDate"
+      xsmall
+    >
+      <template #today-button>
+        <!-- Using Vuetify (but we prefer Wave UI 🤘) -->
+        <div @click="chooseDate(new Date(), true)">{{ t("today") }}</div>
+      </template>
+      <template #cell-content="{ cell, events }">
         <div>
-          <s v-if="isHoliday(cell.formattedDate)"  v-tooltip="getHolidayName(new Date(cell.formattedDate))"
-            class="text text-red-400 dark:text-red-400 font-bold"
-            >{{ cell.content }}</s>
-          <div v-else-if="isOffDay(cell)" class="text-gray-400">
-            <s v-tooltip="t('offDay')">{{ cell.content }}</s>
-          </div>          
-          <span v-else>{{ cell.content }} </span>
-        </div>
+          <div>
+            <s
+              v-if="isHoliday(cell.formattedDate)"
+              v-tooltip="getHolidayName(new Date(cell.formattedDate))"
+              class="text text-red-400 dark:text-red-400 font-bold"
+              >{{ cell.content }}</s
+            >
+            <div v-else-if="isOffDay(cell)" class="text-gray-400">
+              <s v-tooltip="t('offDay')">{{ cell.content }}</s>
+            </div>
+            <span v-else>{{ cell.content }} </span>
+          </div>
 
-        <div>
-          <slot name="default" :cell="cell" :events="events">
-            <Badge
-              v-if="events.length > 0"
-              @contextmenu="(mouseevent) => onRightClickDate(mouseevent, cell)"
-              severity="info"
-              :value="events.length"
-            />
-          </slot>
+          <div>
+            <slot name="default" :cell="cell" :events="events">
+              <Badge
+                v-if="events.length > 0"
+                @contextmenu="
+                  (mouseevent) => onRightClickDate(mouseevent, cell)
+                "
+                severity="info"
+                :value="events.length"
+              />
+            </slot>
+          </div>
         </div>
-      </div>
-    </template>
-  </VueCal>
-</ClientOnly>
+      </template>
+    </VueCal>
+  </ClientOnly>
 </template>
 <script lang="ts" setup generic="T">
 /**
@@ -70,7 +75,7 @@ const props = defineProps<{
   holidays: OffDay[];
 }>();
 const offdays = ref<string[]>([]);
-const emits = defineEmits(["chooseDate", "rightClick"]);
+const emits = defineEmits(["chooseDate", "rightClick","viewChange"]);
 // const allholidays = computed(() => props.holidays.map((item) => item.date));
 const selectedDate = defineModel<Date>({ required: true });
 const getHolidayName = (date: Date) =>
@@ -93,6 +98,7 @@ const allevents = computed(() => {
 });
 const viewChange = (event: CalViewChange) => {
   viewStatus.value = event;
+  emits('viewChange',event)
 };
 
 const isHoliday = (datestr: string) => {
@@ -101,8 +107,9 @@ const isHoliday = (datestr: string) => {
   );
 };
 const isOffDay = (cell: any) => {
-  
-  const dayname: string = new Date(cell.formattedDate) .toLocaleString("en", { weekday: "short" }).toLowerCase();
+  const dayname: string = new Date(cell.formattedDate)
+    .toLocaleString("en", { weekday: "short" })
+    .toLowerCase();
   if (offdays.value.includes(dayname)) return true;
   else return false;
 };

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

@@ -65,10 +65,10 @@ const after = (
 ) => {
   if (v.after) {
     v.after(eventType, data, visible);
-    console.log("eventTypeeventType",eventType,"setting['autoclose'] ",autodeletetab.value)
+   
     //only after mount consider no remove tab
-    if (eventType == "mount") return
-    
+    if (eventType == "mount") return;
+    else if(eventType=='setDocStatus') return;
     deleteTab();
   }
 };
@@ -81,21 +81,20 @@ onKeyStroke("Escape", (e) => {
 const deleteTab = () => {
   const keys = Object.keys(allview.value);
   const lastkey = keys[keys.length - 1];
-  console.log("Trigger delete tab")
+  // console.log("Trigger delete tab");
   if (keys.length == 1) {
     const callback = allview.value[lastkey]?.after;
     if (typeof callback == "function") {
       callback(FormCrudEvent.exit, undefined, visible);
     }
 
-    if(autodeletetab.value){
+    if (autodeletetab.value) {
       delete allview.value[lastkey];
       visible.value = false;
-      useNuxtApp().$event("CloseDialog", "viewer");  
+      useNuxtApp().$event("CloseDialog", "viewer");
     }
-    
-  }else{
-    console.log("Trigger delete tab2")
+  } else {
+    // console.log("Trigger delete tab2");
     delete allview.value[lastkey];
   }
 };
@@ -103,7 +102,7 @@ const deleteTab = () => {
 $listen("ViewRecord", (setting) => {
   visible.value = true;
   if (setting["autoclose"] != undefined) {
-    autodeletetab.value = setting["autoclose"] ==0 ? false : true;
+    autodeletetab.value = setting["autoclose"] == 0 ? false : true;
   }
   allview.value[setting.eventId] = setting;
 });
@@ -127,7 +126,7 @@ $listen("CloseDialog", (documentName: string) => {
 //
 const clearView = () => {
   const firstId = Object.keys(allview.value)[0];
-  console.log("clear view", allview.value);
+  // console.log("clear view", allview.value);
   const callback = allview.value[firstId]?.after;
   if (typeof callback == "function") {
     callback(FormCrudEvent.exit, undefined, visible);

package/templates/nuxt/components/form/FormUser.vue._eta

@@ -7,9 +7,7 @@
     <title v-if="id">{{ data.fullName ?? data.email }}</title>
     <TabView lazy>
       <TabPanel :header="t('profile')">
-        <div
-          class="grid grid-cols-1 lg:grid-cols-2 gap-4 p-2"
-        >
+        <div class="grid grid-cols-1 lg:grid-cols-2 gap-4 p-2">
           <SimpleAppInput
             :input-type="SimpleAppInputType.text"
             :setting="o.getField('#/properties/fullName')"
@@ -37,7 +35,7 @@
           />
         </div>
 
-        <DebugDocumentData v-model="data" :label="doc.getDocName()" />
+        <!-- <DebugDocumentData v-model="data" :label="doc.getDocName()" /> -->
       </TabPanel>
       <TabPanel :header="t('permission')">
         <!-- <UserButtonPermissionInfo></UserButtonPermissionInfo> -->

package/templates/nuxt/components/image/ImageOrganization.vue.eta.vue

@@ -2,41 +2,59 @@
   <ImageToBase64Uploader
     v-if="changable"
     #default
-    class="w-20 h-20 place-content-center"
+    :class="`w-${sizenumber} h-${sizenumber} place-content-center bg-white`"
     @image-uploaded="handleBase64"
   >
-    <Image v-if="imageData!=''" :src="imageData"></Image>
-    <svg v-else xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="black" d="M21 10h-2V4h1V2H4v2h1v6H3a1 1 0 0 0-1 1v9h20v-9a1 1 0 0 0-1-1m-7 8v-4h-4v4H7V4h10v14z"/><path fill="black" d="M9 6h2v2H9zm4 0h2v2h-2zm-4 4h2v2H9zm4 0h2v2h-2z"/></svg>
+    <NuxtImg
+      class="w-full h-full"
+      :key="imageKey"
+      provider="myProvider"
+      :src="imagepath"
+    />
   </ImageToBase64Uploader>
-  <div v-else class="inline-block border rounded-lg w-20 h-20 bg-white">
-    <Image v-if="imageData!=''" :src="imageData"></Image>
-    <svg v-else xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="black" d="M21 10h-2V4h1V2H4v2h1v6H3a1 1 0 0 0-1 1v9h20v-9a1 1 0 0 0-1-1m-7 8v-4h-4v4H7V4h10v14z"/><path fill="black" d="M9 6h2v2H9zm4 0h2v2h-2zm-4 4h2v2H9zm4 0h2v2h-2z"/></svg>
+  <div
+    v-else
+    :class="`inline-block border rounded-lg w-${sizenumber} h-${sizenumber} bg-white`"
+  >
+    <NuxtImg class="w-full h-full" provider="myProvider" :src="imagepath" />
   </div>
 </template>
 <script lang="ts" setup>
 // import {KeyValue} from ''
 const props = defineProps<{
-  changable: boolean;
+  changable?: boolean;
+  orgRecordId?: string;
+  size: number;
 }>();
+const imageKey = ref(0);
+const orgRecordId = computed(
+  () => props.orgRecordId ?? getUserProfile()?.orgRecordId,
+);
+const xorgpath= getCurrentXorg() ? `${getCurrentXorg()}/` : 'MC0wLTA/'
+
+const imagepath = `${xorgpath}images/organization/${
+  orgRecordId.value
+}`;
+const sizenumber = props.size ?? 16;
 const imageData = ref("");
+watch(
+  () => props.orgRecordId,
+  () => imageKey.value++,
+);
 const handleBase64 = async (data: string) => {
   const keyvalue = {
-    key: "organizationLogo",
+    key: "org-" + props.orgRecordId,
     value: data,
   };
-
+  console.log("upload logo ", data);
   const uploadok = await useNuxtApp()
     .$OrganizationDoc()
     .getApi()
     .runUploadlogo(keyvalue);
   if (uploadok) {
-    await loadLogo();
+    const realpath = `/api/${imagepath}`;
+    await fetch(realpath, { cache: "reload", credentials: "include" });
+    imageKey.value++;
   }
 };
-const loadLogo = async () => {
-  await refreshOrgLogo();
-  imageData.value = getOrgLogo();
-};
-
-onMounted(async () => await loadLogo());
 </script>

package/templates/nuxt/components/renderer/RendererDate.vue.eta

@@ -15,5 +15,5 @@
  * author: Ks Tan
  */
 const modelValue = defineModel<Date | string>();
-  const props = defineProps<{value:Date|string}>()
+const props = defineProps<{ value?: Date | string }>();
 </script>