@simitgroup/simpleapp-generator 1.3.3-alpha → 1.3.5-alpha

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

@@ -1,37 +1,43 @@
-
 <template>
-    
-        <div class="flex flex-row w-full">
-            <InputText 
-                @focus="setFocus"              
-                :readonly="readonly"
-                v-model="modelValue"    
-                :placeholder="placeholder"
-                :pt="pt"
-                :class=" !pt ? 'flex-1 w-full rounded-lg  '+ ( props.readonly?'':'rounded-tr-none rounded-br-none') : ''"
-            />
-            <span class="" v-if="!readonly">
-                <button  type="button" @click="toggle"  tabindex="-1"
-                    class="'btn btn-primary p-3 dark:border-blue-900/40 rounded-lg rounded-tl-none rounded-bl-none">
-                    <i class="pi pi-angle-down"></i>
-                </button>
-                <OverlayPanel ref="op" class="p-4">           
-                    <div class="m-4">
-                        <ul>                      
-                            <li v-for="docno in docFormatlist" class="hover-list-primary p-2" >
-                                <a class="" @click="chooseFormat(docno)">
-                                    <span class="pi pi-hashtag mr-2"></span>
-                                    <span class="">{{docno.docNoFormatName}}</span>
-                                    <span class=" text text-green-600">{{docno.sample}}</span>
-                                </a>
-                            </li>                    
-                        </ul>
-                    </div>         
-                </OverlayPanel>
-            </span>
-            <!-- {{ Object.getOwnPropertyNames(setting) }} -->
+  <div class="flex flex-row w-full">
+    <InputText
+      @focus="setFocus"
+      :readonly="readonly"
+      v-model="modelValue"
+      :placeholder="placeholder"
+      :pt="pt"
+      :class="
+        !pt
+          ? 'flex-1 w-full rounded-lg  ' +
+            (props.readonly ? '' : 'rounded-tr-none rounded-br-none')
+          : ''
+      "
+    />
+    <span class="" v-if="!readonly">
+      <button v-ripple
+        type="button"
+        @click="toggle"
+        tabindex="-1"
+        class="'btn btn-primary p-3 dark:border-blue-900/40 rounded-lg rounded-tl-none rounded-bl-none"
+      >
+        <i class="pi pi-angle-down"></i>
+      </button>
+      <OverlayPanel ref="op" class="p-4">
+        <div class="m-4">
+          <ul>
+            <li v-for="docno in docFormatlist" class="hover-list-primary p-2">
+              <a class="" @click="chooseFormat(docno)">
+                <span class="pi pi-hashtag mr-2"></span>
+                <span class="">{{ docno.docNoFormatName }}</span>
+                <span class="text text-green-600">{{ docno.sample }}</span>
+              </a>
+            </li>
+          </ul>
         </div>
-    
+      </OverlayPanel>
+    </span>
+    <!-- {{ Object.getOwnPropertyNames(setting) }} -->
+  </div>
 </template>
 <script lang="ts" setup>
 /**
@@ -40,52 +46,50 @@
  * last change 2023-10-28
  * Author: Ks Tan
  */
-import {ForeignKey} from '~/types'
-import OverlayPanel from 'primevue/overlaypanel';
-import InputText from 'primevue/inputtext';
-import {DocNoFormat} from "~/types"
+import { ForeignKey } from "~/types";
+import OverlayPanel from "primevue/overlaypanel";
+import InputText from "primevue/inputtext";
+import { DocNoFormat } from "~/types";
 const props = defineProps<{
-    setting:any    
-    readonly?:boolean
-    pt?:any
-}>()
+  setting: any;
+  readonly?: boolean;
+  pt?: any;
+}>();
 const op = ref();
-const placeholder = ref('')
-const docFormatlist = ref()
-const modelValue = defineModel<string>({required:true})
-const docNoFormat = props.setting.document.getReactiveData().value.docNoFormat
-const emits = defineEmits(['update:docNoFormat'])
-
-const documenttype = props.setting.document.doctype
-
-const toggle = async (event:any) => {
-    op.value.toggle(event);            
-}
+const placeholder = ref("");
+const docFormatlist = ref();
+const modelValue = defineModel<string>({ required: true });
+const docNoFormat = props.setting.document.getReactiveData().value.docNoFormat;
+const emits = defineEmits(["update:docNoFormat"]);
 
-const chooseFormat =  (item:any) =>{
-    placeholder.value = item.sample    
-    const f = item
-    docNoFormat.value = { _id : f._id, label : f.docNoFormatName}
-    op.value.toggle();
-    emits('update:docNoFormat',item)
-}
+const documenttype = props.setting.document.doctype;
 
-const loadDocFormats = async () =>{
-    docFormatlist.value= await getDocFormats(documenttype)    
-    if(docFormatlist.value.length>0){
-        const f = docFormatlist.value[0]
-        docNoFormat.value = { _id : f._id, label : f.docNoFormatName}
-        placeholder.value = docFormatlist.value[0].sample        
-    }
-}
+const toggle = async (event: any) => {
+  op.value.toggle(event);
+};
 
+const chooseFormat = (item: any) => {
+  placeholder.value = item.sample;
+  const f = item;
+  docNoFormat.value = { _id: f._id, label: f.docNoFormatName };
+  op.value.toggle();
+  emits("update:docNoFormat", item);
+};
 
-const setFocus = (ev:any) => {
-    if(!isMobile()) ev.target.select()
-}
+const loadDocFormats = async () => {
+  docFormatlist.value = await getDocFormats(documenttype);
+  if (docFormatlist.value.length > 0) {
+    const f = docFormatlist.value[0];
+    docNoFormat.value = { _id: f._id, label: f.docNoFormatName };
+    placeholder.value = docFormatlist.value[0].sample;
+  }
+};
 
-onMounted(()=>{
-    loadDocFormats()
+const setFocus = (ev: any) => {
+  if (!isMobile()) ev.target.select();
+};
 
-})
-</script>
+onMounted(() => {
+  loadDocFormats();
+});
+</script>

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

@@ -15,16 +15,21 @@
     <!-- <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> -->
     <!-- <div v-else-if="readonly==true" :uuid="uuid" class="simpleapp-value-readonly">{{ modelValue }}</div> -->
-    <!-- <slot v-else name="default" :uuid="uuid" :error="error"></slot> -->    
-    <slot name="default" :uuid="uuid" :error="error"></slot>    
-    
+    <!-- <slot v-else name="default" :uuid="uuid" :error="error"></slot> -->
+    <slot name="default" :uuid="uuid" :error="error"></slot>
 
-    <small v-if="error" class="text-danger-600 dark:text-danger-400">{{ error }}</small>
+    <small v-if="error" class="text-danger-600 dark:text-danger-400">{{
+      error
+    }}</small>
     <small v-else class="input-desc">{{ fielddesc }}</small>
   </div>
   <div v-else :class="defaultcssclass">
-    <label class="etext-danger-600 dark:text-danger-400">wrong path in getField()</label>
-    <div class="text-danger-600 dark:text-danger-400">{{ props.setting.path }}</div>
+    <label class="etext-danger-600 dark:text-danger-400"
+      >wrong path in getField()</label
+    >
+    <div class="text-danger-600 dark:text-danger-400">
+      {{ props.setting.path }}
+    </div>
   </div>
 </template>
 <script setup lang="ts">
@@ -55,6 +60,7 @@ const props = defineProps<{
   readonly?: boolean;
   // error?:string,
   setting: any;
+  resetcount: number;
 }>();
 
 const readonly = computed(() => {
@@ -85,7 +91,7 @@ const getLabelClass = () => {
     class1 += "-mb-4 ml-1 z-10 text-xs dark:text-gray-100";
   else if (modelValue.value !== undefined)
     class1 += "-mb-4 ml-1 z-10 text-xs dark:text-gray-100";
-  else class1 += "-mb-4 ml-1 z-10 text-xs dark:text-gray-100 hidden";
+  else class1 += "-mb-4 ml-1 z-10 text-xs dark:text-gray-100 ";
   return class1;
 };
 
@@ -137,4 +143,11 @@ watch(props.setting.errors, (newvalue, oldvalue) => {
   // console.log("validation result",props.setting.instancepath,)
   // error.value = newvalue[props.setting.instancepath].message
 });
+
+watch(
+  () => props.resetcount,
+  () => {
+    error.value = "";
+  },
+);
 </script>

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

@@ -1,131 +1,133 @@
 <template>
-    <form class="simpleapp-form" @submit.prevent="true">        
-        <slot name="header"><h3 class="flex flex-col">{{ title }}</h3></slot>
-        <slot  name="default" :data="document.getData()" :getField="getField"></slot>
-    </form>
+  <form class="simpleapp-form" @submit.prevent="true">
+    <slot name="default" :data="document.getData()" :getField="getField"></slot>
+  </form>
 </template>
-<script setup lang="ts" >
+<script setup lang="ts">
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
  * last change 2023-10-28
  * Author: Ks Tan
  */
-import jsonpath from 'jsonpath';
-import { SimpleAppClient } from  '~/simpleapp/generate/clients/SimpleAppClient'
-import type { JSONSchema7,JSONSchema7Definition } from 'json-schema';
-import * as alldefaults from '~/simpleapp/generate/defaults'
-import _, { upperFirst } from 'lodash'
-    const props = defineProps<{
-        title?:string,
-        document: SimpleAppClient<any,any>
-        readonly?:boolean
-    }>()
-    if(!props.document){
-        throw "undefine SimpleAppForm property 'document'"
-    }
+import jsonpath from "jsonpath";
+import { SimpleAppClient } from "~/simpleapp/generate/clients/SimpleAppClient";
+import type { JSONSchema7, JSONSchema7Definition } from "json-schema";
+import * as alldefaults from "~/simpleapp/generate/defaults";
+import _, { upperFirst } from "lodash";
+const props = defineProps<{
+  
+  document: SimpleAppClient<any, any>;
+  readonly?: boolean;
+}>();
+if (!props.document) {
+  throw "undefine SimpleAppForm property 'document'";
+}
 
-    const isreadonly = computed(()=> props.readonly ? props.readonly: props.document.isReadOnly())
+const isreadonly = computed(() =>
+  props.readonly ? props.readonly : props.document.isReadOnly(),
+);
 
-    // const obj = {schema:props.schema,data: props.schema}
-    const getField = (path:string)=>{
-        // console.log("simpleform topath",path)
-        const data = props.document.getData()
-        const schema = props.document.getSchema() as JSONSchema7 //force type for compatibility
-        const fieldsetting = getPathObject(schema,path)
-        // console.log("setting",fieldsetting)
-        
-        type defaulttype = typeof alldefaults
-        type keytype = keyof defaulttype
-        
-        const x : keytype = 'Default'+ props.document.getDocName(true)   as keytype
-        const defaultvalue = alldefaults[x](randomUUID())
-        return {
-            path: path,
-            key: _.last(path.split('/')),
-            instancepath: getInstancePath(schema,path),
-            fieldsetting: fieldsetting,
-            modelObject: data,
-            document: props.document,
-            apiObj:props.document.getApi(),
-            modelField: 'email',
-            isrequired: getIsRequired(schema,path),
-            errors: props.document.getErrors(),
-            readonly: isreadonly.value,
-            defaultValue: defaultvalue
-        } //as SimpleAppFieldSetting
-    }
+// const obj = {schema:props.schema,data: props.schema}
+const getField = (path: string) => {
+  // console.log("simpleform topath",path)
+  const data = props.document.getData();
+  const schema = props.document.getSchema() as JSONSchema7; //force type for compatibility
+  const fieldsetting = getPathObject(schema, path);
+  // console.log("setting",fieldsetting)
+
+  type defaulttype = typeof alldefaults;
+  type keytype = keyof defaulttype;
 
-    //    "schemaPath": "#/properties/email/format",
+  const x: keytype = ("Default" + props.document.getDocName(true)) as keytype;
+  const defaultvalue = alldefaults[x](randomUUID());
+  return {
+    path: path,
+    key: _.last(path.split("/")),
+    instancepath: getInstancePath(schema, path),
+    fieldsetting: fieldsetting,
+    modelObject: data,
+    document: props.document,
+    apiObj: props.document.getApi(),
+    modelField: "email",
+    isrequired: getIsRequired(schema, path),
+    errors: props.document.getErrors(),
+    readonly: isreadonly.value,
+    defaultValue: defaultvalue,
+  }; //as SimpleAppFieldSetting
+};
 
-    const getIsRequired=(schema:any,path:string)=>{
-        if(!path){
-            console.error('unknown path')
-            return 'xx'
-        }
+//    "schemaPath": "#/properties/email/format",
 
-        try{
-            let paths = path.replace('#/','').split('/')
-            const fieldname = paths[paths.length-1]
-            paths = paths.slice(0, -2);    
-            let tmp = schema
-            for(let i=0;i<paths.length;i++){
-                tmp = tmp[paths[i]]
-                
-            }
-            if(Array.isArray(tmp['required'])   ) {
-                    const arr:string[] = tmp['required']
-                    return arr.includes (fieldname)
-                }else{
-                    return false
-                }
+const getIsRequired = (schema: any, path: string) => {
+  if (!path) {
+    console.error("unknown path");
+    return "xx";
+  }
 
-            // console.log("get instance path",instancepath)
-            
-            // return tmp
-        }catch(err:any){
-            console.error(err.message)
-        }
+  try {
+    let paths = path.replace("#/", "").split("/");
+    const fieldname = paths[paths.length - 1];
+    paths = paths.slice(0, -2);
+    let tmp = schema;
+    for (let i = 0; i < paths.length; i++) {
+      tmp = tmp[paths[i]];
     }
-   const getInstancePath=(schema:any,path:string)=>{
-    if(!path){
-        console.error('unknown path')
-        return 'yy'
+    if (Array.isArray(tmp["required"])) {
+      const arr: string[] = tmp["required"];
+      return arr.includes(fieldname);
+    } else {
+      return false;
     }
-    try{
-        let paths = path.replace('#/','').split('/')    
-        let tmp = schema
-        let instancepath=''
-        for(let i=0;i<paths.length;i++){
-            tmp = tmp[paths[i]]
-            if(tmp['type'] && paths[i] !='items'){
-                instancepath=instancepath+'/'+paths[i]
-            }
-        }
 
-        // console.log("get instance path",instancepath)
-        return instancepath
-        // return tmp
-    }catch(err:any){
-        console.error(err.message)
+    // console.log("get instance path",instancepath)
+
+    // return tmp
+  } catch (err: any) {
+    console.error(err.message);
+  }
+};
+const getInstancePath = (schema: any, path: string) => {
+  if (!path) {
+    console.error("unknown path");
+    return "yy";
+  }
+  try {
+    let paths = path.replace("#/", "").split("/");
+    let tmp = schema;
+    let instancepath = "";
+    for (let i = 0; i < paths.length; i++) {
+      tmp = tmp[paths[i]];
+      if (tmp["type"] && paths[i] != "items") {
+        instancepath = instancepath + "/" + paths[i];
+      }
     }
 
+    // console.log("get instance path",instancepath)
+    return instancepath;
+    // return tmp
+  } catch (err: any) {
+    console.error(err.message);
+  }
 
-    // let paths = path.replace('#/','').split('/')    
-    // return '/'+paths[1]
-   }
-   const getPathObject=(schema:JSONSchema7,path:string):JSONSchema7|undefined=>{    
-    // console.log("path",path)
-    if(!path || !path.includes('#/properties')){
-        console.error('unknown path')
-        return undefined
-    }
-    try{        
-        const modifiedpath = path.replace('#','$').replaceAll('/','.')        
-        const queryresult = jsonpath.query(schema,modifiedpath)[0]
-        return queryresult     
-    }catch(err:any){
-        console.error(err.message)        
-    }    
-   }
-</script>
+  // let paths = path.replace('#/','').split('/')
+  // return '/'+paths[1]
+};
+const getPathObject = (
+  schema: JSONSchema7,
+  path: string,
+): JSONSchema7 | undefined => {
+  // console.log("path",path)
+  if (!path || !path.includes("#/properties")) {
+    console.error("unknown path");
+    return undefined;
+  }
+  try {
+    const modifiedpath = path.replace("#", "$").replaceAll("/", ".");
+    const queryresult = jsonpath.query(schema, modifiedpath)[0];
+    return queryresult;
+  } catch (err: any) {
+    console.error(err.message);
+  }
+};
+</script>