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
提交内容
6/6
时间框样式调整！
abp_example/ExampleForm.Application/ExampleApeartDefaultService.cs
diff --git a/abp_example/ExampleForm.Application/ExampleApeartDefaultService.cs b/abp_example/ExampleForm.Application/ExampleApeartDefaultService.cs
index fd22a9c..fb69feb 100644
--- a/abp_example/ExampleForm.Application/ExampleApeartDefaultService.cs
+++ b/abp_example/ExampleForm.Application/ExampleApeartDefaultService.cs
@@ -8,7 +8,7 @@ using PasteApeart.Application.Contracts;
namespace ExampleForm.Application
{
/// <summary>
- ///
+ /// 默认接口的辅助实现
/// </summary>
public class ExampleFormDefaultService : PasteDefaultAppService
{
abp_example/ExampleForm.Application/ExampleFormApplicationModule.cs
diff --git a/abp_example/ExampleForm.Application/ExampleFormApplicationModule.cs b/abp_example/ExampleForm.Application/ExampleFormApplicationModule.cs
index 89035ec..98b5b9f 100644
--- a/abp_example/ExampleForm.Application/ExampleFormApplicationModule.cs
+++ b/abp_example/ExampleForm.Application/ExampleFormApplicationModule.cs
@@ -1,16 +1,13 @@
using ExampleForm.Application;
using ExampleForm.Handler;
using ExampleForm.usermodels;
-using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.DependencyInjection;
using PasteApeart.Application;
using PasteApeart.Helper;
-//using PasteApeart.Helper;
using Volo.Abp.Application;
using Volo.Abp.Application.Dtos;
using Volo.Abp.AutoMapper;
-//using Volo.Abp.AutoMapper;
using Volo.Abp.Modularity;
namespace ExampleForm
@@ -54,12 +51,12 @@ namespace ExampleForm
//ExampleFormDefaultService
context.Services.AddScoped<IPasteDefaultAppService, ExampleFormDefaultService>();
- //context.Services.AddScoped<IPasteDefaultAppService, PasteDefaultAppService>(sp =>
- // new PasteDefaultAppService(
- // sp.GetRequiredService<IPasteDefaultHelper>(),
- // sp.GetRequiredService<IExampleFormDbContext>().As<DbContext>()
- // )
- // );
+ //context.Services.AddScoped<IPasteDefaultAppService, PasteDefaultAppService>(sp =>
+ // new PasteDefaultAppService(
+ // sp.GetRequiredService<IPasteDefaultHelper>(),
+ // sp.GetRequiredService<IExampleFormDbContext>().As<DbContext>()
+ // )
+ // );
}
}
example/ExampleApeart.Application.Contracts/usermodels/RoleInfoDto.cs
diff --git a/example/ExampleApeart.Application.Contracts/usermodels/RoleInfoDto.cs b/example/ExampleApeart.Application.Contracts/usermodels/RoleInfoDto.cs
index 6ca814b..813d49c 100644
--- a/example/ExampleApeart.Application.Contracts/usermodels/RoleInfoDto.cs
+++ b/example/ExampleApeart.Application.Contracts/usermodels/RoleInfoDto.cs
@@ -620,6 +620,7 @@ namespace ExampleApeart.usermodels
/// 排序 这个字段是隐藏的
/// </summary>
[PasteHidden]
+ [PasteQuery("orderby", true)]
[Description("排序 这个字段是隐藏的")]
public new string orderby { get; set; } = "SortStr";
manage/page/pasteform/index.html
diff --git a/manage/page/pasteform/index.html b/manage/page/pasteform/index.html
index cb97146..1ad82cb 100644
--- a/manage/page/pasteform/index.html
+++ b/manage/page/pasteform/index.html
@@ -287,12 +287,12 @@
<%:=item.title%>
<% if(item.orderby){ %>
<span class="orderit">
- <i class="ordersell" dataval="<%:=item.orderby.asc%>">
+ <i class="ordersell <%if(_config.orderby == item.orderby.asc){%>ordered<%}%>" dataval="<%:=item.orderby.asc%>">
<svg width="10" height="16" viewBox="0 0 10 16" fill="none">
<path d="M8 4 L8 16" stroke="currentColor" stroke-width="1" stroke-linecap="round"/>
<path d="M4 8 L8 4" stroke="currentColor" stroke-width="1" stroke-linecap="round"/>
</svg>
- </i><i class="ordersell" dataval="<%:=item.orderby.desc%>">
+ </i><i class="ordersell <%if(_config.orderby == item.orderby.desc){%>ordered<%}%>" dataval="<%:=item.orderby.desc%>">
<svg width="10" height="16" viewBox="0 0 10 16" fill="none">
<path d="M2 4 L2 16" stroke="currentColor" stroke-width="1" stroke-linecap="round"/>
<path d="M2 16 L7 11" stroke="currentColor" stroke-width="1" stroke-linecap="round"/>
@@ -527,8 +527,8 @@
<!-- <script type="text/javascript" src="../lib/page.min.js"></script> -->
<script type="text/javascript" src="../lib/jquery.pagination.js"></script>
- <script type="text/javascript" src="../lib/pickerdaterange/dateRange.js"></script>
- <link rel="stylesheet" href="../lib/pickerdaterange/dateRange.css">
+ <script type="text/javascript" src="./lib/pickerdaterange/dateRange.js"></script>
+ <link rel="stylesheet" href="./lib/pickerdaterange/dateRange.css">
<script type="text/javascript" src="./form.js?v=260905"></script>
<script type="text/javascript" src="./index.js?v=260907"></script>
manage/page/pasteform/index.js
diff --git a/manage/page/pasteform/index.js b/manage/page/pasteform/index.js
index 1648011..fa4e556 100644
--- a/manage/page/pasteform/index.js
+++ b/manage/page/pasteform/index.js
@@ -78,6 +78,7 @@ var _config = {
search_after_selected: true,//搜索区域outer选择后，是否直接查询
trclass: null,//表格中trclass的字段名称，实际中这个值中去获取
batch: false,//是否启用批量操作
+ orderby:"id",//排序
update_row_min_match_rate: 0.6,//更新行数据的时候，最小匹配率，低于这个值则不进行更新
bind_with_edit: false,//绑定模式下，是否启用编辑模式
};
@@ -88,10 +89,6 @@ var _config = {
//_config.next.key _config.next.type _config.next.map
-/**
- * 排序字段 需要查询对象有orderby字段
- */
-var _orderby = "id";
/**
* 初始化事件数据等
@@ -155,7 +152,7 @@ $(window).ready(function () {
//localStorage.setItem(`${location.pathname}?path=${_classPath}`,pageSize);
//切换排序 查询基于哪个排序基于哪个
$(".table").on('click', '.ordersell', function () {
- _orderby = $(this).attr('dataval');
+ _config.orderby = $(this).attr('dataval');
$(".table").find(".ordersell").removeClass('ordered');
$(this).addClass('ordered');
readPageData(1);//直接基于这个查询第一页
@@ -1827,6 +1824,7 @@ function handlerModelFieldcolumnProperty(properties) {
asc: _attribute.args1,
desc: _attribute.args2
};
+
}
}
break;
@@ -1909,15 +1907,15 @@ function HandlerQueryItem(listproperties, pageData) {
listproperties.forEach(item => {
item.dataFrom = item.dataType;
- if (item.name == "show_type") {
- console.log('注意 show_type是表格或者图标显示的参数，当前查询会受干扰');
- }
- if (item.name == "path") {
- console.log('注意 path 是表格数据源标识，当前查询会受干扰');
- }
- if (item.name == "model") {
- console.log('注意 model是当前页面的显示类型，当前查询会受干扰');
- }
+ // if (item.name == "show_type") {
+ // console.log('注意 show_type是表格或者图标显示的参数，当前查询会受干扰');
+ // }
+ // if (item.name == "path") {
+ // console.log('注意 path 是表格数据源标识，当前查询会受干扰');
+ // }
+ // if (item.name == "model") {
+ // console.log('注意 model是当前页面的显示类型，当前查询会受干扰');
+ // }
//合并改版 旧版本
// if (item.attributes) {
@@ -2230,7 +2228,7 @@ function HandlerQueryItem(listproperties, pageData) {
if (item.name == 'orderby') {
if (item.value) {
- _orderby = item.value;
+ _config.orderby = item.value;
}
item.hidden = true;
}
@@ -2896,7 +2894,7 @@ async function readPageData(page) {
}
_info.page = page;
_info.size = _pageSize;
- _info.orderby = _orderby;
+ _info.orderby = _config.orderby;
if (typeof apigetPromise == "function") {
var read = await apigetPromise(`${auto_path()}/page`, _info);
manage/page/pasteform/lib/pickerdaterange/dateRange.css
diff --git a/manage/page/pasteform/lib/pickerdaterange/dateRange.css b/manage/page/pasteform/lib/pickerdaterange/dateRange.css
index b2367e9..bfd5fc7 100644
--- a/manage/page/pasteform/lib/pickerdaterange/dateRange.css
+++ b/manage/page/pasteform/lib/pickerdaterange/dateRange.css
@@ -289,7 +289,7 @@ input{padding:2px 0 1px;*padding:4px 0 0;_padding:4px 0 0;_height:21px;} */
}
.ta_calendar td.today{
color:#fff;
- background-position:-95px 5px;
+ background-position:-95px 4px;
}
.ta_calendar .dis{
color:#9e9e9e;
@@ -367,8 +367,12 @@ input{padding:2px 0 1px;*padding:4px 0 0;_padding:4px 0 0;_height:21px;} */
.ta_calendar table thead th.sat{border-right: 1px solid #e1e1e1;}
.ta_calendar table tbody td {
- line-height: 20px;
- padding: 4px 8px;
+ /* line-height: 20px; */
+ /* padding: 4px 8px; */
+ flex:1;
+ width:12px;
+ height:12px;
+ padding:8px;
text-align:center;
white-space:nowrap;
font-family:"Tahoma";
@@ -379,6 +383,13 @@ input{padding:2px 0 1px;*padding:4px 0 0;_padding:4px 0 0;_height:21px;} */
display: flex;
flex-direction: row;
}
+.ta_calendar_cont tr{
+ display:flex;
+ flex-direction: row;
+ td{
+ flex:1;
+ }
+}
.ta_calendar_cont .i_pre,.ta_calendar_cont .i_next{position:absolute; top:7px;}
.ta_calendar_cont .i_pre{left:10px;}
.ta_calendar_cont .i_next{right:10px;}
@@ -515,8 +526,7 @@ input{padding:2px 0 1px;*padding:4px 0 0;_padding:4px 0 0;_height:21px;} */
}
.ta_dateRangeToday{
- background-color: #099e95;
- border-radius: 50% 50%;
- color: #f2f2f2;
+ color: #11b2fd;
+ font-weight: bold;
}