Commit 9373377a authored by tr's avatar tr

1、表开发工具:说明长度调整为100个汉字;默认值显示优化

2、主界面:弹出窗体图标统一;
parent e786c2d3
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<appSettings> <appSettings>
<add key="UpdateTime" value="2021-08-19 17:29:13.623"/> <add key="UpdateTime" value="2021-08-24 17:46:26.417" />
</appSettings> </appSettings>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</xs:schema> </xs:schema>
<AppSetting> <AppSetting>
<Name>DefaultLink</Name> <Name>DefaultLink</Name>
<Value>Password=sa;Persist Security Info=True;User ID=sa;Initial Catalog=Temp;Data Source=.</Value> <Value>Password=sa;Persist Security Info=True;User ID=sa;Initial Catalog=FTT_Work;Data Source=192.168.1.204</Value>
</AppSetting> </AppSetting>
<AppSetting> <AppSetting>
<Name>ModelExportPath</Name> <Name>ModelExportPath</Name>
......
...@@ -31,6 +31,10 @@ namespace Tools.MyCommon ...@@ -31,6 +31,10 @@ namespace Tools.MyCommon
/// 提示内容 /// 提示内容
/// </summary> /// </summary>
public string ToolTipText { get; set; } public string ToolTipText { get; set; }
/// <summary>
/// 图标序号
/// </summary>
public int ImageIndex { get; set; }
} }
/// <summary> /// <summary>
/// 绑定信息 /// 绑定信息
......
This diff is collapsed.
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(wEditBasic));
this.SuspendLayout(); this.SuspendLayout();
// //
// wEditBasic // wEditBasic
...@@ -35,6 +36,7 @@ ...@@ -35,6 +36,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(384, 268); this.ClientSize = new System.Drawing.Size(384, 268);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "wEditBasic"; this.Name = "wEditBasic";
this.Text = "wEditBasic"; this.Text = "wEditBasic";
this.ResumeLayout(false); this.ResumeLayout(false);
......
This diff is collapsed.
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(wDbSetting));
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
...@@ -144,6 +145,7 @@ ...@@ -144,6 +145,7 @@
this.Controls.Add(this.label3); this.Controls.Add(this.label3);
this.Controls.Add(this.label2); this.Controls.Add(this.label2);
this.Controls.Add(this.label1); this.Controls.Add(this.label1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "wDbSetting"; this.Name = "wDbSetting";
this.Text = "数据库设置"; this.Text = "数据库设置";
this.Load += new System.EventHandler(this.wDbSetting_Load); this.Load += new System.EventHandler(this.wDbSetting_Load);
......
This diff is collapsed.
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(wMsgBox));
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.btnDefault = new System.Windows.Forms.Button(); this.btnDefault = new System.Windows.Forms.Button();
this.tbMessage = new System.Windows.Forms.TextBox(); this.tbMessage = new System.Windows.Forms.TextBox();
...@@ -83,6 +84,7 @@ ...@@ -83,6 +84,7 @@
this.ClientSize = new System.Drawing.Size(240, 128); this.ClientSize = new System.Drawing.Size(240, 128);
this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.tableLayoutPanel1);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.Name = "wMsgBox"; this.Name = "wMsgBox";
this.Text = "提示"; this.Text = "提示";
......
This diff is collapsed.
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(wSysSetting));
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
...@@ -197,6 +198,7 @@ ...@@ -197,6 +198,7 @@
this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox1);
this.Controls.Add(this.label2); this.Controls.Add(this.label2);
this.Controls.Add(this.label1); this.Controls.Add(this.label1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "wSysSetting"; this.Name = "wSysSetting";
this.Text = "系统配置"; this.Text = "系统配置";
this.Load += new System.EventHandler(this.wSysSetting_Load); this.Load += new System.EventHandler(this.wSysSetting_Load);
......
This diff is collapsed.
...@@ -586,9 +586,9 @@ namespace Tools.UI ...@@ -586,9 +586,9 @@ namespace Tools.UI
new TQuery("ColumnDescInfo", $@" new TQuery("ColumnDescInfo", $@"
SELECT SELECT
FieldName = CONVERT(VARCHAR(100), a.name), FieldName = CONVERT(VARCHAR(100), a.name),
[Description] = CONVERT(VARCHAR (50), isnull(d.[value],'')), [Description] = CONVERT(VARCHAR(200), isnull(d.[value],'')),
IsNotNull = CASE WHEN a.isnullable=1 THEN 0 ELSE 1 END, IsNotNull = CASE WHEN a.isnullable=1 THEN 0 ELSE 1 END,
DefaultValue = REPLACE(REPLACE(c.text, '(', ''), ')', ''), DefaultValue = CASE WHEN e.name='datetime' THEN STUFF(STUFF(c.text, LEN(c.text), 1, ''), 1, 1, '') ELSE REPLACE(REPLACE(c.text, '(', ''), ')', '') END,
ColumnType = CASE WHEN CHARINDEX('varchar',e.name,0) > 0 THEN e.name+'('+CAST(a.length AS VARCHAR(50)) +')' ELSE e.name END ColumnType = CASE WHEN CHARINDEX('varchar',e.name,0) > 0 THEN e.name+'('+CAST(a.length AS VARCHAR(50)) +')' ELSE e.name END
FROM dbo.syscolumns a FROM dbo.syscolumns a
INNER JOIN dbo.sysobjects b ON b.id = a.id AND b.xtype = 'U' AND b.name <> 'dtproperties' INNER JOIN dbo.sysobjects b ON b.id = a.id AND b.xtype = 'U' AND b.name <> 'dtproperties'
......
...@@ -7,18 +7,20 @@ namespace Tools ...@@ -7,18 +7,20 @@ namespace Tools
{ {
public class wExtend public class wExtend
{ {
//预定义分类:统一采用四字说明
string Tools_uni = "通用工具";
string Tools_imp = "实施工具";
string Tools_dev = "开发工具";
string Tools_human = "行政工具";
string Tools_demos = "示例程序";
/// <summary> /// <summary>
/// 获取模块列表 /// 获取模块列表
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public List<ModuleInfo> GetModuleList() public List<ModuleInfo> GetModuleList()
{ {
//预定义分类:统一采用四字说明
var Tools_uni = "通用工具";
var Tools_imp = "实施工具";
var Tools_dev = "开发工具";
var Tools_human = "行政工具";
var Tools_demos = "示例程序";
//为保证显示效果:名称长度尽量少于9个汉字 //为保证显示效果:名称长度尽量少于9个汉字
return new List<ModuleInfo> return new List<ModuleInfo>
{ {
...@@ -67,7 +69,30 @@ namespace Tools ...@@ -67,7 +69,30 @@ namespace Tools
GroupName = group, GroupName = group,
Text = text, Text = text,
ToolTipText = tip, ToolTipText = tip,
ImageIndex = this.GetGroupImageIndex(group),
}; };
} }
private int GetGroupImageIndex(string group)
{
int result = 0;
if (group == Tools_imp)
{
result = 1;
}
else if (group == Tools_dev)
{
result = 2;
}
else if (group == Tools_human)
{
result = 3;
}
else if (group == Tools_demos)
{
result = 4;
}
return result;
}
} }
} }
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiSysUpload = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiSysUpload = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiSysUpdate = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiSysUpdate = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiSysUpdateLog = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiSysReLogin = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiSysReLogin = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiSysExit = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiSysExit = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
...@@ -65,7 +66,6 @@ ...@@ -65,7 +66,6 @@
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.tsmiSysUpdateLog = new System.Windows.Forms.ToolStripMenuItem();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel1.SuspendLayout();
...@@ -128,15 +128,11 @@ ...@@ -128,15 +128,11 @@
// //
this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
this.imageList1.TransparentColor = System.Drawing.Color.Transparent; this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
this.imageList1.Images.SetKeyName(0, "机械电动工具mechanical-电动机.png"); this.imageList1.Images.SetKeyName(0, "29_流程.png");
this.imageList1.Images.SetKeyName(1, "机械电动工具mechanical-大切割.png"); this.imageList1.Images.SetKeyName(1, "25_密码.png");
this.imageList1.Images.SetKeyName(2, "机械电动工具mechanical-气枪.png"); this.imageList1.Images.SetKeyName(2, "27_关联.png");
this.imageList1.Images.SetKeyName(3, "机械电动工具mechanical-电锯.png"); this.imageList1.Images.SetKeyName(3, "51_工作群组.png");
this.imageList1.Images.SetKeyName(4, "机械电动工具mechanical-电锤.png"); this.imageList1.Images.SetKeyName(4, "60_空间.png");
this.imageList1.Images.SetKeyName(5, "机械电动工具mechanical-标枪.png");
this.imageList1.Images.SetKeyName(6, "机械电动工具mechanical-铅镫.png");
this.imageList1.Images.SetKeyName(7, "机械电动工具mechanical-气泵.png");
this.imageList1.Images.SetKeyName(8, "机械电动工具mechanical-电钻.png");
// //
// tabControl1 // tabControl1
// //
...@@ -200,25 +196,31 @@ ...@@ -200,25 +196,31 @@
// tsmiSysUpload // tsmiSysUpload
// //
this.tsmiSysUpload.Name = "tsmiSysUpload"; this.tsmiSysUpload.Name = "tsmiSysUpload";
this.tsmiSysUpload.Size = new System.Drawing.Size(180, 22); this.tsmiSysUpload.Size = new System.Drawing.Size(124, 22);
this.tsmiSysUpload.Text = "上传更新"; this.tsmiSysUpload.Text = "上传更新";
// //
// tsmiSysUpdate // tsmiSysUpdate
// //
this.tsmiSysUpdate.Name = "tsmiSysUpdate"; this.tsmiSysUpdate.Name = "tsmiSysUpdate";
this.tsmiSysUpdate.Size = new System.Drawing.Size(180, 22); this.tsmiSysUpdate.Size = new System.Drawing.Size(124, 22);
this.tsmiSysUpdate.Text = "检查更新"; this.tsmiSysUpdate.Text = "检查更新";
// //
// tsmiSysUpdateLog
//
this.tsmiSysUpdateLog.Name = "tsmiSysUpdateLog";
this.tsmiSysUpdateLog.Size = new System.Drawing.Size(124, 22);
this.tsmiSysUpdateLog.Text = "更新记录";
//
// tsmiSysReLogin // tsmiSysReLogin
// //
this.tsmiSysReLogin.Name = "tsmiSysReLogin"; this.tsmiSysReLogin.Name = "tsmiSysReLogin";
this.tsmiSysReLogin.Size = new System.Drawing.Size(180, 22); this.tsmiSysReLogin.Size = new System.Drawing.Size(124, 22);
this.tsmiSysReLogin.Text = "重新登录"; this.tsmiSysReLogin.Text = "重新登录";
// //
// tsmiSysExit // tsmiSysExit
// //
this.tsmiSysExit.Name = "tsmiSysExit"; this.tsmiSysExit.Name = "tsmiSysExit";
this.tsmiSysExit.Size = new System.Drawing.Size(180, 22); this.tsmiSysExit.Size = new System.Drawing.Size(124, 22);
this.tsmiSysExit.Text = "退出系统"; this.tsmiSysExit.Text = "退出系统";
// //
// toolStripMenuItem2 // toolStripMenuItem2
...@@ -233,13 +235,13 @@ ...@@ -233,13 +235,13 @@
// tsmiAccPasswordMgr // tsmiAccPasswordMgr
// //
this.tsmiAccPasswordMgr.Name = "tsmiAccPasswordMgr"; this.tsmiAccPasswordMgr.Name = "tsmiAccPasswordMgr";
this.tsmiAccPasswordMgr.Size = new System.Drawing.Size(180, 22); this.tsmiAccPasswordMgr.Size = new System.Drawing.Size(124, 22);
this.tsmiAccPasswordMgr.Text = "密码管理"; this.tsmiAccPasswordMgr.Text = "密码管理";
// //
// tsmiAccPersonalSetting // tsmiAccPersonalSetting
// //
this.tsmiAccPersonalSetting.Name = "tsmiAccPersonalSetting"; this.tsmiAccPersonalSetting.Name = "tsmiAccPersonalSetting";
this.tsmiAccPersonalSetting.Size = new System.Drawing.Size(180, 22); this.tsmiAccPersonalSetting.Size = new System.Drawing.Size(124, 22);
this.tsmiAccPersonalSetting.Text = "个人设置"; this.tsmiAccPersonalSetting.Text = "个人设置";
// //
// toolStripMenuItem3 // toolStripMenuItem3
...@@ -254,13 +256,13 @@ ...@@ -254,13 +256,13 @@
// tsmiHelpDocument // tsmiHelpDocument
// //
this.tsmiHelpDocument.Name = "tsmiHelpDocument"; this.tsmiHelpDocument.Name = "tsmiHelpDocument";
this.tsmiHelpDocument.Size = new System.Drawing.Size(180, 22); this.tsmiHelpDocument.Size = new System.Drawing.Size(124, 22);
this.tsmiHelpDocument.Text = "帮助文档"; this.tsmiHelpDocument.Text = "帮助文档";
// //
// tsmiHelpAboutUs // tsmiHelpAboutUs
// //
this.tsmiHelpAboutUs.Name = "tsmiHelpAboutUs"; this.tsmiHelpAboutUs.Name = "tsmiHelpAboutUs";
this.tsmiHelpAboutUs.Size = new System.Drawing.Size(180, 22); this.tsmiHelpAboutUs.Size = new System.Drawing.Size(124, 22);
this.tsmiHelpAboutUs.Text = "关于我们"; this.tsmiHelpAboutUs.Text = "关于我们";
// //
// Header // Header
...@@ -457,12 +459,6 @@ ...@@ -457,12 +459,6 @@
this.timer1.Interval = 1000; this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick); this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
// //
// tsmiSysUpdateLog
//
this.tsmiSysUpdateLog.Name = "tsmiSysUpdateLog";
this.tsmiSysUpdateLog.Size = new System.Drawing.Size(180, 22);
this.tsmiSysUpdateLog.Text = "更新记录";
//
// wMain // wMain
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
......
...@@ -445,7 +445,7 @@ namespace Tools ...@@ -445,7 +445,7 @@ namespace Tools
{ {
Text = m.Text, Text = m.Text,
ToolTipText = m.ToolTipText, ToolTipText = m.ToolTipText,
ImageIndex = 1, ImageIndex = m.ImageIndex % this.imageList1.Images.Count,
Group = grp, Group = grp,
Tag = m.ViewFormType, Tag = m.ViewFormType,
}); });
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment