Property selected bug fix

TabularEditor · Apr 18, 2018 · 28d5990 · 28d5990
1 parent 5cf9e41
commit 28d5990
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/TabularEditor/UI/UIController_ExpressionEditor.cs b/TabularEditor/UI/UIController_ExpressionEditor.cs
@@ -101,6 +101,7 @@ private void ExpressionEditor_ExpressionSelectorChanged(object sender, EventArgs
         {
             if (ExpressionEditor_Current is IDaxDependantObject)
             {
+                SetText(UI.ExpressionEditor.Text, LastDaxProperty);
                 ExpressionEditor_SetText();
             }
         }
@@ -211,6 +212,18 @@ private void SetText(string value)
             }
         }
 
+        private void SetText(string value, DAXProperty prop)
+        {
+            if (ExpressionEditor_Current is IDaxDependantObject)
+            {
+                (ExpressionEditor_Current as IDaxDependantObject).SetDAX(prop, value);
+            }
+            else if (ExpressionEditor_Current != null)
+            {
+                ExpressionEditor_Current.Expression = value;
+            }
+        }
+
         private DAXProperty CurrentDaxProperty
         {
             get
@@ -222,6 +235,7 @@ private DAXProperty CurrentDaxProperty
                 UI.ExpressionSelector.SelectedItem = DaxPropertyComboBoxItem.Items[value];
             }
         }
+        private DAXProperty LastDaxProperty;
 
         private void ExpressionEditor_SetText()
         {
@@ -243,12 +257,15 @@ private void ExpressionEditor_SetText()
             {
                 UI.CurrentMeasureLabel.Text = (_expressionEditor_Current as IDaxObject).DaxObjectName + " :=";
                 UI.CurrentMeasureLabel.Visible = true;
-            } else
+            }
+            else
             {
                 UI.CurrentMeasureLabel.Visible = false;
             }
 
             UI.ExpressionEditor.TextChanged += ExpressionEditor_TextChanged;
+
+            LastDaxProperty = CurrentDaxProperty;
         }
 
         private void ExpressionEditor_Preview()