模板等若干更新

Author: mikezss

controllers/devcontrol.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"encoding/json"
+
 	"github.com/mikezss/skl-dev-go/models"
 
 	_ "bufio"
@@ -879,6 +880,7 @@ func (this *DEVController) updateNGcomponenthtml(modulename string, componentnam
 			fmt.Println(err)
 			return err
 		}
+		//{'name':'reset','icon':'reload'},{'name':'search','icon':'search'}
 		buttons := "["
 		barry := strings.Split(cad.Component.Buttons, ",")
 

views/template/component_queryandlist.tpl

@@ -43,25 +43,29 @@ export class ${firstuppercomponentname$}Component implements OnInit {
 
   getquery(event) {
     console.log(event);
-    this.loading = true;
-    this.querydata.Pageindex = this.pageindex;
-    this.querydata.Pagesize = this.pagesize;
-	this.querydata.Flowstatus = this.ms.checkboxgroup2string(this.queryitems[3].checkboxgroup);
-    this.cs.get${componentname$}count(this.querydata).subscribe(response => {
-      this.total = response.Total;
-    });
-
-    this.cs.get${componentname$}bypageindex(this.querydata).subscribe(data => {
-      let respons: any[] = [];
-      respons = data; 
-	  for (let data1 of respons) {
-        data1.Routerlink = "/${componentname$}";
-        data1.QueryParams = {'Mode': 's', 'Flowinstid': data1.Flowinstid};
-      }     
-      this.listdata = respons;
-      this.loading = false;
-    });
-
+    if (event == 'search') {
+      this.loading = true;
+      this.querydata.Pageindex = this.pageindex;
+      this.querydata.Pagesize = this.pagesize;
+  	  this.querydata.Flowstatus = this.ms.checkboxgroup2string(this.queryitems[3].checkboxgroup);
+      this.cs.get${componentname$}count(this.querydata).subscribe(response => {
+        this.total = response.Total;
+      });
+  
+      this.cs.get${componentname$}bypageindex(this.querydata).subscribe(data => {
+        let respons: any[] = [];
+        respons = data; 
+  	  for (let data1 of respons) {
+          data1.Routerlink = "/${componentname$}";
+          data1.QueryParams = {'Mode': 's', 'Flowinstid': data1.Flowinstid};
+          data1.Editable = true;
+        }     
+        this.listdata = respons;
+        this.loading = false;
+      });
+    } else {
+      this.reset();
+    }
   }
 
   edit(event) {
@@ -85,6 +89,7 @@ export class ${firstuppercomponentname$}Component implements OnInit {
 	  for (let data1 of respons) {
         data1.Routerlink = "/${componentname$}";
         data1.QueryParams = {'Mode': 's', 'Flowinstid': data1.Flowinstid};
+        data1.Editable = true;
       }      
       this.listdata = respons;
       this.loading = false;

views/template/html_sgltblist.tpl

@@ -9,5 +9,5 @@
 	[total]="total" 
 	[loading]="loading" 
 	(refreshtable)="refreshtable($event)"
-	[buttons]="['save']">
+	[buttons]="[{'name':'save','icon':'save'}]">
 </app-skl-list>

views/template/html_sklquery.tpl

@@ -4,6 +4,6 @@
 	(action)="getquery($event)" 	
 	[ncolcount]=${colcount$}   
 	[formdata]="querydata" 
-	[buttons]="['reset','search']"
+	[buttons]="[{'name':'reset','icon':'reload'},{'name':'search','icon':'search'}]"
 	(formdatachange)="formdatachange($event)">
 </app-skl-form>

views/template/service_formandlist.tpl

@@ -1,6 +1,6 @@
 save${componentname$}(formdata,listdata): Observable<any> {
     
-    return this.http.post(this.ls.api_url + '/${componentname$}/sav${componentname$}', {      
+    return this.http.post(this.ls.api_url + '/${componentname$}/save${componentname$}', {      
       '${componentname$}': formdata,
       '${componentname$}item': listdata
     }, httpOptions).pipe();
@@ -11,7 +11,7 @@ get${componentname$}(queryitem): Observable<any> {
 }
 
 get${componentname$}item(queryitem): Observable<any> {
-    return this.http.post(this.ls.api_url + '/${componentname$}/ge${componentname$}item', queryitem, httpOptions).pipe();
+    return this.http.post(this.ls.api_url + '/${componentname$}/get${componentname$}item', queryitem, httpOptions).pipe();
 }
 get${componentname$}byid(queryitem): Observable<any> {
     return this.http.post(this.ls.api_url + '/${componentname$}/get${componentname$}byid', queryitem, httpOptions).pipe();