diff --git a/src/Basal/IFox.Basal.Shared/ExpressionTrees/SqlExpressionVisitor.cs b/src/Basal/IFox.Basal.Shared/ExpressionTrees/SqlExpressionVisitor.cs index bfd62836c6627f7f1cf251d8d8dee76cdb6cca35..17ce385bac8674c34d9c99187cc8524e3157803c 100644 --- a/src/Basal/IFox.Basal.Shared/ExpressionTrees/SqlExpressionVisitor.cs +++ b/src/Basal/IFox.Basal.Shared/ExpressionTrees/SqlExpressionVisitor.cs @@ -1,4 +1,6 @@ #if NET45 +using Microsoft.CSharp.RuntimeBinder; + namespace IFoxCAD.Basal; /// diff --git a/src/CAD/IFox.CAD.Shared/ExtensionMethod/JigEx.cs b/src/CAD/IFox.CAD.Shared/ExtensionMethod/JigEx.cs index 15024ab6552f1ca810b0d2e8d219589951f890a9..c6f1296d1efba8756ce35d2f7853baad6ec8cf84 100644 --- a/src/CAD/IFox.CAD.Shared/ExtensionMethod/JigEx.cs +++ b/src/CAD/IFox.CAD.Shared/ExtensionMethod/JigEx.cs @@ -216,25 +216,16 @@ public JigPromptPointOptions SetOptions(string msg, _options = JigPointOptions(); _options.Message = Environment.NewLine + msg; - - // 加入关键字,加入时候将空格内容放到最后 - string spaceValue = string.Empty; - const string spaceKey = " "; + if (keywords != null) foreach (var item in keywords) - if (item.Key == spaceKey) - spaceValue = item.Value; - else _options.Keywords.Add(item.Key, item.Key, item.Value); - /// 因为默认配置函数导致此处空格触发是无效的, - /// 但是用户如果想触发,就需要在外部减去默认UserInputControls配置 - /// 要放最后,才能优先触发其他关键字 - if (spaceValue != string.Empty) - _options.Keywords.Add(spaceKey, spaceKey, spaceValue); - else - _options.Keywords.Add(spaceKey, spaceKey, "<空格退出>"); + // 因为默认配置函数导致此处空格触发是无效的, + // 但是用户如果想触发,就需要在外部减去默认UserInputControls配置 + // 要放最后,才能优先触发其他关键字 + // 外部设置减去配置 // _options.UserInputControls =