zilinsoft/SuperDesign
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

### 2025-01-08 星期三更新

Browse Source 
------
#### RySmartEditor    V1.0.2501.0801
- *.[改进]复制文件到其它站点同位置功能支持复制文件夹。
#### SuperDesign    V3.0.2501.0801
- *.[新增]支持直接设置主项目的功能。
- *.[新增]新增支持设置在发布日志时是否更新版本号的功能。
- *.[新增]更新日志右键菜单支持快速添加日志前缀。
- *.[改进]更新日志保存时如果冲突,则显示数据库和本地日志内容进行对比。
- *.[修复]修复更新日志输入框粘贴文本会携带颜色的字体的BUG。
- *.[修复]修复打开Git时无法粘贴更新日志的BUG。
This commit is contained in:
zilinsoft committed 2025-01-08 16:55:25 +08:00
1 parent 1501abd07f
commit c000c7ef1b
21 files changed
+631 -80
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/RySmartEditor/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.2412.0201")]
[assembly: AssemblyFileVersion("1.0.2412.0201")]
[assembly: AssemblyVersion("1.0.2501.0801")]
[assembly: AssemblyFileVersion("1.0.2501.0801")]
Source/RySmartEditor/SmartEditor/FrmFileBrowser_New.cs
+44 -33
View File
@@ -29,6 +29,7 @@ using ScintillaNET;
using WinShell;
using static System.Net.Mime.MediaTypeNames;
using System.Runtime.InteropServices.ComTypes;
using System.Threading;
namespace SuperDesign.Tools.SmartEditor
{
@@ -1218,55 +1219,65 @@ namespace SuperDesign.Tools.SmartEditor
case DialogResult.No:
return;
}
IDbInterface db = Itrycn_Db.CreateDataProvider(Itrycn_Db.dataType);
if (db.ConnDb(Itrycn_Db.User_SQLConn) == 1)
this.Enabled = false;
Thread th = new Thread(Start);
th.Start();
void Start()
{
DataSet ds = db.ReadData("select * from Site");
if (ds.HaveData())
IDbInterface db = Itrycn_Db.CreateDataProvider(Itrycn_Db.dataType);
if (db.ConnDb(Itrycn_Db.User_SQLConn) == 1)
{
for (int m = 0; m < list.Count; m++)
DataSet ds = db.ReadData("select * from Site");
if (ds.HaveData())
{
var row = (MyFileSystemInfo)list[m];
var xd_path = "";
var cur_Id = -1;
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
DataRow reader = ds.Tables[0].Rows[i];
if (row.FullName.IndexOfEx(reader["localPath"].ToString()) < 0)
{
continue;
}
xd_path = row.FullName.Replace(reader["localPath"].ToString(), "", true).Trim('\\');
cur_Id = reader["id"].ToInt();
break;
}
if (cur_Id == -1)
{
MessageBox.Show("当前选定的文件无法获取站点信息。", "无法获取站点", MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
else
for (int m = 0; m < list.Count; m++)
{
var row = (MyFileSystemInfo)list[m];
var xd_path = "";
var cur_Id = -1;
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
DataRow reader = ds.Tables[0].Rows[i];
if (cur_Id == reader["id"].ToInt()) { continue; }
if (System.IO.File.Exists(reader["localPath"].ToString() + "\\" + xd_path))
if (row.FullName.IndexOfEx(reader["localPath"].ToString()) < 0)
{
//如果已存在,则先进行备份
RyFiles.DeleteFile(reader["localPath"].ToString() + "\\" + xd_path, true);
continue;
}
if (!RyFiles.CopyBigFile(row.FullName, reader["localPath"].ToString() + "\\" + xd_path))
xd_path = row.FullName.Replace(reader["localPath"].ToString(), "", true).Trim('\\');
cur_Id = reader["id"].ToInt();
break;
}
if (cur_Id == -1)
{
MessageBox.Show("当前选定的文件无法获取站点信息。", "无法获取站点", MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
else
{
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
MessageBox.Show("复制到以下位置出错\r\n" + reader["localPath"].ToString() + "\\" + xd_path, "复制出错", MessageBoxButtons.OK, MessageBoxIcon.Warning);
DataRow reader = ds.Tables[0].Rows[i];
if (cur_Id == reader["id"].ToInt()) { continue; }
if (RyFiles.FileOrDirExist(reader["localPath"].ToString() + "\\" + xd_path))
{
//如果已存在,则先进行备份
RyFiles.DeleteFile(reader["localPath"].ToString() + "\\" + xd_path, true);
}
if (RyFiles.CopyFileOrFolder(row.FullName, reader["localPath"].ToString() + "\\" + xd_path) != 0)
{
MessageBox.Show("复制到以下位置出错\r\n" + reader["localPath"].ToString() + "\\" + xd_path, "复制出错", MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
}
}
}
}
ds?.Dispose();
}
ds?.Dispose();
db.Free();
this.Invoke(new Action(() =>
{
this.Enabled = true;
UpdateNode(TreeDir.SelectedNode);
}));
}
db.Free();
UpdateNode(TreeDir.SelectedNode);
//olvFiles.RemoveObjects(del_list);
}
}