修正类父级解析失败的问题，增加const类型关键字

Author: 邹杭特

Assets/BridgeUI/Core/Behaiver/Panels/PanelBase.cs

@@ -28,7 +28,7 @@ namespace BridgeUI
     [BridgeUI.Attributes.PanelParent]
     public class PanelBase : PanelCore, IBindingContext
     {
-        private Binding.PropertyBinder _binder;
+        protected Binding.PropertyBinder _binder;
         public virtual Binding.PropertyBinder Binder
         {
             get
@@ -49,7 +49,7 @@ protected IViewModel defultViewModel
             {
                 if (_defultViewModel == null)
                 {
-                    _defultViewModel = ScriptableObject.CreateInstance<ViewModel>();
+                    _defultViewModel = ScriptableObject.CreateInstance<ViewModelObject>();
                 }
                 return _defultViewModel;
             }
@@ -72,7 +72,7 @@ public IViewModel ViewModel
         [ContextMenu("加载ViewModel")]
         private void LoadDefultViewModel()
         {
-            _viewModel = ScriptableObject.CreateInstance<ViewModel>();
+            _viewModel = ScriptableObject.CreateInstance<ViewModelObject>();
         }
         [ContextMenu("清除ViewModel")]
         private void ClearDefultViewModel()
@@ -117,9 +117,9 @@ protected override void HandleData(object data)
         {
             base.HandleData(data);
 
-            if (data is Binding.ViewModel)
+            if (data is IViewModel)
             {
-                ViewModel = data as Binding.ViewModel;
+                ViewModel = data as IViewModel;
             }
             else if (data is IDictionary)
             {

Assets/BridgeUI/Core/Binding/Editor/BindingWindow.cs

@@ -112,7 +112,7 @@ private void SwitchComponent(MonoBehaviour v)
                 panelDrawer = UnityEditor.Editor.CreateEditor(panelCompnent);
             }
             InitPanelBase(v);
-            GenCodeUtil.AnalysisComponent(panelCompnent, components);
+            GenCodeUtil.AnalysisComponent(panelCompnent, components,rule);
         }
 
         private void InitPanelBase(MonoBehaviour v)
@@ -255,7 +255,7 @@ private void DrawPreComponents()
                         else
                         {
                             //从旧的脚本解析出
-                            GenCodeUtil.AnalysisComponent(component, components);
+                            GenCodeUtil.AnalysisComponent(component, components,rule);
                         }
                     });
 
@@ -304,7 +304,7 @@ private void DrawPreComponents()
                             if (item is GameObject)
                             {
                                 var obj = item as GameObject;
-                                var parent = PrefabUtility.GetPrefabParent(obj);
+                                var parent = PrefabUtility.GetPrefabObject(obj);
                                 if (parent){
                                     obj = parent as GameObject;
                                 }

Assets/BridgeUI/Core/Binding/Editor/ViewModelContainerDrawer.cs

@@ -82,7 +82,7 @@ private ScriptableObject GetAssetByType(Type type)
 
         private void InitTypeOptions()
         {
-            viewModelTypes = BridgeUI.Drawer.MvvmUtil.GetSubInstenceTypes(typeof(ViewModel)).ToArray();
+            viewModelTypes = BridgeUI.Drawer.MvvmUtil.GetSubInstenceTypes(typeof(ViewModelObject)).ToArray();
             options = viewModelTypes.Select(x => new GUIContent(x.FullName)).ToArray();
         }
 

Assets/BridgeUI/Core/Binding/ViewModel.cs

@@ -1,16 +1,17 @@
 using UnityEngine;
 using System.Collections.Generic;
 using UnityEngine.Events;
+using System;
 
 namespace BridgeUI.Binding
 {
-    public class ViewModel : ScriptableObject, IViewModel
+    public class ViewModel : IViewModel
     {
 #if BridgeUI_Log
         public static bool log { get; set; }
 #endif
         private List<IBindingContext> _contexts = new List<IBindingContext>();
-        protected List<IBindingContext> Contexts { get { return _contexts; } }
+        public List<IBindingContext> Contexts { get { return _contexts; } }
         private readonly Dictionary<string, IBindableProperty> innerDic = new Dictionary<string, IBindableProperty>();
         protected IBindableProperty this[string key]
         {
@@ -73,14 +74,63 @@ protected virtual void SetValue<T>(string keyward, T value)
         }
         public virtual void OnBinding(IBindingContext context) { this._contexts.Add(context); }
         public virtual void OnUnBinding(IBindingContext context) { this._contexts.Remove(context); }
-        protected virtual void Monitor<T>(string sourceName, UnityAction<T> onValueChanged)
+        public virtual void Monitor<T>(string sourceName, UnityAction<T> onValueChanged)
         {
             if (!string.IsNullOrEmpty(sourceName) && onValueChanged != null)
             {
                 GetBindableProperty<T>(sourceName).RegistValueChanged(onValueChanged);
             }
         }
+    }
+
+    public class ViewModelObject : ScriptableObject, IViewModel
+    {
+        protected ViewModel viewModel = new ViewModel();
+        protected List<IBindingContext> Contexts { get { return viewModel.Contexts; } }
+
+        public virtual bool ContainsKey(string key)
+        {
+            return viewModel.ContainsKey(key);
+        }
+
+        public virtual IBindableProperty GetBindableProperty(string keyward, Type type)
+        {
+            return viewModel.GetBindableProperty(keyward,type);
+        }
+
+        public virtual BindableProperty<T> GetBindableProperty<T>(string keyward)
+        {
+            return viewModel.GetBindableProperty<T>(keyward);
+        }
+
+        public virtual void OnBinding(IBindingContext context)
+        {
+            viewModel.OnBinding(context);
+        }
+
+        public virtual void OnUnBinding(IBindingContext context)
+        {
+            viewModel.OnUnBinding(context);
+        }
 
+        public virtual void SetBindableProperty(string keyward, IBindableProperty value)
+        {
+            viewModel.SetBindableProperty(keyward,value);
+        }
+        #region 
+        protected virtual T GetValue<T>(string keyward)
+        {
+            return viewModel.GetBindableProperty<T>(keyward).Value;
+        }
+        protected virtual void SetValue<T>(string keyward, T value)
+        {
+            viewModel.GetBindableProperty<T>(keyward).Value = value;
+        }
+        protected virtual void Monitor<T>(string sourceName, UnityAction<T> onValueChanged)
+        {
+            viewModel.Monitor(sourceName, onValueChanged);
+        }
+        #endregion
     }
 
 }

Assets/BridgeUI/Core/Binding/ViewModelContainer.cs

@@ -7,7 +7,7 @@ namespace BridgeUI.Binding
     public class ViewModelContainer : ScriptableObject, IViewModel
     {
         [SerializeField]
-        public ViewModel instence;
+        public ViewModelObject instence;
 
         public bool ContainsKey(string key)
         {

Assets/BridgeUI/Core/Editor/PanelGroupDrawer.cs

@@ -281,7 +281,7 @@ private void TrySaveAllPrefabs(UIInfoBase[] proprety)
                 var item = proprety[i];
                 var obj = EditorUtility.InstanceIDToObject(item.instanceID);
                 if (obj == null) continue;
-                var prefab = PrefabUtility.GetPrefabParent(obj);
+                var prefab = PrefabUtility.GetPrefabObject(obj);
                 if (prefab != null)
                 {
                     var root = PrefabUtility.FindPrefabRoot((GameObject)prefab);

Assets/BridgeUI/Core/GenCode/Editor/ComponentItemDrawer.cs

@@ -150,7 +150,7 @@ private void DrawScriptTarget(Rect targetRect, ComponentItem item)
             var newTarget = EditorGUI.ObjectField(targetRect, item.scriptTarget, item.componentType, true);
             if (newTarget != item.scriptTarget)
             {
-                var prefabTarget = PrefabUtility.GetPrefabParent(newTarget);
+                var prefabTarget = PrefabUtility.GetPrefabObject(newTarget);
                 Debug.Log(prefabTarget);
                 if (prefabTarget != null)
                 {
@@ -175,7 +175,7 @@ private void DrawTarget(Rect targetRect, ComponentItem item)
             var newTarget = EditorGUI.ObjectField(targetRect, item.target, item.componentType, true);
             if (newTarget != item.target)
             {
-                var prefabTarget = PrefabUtility.GetPrefabParent(newTarget);
+                var prefabTarget = PrefabUtility.GetPrefabObject(newTarget);
                 if (prefabTarget != null)
                 {
                     newTarget = prefabTarget;
@@ -185,7 +185,7 @@ private void DrawTarget(Rect targetRect, ComponentItem item)
 
             if (EditorGUI.EndChangeCheck() && item.target)
             {
-                var parent = PrefabUtility.GetPrefabParent(item.target);
+                var parent = PrefabUtility.GetPrefabObject(item.target);
                 if (parent)
                 {
                     item.target = parent as GameObject;

Assets/BridgeUI/Core/GenCode/Editor/ComponetCode/ComponentCode.cs

@@ -65,11 +65,14 @@ public virtual void CompleteCode(ComponentItem component, bool bindingAble)
         {
             foreach (var item in component.viewItems)
             {
+                GenCodeUtil.CompleteKeyField(item.bindingSource, classNode);
                 BindingMemberInvocations(component.name, item);
             }
 
             foreach (var item in component.eventItems)
             {
+                GenCodeUtil.CompleteKeyField(item.bindingSource, classNode);
+
                 switch (item.type)
                 {
                     case BindingType.NoBinding:
@@ -104,7 +107,7 @@ protected virtual void BindingMemberInvocations(string name, BindingShow binding
             //UnityEngine.Debug.Log(bindingInfo.bindingTarget);
             //UnityEngine.Debug.Log(bindingInfo.bindingTargetType.type);
 
-            var arg1 = string.Format("\"{0}\"", bindingInfo.bindingSource);
+            var arg1 = GenCodeUtil.GetSourceKeyWord(bindingInfo.bindingSource);
             var invocation = invocations.Where(
                 x => x.Target.ToString().Contains("Binder") &&
                      x.Arguments.Count > 0 &&
@@ -136,7 +139,7 @@ protected virtual void BindingMemberInvocations(string name, BindingShow binding
                     invocation = new InvocationExpression();
                     invocation.Target = new MemberReferenceExpression(new IdentifierExpression("Binder"), methodName, new AstType[0]);
                     invocation.Arguments.Add(new IdentifierExpression(arg0));
-                    invocation.Arguments.Add(new PrimitiveExpression(bindingInfo.bindingSource));
+                    invocation.Arguments.Add(new IdentifierExpression(GenCodeUtil.GetSourceKeyWord(bindingInfo.bindingSource)));
                     PropBindingsNode.Body.Add(invocation);
                 }
 
@@ -153,7 +156,7 @@ protected virtual void BindingEventInvocations(string name, Type componentType,
         {
             var invocations = PropBindingsNode.Body.Descendants.OfType<InvocationExpression>();
             var arg0_name = "m_" + name + "." + bindingInfo.bindingTarget;//绑定目标
-            var arg1_name = string.Format("\"{0}\"", bindingInfo.bindingSource);//绑定源
+            var arg1_name = GenCodeUtil.GetSourceKeyWord(bindingInfo.bindingSource);//绑定源
 
             var may_invocations = invocations.Where(
                 x => x.Target.ToString().Contains("Binder") &&
@@ -195,7 +198,7 @@ protected virtual void BindingEventInvocations(string name, Type componentType,
                     invocation = new InvocationExpression();
                     invocation.Target = new MemberReferenceExpression(new IdentifierExpression("Binder"), methodName, new AstType[0]);
                     invocation.Arguments.Add(new IdentifierExpression(arg0_name));
-                    invocation.Arguments.Add(new PrimitiveExpression(bindingInfo.bindingSource));
+                    invocation.Arguments.Add(new IdentifierExpression(GenCodeUtil.GetSourceKeyWord(bindingInfo.bindingSource)));
                     if (bindingInfo.type == BindingType.WithTarget)
                     {
                         invocation.Arguments.Add(new IdentifierExpression("m_" + name));
@@ -217,7 +220,7 @@ protected virtual void LocalEventInvocations(string name, BindingEvent bindingIn
             var targetName = "m_" + name;
             var invocation = invocations.Where(x =>
             x.Target.ToString().Contains(targetName) &&
-            x.Arguments.FirstOrDefault().ToString() == bindingInfo.bindingSource).FirstOrDefault();
+            x.Arguments.FirstOrDefault().ToString() == GenCodeUtil.GetSourceKeyWord(bindingInfo.bindingSource)).FirstOrDefault();
 
             var eventName = bindingInfo.bindingTarget;//如onClick
             if (invocation == null && !string.IsNullOrEmpty(eventName) && !string.IsNullOrEmpty(bindingInfo.bindingSource))
@@ -345,7 +348,7 @@ protected virtual void AnalysisLoaclInvocation(InvocationExpression invocation,
             var component = components.Find(x => invocation.Target.ToString().Contains("m_" + x.name));
             if (component != null)
             {
-                string bindingSource = invocation.Arguments.First().ToString();
+                string bindingSource = GenCodeUtil.FromSourceKey(invocation.Arguments.First().ToString());
                 var info = component.eventItems.Find(x => invocation.Target.ToString().Contains("m_" + component.name + "." + x.bindingTarget) && x.type == BindingType.NoBinding && x.bindingSource == bindingSource);
 
                 if (info == null)
@@ -372,23 +375,23 @@ protected virtual void AnalysisBindingMembers(InvocationExpression invocation, L
             var component = components.Find(x => invocation.Arguments.Count > 1 && invocation.Arguments.First().ToString().Contains(string.Format("m_{0}.", x.name)));
             if (component != null)
             {
-                var source = invocation.Arguments.ToArray()[1].ToString().Replace("\"", "");
-                var info = component.viewItems.Find(x => x.bindingSource == source);
+                var sourceName = GenCodeUtil.FromSourceKey(invocation.Arguments.ToArray()[1].ToString());
+                var info = component.viewItems.Find(x => x.bindingSource == sourceName);
                 var isMethod = false;
                 var targetName = AnalysisTargetFromLamdaArgument(invocation.Arguments.First().ToString(), out isMethod);
-                UnityEngine.Debug.Log("解析出字段：" + targetName);
+                //UnityEngine.Debug.Log("解析出字段：" + targetName);
 
                 if (string.IsNullOrEmpty(targetName))
                 {
                     UnityEngine.Debug.Assert(!string.IsNullOrEmpty(targetName), "annalysis err:" + invocation.Arguments.First().ToString());
                     return;
                 }
                 var type = GetTypeClamp(component.componentType, targetName);
-                UnityEngine.Debug.Log("解析出类型：" + type);
+                //UnityEngine.Debug.Log("解析出类型：" + type);
                 if (info == null)
                 {
                     info = new BindingShow();
-                    info.bindingSource = source;
+                    info.bindingSource = sourceName;
                     info.bindingTarget = targetName;
                     info.isMethod = isMethod;
                     component.viewItems.Add(info);
@@ -420,7 +423,7 @@ private string AnalysisTargetFromLamdaArgument(string arg, out bool isMethod)
             else
             {
                 var value = arg;
-                if(arg.Contains("\""))
+                if (arg.Contains("\""))
                 {
                     value = arg.Replace("\"", "");
                     isMethod = false;
@@ -429,9 +432,10 @@ private string AnalysisTargetFromLamdaArgument(string arg, out bool isMethod)
                 {
                     isMethod = true;
                 }
-                UnityEngine.Debug.Log(isMethod);
+                //UnityEngine.Debug.Log(isMethod);
 
-                if (value.Contains(".")){
+                if (value.Contains("."))
+                {
                     value = value.Substring(value.IndexOf('.') + 1);
                 }
                 return value;
@@ -450,16 +454,16 @@ protected virtual void AnalysisBindingEvents(InvocationExpression invocation, Li
 
             if (component != null)
             {
-                var source = invocation.Arguments.ToArray()[1].ToString().Replace("\"", "");
-                var info = component.eventItems.Find(x => x.bindingSource == source);
+                var sourceName = GenCodeUtil.FromSourceKey(invocation.Arguments.ToArray()[1].ToString());
+                var info = component.eventItems.Find(x => x.bindingSource == sourceName);
                 var arg0 = invocation.Arguments.First().ToString();
                 var targetName = arg0.Substring(arg0.IndexOf(".") + 1);
                 Type infoType = GetTypeClamp(component.componentType, targetName);
 
                 if (info == null)
                 {
                     info = new BindingEvent();
-                    info.bindingSource = source;
+                    info.bindingSource = sourceName;
                     info.bindingTarget = targetName;
                     info.bindingTargetType.Update(infoType);
                     component.eventItems.Add(info);