Merge pull request #766 from trheyi/main

Optimize upload component
YaoApp · Oct 26, 2024 · d4c0a23 · d4c0a23
2 parents 2a070f6 + 661c3e6
commit d4c0a23
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/widgets/component/component.go b/widgets/component/component.go
@@ -29,7 +29,7 @@ func (dsl DSL) Map() map[string]interface{} {
 	}
 
 	// Add Default Value for Upload api
-	if dsl.Type == "Upload" && dsl.Props != nil && !dsl.Props.Has("api") {
+	if (dsl.Type == "Upload" || dsl.Type == "Image") && dsl.Props != nil && !dsl.Props.Has("api") {
 		res["props"].(map[string]interface{})["$api"] = map[string]interface{}{"process": "fs.data.Upload"}
 	}
 

diff --git a/widgets/table/process.go b/widgets/table/process.go
@@ -164,7 +164,7 @@ func processComponent(process *gouProcess.Process) interface{} {
 	// :query
 	query := map[string]interface{}{}
 	if process.NumOfArgsIs(4) {
-		query = process.ArgsMap(3)
+		query = process.ArgsMap(3, map[string]interface{}{})
 	}
 
 	// execute query

diff --git a/widgets/table/table.go b/widgets/table/table.go
@@ -344,7 +344,7 @@ func (dsl *DSL) Xgen(data map[string]interface{}, excludes map[string]bool) (map
 	for _, cProp := range dsl.CProps {
 		err := cProp.Replace(setting, func(cProp component.CloudPropsDSL) interface{} {
 
-			if cProp.Type == "Upload" || cProp.Type == "WangEditor" {
+			if cProp.Type == "Upload" || cProp.Type == "WangEditor" || cProp.Type == "Image" {
 				return fmt.Sprintf("/api/__yao/table/%s%s", dsl.ID, cProp.UploadPath())
 			}