@simitgroup/simpleapp-generator 1.1.11 → 1.1.14

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

@@ -4,90 +4,7 @@
         (subtype? `type="${subtype}"`:'') +' ' + 
         (hidelabel? ':hidelabel="true"':'') +
         (instancepath ?  `:instancepath="\`${instancepath}\`"` : '') + '/>' %>
-<script setup lang="ts">
-/**
- * This file was automatically generated by simpleapp everytime regenerate code.
- * delete file "delete-me-for-avoid-override" if you want to modify this file and 
- * prevent regenerate code override it.
- * last change 2023-09-09
- * author: Ks Tan
- */
- import {SimpleAppInputType} from "~/types"
- import ConfirmPopup from 'primevue/confirmpopup';
- import { useConfirm } from "primevue/useconfirm";
- const confirm = useConfirm(); 
- const isReadOnly =ref(true)
- const props = defineProps<{_id?:string}>()
- const {$<%= it.typename %>Doc,$event } = useNuxtApp();
- const doc = $<%= it.typename %>Doc()
- const data = doc.getReactiveData();
- const emits = defineEmits(['afterCreate'])
-
-
-const fetchRecord = async (recordid:string) =>{
-  await doc.getById(recordid)
-}
-
-const id = computed(() => props._id ?? '');
-  
-
-const disabled = computed(()=>{
-  return false
-})
-
-const createData = async () => {
-  // disabled.value=true
-  
-  doc.create().then((res)=>{
-      //refresh()      
-      emits('afterCreate',res.data)
-    }).catch(err=>{
-      console.error(err)
-    })
- 
-};
-const updateData = async () => {  
-  doc.update().then(()=>{
-      // visible.value=false
-      refresh()
-    }).catch(err=>{
-      console.error(err)
-    })
-  
-};
-const deleteData = (event:Event) => {
-    
-    confirm.require({
-        target: event.currentTarget as HTMLElement,
-        message:'Delete?',
-        icon: 'pi pi-exclamation-triangle',
-        acceptClass: 'p-button-danger',
-        accept: ()=>{
-            // disabled.value=true 
-            doc.delete(data.value._id ?? "").then((res) => {              
-                refresh();    
-                goTo(doc.getDocName())
-            });
-        },
-        reject: () => {
-            console.log("Cancel delete")
-        }
-    })  
-};
-const newData = ()=>{
-  goTo(doc.getDocName(),'new')
-}
-const refresh = ()=>{
-  $event('RefreshDocumentList',{documentName:doc.getDocName()})
-}
 
-
-if (id.value && id.value != 'new') {
-  fetchRecord(id.value);
-}else{
-  isReadOnly.value=false
-}
-</script>
 <template>    
     
     <SimpleAppForm #default="o" :document="doc" :readonly="isReadOnly">
@@ -110,7 +27,13 @@ if (id.value && id.value != 'new') {
               <Button class="btn-primary" :disabled="disabled" @click="updateData" type="button" v-if="canPerform(doc.getDocName(),'update') && !doc.isNew()">Update</Button>
               <Button class="btn-danger" :disabled="disabled" @click="deleteData($event)" type="button" v-if="canPerform(doc.getDocName(),'delete') && !doc.isNew()">Delete</Button>
 
-              
+              <!-- special api start-->
+              <%for(let i=0;i<it.apiSettings.length;i++){%>
+                <% let api = it.apiSettings[i] %>
+                <Button class="btn-warn" :disabled="disabled" type="button" v-if="canPerform(doc.getDocName(), 'update') && !doc.isNew()"
+                        @click="run<%=capitalizeFirstLetter(api.action)%>" >{{t('<%=api.action%>')}}</Button>
+              <%}%>
+              <!-- special api end -->
               <ProgressSpinner v-if="disabled==true" style="width: 2rem; height: 2rem" ></ProgressSpinner>
               <ConfirmPopup></ConfirmPopup>              
             </div>
@@ -230,3 +153,113 @@ if (id.value && id.value != 'new') {
     </SimpleAppForm>
     <DebugDocumentData v-model="data" :label="doc.getDocName()"/>
 </template>
+
+
+<script setup lang="ts">
+/**
+ * This file was automatically generated by simpleapp everytime regenerate code.
+ * delete file "delete-me-for-avoid-override" if you want to modify this file and 
+ * prevent regenerate code override it.
+ * last change 2023-09-09
+ * author: Ks Tan
+ */
+ import {SimpleAppInputType} from "~/types"
+ import ConfirmPopup from 'primevue/confirmpopup';
+ import { useConfirm } from "primevue/useconfirm";
+ const confirm = useConfirm(); 
+ const isReadOnly =ref(true)
+ const props = defineProps<{_id?:string}>()
+ const {$<%= it.typename %>Doc,$event } = useNuxtApp();
+ const doc = $<%= it.typename %>Doc()
+ const data = doc.getReactiveData();
+ const emits = defineEmits(['afterCreate'])
+
+
+const fetchRecord = async (recordid:string) =>{
+  await doc.getById(recordid)
+}
+
+const id = computed(() => props._id ?? '');
+  
+
+const disabled = computed(()=>{
+  return false
+})
+
+const createData = async () => {
+  // disabled.value=true
+  
+  doc.create().then((res)=>{
+      //refresh()      
+      emits('afterCreate',res.data)
+    }).catch(err=>{
+      console.error(err)
+    })
+ 
+};
+const updateData = async () => {  
+  doc.update().then(()=>{
+      // visible.value=false
+      refresh()
+    }).catch(err=>{
+      console.error(err)
+    })
+  
+};
+const deleteData = (event:Event) => {
+    
+    confirm.require({
+        target: event.currentTarget as HTMLElement,
+        message:'Delete?',
+        icon: 'pi pi-exclamation-triangle',
+        acceptClass: 'p-button-danger',
+        accept: ()=>{
+            // disabled.value=true 
+            doc.delete(data.value._id ?? "").then((res) => {              
+                refresh();    
+                goTo(doc.getDocName())
+            });
+        },
+        reject: () => {
+            console.log("Cancel delete")
+        }
+    })  
+};
+const newData = ()=>{
+  goTo(doc.getDocName(),'new')
+}
+const refresh = ()=>{
+  $event('RefreshDocumentList',{documentName:doc.getDocName()})
+}
+
+
+if (id.value && id.value != 'new') {
+  fetchRecord(id.value);
+}else{
+  isReadOnly.value=false
+}
+
+<%for(let i=0;i<it.apiSettings.length;i++){%>
+  <% let api = it.apiSettings[i] %>
+    const run<%=capitalizeFirstLetter(api.action)%> = async () =>{
+
+        const data = {
+            id: id.value
+        }
+        const result = await doc.run<%=capitalizeFirstLetter(api.action)%>(
+             <% if(api.entryPoint && api.entryPoint.includes(':')) {%>
+                <%let subpath = api.entryPoint.split('/')%>
+                <% for(let a=0;a<subpath.length;a++){%>
+                    <%const partstr = subpath[a]%>
+                    <%if(partstr.includes(':')){%>
+                    <% const paraname = partstr.replace(':','') %>  
+                    <%= paraname=='id' ? 'id.value' : paraname %>,
+                    <%}%>    
+                <%}%>  
+            <%}%>
+            data
+        )
+        
+    }
+<%}%>
+</script>

package/templates/basic/nuxt/simpleapp.generate.client.ts.eta

@@ -105,7 +105,7 @@ export class <%= it.typename%>Client extends SimpleAppClient<<%= it.typename%>,<
 
   <%for(let i=0;i<it.apiSettings.length;i++){%>
   <% let api = it.apiSettings[i] %>
-  async <%=api.action%>(<% if(api.entryPoint && api.entryPoint.includes(':')) {%>
+  async run<%=capitalizeFirstLetter(api.action)%>(<% if(api.entryPoint && api.entryPoint.includes(':')) {%>
           <%let subpath = api.entryPoint.split('/')%>
           <% for(let a=0;a<subpath.length;a++){%>
             <%const partstr = subpath[a]%>
@@ -114,9 +114,11 @@ export class <%= it.typename%>Client extends SimpleAppClient<<%= it.typename%>,<
                <%=paraname%>: string,
             <%}%>    
           <%}%>  
-        <%}%>){
+        <%}%>
+         <% if(['post','put','patch'].includes(api.method)){ %>data:any<%}%>  
+        ){
     //const recordid: string = this.data.value._id ?? '';
-    return await this.docapi.<%=api.action%>(
+    return await this.docapi.run<%=capitalizeFirstLetter(api.action)%>(
       <% if(api.entryPoint && api.entryPoint.includes(':')) {%>
           <%let subpath = api.entryPoint.split('/')%>
           <% for(let a=0;a<subpath.length;a++){%>
@@ -125,8 +127,9 @@ export class <%= it.typename%>Client extends SimpleAppClient<<%= it.typename%>,<
               <% const paraname = partstr.replace(':','') %>  
                <%=paraname%>,
             <%}%>    
-          <%}%>  
+          <%}%>
         <%}%>
+        <% if(['post','put','patch'].includes(api.method)){ %>data<%}%>  
     )
     .then((res: AxiosResponse) => {
       if(this.event){this.event('info:<%=api.action%>',res.data)}

package/templates/nest/.env._eta

@@ -3,7 +3,9 @@ DRYRUN=false
 PROJECT_NAME=SimpleApp Demo1
 PROJECT_DESCRIPTION=Try CRUD
 PROJECT_Version=1.0.0
-MONGODB_URL=<%=it.configs.mongoConnectStr%>
+MONGO_DB_URL=<%=it.configs.mongoConnectStr%>
+
+MONGO_DB_NAME=<%=it.configs.mongoDbName%>
 
 HTTP_PORT=<%=it.configs.backendPort%>
 
@@ -11,6 +13,8 @@ BPMN_HOST=<%=it.configs.bpmnsetting.bpmnHost%>
 
 BPMN_PORT=<%=it.configs.bpmnsetting.bpmnPort%>
 
+BPMN_PATH=./src/workflow/bpmn/
+
 BPMN_API_KEY=<%=it.configs.bpmnsetting.bpmnApiKey%>
 
 OAUTH2_BASEURL=<%=it.configs.oauthSetting.oauthBaseUrl%>
@@ -27,6 +31,8 @@ OAUTH2_ADMINROLE = <%=it.configs.oauthSetting.adminRole%>
 
 AUTH_SECRET_KEY=<%=it.configs.oauthSetting.oauthAuthSecretKey%>
 
+BACKEND_URL=http://localhost:<%=it.configs.backendPort%>
+
 AUTH_ORIGIN=http://localhost:8080
 
 ADMIN_EMAIL=