整理代码

1 files changed, 30 insertions, 13 deletions

diff --git a/server-beta/src/core/getfield.lua b/server-beta/src/core/getfield.lua
index af16bdf5..328de34a 100644
--- a/server-beta/src/core/getfield.lua
+++ b/server-beta/src/core/getfield.lua
@@ -5,27 +5,44 @@ local m = {}
 
 function m:field(source, key, callback)
     local used = {}
-    used[source] = true
     local found = false
+    used[source] = true
+
     local node = source.node
+    used[node] = true
+
+    callback(source.field, 'get')
     local myKey = guide.getKeyName(source)
+    self:eachField(node, myKey, function (src, mode)
+        if used[src] then
+            return
+        end
+        used[src] = true
+        self:eachField(src, key, function (src, mode)
+            used[src] = true
+            if mode == 'set' then
+                callback(src, mode)
+                found = true
+            end
+        end)
+    end)
+
     self:eachValue(node, function (src)
         self:eachField(src, myKey, function (src, mode)
-            if mode == 'set' then
-                self:eachValue(src, function (src)
-                    self:eachField(src, key, function (src, mode)
-                        if key == guide.getKeyName(src) then
-                            used[src] = true
-                            callback(src, mode)
-                            if mode == 'set' then
-                                found = true
-                            end
-                        end
-                    end)
-                end)
+            if used[src] then
+                return
             end
+            used[src] = true
+            self:eachField(src, key, function (src, mode)
+                used[src] = true
+                if mode == 'set' then
+                    callback(src, mode)
+                    found = true
+                end
+            end)
         end)
     end)
+
     checkSMT(self, key, used, found, callback)
 end