Skip to content

张东亮 / NS100

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 0d8e1c53 由 张东亮
选项

1

1 个父辈 ab16c896
内嵌 并排
正在显示 4 个修改的文件 包含 21 行增加 和 21 行删除
BLL/Config.cs
...@@ -314,8 +314,8 @@ namespace BLL ...@@ -314,8 +314,8 @@ namespace BLL
[MyConfigComment("数据源类型")] [MyConfigComment("数据源类型")]
public static MyConfig<string> DataSource_Type; public static MyConfig<string> DataSource_Type;
[MyConfigComment("数据源字符串")] [MyConfigComment("数据源文件路径")]
public static MyConfig<string> DataSource_String; public static MyConfig<string> DataSource_FilePath;
[MyConfigComment("数据源编码")] [MyConfigComment("数据源编码")]
public static MyConfig<string> DataSource_Encoding; public static MyConfig<string> DataSource_Encoding;
[MyConfigComment("数据源匹配Key")] [MyConfigComment("数据源匹配Key")]
......
BLL/ExtraFileData.cs
...@@ -15,7 +15,7 @@ namespace BLL ...@@ -15,7 +15,7 @@ namespace BLL
public static Dictionary<string, Dictionary<string, string>> AllData = new Dictionary<string, Dictionary<string, string>>(); public static Dictionary<string, Dictionary<string, string>> AllData = new Dictionary<string, Dictionary<string, string>>();
public static List<string> Titles = new List<string>(); public static List<string> Titles = new List<string>();
public static void Init() { public static void Init() {
var ext = Path.GetExtension(Config.DataSource_String); var ext = Path.GetExtension(Config.DataSource_FilePath);
if (string.IsNullOrEmpty(ext)) if (string.IsNullOrEmpty(ext))
{ {
return; return;
...@@ -29,24 +29,24 @@ namespace BLL ...@@ -29,24 +29,24 @@ namespace BLL
} }
public static void LoadCSVALlData() public static void LoadCSVALlData()
{ {
LogNet.log.Info("数据源:" + Config.DataSource_String); LogNet.log.Info("数据源:" + Config.DataSource_FilePath);
if (!File.Exists(Config.DataSource_String)) if (!File.Exists(Config.DataSource_FilePath))
{ {
return; 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; //Common.extraKey = titles;
string[] files; string[] files;
if (Config.DataSource_Recursive) if (Config.DataSource_Recursive)
{ {
var ext = Path.GetExtension(Config.DataSource_String); var ext = Path.GetExtension(Config.DataSource_FilePath);
var path = Path.GetDirectoryName(Config.DataSource_String); var path = Path.GetDirectoryName(Config.DataSource_FilePath);
files=Directory.GetFiles(path, "*" + ext); files=Directory.GetFiles(path, "*" + ext);
} }
else else
{ {
files = new string[] { Config.DataSource_String }; files = new string[] { Config.DataSource_FilePath };
} }
...@@ -97,23 +97,23 @@ namespace BLL ...@@ -97,23 +97,23 @@ namespace BLL
public static void LoadXLSALlData() { public static void LoadXLSALlData() {
if (!File.Exists(Config.DataSource_String)) { if (!File.Exists(Config.DataSource_FilePath)) {
return; return;
//throw new FileNotFoundException(Config.DataSource_String); //throw new FileNotFoundException(Config.DataSource_String);
} }
Titles = ParseXLSFileTitle(Config.DataSource_String); Titles = ParseXLSFileTitle(Config.DataSource_FilePath);
//Common.extraKey = titles; //Common.extraKey = titles;
string[] files; string[] files;
if (Config.DataSource_Recursive) if (Config.DataSource_Recursive)
{ {
var ext = Path.GetExtension(Config.DataSource_String); var ext = Path.GetExtension(Config.DataSource_FilePath);
var path = Path.GetDirectoryName(Config.DataSource_String); var path = Path.GetDirectoryName(Config.DataSource_FilePath);
files = Directory.GetFiles(path, "*" + ext); files = Directory.GetFiles(path, "*" + ext);
} }
else else
{ {
files = new string[] { Config.DataSource_String }; files = new string[] { Config.DataSource_FilePath };
} }
......
SmartScan/SetControl/UsrDataSource.cs
...@@ -20,7 +20,7 @@ namespace SmartScan ...@@ -20,7 +20,7 @@ namespace SmartScan
CboDataType.Items.Add("Excel/CSV"); CboDataType.Items.Add("Excel/CSV");
CboDataType.SelectedIndex = 0; CboDataType.SelectedIndex = 0;
TxtDataSource.TextChanged += TxtDataSource_TextChanged; TxtDataSource.TextChanged += TxtDataSource_TextChanged;
TxtDataSource.Text = Config.DataSource_String; TxtDataSource.Text = Config.DataSource_FilePath;
ChkRecursive.Checked= Config.DataSource_Recursive; ChkRecursive.Checked= Config.DataSource_Recursive;
Asa.FaceControl.Language.SetLanguage(this); Asa.FaceControl.Language.SetLanguage(this);
} }
...@@ -92,7 +92,7 @@ namespace SmartScan ...@@ -92,7 +92,7 @@ namespace SmartScan
CboDataKey.SelectedText = Config.DataSource_DataKey; CboDataKey.SelectedText = Config.DataSource_DataKey;
} }
TxtDataSource.Text = Config.DataSource_String; TxtDataSource.Text = Config.DataSource_FilePath;
return facePanel1; return facePanel1;
} }
...@@ -103,7 +103,7 @@ namespace SmartScan ...@@ -103,7 +103,7 @@ namespace SmartScan
else else
Config.DataSource_Type = "none"; Config.DataSource_Type = "none";
Config.DataSource_String = TxtDataSource.Text; Config.DataSource_FilePath = TxtDataSource.Text;
Config.DataSource_DataKey = CboDataKey.Text; Config.DataSource_DataKey = CboDataKey.Text;
Config.DataSource_DataTitle = CboDataTitle.Text; Config.DataSource_DataTitle = CboDataTitle.Text;
Config.DataSource_Recursive = ChkRecursive.Checked; Config.DataSource_Recursive = ChkRecursive.Checked;
......
SmartScan/SetControl/UsrExportData.cs
...@@ -20,7 +20,7 @@ namespace SmartScan ...@@ -20,7 +20,7 @@ namespace SmartScan
CboDataType.Items.Add("Excel/CSV"); CboDataType.Items.Add("Excel/CSV");
CboDataType.SelectedIndex = 0; CboDataType.SelectedIndex = 0;
TxtDataSource.TextChanged += TxtDataSource_TextChanged; TxtDataSource.TextChanged += TxtDataSource_TextChanged;
TxtDataSource.Text = Config.DataSource_String; TxtDataSource.Text = Config.DataSource_FilePath;
ChkRecursive.Checked= Config.DataSource_Recursive; ChkRecursive.Checked= Config.DataSource_Recursive;
Asa.FaceControl.Language.SetLanguage(this); Asa.FaceControl.Language.SetLanguage(this);
} }
...@@ -92,7 +92,7 @@ namespace SmartScan ...@@ -92,7 +92,7 @@ namespace SmartScan
CboDataKey.SelectedText = Config.DataSource_DataKey; CboDataKey.SelectedText = Config.DataSource_DataKey;
} }
TxtDataSource.Text = Config.DataSource_String; TxtDataSource.Text = Config.DataSource_FilePath;
return facePanel1; return facePanel1;
} }
...@@ -103,7 +103,7 @@ namespace SmartScan ...@@ -103,7 +103,7 @@ namespace SmartScan
else else
Config.DataSource_Type = "none"; Config.DataSource_Type = "none";
Config.DataSource_String = TxtDataSource.Text; Config.DataSource_FilePath = TxtDataSource.Text;
Config.DataSource_DataKey = CboDataKey.Text; Config.DataSource_DataKey = CboDataKey.Text;
Config.DataSource_DataTitle = CboDataTitle.Text; Config.DataSource_DataTitle = CboDataTitle.Text;
Config.DataSource_Recursive = ChkRecursive.Checked; Config.DataSource_Recursive = ChkRecursive.Checked;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!