apeart / paste-apeart master
commits列表
30 项
- 2026-10-29
- 2026-10-28
- 2026-10-27
- 2026-10-27
- 2026-10-23
- 2026-10-22
- 2026-10-19
- 2026-10-17
- 2026-10-17
- 2026-10-17
- 2026-10-16
- 2026-10-15
- 2026-10-13
- 2026-10-13
- 2026-10-12
- 2026-10-11
- 2026-10-09
- 2026-09-30
- 2026-09-29
- 2026-09-26
- 2026-09-25
- 2026-09-25
- 2026-09-24
- 2026-09-23
- 2026-09-22
- 2026-09-22
- 2026-09-22
- 2026-09-21
- 2026-09-21
- 2026-09-21
提交内容
10/10
阶段性升级
example/ExampleApeart.Application.Contracts/ExampleApeart.Application.Contracts.csproj
diff --git a/example/ExampleApeart.Application.Contracts/ExampleApeart.Application.Contracts.csproj b/example/ExampleApeart.Application.Contracts/ExampleApeart.Application.Contracts.csproj
index e866f62..021b642 100644
--- a/example/ExampleApeart.Application.Contracts/ExampleApeart.Application.Contracts.csproj
+++ b/example/ExampleApeart.Application.Contracts/ExampleApeart.Application.Contracts.csproj
@@ -23,5 +23,9 @@
<ItemGroup>
<ProjectReference Include="..\ExampleApeart.Domain\ExampleApeart.Domain.csproj" />
</ItemGroup>
+
+ <ItemGroup>
+ <Folder Include="testmodels\" />
+ </ItemGroup>
</Project>
example/ExampleApeart.Application.Contracts/usermodels/GradeInfoDto.cs
diff --git a/example/ExampleApeart.Application.Contracts/usermodels/GradeInfoDto.cs b/example/ExampleApeart.Application.Contracts/usermodels/GradeInfoDto.cs
index 1fba618..1f619c1 100644
--- a/example/ExampleApeart.Application.Contracts/usermodels/GradeInfoDto.cs
+++ b/example/ExampleApeart.Application.Contracts/usermodels/GradeInfoDto.cs
@@ -47,6 +47,19 @@ namespace ExampleApeart.usermodels
///</summary>
[Description("状态")]
public bool IsEnable { get; set; } = true;
+
+ /// <summary>
+ /// int 模拟输入多个int,使用,分割
+ /// </summary>
+ [PasteSplit(",")]
+ public int[] ids { get; set; }
+
+ /// <summary>
+ /// DateTime 模拟输入多个DateTime,使用;分割
+ /// </summary>
+ [PasteSplit(";")]
+ public DateTime[] dates { get; set; }
+
}
///<summary>
@@ -171,7 +184,7 @@ namespace ExampleApeart.usermodels
///名称
///</summary>
[MaxLength(16)]
- [PasteField("Name","()")]
+ [PasteField("Name", "()")]
[Description("名称 基于名称查询")]
public string Name { get; set; }
example/ExampleApeart.EntityFrameworkCore/Migrations/20260922014413_add_new_column.Designer.cs
diff --git a/example/ExampleApeart.EntityFrameworkCore/Migrations/20260922014413_add_new_column.Designer.cs b/example/ExampleApeart.EntityFrameworkCore/Migrations/20260922014413_add_new_column.Designer.cs
new file mode 100644
index 0000000..7df68ed
--- /dev/null
+++ b/example/ExampleApeart.EntityFrameworkCore/Migrations/20260922014413_add_new_column.Designer.cs
@@ -0,0 +1,200 @@
+// <auto-generated />
+using System;
+using ExampleApeart.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace ExampleApeart.EntityFrameworkCore.Migrations
+{
+ [DbContext(typeof(SqliteDb))]
+ [Migration("20260922014413_add_new_column")]
+ partial class add_new_column
+ {
+ /// <inheritdoc />
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder.HasAnnotation("ProductVersion", "8.0.19");
+
+ modelBuilder.Entity("ExampleApeart.usermodels.GradeInfo", b =>
+ {
+ b.Property<int>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("INTEGER");
+
+ b.Property<string>("Code")
+ .HasMaxLength(8)
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Desc")
+ .HasMaxLength(64)
+ .HasColumnType("TEXT");
+
+ b.Property<bool>("IsEnable")
+ .HasColumnType("INTEGER");
+
+ b.Property<string>("Mark")
+ .HasMaxLength(64)
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Name")
+ .IsRequired()
+ .HasMaxLength(16)
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("Name")
+ .IsUnique();
+
+ b.ToTable("PTGradeInfo", (string)null);
+ });
+
+ modelBuilder.Entity("ExampleApeart.usermodels.GradeRole", b =>
+ {
+ b.Property<int>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("GradeId")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("RoleId")
+ .HasColumnType("INTEGER");
+
+ b.HasKey("Id");
+
+ b.ToTable("PTGradeRole", null, t =>
+ {
+ t.HasComment("角色权限");
+ });
+ });
+
+ modelBuilder.Entity("ExampleApeart.usermodels.RoleInfo", b =>
+ {
+ b.Property<int>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("INTEGER");
+
+ b.Property<string>("Desc")
+ .HasMaxLength(64)
+ .HasColumnType("TEXT");
+
+ b.Property<int>("FatherId")
+ .HasColumnType("INTEGER");
+
+ b.Property<string>("FatherStr")
+ .HasMaxLength(64)
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Icon")
+ .HasMaxLength(32)
+ .HasColumnType("TEXT");
+
+ b.Property<bool>("IsDefault")
+ .HasColumnType("INTEGER");
+
+ b.Property<bool>("IsEnable")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("Level")
+ .HasColumnType("INTEGER");
+
+ b.Property<string>("Model")
+ .HasMaxLength(16)
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Name")
+ .HasMaxLength(16)
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Path")
+ .HasMaxLength(128)
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Role")
+ .HasMaxLength(16)
+ .HasColumnType("TEXT");
+
+ b.Property<int>("RoleType")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("Sort")
+ .HasColumnType("INTEGER");
+
+ b.Property<string>("SortStr")
+ .HasMaxLength(20)
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.ToTable("PTRoleInfo", (string)null);
+ });
+
+ modelBuilder.Entity("ExampleApeart.usermodels.UserGrade", b =>
+ {
+ b.Property<int>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("GradeId")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("UserId")
+ .HasColumnType("INTEGER");
+
+ b.HasKey("Id");
+
+ b.ToTable("PTUserGrade", (string)null);
+ });
+
+ modelBuilder.Entity("ExampleApeart.usermodels.UserInfo", b =>
+ {
+ b.Property<int>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("INTEGER");
+
+ b.Property<DateTime>("CreateDate")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Desc")
+ .HasMaxLength(64)
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Email")
+ .HasMaxLength(64)
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Head")
+ .HasMaxLength(128)
+ .HasColumnType("TEXT");
+
+ b.Property<bool>("IsEnable")
+ .HasColumnType("INTEGER");
+
+ b.Property<string>("Name")
+ .HasMaxLength(32)
+ .HasColumnType("TEXT");
+
+ b.Property<string>("PassWord")
+ .HasMaxLength(64)
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("Email")
+ .IsUnique();
+
+ b.ToTable("PTUserInfo", null, t =>
+ {
+ t.HasComment("登录用户表");
+ });
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
example/ExampleApeart.EntityFrameworkCore/Migrations/20260922014413_add_new_column.cs
diff --git a/example/ExampleApeart.EntityFrameworkCore/Migrations/20260922014413_add_new_column.cs b/example/ExampleApeart.EntityFrameworkCore/Migrations/20260922014413_add_new_column.cs
new file mode 100644
index 0000000..d47d7cc
--- /dev/null
+++ b/example/ExampleApeart.EntityFrameworkCore/Migrations/20260922014413_add_new_column.cs
@@ -0,0 +1,58 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ExampleApeart.EntityFrameworkCore.Migrations
+{
+ /// <inheritdoc />
+ public partial class add_new_column : Migration
+ {
+ /// <inheritdoc />
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.RenameColumn(
+ name: "UserName",
+ table: "PTUserInfo",
+ newName: "Name");
+
+ migrationBuilder.RenameColumn(
+ name: "UserHead",
+ table: "PTUserInfo",
+ newName: "Head");
+
+ migrationBuilder.RenameColumn(
+ name: "RootId",
+ table: "PTRoleInfo",
+ newName: "IsDefault");
+
+ migrationBuilder.AlterTable(
+ name: "PTGradeRole",
+ comment: "角色权限",
+ oldComment: "角色绑定权限");
+ }
+
+ /// <inheritdoc />
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.RenameColumn(
+ name: "Name",
+ table: "PTUserInfo",
+ newName: "UserName");
+
+ migrationBuilder.RenameColumn(
+ name: "Head",
+ table: "PTUserInfo",
+ newName: "UserHead");
+
+ migrationBuilder.RenameColumn(
+ name: "IsDefault",
+ table: "PTRoleInfo",
+ newName: "RootId");
+
+ migrationBuilder.AlterTable(
+ name: "PTGradeRole",
+ comment: "角色绑定权限",
+ oldComment: "角色权限");
+ }
+ }
+}
example/ExampleApeart.EntityFrameworkCore/Migrations/SqliteDbModelSnapshot.cs
diff --git a/example/ExampleApeart.EntityFrameworkCore/Migrations/SqliteDbModelSnapshot.cs b/example/ExampleApeart.EntityFrameworkCore/Migrations/SqliteDbModelSnapshot.cs
index cbb454c..1d438e5 100644
--- a/example/ExampleApeart.EntityFrameworkCore/Migrations/SqliteDbModelSnapshot.cs
+++ b/example/ExampleApeart.EntityFrameworkCore/Migrations/SqliteDbModelSnapshot.cs
@@ -24,7 +24,7 @@ namespace ExampleApeart.EntityFrameworkCore.Migrations
.HasColumnType("INTEGER");
b.Property<string>("Code")
- .HasMaxLength(4)
+ .HasMaxLength(8)
.HasColumnType("TEXT");
b.Property<string>("Desc")
@@ -67,7 +67,7 @@ namespace ExampleApeart.EntityFrameworkCore.Migrations
b.ToTable("PTGradeRole", null, t =>
{
- t.HasComment("角色绑定权限");
+ t.HasComment("角色权限");
});
});
@@ -92,6 +92,9 @@ namespace ExampleApeart.EntityFrameworkCore.Migrations
.HasMaxLength(32)
.HasColumnType("TEXT");
+ b.Property<bool>("IsDefault")
+ .HasColumnType("INTEGER");
+
b.Property<bool>("IsEnable")
.HasColumnType("INTEGER");
@@ -117,9 +120,6 @@ namespace ExampleApeart.EntityFrameworkCore.Migrations
b.Property<int>("RoleType")
.HasColumnType("INTEGER");
- b.Property<int>("RootId")
- .HasColumnType("INTEGER");
-
b.Property<int>("Sort")
.HasColumnType("INTEGER");
@@ -166,19 +166,19 @@ namespace ExampleApeart.EntityFrameworkCore.Migrations
.HasMaxLength(64)
.HasColumnType("TEXT");
+ b.Property<string>("Head")
+ .HasMaxLength(128)
+ .HasColumnType("TEXT");
+
b.Property<bool>("IsEnable")
.HasColumnType("INTEGER");
- b.Property<string>("PassWord")
- .HasMaxLength(64)
- .HasColumnType("TEXT");
-
- b.Property<string>("UserHead")
- .HasMaxLength(128)
+ b.Property<string>("Name")
+ .HasMaxLength(32)
.HasColumnType("TEXT");
- b.Property<string>("UserName")
- .HasMaxLength(32)
+ b.Property<string>("PassWord")
+ .HasMaxLength(64)
.HasColumnType("TEXT");
b.HasKey("Id");
example/ExampleApeart.HttpApi.Host/ExampleApeart.Application.Contracts.xml
diff --git a/example/ExampleApeart.HttpApi.Host/ExampleApeart.Application.Contracts.xml b/example/ExampleApeart.HttpApi.Host/ExampleApeart.Application.Contracts.xml
index 2c69a21..e0f3d07 100644
--- a/example/ExampleApeart.HttpApi.Host/ExampleApeart.Application.Contracts.xml
+++ b/example/ExampleApeart.HttpApi.Host/ExampleApeart.Application.Contracts.xml
@@ -104,6 +104,16 @@
状态
</summary>
</member>
+ <member name="P:ExampleApeart.usermodels.GradeInfoAddDto.ids">
+ <summary>
+ int 模拟输入多个int,使用,分割
+ </summary>
+ </member>
+ <member name="P:ExampleApeart.usermodels.GradeInfoAddDto.dates">
+ <summary>
+ DateTime 模拟输入多个DateTime,使用;分割
+ </summary>
+ </member>
<member name="T:ExampleApeart.usermodels.GradeInfoUpdateDto">
<summary>
角色信息 一个账号可以绑定多个角色,角色绑定权限
example/ExampleApeart.HttpApi.Host/ExampleApeart.EntityFrameworkCore.xml
diff --git a/example/ExampleApeart.HttpApi.Host/ExampleApeart.EntityFrameworkCore.xml b/example/ExampleApeart.HttpApi.Host/ExampleApeart.EntityFrameworkCore.xml
index d34a376..113c23c 100644
--- a/example/ExampleApeart.HttpApi.Host/ExampleApeart.EntityFrameworkCore.xml
+++ b/example/ExampleApeart.HttpApi.Host/ExampleApeart.EntityFrameworkCore.xml
@@ -197,6 +197,18 @@
<member name="M:ExampleApeart.EntityFrameworkCore.Migrations.database_init.BuildTargetModel(Microsoft.EntityFrameworkCore.ModelBuilder)">
<inheritdoc />
</member>
+ <member name="T:ExampleApeart.EntityFrameworkCore.Migrations.add_new_column">
+ <inheritdoc />
+ </member>
+ <member name="M:ExampleApeart.EntityFrameworkCore.Migrations.add_new_column.Up(Microsoft.EntityFrameworkCore.Migrations.MigrationBuilder)">
+ <inheritdoc />
+ </member>
+ <member name="M:ExampleApeart.EntityFrameworkCore.Migrations.add_new_column.Down(Microsoft.EntityFrameworkCore.Migrations.MigrationBuilder)">
+ <inheritdoc />
+ </member>
+ <member name="M:ExampleApeart.EntityFrameworkCore.Migrations.add_new_column.BuildTargetModel(Microsoft.EntityFrameworkCore.ModelBuilder)">
+ <inheritdoc />
+ </member>
<member name="T:ExampleApeart.EntityFrameworkCore.Migrations.MyAuditingDbMigrations.audit_data_init">
<inheritdoc />
</member>
manage/page/pasteform/index.css
diff --git a/manage/page/pasteform/index.css b/manage/page/pasteform/index.css
index 9ad8323..18d42da 100644
--- a/manage/page/pasteform/index.css
+++ b/manage/page/pasteform/index.css
@@ -219,7 +219,6 @@ body {
overflow: hidden;
margin-top: 8px !important;
line-height: 30px;
- margin-right: 100px;
}
.page_foot .totalsum {
min-width: 100px;
@@ -243,6 +242,12 @@ body {
.page_foot .totalsum .name::after {
content: ':';
}
+.page_foot .pagination-select {
+ border-radius: 4px;
+}
+.page_foot li {
+ border-radius: 4px;
+}
.pagenumarea {
width: auto;
}
manage/page/pasteform/index.less
diff --git a/manage/page/pasteform/index.less b/manage/page/pasteform/index.less
index 12cbc15..655496a 100644
--- a/manage/page/pasteform/index.less
+++ b/manage/page/pasteform/index.less
@@ -1,4 +1,5 @@
@charset "UTF-8";
+
*::-webkit-scrollbar {
/*滚动条整体样式*/
width: 8px;
@@ -267,7 +268,6 @@ body {
overflow: hidden;
margin-top: 8px !important;
line-height: 30px;
- margin-right: 100px;
.totalsum {
min-width: 100px;
@@ -294,6 +294,14 @@ body {
}
}
}
+
+ .pagination-select {
+ border-radius: 4px;
+ }
+
+ li {
+ border-radius: 4px;
+ }
}
@@ -557,6 +565,7 @@ body {
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
+
&:focus {
border: 1px solid #888;
}
manage/page/pasteform/readme.md
diff --git a/manage/page/pasteform/readme.md b/manage/page/pasteform/readme.md
index fde0e33..23e1fec 100644
--- a/manage/page/pasteform/readme.md
+++ b/manage/page/pasteform/readme.md
@@ -1569,4 +1569,9 @@ public class UserInfoListDto{
## 26.09.08
1.修复之前的[]的selects的query问题，单个的时候直接显示，不显示数量(1) 多个的时候才显示！
2.datetime,如果已经有daterange的时候，则不进行datetime的处理，其实PasteDaterange和PasteDate是互斥的！
+
+## 26.09.09
+ 1.调整页面的页面区域的样式border-raduis:4px;
+ 2.修复1中的宽度问题，不知道啥时候设置的margin-right:100px;
+
\ No newline at end of file