Merge branch 'NS100_WPF' of http://106.15.194.121:8083/zdl/NS100 into NS100_WPF

BLL/Extension/Item_General.cs

@@ -242,37 +242,9 @@ namespace BLL
             }
 
 
-            //第二次刷新界面
-            for (int i = 0; i < extensions.Count; i++)
-            {
-                #region 如果是下拉框加载内容
-                if (extensions[i].Type == "ComboBox")
-                {
-                    var s = extensions[i].Control as Asa.FaceControl.FaceComboBox;
-                    s.Items.Clear();
-                    var data = ExtraFileData.DataTitle
-                        .Where(a => a.Contains(extensions[i].Control.Text))
-                        .Distinct()
-                        .OrderBy(tit => tit)
-                        .ToArray();
-                    s.Items.AddRange(data);
-                    s.Text = "";
-                    s.SelectedIndex = -1;
-                    s.Enabled = true;
-                }
-                #endregion
-                extensions[i].Control.ForeColor = System.Drawing.Color.White;
-                if (key.ContainsKey(extensions[i].Key))
-                {
-                    extensions[i].Control.Text = key[extensions[i].Key].Replace("<OCR>", "");
-                }
-                if (extensions[i].LinkName == "ischeckresult")
-                {
-                    extensions[i].Control.Text = BLLCommon.extension.labelText;
-                }
-            }
-
 
+            extensionsUpdate(key);
+             
 
             key = ExtraFileData.MatchFileData(key, out bool findOk);
             bool hasDataSource = (!string.IsNullOrEmpty(Config.DataSource_DataKey)) ||
@@ -283,6 +255,12 @@ namespace BLL
 
                 if (!string.IsNullOrEmpty(config.ReelIDKeyWord) && isdisplay)
                 {
+
+                    LogNet.log.Info($"OnKeySet  匹配到外部数据源 findOK ，key="+JsonConvert.SerializeObject(key));
+                    OnKeySet(templateName, originalCode, key, hasMatch);
+                    extensionsUpdate(key);
+                   
+
                     var Reelidstr = GetReelid();
                     if (key.ContainsKey(config.ReelIDKeyWord))
                     {
@@ -395,6 +373,41 @@ namespace BLL
 
             return true;
         }
+
+        private   void extensionsUpdate(Dictionary<string,string> key)
+        {   
+            //第三次刷新
+            for (int i = 0; i < extensions.Count; i++)
+            {
+                #region 如果是下拉框加载内容
+                if (extensions[i].Type == "ComboBox")
+                {
+                    var s = extensions[i].Control as Asa.FaceControl.FaceComboBox;
+                    s.Items.Clear();
+                    var data = ExtraFileData.DataTitle
+                        .Where(a => a.Contains(extensions[i].Control.Text))
+                        .Distinct()
+                        .OrderBy(tit => tit)
+                        .ToArray();
+                    s.Items.AddRange(data);
+                    s.Text = "";
+                    s.SelectedIndex = -1;
+                    s.Enabled = true;
+                }
+                #endregion
+                extensions[i].Control.ForeColor = System.Drawing.Color.White;
+                if (key.ContainsKey(extensions[i].Key))
+                {
+                    extensions[i].Control.Text = key[extensions[i].Key].Replace("<OCR>", "");
+                }
+                if (extensions[i].LinkName == "ischeckresult")
+                {
+                    extensions[i].Control.Text = BLLCommon.extension.labelText;
+                }
+            }
+             
+
+        }
         public static void DoEvents()
         {
             var frame = new DispatcherFrame();
@@ -516,6 +529,8 @@ namespace BLL
                 formattedID = reelID.ToString();
             }
 
+            var uikey = GetUIKeywords();
+            LogNet.log.Info("Enter GetReelid Method, uikey="+ JsonConvert.SerializeObject(uikey));
             for (int i = 0; i < keys.Length; i++)
             {
                 string key = keys[i];
@@ -548,7 +563,6 @@ namespace BLL
                     // 对于字符类型，直接保留不替换
                     continue;
                 }
-                var uikey = GetUIKeywords();
                 if (uikey.ContainsKey(key))
                     processedPattern = processedPattern.Replace(keyPlaceholder, uikey[key]);