1

BLL/Config.cs

@@ -314,8 +314,8 @@ namespace BLL
 
         [MyConfigComment("数据源类型")]
         public static MyConfig<string> DataSource_Type;
-        [MyConfigComment("数据源字符串")]
-        public static MyConfig<string> DataSource_String;
+        [MyConfigComment("数据源文件路径")]
+        public static MyConfig<string> DataSource_FilePath;
         [MyConfigComment("数据源编码")]
         public static MyConfig<string> DataSource_Encoding;
         [MyConfigComment("数据源匹配Key")]

BLL/ExtraFileData.cs

@@ -15,7 +15,7 @@ namespace BLL
         public static Dictionary<string, Dictionary<string, string>> AllData = new Dictionary<string, Dictionary<string, string>>();
         public static List<string> Titles = new List<string>();
         public static void Init() {
-            var ext = Path.GetExtension(Config.DataSource_String);
+            var ext = Path.GetExtension(Config.DataSource_FilePath);
             if (string.IsNullOrEmpty(ext))
             {
                 return;
@@ -29,24 +29,24 @@ namespace BLL
         }
         public static void LoadCSVALlData()
         {
-            LogNet.log.Info("数据源:" + Config.DataSource_String);
-            if (!File.Exists(Config.DataSource_String))
+            LogNet.log.Info("数据源:" + Config.DataSource_FilePath);
+            if (!File.Exists(Config.DataSource_FilePath))
             {
                 return;
-                throw new FileNotFoundException(Config.DataSource_String);
+                throw new FileNotFoundException(Config.DataSource_FilePath);
             }
-            Titles = ParseCSVFileTitle(Config.DataSource_String);
+            Titles = ParseCSVFileTitle(Config.DataSource_FilePath);
             //Common.extraKey = titles;
             string[] files;
             if (Config.DataSource_Recursive)
             {
-                var ext = Path.GetExtension(Config.DataSource_String);
-                var path = Path.GetDirectoryName(Config.DataSource_String);
+                var ext = Path.GetExtension(Config.DataSource_FilePath);
+                var path = Path.GetDirectoryName(Config.DataSource_FilePath);
                 files=Directory.GetFiles(path, "*" + ext);
             }
             else
             {
-                files = new string[] { Config.DataSource_String };
+                files = new string[] { Config.DataSource_FilePath };
             }
             
             
@@ -97,23 +97,23 @@ namespace BLL
 
 
         public static void LoadXLSALlData() {
-            if (!File.Exists(Config.DataSource_String)) {
+            if (!File.Exists(Config.DataSource_FilePath)) {
                 return;
                 //throw new FileNotFoundException(Config.DataSource_String);
             }
-            Titles = ParseXLSFileTitle(Config.DataSource_String);
+            Titles = ParseXLSFileTitle(Config.DataSource_FilePath);
             //Common.extraKey = titles;
 
             string[] files;
             if (Config.DataSource_Recursive)
             {
-                var ext = Path.GetExtension(Config.DataSource_String);
-                var path = Path.GetDirectoryName(Config.DataSource_String);
+                var ext = Path.GetExtension(Config.DataSource_FilePath);
+                var path = Path.GetDirectoryName(Config.DataSource_FilePath);
                 files = Directory.GetFiles(path, "*" + ext);
             }
             else
             {
-                files = new string[] { Config.DataSource_String };
+                files = new string[] { Config.DataSource_FilePath };
             }
 
 

SmartScan/SetControl/UsrDataSource.cs

@@ -20,7 +20,7 @@ namespace SmartScan
             CboDataType.Items.Add("Excel/CSV");
             CboDataType.SelectedIndex = 0;
             TxtDataSource.TextChanged += TxtDataSource_TextChanged;
-            TxtDataSource.Text = Config.DataSource_String;
+            TxtDataSource.Text = Config.DataSource_FilePath;
             ChkRecursive.Checked= Config.DataSource_Recursive;
             Asa.FaceControl.Language.SetLanguage(this);
         }
@@ -92,7 +92,7 @@ namespace SmartScan
                 CboDataKey.SelectedText = Config.DataSource_DataKey;
             }
 
-            TxtDataSource.Text = Config.DataSource_String;
+            TxtDataSource.Text = Config.DataSource_FilePath;
             return facePanel1;
         }
 
@@ -103,7 +103,7 @@ namespace SmartScan
             else
                 Config.DataSource_Type = "none";
 
-            Config.DataSource_String = TxtDataSource.Text;
+            Config.DataSource_FilePath = TxtDataSource.Text;
             Config.DataSource_DataKey = CboDataKey.Text;
             Config.DataSource_DataTitle = CboDataTitle.Text;
             Config.DataSource_Recursive = ChkRecursive.Checked;

SmartScan/SetControl/UsrExportData.cs

@@ -20,7 +20,7 @@ namespace SmartScan
             CboDataType.Items.Add("Excel/CSV");
             CboDataType.SelectedIndex = 0;
             TxtDataSource.TextChanged += TxtDataSource_TextChanged;
-            TxtDataSource.Text = Config.DataSource_String;
+            TxtDataSource.Text = Config.DataSource_FilePath;
             ChkRecursive.Checked= Config.DataSource_Recursive;
             Asa.FaceControl.Language.SetLanguage(this);
         }
@@ -92,7 +92,7 @@ namespace SmartScan
                 CboDataKey.SelectedText = Config.DataSource_DataKey;
             }
 
-            TxtDataSource.Text = Config.DataSource_String;
+            TxtDataSource.Text = Config.DataSource_FilePath;
             return facePanel1;
         }
 
@@ -103,7 +103,7 @@ namespace SmartScan
             else
                 Config.DataSource_Type = "none";
 
-            Config.DataSource_String = TxtDataSource.Text;
+            Config.DataSource_FilePath = TxtDataSource.Text;
             Config.DataSource_DataKey = CboDataKey.Text;
             Config.DataSource_DataTitle = CboDataTitle.Text;
             Config.DataSource_Recursive = ChkRecursive.Checked;