@simitgroup/simpleapp-generator 2.0.2-m-alpha → 2.0.2-n-alpha

package/templates/nuxt/app.vue.eta

@@ -9,8 +9,6 @@
     <EventDocumentViewer></EventDocumentViewer>      
     <EventDecision/>
     <EventNotification/>
-    <SubscriptionExpirationWarning/>
-    <SubscriptionFreeBanner/>
     <NuxtPage/>
   </NuxtLayout>
 </template>
@@ -31,9 +29,9 @@ watch(()=>useRoute().fullPath,async (newval,oldvalue)=>{
   if(getPathPara('xorg','')!=''){
   
     if(getCurrentXorg()===''){
-      goTo('/picktenant')
+      navigateTo('/picktenant')
     }else if(!getUserProfile()?.currentGroup){
-      navigateTo('pickgroup')
+      goTo('pickgroup')
     }
     setGraphqlServer()
   }  
@@ -56,9 +54,9 @@ onMounted(async()=>{
     const currentgroup = useCookie('currentGroup').value
     //if no xorg, no enforce pick group
     if(getCurrentXorg()===''){
-      goTo('/picktenant')
+      navigateTo('/picktenant')
     }else if(!currentgroup){
-      navigateTo('/pickgroup')
+      goTo('/pickgroup')
     }
     setGraphqlServer()
   }else{

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

@@ -160,7 +160,6 @@
                 getDocument(setting.fieldsetting['x-foreignkey']).viewer,
               )
             "
-            :paras="props.paras"
             @after="
               async (eventType: FormCrudEvent, data: any, result: any) =>
                 await afterRenderMobileForm(eventType, data)
@@ -207,7 +206,6 @@ const props = withDefaults(
     componentProps?: AutoCompleteProps;
     autocompleteFilter?: any;
     pt?: any;
-    paras?: any;
   }>(),
   {
     allowAddNew: true,
@@ -360,7 +358,6 @@ const openViewer = (readonly: boolean) => {
       readonly: readonly,
       viewer: getDocument(docname)?.viewer,
       documentName: docname,
-      paras: props.paras,
 
       //after create, auto copy value into auto complete
       after: async (eventType: FormCrudEvent, data: any) => {

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

@@ -179,7 +179,6 @@
       :readonly="isReadonly"
       :placeholder="placeholder"
       :autocomplete-filter="autocompleteFilter"
-      :paras="paras"
       @change="onChange"
     >
       <template #header>
@@ -420,14 +419,13 @@ const props = withDefaults(
     setting: any;
     type?: string;
     instancepath?: string;
-    options?: string[] | Array<{ value: string; label: string }>;
+    options?: string[];
     hidelabel?: boolean;
     readonly?: boolean;
     autofocus?: boolean;
     pt?: any;
     placeholder?: string;
     autocompleteFilter?: any;
-    paras?: any;
     componentProps?:
       | InputNumberProps
       | InputSwitchProps

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

@@ -16,24 +16,24 @@ export const today = () => useDayjs()().format('YYYY-MM-DD')
 /**
  * convert date object or ISO8601 date become local datetime string
  * @param date date|string
- * @returns local shortform date-time (DD/MM/YYYY HH:mm)
+ * @returns local shortform date-time
  */
 export const dateRenderToDateTimeStr = (date:Date|string) => 
-  useDayjs()(date).format('DD/MM/YYYY HH:mm')
+  convertToDate(date).toLocaleString().replace(',', ' ').slice(0,-3)
 /**
  * convert date object or ISO datestring become local date string
  * @param date date|string
- * @returns local short form date (DD/MM/YYYY)
+ * @returns local short form date
  */
 export const dateRenderToDateStr = (date:Date|string) => 
-  useDayjs()(date).format('DD/MM/YYYY')
+  convertToDate(date).toLocaleDateString().replace(',', ' ')
 /**
  * convert date object or ISO datestring become time string (without seconds)
  * @param date date|string
  * @returns 
  */
 export const dateRenderToTimeStr = (date:Date|string) => 
-  useDayjs()(date).format('HH:mm')
+  convertToDate(date).toLocaleTimeString().slice(0,-3)
 
 
 /**

package/templates/nuxt/plugins/20.simpleapp-userstore.ts.eta

@@ -327,17 +327,6 @@ export default defineNuxtPlugin(async (nuxtApp) => {
       isExecutive() {
         return this.currentGroup == "executive";
       },
-      isBillingUser() {
-        const roles = this.roles;
-        return roles.includes("tenantowner") || roles.includes("billing") || roles.includes("superadmin") || roles.includes("devbilling") || roles.includes("devsupport");
-      },
-      isInternalUser() {
-        const roles = this.roles;
-        return roles.includes("superadmin") || roles.includes("devbilling") || roles.includes("devsupport");
-      },
-      isDevSupport() {
-        return this.roles.includes("devsupport");
-      },
     },
   });