Quellcode durchsuchen

修改构建树数据结构方法

huangyh vor 6 Jahren
Ursprung
Commit
d21ab0bba6
2 geänderte Dateien mit 18 neuen und 9 gelöschten Zeilen
  1. 3 3
      light-apiengine.xml
  2. 15 6
      utils/tree_util.go

+ 3 - 3
light-apiengine.xml

@@ -719,9 +719,9 @@
             <prop name="content" caption="内容" type="interface{}" />
         </bean>
         <bean name="tree_node" desc="树结点">
-            <prop name="id" caption="ID" type="string" />
-            <prop name="text" caption="标题" type="string" />
-            <prop name="parent" caption="父结点" type="string" />
+            <prop name="id" caption="ID" type="interface{}" />
+            <prop name="text" caption="标题" type="interface{}" />
+            <prop name="parent" caption="父结点" type="interface{}" />
             <prop name="nodes" caption="子结点" type="*TreeNode array" />
             <prop name="tag" caption="tag" type="interface{}" />
         </bean>

+ 15 - 6
utils/tree_util.go

@@ -81,14 +81,23 @@ func BuildTree(root string, treeSrcs []map[string]interface{}) ([]*models.TreeNo
 	return rootArr, nil
 }
 
-func toString(v interface{}, defaultValue string) string {
+func toString(v interface{}, defaultValue string) interface{} {
 	if v == nil {
 		return defaultValue
 	}
-	strv, flag := v.(string)
-	if !flag {
-		return defaultValue
-	} else {
-		return strv
+	switch t := v.(type) {
+	case int:
+		return t
+	case string:
+		return t
+	default:
+		return t
 	}
+
+	//strv, flag := v.(string)
+	//if !flag {
+	//	return defaultValue
+	//} else {
+	//	return result
+	//}
 }