-
-
+
+
@if(Model.QueryWhetherList.Count > 0){
+
+
+
+
foreach (var column in Model.QueryWhetherList) {
if(@column.EffectType == "Input" || @column.EffectType == "InputTextArea") {
-
+
-
} else if(@column.EffectType == "InputNumber") {
-
+
-
} else if(@column.EffectType == "fk") {
-
+
} else if(@column.EffectType == "Select") {
-
+
-
+
} else if(@column.EffectType == "EnumSelector") {
-
+
-
+
} else if(@column.EffectType == "DatePicker") {
-
+
@if(@column.QueryType == "~"){
@:
- 查询
+ 查询
重置
+ 高级查询
+ 隐藏
-
+
新增
@@ -147,11 +154,7 @@
@:
@: {{dv('@(@column.DictTypeCode)', row.@column.LowerPropertyName)?.name}}
@:
- } else if(@column.EffectType == "DatePicker") {
- @:
- @:{{ formatDate(new Date(row.@(@column.LowerPropertyName)), 'YYYY-mm-dd') }}
- @:
- }
+ }
}
}
@@ -170,15 +173,6 @@
@@ -191,8 +185,10 @@
import { onMounted, reactive, ref } from 'vue';
import { ElMessageBox, ElMessage } from "element-plus";
import { auth } from '/@@/utils/authFunction';
-import { VxeGridInstance, VxePagerEvents, VxePagerDefines } from 'vxe-table';
-import { useVxeTable } from '/@@/hooks/vxeTableOptionsHook';
+
+import { VxeGridInstance, VxeGridListeners, VxeGridPropTypes } from 'vxe-table';
+import { useVxeTable } from '/@@/hooks/useVxeTableOptionsHook';
+import { Local } from '/@@/utils/storage';
@if(@Model.TableField.Any(x=>x.EffectType == "ConstSelector")){
@:import { codeToName, getConstType } from "/@@/utils/constHelper";
@@ -218,14 +214,24 @@ import PrintDialog from '/@@/views/system/print/component/hiprint/preview.vue';
import EditDialog from '/@@/views/@(@Model.PagePath)/@(@Model.LowerClassName)/component/editDialog.vue';
import ModifyRecord from '/@@/components/table/modifyRecord.vue';
+@if (@Model.IsApiService) {
// 接口函数
-import { getAPI } from '/@@/utils/axios-utils';
+@:import { getAPI } from '/@@/utils/axios-utils';
// 接口
-import { @(@Model.ClassName)Api } from '/@@/api-services/api';
+@:import { @(@Model.ClassName)Api } from '/@@/api-services/api';
// 模型
-import { @(@Model.ClassName), @(@Model.ClassName)Input, @(@Model.ClassName)Output } from '/@@/api-services/models';
+@:import { @(@Model.ClassName), @(@Model.ClassName)Input, @(@Model.ClassName)Output } from '/@@/api-services/models';
+
+} else {
+@:import { page@(@Model.ClassName), delete@(@Model.ClassName) } from '/@@/api/@(@Model.PagePath)/@(@Model.LowerClassName)';
+foreach (var column in Model.QueryWhetherList){
+ if(@column.EffectType == "fk"){
+ @:import { get@(@column.FkEntityName)@(@column.PropertyName)Dropdown } from '/@@/api/@(@Model.PagePath)/@(@Model.LowerClassName)';
+ }
+}
+}
// 子窗口对象
const xGrid = ref();
@@ -234,108 +240,112 @@ const editDialogRef = ref>();
// 变量
const state = reactive({
+ showAdvanceQueryUI: false,
queryParams: {
+ searchKey: undefined,
@if(Model.QueryWhetherList.Count > 0) {
@foreach (var column in Model.QueryWhetherList) {
@:@(@column.LowerPropertyName): undefined,
}
}
},
- tableParams: {
- page: 1,
- pageSize: 50,
- field: 'id', // 默认的排序字段
- order: 'aes', // 排序方向
- descStr: 'desc', // 降序排序的关键字符
- total: 0 as any,
+ localPageParam: {
+ pageSize: 50 as number,
+ defaultSort: { field: 'createTime', order: 'asc', descStr: 'desc' },
},
visible: false,
title: '',
});
+// 本地存储参数
+const localPageParamKey = 'localPageParam:@(@Model.LowerClassName)';
+
+// 改变高级查询的控件显示状态
+const changeAdvanceQueryUI = () => {
+ state.showAdvanceQueryUI = !state.showAdvanceQueryUI;
+};
+
// 表格参数配置
-const options = useVxeTable<@(@Model.ClassName)>({
- id: '@(@Model.ClassName)',
- name: '@(@Model.BusName)',
- columns: [
- { type: 'seq', title: '序号', width: 60, fixed: 'left' },
- @foreach (var column in Model.TableField) {
- var whethersortable =column.WhetherSortable == "Y" ? "sortable: true" : "sortable: false";
- if(@column.WhetherTable == "Y") {
- if(@column.EffectType == "Upload" || @column.EffectType == "fk" || @column.EffectType == "ApiTreeSelect" || @column.EffectType == "Switch" || @column.EffectType == "ConstSelector") {
- if(@column.EffectType == "Upload") {
- @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_@column.LowerPropertyName' }, @whethersortable },
- } else if(@column.EffectType == "fk") {
- @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_@column.LowerPropertyName' }, @whethersortable },
- } else if(@column.EffectType == "ApiTreeSelect") {
- @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_@column.LowerPropertyName' }, @whethersortable },
- } else if(@column.EffectType == "Switch") {
- @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_@column.LowerPropertyName' }, @whethersortable },
- } else if(@column.EffectType == "ConstSelector") {
- @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_@column.LowerPropertyName' }, @whethersortable },
- }
- } else if(@column.EffectType == "Select") {
- @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_@column.LowerPropertyName' }, @whethersortable },
- } else if(@column.EffectType == "EnumSelector") {
- @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_@column.LowerPropertyName' }, @whethersortable },
- } else if(@column.EffectType == "DatePicker") {
- @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_@column.LowerPropertyName' }, @whethersortable },
- } else {
- @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', @whethersortable},
- }
- }
- }
- { field: '', title: '修改记录', width: 100, showOverflow: 'tooltip', slots: { default: 'row_record' } },
- { title: '操作', fixed: 'right', width: 180, showOverflow: true, slots: { default: 'row_buttons' } },
- ],
- enableExport: auth('@(@Model.LowerClassName):export'),
- searchCallback: () => handleQuery(),
- queryAllCallback: () => fetchData({ pageSize: 99999 }),
-});
+const options = useVxeTable<@(@Model.ClassName)>(
+ {
+ id: '@(@Model.ClassName)',
+ name: '@(@Model.BusName)',
+ columns: [
+ { type: 'seq', title: '序号', width: 60, fixed: 'left' },
+ @foreach (var column in Model.TableField) {
+ var whethersortable =column.WhetherSortable == "Y" ? "sortable: true" : "sortable: false";
+ if(@column.WhetherTable == "Y") {
+ if(@column.EffectType == "Upload" || @column.EffectType == "fk" || @column.EffectType == "ApiTreeSelect" || @column.EffectType == "Switch" || @column.EffectType == "ConstSelector") {
+ if(@column.EffectType == "Upload") {
+ @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_@column.LowerPropertyName' }, @whethersortable },
+ } else if(@column.EffectType == "fk") {
+ @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_@column.LowerPropertyName' }, @whethersortable },
+ } else if(@column.EffectType == "ApiTreeSelect") {
+ @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_@column.LowerPropertyName' }, @whethersortable },
+ } else if(@column.EffectType == "Switch") {
+ @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_@column.LowerPropertyName' }, @whethersortable },
+ } else if(@column.EffectType == "ConstSelector") {
+ @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_@column.LowerPropertyName' }, @whethersortable },
+ }
+ } else if(@column.EffectType == "Select") {
+ @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_@column.LowerPropertyName' }, @whethersortable },
+ } else if(@column.EffectType == "EnumSelector") {
+ @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_@column.LowerPropertyName' }, @whethersortable },
+ } else if(@column.EffectType == "DatePicker") {
+ @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', formatter: ({ cellValue }) => formatDate(new Date(cellValue), 'YYYY-mm-dd HH:MM:SS'), @whethersortable },
+ } else {
+ @:{ field: '@column.LowerPropertyName', title: '@column.ColumnComment', minWidth: 100, showOverflow: 'tooltip', @whethersortable},
+ }
+ }
+ }
+ { field: '', title: '修改记录', width: 100, showOverflow: 'tooltip', slots: { default: 'row_record' } },
+ { title: '操作', fixed: 'right', width: 180, showOverflow: true, slots: { default: 'row_buttons' } },
+ ],
+ },
+ // vxeGrid配置参数(此处可覆写任何参数)，参考vxe-table官方文档
+ {
+ // 代理配置
+ proxyConfig: { autoLoad: true, ajax: { query: ({ page, sort }) => handleQueryApi(page, sort) } },
+ // 排序配置
+ sortConfig: { defaultSort: Local.get(localPageParamKey)?.defaultSort || state.localPageParam.defaultSort },
+ // 分页配置
+ pagerConfig: { pageSize: Local.get(localPageParamKey)?.pageSize || state.localPageParam.pageSize },
+ // 工具栏配置
+ toolbarConfig: { export: false },
+ // 行设置
+ rowConfig: { height: 80 },
+ }
+);
// 页面初始化
onMounted(async () => {
await handleQuery();
});
-// 查询操作
-const handleQuery = async (reset = false) => {
- options.loading = true;
- if (reset) state.tableParams.page = 1;
- var res = await fetchData(null);
- xGrid.value?.loadData(res.data.result?.items ?? []);
- state.tableParams.total = res.data.result?.total;
- options.loading = false;
+// 查询api
+const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, sort: VxeGridPropTypes.ProxyAjaxQuerySortCheckedParams) => {
+ const params = Object.assign(state.queryParams, { page: page.currentPage, pageSize: page.pageSize, field: sort.field, order: sort.order, descStr: 'desc' }) as @(@Model.ClassName)Input;
+ @if (@Model.IsApiService) {
+ @:return getAPI(@(@Model.ClassName)Api).api@(@Model.ClassName)PagePost(params);
+ } else {
+ @:return page@(@Model.ClassName)(params);
+ }
};
-// 获取数据
-const fetchData = async (tableParams: any) => {
- let params = Object.assign(state.queryParams, state.tableParams, tableParams);
- return getAPI(@(@Model.ClassName)Api).api@(@Model.ClassName)PagePost(params);
+// 查询操作
+const handleQuery = async (reset = false) => {
+ await xGrid.value?.commitProxy('query');
};
// 重置操作
-const resetQuery = () => {
+const resetQuery = async () => {
+ state.queryParams.searchKey = undefined,
@if(Model.QueryWhetherList.Count > 0) {
@foreach (var column in Model.QueryWhetherList) {
@:state.queryParams.@(@column.LowerPropertyName) = undefined,
}
}
- handleQuery(true);
-};
-
-// 改变页码序号或页面容量
-const pageChange: VxePagerEvents.PageChange = ({ currentPage, pageSize }: VxePagerDefines.PageChangeEventParams) => {
- state.tableParams.page = currentPage;
- state.tableParams.pageSize = pageSize;
- handleQuery();
-};
-
-// 列排序
-const sortChange = (options: any) => {
- state.tableParams.field = options.field;
- state.tableParams.order = options.order;
- handleQuery();
+ await xGrid.value?.commitProxy('reload');
};
// 打开新增页面
@@ -354,7 +364,11 @@ const handleEdit = (row: any) => {
const handlePrint = async (row: any) => {
state.title = '打印@(@Model.BusName)';
@if(@Model.PrintType == "custom"){
+ if (@Model.IsApiService) {
@:var res = await getAPI(SysPrintApi).apiSysPrintPrintNameGet('@Model.PrintName');
+ } else {
+ @:var res = await getPrint@(@Model.ClassName)(row);
+ }
@:var printTemplate = res.data.result as SysPrint;
@:var template = JSON.parse(printTemplate.template);
@:var width = template.panels[0].width;
@@ -375,13 +389,31 @@ const handleDelete = (row: any) => {
cancelButtonText: '取消',
type: 'warning',
}).then(async () => {
- await getAPI(@(@Model.ClassName)Api).api@(@Model.ClassName)DeletePost({ id: row.id });
+ @if (@Model.IsApiService) {
+ @:await getAPI(@(@Model.ClassName)Api).api@(@Model.ClassName)DeletePost({ id: row.id });
+ } else {
+ @:await delete@(@Model.ClassName)(row);
+ }
handleQuery();
ElMessage.success('删除成功');
})
.catch(() => {});
};
+// 表格事件
+const gridEvents: VxeGridListeners<@(@Model.ClassName)> = {
+ // 只对 pager-config 配置时有效，分页发生改变时会触发该事件
+ async pageChange({ pageSize }) {
+ state.localPageParam.pageSize = pageSize;
+ Local.set(localPageParamKey, state.localPageParam);
+ },
+ // 当排序条件发生变化时会触发该事件
+ async sortChange({ field, order }) {
+ state.localPageParam.defaultSort = { field: field, order: order!, descStr: 'desc' };
+ Local.set(localPageParamKey, state.localPageParam);
+ },
+};
+
@foreach (var column in Model.QueryWhetherList) {
@if(@column.EffectType == "fk") {
@:const @LowerFirstLetter(@column.FkEntityName)@(@column.PropertyName)DropdownList = ref([]);
diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Const/DingTalkConst.cs b/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Const/DingTalkConst.cs
index 9df79af4..4547390e 100644
--- a/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Const/DingTalkConst.cs
+++ b/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Const/DingTalkConst.cs
@@ -36,10 +36,12 @@ public class DingTalkConst
/// 主部门Id
///
public const string DeptId = "sys00-mainDeptId";
+
///
/// 主部门
///
public const string Dept = "sys00-mainDept";
+
///
/// 职位
///
diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Entity/DingTalkUser.cs b/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Entity/DingTalkUser.cs
index fee3251c..fe2f0137 100644
--- a/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Entity/DingTalkUser.cs
+++ b/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Entity/DingTalkUser.cs
@@ -73,23 +73,25 @@ public class DingTalkUser : EntityBase
[SugarColumn(ColumnDescription = "工号", Length = 16)]
[MaxLength(16)]
public string? JobNumber { get; set; }
+
///
/// 主部门Id
///
[SugarColumn(ColumnDescription = "主部门Id", Length = 16)]
[MaxLength(16)]
public string? DeptId { get; set; }
+
///
/// 主部门
///
[SugarColumn(ColumnDescription = "主部门", Length = 16)]
[MaxLength(16)]
public string? Dept { get; set; }
+
///
/// 职位
///
[SugarColumn(ColumnDescription = "职位", Length = 16)]
[MaxLength(16)]
public string? Position { get; set; }
-
}
\ No newline at end of file
diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Service/DingTalkService.cs b/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Service/DingTalkService.cs
index 02322eda..71365f0c 100644
--- a/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Service/DingTalkService.cs
+++ b/Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Service/DingTalkService.cs
@@ -43,7 +43,7 @@ public class DingTalkService : IDynamicApiController, IScoped
///
///
/// > GetDingTalkCurrentEmployeesList(string access_token, [Required] GetDingTalkCurrentEmployeesListInput input)
{
return await _dingTalkApi.GetDingTalkCurrentEmployeesList(access_token, input);
@@ -55,7 +55,7 @@ public class DingTalkService : IDynamicApiController, IScoped
///
///
/// >> GetDingTalkCurrentEmployeesRosterList(string access_token, [Required] GetDingTalkCurrentEmployeesRosterListInput input)
{
return await _dingTalkApi.GetDingTalkCurrentEmployeesRosterList(access_token, input);
diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.GoView/Entity/GoViewPro.cs b/Admin.NET/Plugins/Admin.NET.Plugin.GoView/Entity/GoViewPro.cs
index 023d5c9b..0594ca67 100644
--- a/Admin.NET/Plugins/Admin.NET.Plugin.GoView/Entity/GoViewPro.cs
+++ b/Admin.NET/Plugins/Admin.NET.Plugin.GoView/Entity/GoViewPro.cs
@@ -1,4 +1,4 @@
-// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
+// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
//
// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
//
@@ -10,6 +10,7 @@ namespace Admin.NET.Plugin.GoView;
/// GoView 项目表
///
[SugarTable(null, "GoView 项目表")]
+[SysTable]
public class GoViewPro : EntityTenant
{
///
diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.GoView/Entity/GoViewProData.cs b/Admin.NET/Plugins/Admin.NET.Plugin.GoView/Entity/GoViewProData.cs
index a792c033..ab5bd036 100644
--- a/Admin.NET/Plugins/Admin.NET.Plugin.GoView/Entity/GoViewProData.cs
+++ b/Admin.NET/Plugins/Admin.NET.Plugin.GoView/Entity/GoViewProData.cs
@@ -10,6 +10,7 @@ namespace Admin.NET.Plugin.GoView;
/// GoView 项目数据表
///
[SugarTable(null, "GoView 项目数据表")]
+[SysTable]
public class GoViewProData : EntityTenant
{
///
diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.ReZero/Admin.NET.Plugin.ReZero.csproj b/Admin.NET/Plugins/Admin.NET.Plugin.ReZero/Admin.NET.Plugin.ReZero.csproj
index 78754ba0..585392af 100644
--- a/Admin.NET/Plugins/Admin.NET.Plugin.ReZero/Admin.NET.Plugin.ReZero.csproj
+++ b/Admin.NET/Plugins/Admin.NET.Plugin.ReZero/Admin.NET.Plugin.ReZero.csproj
@@ -24,7 +24,7 @@
-
diff --git a/Web/api_build/build.bat b/Web/api_build/build.bat
index ca72b6d4..f36d10e3 100644
--- a/Web/api_build/build.bat
+++ b/Web/api_build/build.bat
@@ -12,7 +12,7 @@ if exist %apiServicesPath% (
echo ================================ 开始生成 api-services ================================
-java -jar %dir%swagger-codegen-cli.jar generate -i http://localhost:5005/swagger/All%%20Groups/swagger.json -l typescript-axios -o %apiServicesPath%
+java -jar %dir%swagger-codegen-cli.jar generate -i http://localhost:5005/swagger/Default/swagger.json -l typescript-axios -o %apiServicesPath%
@rem 删除不必要的文件和文件夹
rd /s /q %apiServicesPath%.swagger-codegen
diff --git a/Web/api_build/build.sh b/Web/api_build/build.sh
index 75b792bc..f59ad4f0 100644
--- a/Web/api_build/build.sh
+++ b/Web/api_build/build.sh
@@ -14,7 +14,7 @@ fi
echo "================================ 开始生成 api-services ================================"
-java -jar "${currPath}"/swagger-codegen-cli.jar generate -i http://localhost:5005/swagger/All%20Groups/swagger.json -l typescript-axios -o "${apiServicesPath}"
+java -jar "${currPath}"/swagger-codegen-cli.jar generate -i http://localhost:5005/swagger/Default/swagger.json -l typescript-axios -o "${apiServicesPath}"
rm -rf "${apiServicesPath}".swagger-codegen
rm -f "${apiServicesPath}".gitignore
diff --git a/Web/api_build/build_all.bat b/Web/api_build/build_all.bat
new file mode 100644
index 00000000..ef0b785f
--- /dev/null
+++ b/Web/api_build/build_all.bat
@@ -0,0 +1,27 @@
+@echo off
+CHCP 65001
+
+set dir=%~dp0
+
+set apiServicesPath=%dir%..\src\api-services\
+
+if exist %apiServicesPath% (
+ echo ================================ 删除目录 api-services ================================
+ rd /s /q %apiServicesPath%
+)
+
+echo ================================ 开始生成 api-services ================================
+
+java -jar %dir%swagger-codegen-cli.jar generate -i http://localhost:5005/swagger/All%20Groups/swagger.json -l typescript-axios -o %apiServicesPath%
+
+@rem 删除不必要的文件和文件夹
+rd /s /q %apiServicesPath%.swagger-codegen
+del /q %apiServicesPath%.gitignore
+del /q %apiServicesPath%.npmignore
+del /q %apiServicesPath%.swagger-codegen-ignore
+del /q %apiServicesPath%git_push.sh
+del /q %apiServicesPath%package.json
+del /q %apiServicesPath%README.md
+del /q %apiServicesPath%tsconfig.json
+
+echo ================================ 生成结束 ================================
\ No newline at end of file
diff --git a/Web/api_build/build_all.sh b/Web/api_build/build_all.sh
new file mode 100644
index 00000000..75b792bc
--- /dev/null
+++ b/Web/api_build/build_all.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+currPath=$(pwd)
+parentPath=$(dirname "$currPath")
+apiServicesPath=${parentPath}/src/api-services/
+
+echo "================================ 生成目录 ${apiServicesPath} ================================"
+
+# 判断目录是否存在
+if test -d "$apiServicesPath"; then
+ echo "================================ 删除目录 api-services ================================"
+ rm -rf "${apiServicesPath}"
+fi
+
+echo "================================ 开始生成 api-services ================================"
+
+java -jar "${currPath}"/swagger-codegen-cli.jar generate -i http://localhost:5005/swagger/All%20Groups/swagger.json -l typescript-axios -o "${apiServicesPath}"
+
+rm -rf "${apiServicesPath}".swagger-codegen
+rm -f "${apiServicesPath}".gitignore
+rm -f "${apiServicesPath}".npmignore
+rm -f "${apiServicesPath}".swagger-codegen-ignore
+rm -f "${apiServicesPath}"git_push.sh
+rm -f "${apiServicesPath}"package.json
+rm -f "${apiServicesPath}"README.md
+rm -f "${apiServicesPath}"tsconfig.json
+
+echo "================================ 生成结束 ================================"
diff --git a/Web/api_build/build_approvalFlow.bat b/Web/api_build/build_approvalFlow.bat
new file mode 100644
index 00000000..6881dabb
--- /dev/null
+++ b/Web/api_build/build_approvalFlow.bat
@@ -0,0 +1,27 @@
+@echo off
+CHCP 65001
+
+set dir=%~dp0
+
+set apiServicesPath=%dir%..\src\api-services\_approvalFlow
+
+if exist %apiServicesPath% (
+ echo ================================ 删除目录 api-services ================================
+ rd /s /q %apiServicesPath%
+)
+
+echo ================================ 开始生成 api-services ================================
+
+java -jar %dir%swagger-codegen-cli.jar generate -i http://localhost:5005/swagger/ApprovalFlow/swagger.json -l typescript-axios -o %apiServicesPath%
+
+@rem 删除不必要的文件和文件夹
+rd /s /q %apiServicesPath%.swagger-codegen
+del /q %apiServicesPath%.gitignore
+del /q %apiServicesPath%.npmignore
+del /q %apiServicesPath%.swagger-codegen-ignore
+del /q %apiServicesPath%git_push.sh
+del /q %apiServicesPath%package.json
+del /q %apiServicesPath%README.md
+del /q %apiServicesPath%tsconfig.json
+
+echo ================================ 生成结束 ================================
\ No newline at end of file
diff --git a/Web/api_build/build_approvalFlow.sh b/Web/api_build/build_approvalFlow.sh
new file mode 100644
index 00000000..d0e651ed
--- /dev/null
+++ b/Web/api_build/build_approvalFlow.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+currPath=$(pwd)
+parentPath=$(dirname "$currPath")
+apiServicesPath=${parentPath}/src/api-services/_approvalFlow
+
+echo "================================ 生成目录 ${apiServicesPath} ================================"
+
+# 判断目录是否存在
+if test -d "$apiServicesPath"; then
+ echo "================================ 删除目录 api-services ================================"
+ rm -rf "${apiServicesPath}"
+fi
+
+echo "================================ 开始生成 api-services ================================"
+
+java -jar "${currPath}"/swagger-codegen-cli.jar generate -i http://localhost:5005/swagger/ApprovalFlow/swagger.json -l typescript-axios -o "${apiServicesPath}"
+
+rm -rf "${apiServicesPath}".swagger-codegen
+rm -f "${apiServicesPath}".gitignore
+rm -f "${apiServicesPath}".npmignore
+rm -f "${apiServicesPath}".swagger-codegen-ignore
+rm -f "${apiServicesPath}"git_push.sh
+rm -f "${apiServicesPath}"package.json
+rm -f "${apiServicesPath}"README.md
+rm -f "${apiServicesPath}"tsconfig.json
+
+echo "================================ 生成结束 ================================"
diff --git a/Web/api_build/build_dingTalk.bat b/Web/api_build/build_dingTalk.bat
new file mode 100644
index 00000000..fd5fe114
--- /dev/null
+++ b/Web/api_build/build_dingTalk.bat
@@ -0,0 +1,27 @@
+@echo off
+CHCP 65001
+
+set dir=%~dp0
+
+set apiServicesPath=%dir%..\src\api-services\_goView
+
+if exist %apiServicesPath% (
+ echo ================================ 删除目录 api-services ================================
+ rd /s /q %apiServicesPath%
+)
+
+echo ================================ 开始生成 api-services ================================
+
+java -jar %dir%swagger-codegen-cli.jar generate -i http://localhost:5005/swagger/GoView/swagger.json -l typescript-axios -o %apiServicesPath%
+
+@rem 删除不必要的文件和文件夹
+rd /s /q %apiServicesPath%.swagger-codegen
+del /q %apiServicesPath%.gitignore
+del /q %apiServicesPath%.npmignore
+del /q %apiServicesPath%.swagger-codegen-ignore
+del /q %apiServicesPath%git_push.sh
+del /q %apiServicesPath%package.json
+del /q %apiServicesPath%README.md
+del /q %apiServicesPath%tsconfig.json
+
+echo ================================ 生成结束 ================================
\ No newline at end of file
diff --git a/Web/api_build/build_dingTalk.sh b/Web/api_build/build_dingTalk.sh
new file mode 100644
index 00000000..3b051123
--- /dev/null
+++ b/Web/api_build/build_dingTalk.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+currPath=$(pwd)
+parentPath=$(dirname "$currPath")
+apiServicesPath=${parentPath}/src/api-services/_goView
+
+echo "================================ 生成目录 ${apiServicesPath} ================================"
+
+# 判断目录是否存在
+if test -d "$apiServicesPath"; then
+ echo "================================ 删除目录 api-services ================================"
+ rm -rf "${apiServicesPath}"
+fi
+
+echo "================================ 开始生成 api-services ================================"
+
+java -jar "${currPath}"/swagger-codegen-cli.jar generate -i http://localhost:5005/swagger/All%20Groups/swagger.json -l typescript-axios -o "${apiServicesPath}"
+
+rm -rf "${apiServicesPath}".swagger-codegen
+rm -f "${apiServicesPath}".gitignore
+rm -f "${apiServicesPath}".npmignore
+rm -f "${apiServicesPath}".swagger-codegen-ignore
+rm -f "${apiServicesPath}"git_push.sh
+rm -f "${apiServicesPath}"package.json
+rm -f "${apiServicesPath}"README.md
+rm -f "${apiServicesPath}"tsconfig.json
+
+echo "================================ 生成结束 ================================"
diff --git a/Web/api_build/build_goView.bat b/Web/api_build/build_goView.bat
new file mode 100644
index 00000000..fd5fe114
--- /dev/null
+++ b/Web/api_build/build_goView.bat
@@ -0,0 +1,27 @@
+@echo off
+CHCP 65001
+
+set dir=%~dp0
+
+set apiServicesPath=%dir%..\src\api-services\_goView
+
+if exist %apiServicesPath% (
+ echo ================================ 删除目录 api-services ================================
+ rd /s /q %apiServicesPath%
+)
+
+echo ================================ 开始生成 api-services ================================
+
+java -jar %dir%swagger-codegen-cli.jar generate -i http://localhost:5005/swagger/GoView/swagger.json -l typescript-axios -o %apiServicesPath%
+
+@rem 删除不必要的文件和文件夹
+rd /s /q %apiServicesPath%.swagger-codegen
+del /q %apiServicesPath%.gitignore
+del /q %apiServicesPath%.npmignore
+del /q %apiServicesPath%.swagger-codegen-ignore
+del /q %apiServicesPath%git_push.sh
+del /q %apiServicesPath%package.json
+del /q %apiServicesPath%README.md
+del /q %apiServicesPath%tsconfig.json
+
+echo ================================ 生成结束 ================================
\ No newline at end of file
diff --git a/Web/api_build/build_goView.sh b/Web/api_build/build_goView.sh
new file mode 100644
index 00000000..ea5a77cb
--- /dev/null
+++ b/Web/api_build/build_goView.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+currPath=$(pwd)
+parentPath=$(dirname "$currPath")
+apiServicesPath=${parentPath}/src/api-services/_dingTalk
+
+echo "================================ 生成目录 ${apiServicesPath} ================================"
+
+# 判断目录是否存在
+if test -d "$apiServicesPath"; then
+ echo "================================ 删除目录 api-services ================================"
+ rm -rf "${apiServicesPath}"
+fi
+
+echo "================================ 开始生成 api-services ================================"
+
+java -jar "${currPath}"/swagger-codegen-cli.jar generate -i http://localhost:5005/swagger/DingTalk/swagger.json -l typescript-axios -o "${apiServicesPath}"
+
+rm -rf "${apiServicesPath}".swagger-codegen
+rm -f "${apiServicesPath}".gitignore
+rm -f "${apiServicesPath}".npmignore
+rm -f "${apiServicesPath}".swagger-codegen-ignore
+rm -f "${apiServicesPath}"git_push.sh
+rm -f "${apiServicesPath}"package.json
+rm -f "${apiServicesPath}"README.md
+rm -f "${apiServicesPath}"tsconfig.json
+
+echo "================================ 生成结束 ================================"
diff --git a/Web/package.json b/Web/package.json
index efcffd08..467a1bfa 100644
--- a/Web/package.json
+++ b/Web/package.json
@@ -2,7 +2,7 @@
"name": "admin.net.pro",
"type": "module",
"version": "2.4.33",
- "lastBuildTime": "2024.07.09",
+ "lastBuildTime": "2024.07.14",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun",
"license": "MIT",
@@ -16,7 +16,7 @@
"@element-plus/icons-vue": "^2.3.1",
"@logicflow/core": "^1.2.27",
"@logicflow/extension": "^1.2.27",
- "@microsoft/signalr": "^8.0.0",
+ "@microsoft/signalr": "^8.0.7",
"@vue-office/docx": "^1.6.2",
"@vue-office/excel": "^1.7.8",
"@vue-office/pdf": "^2.0.2",
@@ -31,7 +31,7 @@
"echarts": "^5.5.1",
"echarts-gl": "^2.0.9",
"echarts-wordcloud": "^2.1.0",
- "element-plus": "^2.7.6",
+ "element-plus": "^2.7.7",
"exceljs": "^4.4.0",
"ezuikit": "^1.0.0",
"ezuikit-js": "^8.0.5",
@@ -49,10 +49,10 @@
"print-js": "^1.6.0",
"push.js": "^1.0.12",
"qrcodejs2-fixes": "^0.0.2",
- "qs": "^6.12.2",
+ "qs": "^6.12.3",
"relation-graph": "^2.2.2",
"screenfull": "^6.0.2",
- "sm-crypto-v2": "^1.9.0",
+ "sm-crypto-v2": "^1.9.1",
"sortablejs": "^1.15.2",
"splitpanes": "^3.1.5",
"vcrontab-3": "^3.3.22",
@@ -68,8 +68,8 @@
"vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2",
"vuedraggable": "4.0.3",
- "vxe-pc-ui": "^4.0.51",
- "vxe-table": "^4.7.45",
+ "vxe-pc-ui": "^4.0.67",
+ "vxe-table": "^4.7.50",
"vxe-table-plugin-element": "^4.0.4",
"vxe-table-plugin-export-xlsx": "^4.0.5",
"xe-utils": "^3.5.28",
@@ -88,13 +88,13 @@
"@vitejs/plugin-vue-jsx": "^4.0.0",
"@vue/compiler-sfc": "^3.4.31",
"code-inspector-plugin": "^0.14.2",
- "eslint": "^9.6.0",
+ "eslint": "^9.7.0",
"eslint-plugin-vue": "^9.27.0",
"less": "^4.2.0",
- "prettier": "^3.3.2",
+ "prettier": "^3.3.3",
"rollup-plugin-visualizer": "^5.12.0",
- "sass": "^1.77.6",
- "terser": "^5.31.1",
+ "sass": "^1.77.8",
+ "terser": "^5.31.2",
"typescript": "^5.5.3",
"vite": "^5.3.3",
"vite-plugin-cdn-import": "^1.0.1",
diff --git a/Web/src/api-services/apis/sys-code-gen-api.ts b/Web/src/api-services/apis/sys-code-gen-api.ts
index 85ca3ec7..8ff15afc 100644
--- a/Web/src/api-services/apis/sys-code-gen-api.ts
+++ b/Web/src/api-services/apis/sys-code-gen-api.ts
@@ -26,8 +26,8 @@ import { AdminResultListTableOutput } from '../models';
import { AdminResultObject } from '../models';
import { AdminResultSqlSugarPagedListSysCodeGen } from '../models';
import { AdminResultSysCodeGen } from '../models';
-import { CodeGenInput } from '../models';
import { DeleteCodeGenInput } from '../models';
+import { PageCodeGenInput } from '../models';
import { SysCodeGen } from '../models';
import { UpdateCodeGenInput } from '../models';
/**
@@ -328,11 +328,11 @@ export const SysCodeGenApiAxiosParamCreator = function (configuration?: Configur
/**
*
* @summary 获取代码生成分页列表 🔖
- * @param {CodeGenInput} [body]
+ * @param {PageCodeGenInput} [body]
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
- apiSysCodeGenPagePost: async (body?: CodeGenInput, options: AxiosRequestConfig = {}): Promise => {
+ apiSysCodeGenPagePost: async (body?: PageCodeGenInput, options: AxiosRequestConfig = {}): Promise => {
const localVarPath = `/api/sysCodeGen/page`;
// use dummy base URL string because the URL constructor only accepts absolute URLs.
const localVarUrlObj = new URL(localVarPath, 'https://example.com');
@@ -661,11 +661,11 @@ export const SysCodeGenApiFp = function(configuration?: Configuration) {
/**
*
* @summary 获取代码生成分页列表 🔖
- * @param {CodeGenInput} [body]
+ * @param {PageCodeGenInput} [body]
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
- async apiSysCodeGenPagePost(body?: CodeGenInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> {
+ async apiSysCodeGenPagePost(body?: PageCodeGenInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> {
const localVarAxiosArgs = await SysCodeGenApiAxiosParamCreator(configuration).apiSysCodeGenPagePost(body, options);
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
@@ -799,11 +799,11 @@ export const SysCodeGenApiFactory = function (configuration?: Configuration, bas
/**
*
* @summary 获取代码生成分页列表 🔖
- * @param {CodeGenInput} [body]
+ * @param {PageCodeGenInput} [body]
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
- async apiSysCodeGenPagePost(body?: CodeGenInput, options?: AxiosRequestConfig): Promise> {
+ async apiSysCodeGenPagePost(body?: PageCodeGenInput, options?: AxiosRequestConfig): Promise> {
return SysCodeGenApiFp(configuration).apiSysCodeGenPagePost(body, options).then((request) => request(axios, basePath));
},
/**
@@ -924,12 +924,12 @@ export class SysCodeGenApi extends BaseAPI {
/**
*
* @summary 获取代码生成分页列表 🔖
- * @param {CodeGenInput} [body]
+ * @param {PageCodeGenInput} [body]
* @param {*} [options] Override http request option.
* @throws {RequiredError}
* @memberof SysCodeGenApi
*/
- public async apiSysCodeGenPagePost(body?: CodeGenInput, options?: AxiosRequestConfig) : Promise> {
+ public async apiSysCodeGenPagePost(body?: PageCodeGenInput, options?: AxiosRequestConfig) : Promise> {
return SysCodeGenApiFp(this.configuration).apiSysCodeGenPagePost(body, options).then((request) => request(this.axios, this.basePath));
}
/**
diff --git a/Web/src/api-services/apis/sys-common-api.ts b/Web/src/api-services/apis/sys-common-api.ts
index b3bdd82c..65aed958 100644
--- a/Web/src/api-services/apis/sys-common-api.ts
+++ b/Web/src/api-services/apis/sys-common-api.ts
@@ -17,6 +17,7 @@ import { Configuration } from '../configuration';
// Some imports not used depending on template conditions
// @ts-ignore
import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../base';
+import { AdminResultIActionResult } from '../models';
import { AdminResultListApiOutput } from '../models';
import { AdminResultSmKeyPairOutput } from '../models';
import { AdminResultString } from '../models';
@@ -74,6 +75,54 @@ export const SysCommonApiAxiosParamCreator = function (configuration?: Configura
options: localVarRequestOptions,
};
},
+ /**
+ *
+ * @summary 下载标记错误的临时 Excel（全局）
+ * @param {string} [fileName]
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ */
+ apiSysCommonDownloadErrorExcelTempPost: async (fileName?: string, options: AxiosRequestConfig = {}): Promise => {
+ const localVarPath = `/api/sysCommon/downloadErrorExcelTemp`;
+ // use dummy base URL string because the URL constructor only accepts absolute URLs.
+ const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+ let baseOptions;
+ if (configuration) {
+ baseOptions = configuration.baseOptions;
+ }
+ const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
+ const localVarHeaderParameter = {} as any;
+ const localVarQueryParameter = {} as any;
+
+ // authentication Bearer required
+ // http bearer authentication required
+ if (configuration && configuration.accessToken) {
+ const accessToken = typeof configuration.accessToken === 'function'
+ ? await configuration.accessToken()
+ : await configuration.accessToken;
+ localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+ }
+
+ if (fileName !== undefined) {
+ localVarQueryParameter['fileName'] = fileName;
+ }
+
+ const query = new URLSearchParams(localVarUrlObj.search);
+ for (const key in localVarQueryParameter) {
+ query.set(key, localVarQueryParameter[key]);
+ }
+ for (const key in options.params) {
+ query.set(key, options.params[key]);
+ }
+ localVarUrlObj.search = (new URLSearchParams(query)).toString();
+ let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+ localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+ return {
+ url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+ options: localVarRequestOptions,
+ };
+ },
/**
*
* @summary 获取MD5加密字符串 🏆
@@ -195,6 +244,20 @@ export const SysCommonApiFp = function(configuration?: Configuration) {
return axios.request(axiosRequestArgs);
};
},
+ /**
+ *
+ * @summary 下载标记错误的临时 Excel（全局）
+ * @param {string} [fileName]
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ */
+ async apiSysCommonDownloadErrorExcelTempPost(fileName?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> {
+ const localVarAxiosArgs = await SysCommonApiAxiosParamCreator(configuration).apiSysCommonDownloadErrorExcelTempPost(fileName, options);
+ return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+ const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+ return axios.request(axiosRequestArgs);
+ };
+ },
/**
*
* @summary 获取MD5加密字符串 🏆
@@ -242,6 +305,16 @@ export const SysCommonApiFactory = function (configuration?: Configuration, base
async apiSysCommonApiListGet(groupName?: string, options?: AxiosRequestConfig): Promise> {
return SysCommonApiFp(configuration).apiSysCommonApiListGet(groupName, options).then((request) => request(axios, basePath));
},
+ /**
+ *
+ * @summary 下载标记错误的临时 Excel（全局）
+ * @param {string} [fileName]
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ */
+ async apiSysCommonDownloadErrorExcelTempPost(fileName?: string, options?: AxiosRequestConfig): Promise> {
+ return SysCommonApiFp(configuration).apiSysCommonDownloadErrorExcelTempPost(fileName, options).then((request) => request(axios, basePath));
+ },
/**
*
* @summary 获取MD5加密字符串 🏆
@@ -283,6 +356,17 @@ export class SysCommonApi extends BaseAPI {
public async apiSysCommonApiListGet(groupName?: string, options?: AxiosRequestConfig) : Promise> {
return SysCommonApiFp(this.configuration).apiSysCommonApiListGet(groupName, options).then((request) => request(this.axios, this.basePath));
}
+ /**
+ *
+ * @summary 下载标记错误的临时 Excel（全局）
+ * @param {string} [fileName]
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ * @memberof SysCommonApi
+ */
+ public async apiSysCommonDownloadErrorExcelTempPost(fileName?: string, options?: AxiosRequestConfig) : Promise> {
+ return SysCommonApiFp(this.configuration).apiSysCommonDownloadErrorExcelTempPost(fileName, options).then((request) => request(this.axios, this.basePath));
+ }
/**
*
* @summary 获取MD5加密字符串 🏆
diff --git a/Web/src/api-services/apis/sys-ldap-api.ts b/Web/src/api-services/apis/sys-ldap-api.ts
index 5bfd7ee5..8514955e 100644
--- a/Web/src/api-services/apis/sys-ldap-api.ts
+++ b/Web/src/api-services/apis/sys-ldap-api.ts
@@ -23,8 +23,8 @@ import { AdminResultListSysLdap } from '../models';
import { AdminResultSqlSugarPagedListSysLdap } from '../models';
import { AdminResultSysLdap } from '../models';
import { DeleteSysLdapInput } from '../models';
+import { PageSysLdapInput } from '../models';
import { SyncSysLdapInput } from '../models';
-import { SysLdapInput } from '../models';
import { UpdateSysLdapInput } from '../models';
/**
* SysLdapApi - axios parameter creator
@@ -226,11 +226,11 @@ export const SysLdapApiAxiosParamCreator = function (configuration?: Configurati
/**
*
* @summary 获取系统域登录配置分页列表 🔖
- * @param {SysLdapInput} [body]
+ * @param {PageSysLdapInput} [body]
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
- apiSysLdapPagePost: async (body?: SysLdapInput, options: AxiosRequestConfig = {}): Promise => {
+ apiSysLdapPagePost: async (body?: PageSysLdapInput, options: AxiosRequestConfig = {}): Promise => {
const localVarPath = `/api/sysLdap/page`;
// use dummy base URL string because the URL constructor only accepts absolute URLs.
const localVarUrlObj = new URL(localVarPath, 'https://example.com');
@@ -482,11 +482,11 @@ export const SysLdapApiFp = function(configuration?: Configuration) {
/**
*
* @summary 获取系统域登录配置分页列表 🔖
- * @param {SysLdapInput} [body]
+ * @param {PageSysLdapInput} [body]
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
- async apiSysLdapPagePost(body?: SysLdapInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> {
+ async apiSysLdapPagePost(body?: PageSysLdapInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> {
const localVarAxiosArgs = await SysLdapApiAxiosParamCreator(configuration).apiSysLdapPagePost(body, options);
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
@@ -586,11 +586,11 @@ export const SysLdapApiFactory = function (configuration?: Configuration, basePa
/**
*
* @summary 获取系统域登录配置分页列表 🔖
- * @param {SysLdapInput} [body]
+ * @param {PageSysLdapInput} [body]
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
- async apiSysLdapPagePost(body?: SysLdapInput, options?: AxiosRequestConfig): Promise> {
+ async apiSysLdapPagePost(body?: PageSysLdapInput, options?: AxiosRequestConfig): Promise> {
return SysLdapApiFp(configuration).apiSysLdapPagePost(body, options).then((request) => request(axios, basePath));
},
/**
@@ -679,12 +679,12 @@ export class SysLdapApi extends BaseAPI {
/**
*
* @summary 获取系统域登录配置分页列表 🔖
- * @param {SysLdapInput} [body]
+ * @param {PageSysLdapInput} [body]
* @param {*} [options] Override http request option.
* @throws {RequiredError}
* @memberof SysLdapApi
*/
- public async apiSysLdapPagePost(body?: SysLdapInput, options?: AxiosRequestConfig) : Promise> {
+ public async apiSysLdapPagePost(body?: PageSysLdapInput, options?: AxiosRequestConfig) : Promise> {
return SysLdapApiFp(this.configuration).apiSysLdapPagePost(body, options).then((request) => request(this.axios, this.basePath));
}
/**
diff --git a/Web/src/api-services/apis/sys-notice-api.ts b/Web/src/api-services/apis/sys-notice-api.ts
index 88d9bd17..446f6b12 100644
--- a/Web/src/api-services/apis/sys-notice-api.ts
+++ b/Web/src/api-services/apis/sys-notice-api.ts
@@ -22,6 +22,9 @@ import { AdminResultListSysNotice } from '../models';
import { AdminResultSqlSugarPagedListSysNotice } from '../models';
import { AdminResultSqlSugarPagedListSysNoticeUser } from '../models';
import { DeleteNoticeInput } from '../models';
+import { Filter } from '../models';
+import { FilterLogicEnum } from '../models';
+import { FilterOperatorEnum } from '../models';
import { NoticeInput } from '../models';
import { NoticeTypeEnum } from '../models';
import { PageNoticeInput } from '../models';
@@ -186,10 +189,18 @@ export const SysNoticeApiAxiosParamCreator = function (configuration?: Configura
* @param {string} [field] 排序字段
* @param {string} [order] 排序方向
* @param {string} [descStr] 降序排序
+ * @param {Array} [searchFields] 字段名称集合
+ * @param {string} [searchKeyword] 关键字
+ * @param {string} [keyword] 模糊查询关键字
+ * @param {FilterLogicEnum} [filterLogic] 过滤条件
+ * @param {Array} [filterFilters] 筛选过滤条件子项
+ * @param {string} [filterField] 字段名称
+ * @param {FilterOperatorEnum} [filterOperator] 逻辑运算符
+ * @param {any} [filterValue] 字段值
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
- apiSysNoticePageReceivedGet: async (title?: string, type?: NoticeTypeEnum, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options: AxiosRequestConfig = {}): Promise => {
+ apiSysNoticePageReceivedGet: async (title?: string, type?: NoticeTypeEnum, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options: AxiosRequestConfig = {}): Promise => {
const localVarPath = `/api/sysNotice/pageReceived`;
// use dummy base URL string because the URL constructor only accepts absolute URLs.
const localVarUrlObj = new URL(localVarPath, 'https://example.com');
@@ -238,6 +249,38 @@ export const SysNoticeApiAxiosParamCreator = function (configuration?: Configura
localVarQueryParameter['DescStr'] = descStr;
}
+ if (searchFields) {
+ localVarQueryParameter['Search.Fields'] = searchFields;
+ }
+
+ if (searchKeyword !== undefined) {
+ localVarQueryParameter['Search.Keyword'] = searchKeyword;
+ }
+
+ if (keyword !== undefined) {
+ localVarQueryParameter['Keyword'] = keyword;
+ }
+
+ if (filterLogic !== undefined) {
+ localVarQueryParameter['Filter.Logic'] = filterLogic;
+ }
+
+ if (filterFilters) {
+ localVarQueryParameter['Filter.Filters'] = filterFilters;
+ }
+
+ if (filterField !== undefined) {
+ localVarQueryParameter['Filter.Field'] = filterField;
+ }
+
+ if (filterOperator !== undefined) {
+ localVarQueryParameter['Filter.Operator'] = filterOperator;
+ }
+
+ if (filterValue !== undefined) {
+ localVarQueryParameter['Filter.Value'] = filterValue;
+ }
+
const query = new URLSearchParams(localVarUrlObj.search);
for (const key in localVarQueryParameter) {
query.set(key, localVarQueryParameter[key]);
@@ -502,11 +545,19 @@ export const SysNoticeApiFp = function(configuration?: Configuration) {
* @param {string} [field] 排序字段
* @param {string} [order] 排序方向
* @param {string} [descStr] 降序排序
+ * @param {Array} [searchFields] 字段名称集合
+ * @param {string} [searchKeyword] 关键字
+ * @param {string} [keyword] 模糊查询关键字
+ * @param {FilterLogicEnum} [filterLogic] 过滤条件
+ * @param {Array} [filterFilters] 筛选过滤条件子项
+ * @param {string} [filterField] 字段名称
+ * @param {FilterOperatorEnum} [filterOperator] 逻辑运算符
+ * @param {any} [filterValue] 字段值
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
- async apiSysNoticePageReceivedGet(title?: string, type?: NoticeTypeEnum, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> {
- const localVarAxiosArgs = await SysNoticeApiAxiosParamCreator(configuration).apiSysNoticePageReceivedGet(title, type, page, pageSize, field, order, descStr, options);
+ async apiSysNoticePageReceivedGet(title?: string, type?: NoticeTypeEnum, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> {
+ const localVarAxiosArgs = await SysNoticeApiAxiosParamCreator(configuration).apiSysNoticePageReceivedGet(title, type, page, pageSize, field, order, descStr, searchFields, searchKeyword, keyword, filterLogic, filterFilters, filterField, filterOperator, filterValue, options);
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
@@ -616,11 +667,19 @@ export const SysNoticeApiFactory = function (configuration?: Configuration, base
* @param {string} [field] 排序字段
* @param {string} [order] 排序方向
* @param {string} [descStr] 降序排序
+ * @param {Array} [searchFields] 字段名称集合
+ * @param {string} [searchKeyword] 关键字
+ * @param {string} [keyword] 模糊查询关键字
+ * @param {FilterLogicEnum} [filterLogic] 过滤条件
+ * @param {Array} [filterFilters] 筛选过滤条件子项
+ * @param {string} [filterField] 字段名称
+ * @param {FilterOperatorEnum} [filterOperator] 逻辑运算符
+ * @param {any} [filterValue] 字段值
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
- async apiSysNoticePageReceivedGet(title?: string, type?: NoticeTypeEnum, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options?: AxiosRequestConfig): Promise> {
- return SysNoticeApiFp(configuration).apiSysNoticePageReceivedGet(title, type, page, pageSize, field, order, descStr, options).then((request) => request(axios, basePath));
+ async apiSysNoticePageReceivedGet(title?: string, type?: NoticeTypeEnum, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options?: AxiosRequestConfig): Promise> {
+ return SysNoticeApiFp(configuration).apiSysNoticePageReceivedGet(title, type, page, pageSize, field, order, descStr, searchFields, searchKeyword, keyword, filterLogic, filterFilters, filterField, filterOperator, filterValue, options).then((request) => request(axios, basePath));
},
/**
*
@@ -714,12 +773,20 @@ export class SysNoticeApi extends BaseAPI {
* @param {string} [field] 排序字段
* @param {string} [order] 排序方向
* @param {string} [descStr] 降序排序
+ * @param {Array} [searchFields] 字段名称集合
+ * @param {string} [searchKeyword] 关键字
+ * @param {string} [keyword] 模糊查询关键字
+ * @param {FilterLogicEnum} [filterLogic] 过滤条件
+ * @param {Array} [filterFilters] 筛选过滤条件子项
+ * @param {string} [filterField] 字段名称
+ * @param {FilterOperatorEnum} [filterOperator] 逻辑运算符
+ * @param {any} [filterValue] 字段值
* @param {*} [options] Override http request option.
* @throws {RequiredError}
* @memberof SysNoticeApi
*/
- public async apiSysNoticePageReceivedGet(title?: string, type?: NoticeTypeEnum, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options?: AxiosRequestConfig) : Promise> {
- return SysNoticeApiFp(this.configuration).apiSysNoticePageReceivedGet(title, type, page, pageSize, field, order, descStr, options).then((request) => request(this.axios, this.basePath));
+ public async apiSysNoticePageReceivedGet(title?: string, type?: NoticeTypeEnum, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options?: AxiosRequestConfig) : Promise> {
+ return SysNoticeApiFp(this.configuration).apiSysNoticePageReceivedGet(title, type, page, pageSize, field, order, descStr, searchFields, searchKeyword, keyword, filterLogic, filterFilters, filterField, filterOperator, filterValue, options).then((request) => request(this.axios, this.basePath));
}
/**
*
diff --git a/Web/src/api-services/apis/sys-open-access-api.ts b/Web/src/api-services/apis/sys-open-access-api.ts
index 73067609..f04ed1b7 100644
--- a/Web/src/api-services/apis/sys-open-access-api.ts
+++ b/Web/src/api-services/apis/sys-open-access-api.ts
@@ -22,7 +22,7 @@ import { AdminResultSqlSugarPagedListOpenAccessOutput } from '../models';
import { AdminResultString } from '../models';
import { DeleteOpenAccessInput } from '../models';
import { GenerateSignatureInput } from '../models';
-import { OpenAccessInput } from '../models';
+import { PageOpenAccessInput } from '../models';
import { UpdateOpenAccessInput } from '../models';
/**
* SysOpenAccessApi - axios parameter creator
@@ -177,11 +177,11 @@ export const SysOpenAccessApiAxiosParamCreator = function (configuration?: Confi
/**
*
* @summary 获取开放接口身份分页列表 🔖
- * @param {OpenAccessInput} [body]
+ * @param {PageOpenAccessInput} [body]
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
- apiSysOpenAccessPagePost: async (body?: OpenAccessInput, options: AxiosRequestConfig = {}): Promise => {
+ apiSysOpenAccessPagePost: async (body?: PageOpenAccessInput, options: AxiosRequestConfig = {}): Promise => {
const localVarPath = `/api/sysOpenAccess/page`;
// use dummy base URL string because the URL constructor only accepts absolute URLs.
const localVarUrlObj = new URL(localVarPath, 'https://example.com');
@@ -367,11 +367,11 @@ export const SysOpenAccessApiFp = function(configuration?: Configuration) {
/**
*
* @summary 获取开放接口身份分页列表 🔖
- * @param {OpenAccessInput} [body]
+ * @param {PageOpenAccessInput} [body]
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
- async apiSysOpenAccessPagePost(body?: OpenAccessInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> {
+ async apiSysOpenAccessPagePost(body?: PageOpenAccessInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> {
const localVarAxiosArgs = await SysOpenAccessApiAxiosParamCreator(configuration).apiSysOpenAccessPagePost(body, options);
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
@@ -447,11 +447,11 @@ export const SysOpenAccessApiFactory = function (configuration?: Configuration,
/**
*
* @summary 获取开放接口身份分页列表 🔖
- * @param {OpenAccessInput} [body]
+ * @param {PageOpenAccessInput} [body]
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
- async apiSysOpenAccessPagePost(body?: OpenAccessInput, options?: AxiosRequestConfig): Promise> {
+ async apiSysOpenAccessPagePost(body?: PageOpenAccessInput, options?: AxiosRequestConfig): Promise> {
return SysOpenAccessApiFp(configuration).apiSysOpenAccessPagePost(body, options).then((request) => request(axios, basePath));
},
/**
@@ -519,12 +519,12 @@ export class SysOpenAccessApi extends BaseAPI {
/**
*
* @summary 获取开放接口身份分页列表 🔖
- * @param {OpenAccessInput} [body]
+ * @param {PageOpenAccessInput} [body]
* @param {*} [options] Override http request option.
* @throws {RequiredError}
* @memberof SysOpenAccessApi
*/
- public async apiSysOpenAccessPagePost(body?: OpenAccessInput, options?: AxiosRequestConfig) : Promise> {
+ public async apiSysOpenAccessPagePost(body?: PageOpenAccessInput, options?: AxiosRequestConfig) : Promise> {
return SysOpenAccessApiFp(this.configuration).apiSysOpenAccessPagePost(body, options).then((request) => request(this.axios, this.basePath));
}
/**
diff --git a/Web/src/api-services/apis/sys-wechat-pay-api.ts b/Web/src/api-services/apis/sys-wechat-pay-api.ts
index 2bb91d93..36620a41 100644
--- a/Web/src/api-services/apis/sys-wechat-pay-api.ts
+++ b/Web/src/api-services/apis/sys-wechat-pay-api.ts
@@ -17,9 +17,14 @@ import { Configuration } from '../configuration';
// Some imports not used depending on template conditions
// @ts-ignore
import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../base';
+import { AdminResultCreatePayTransactionOutput } from '../models';
+import { AdminResultGetRefundDomesticRefundByOutRefundNumberResponse } from '../models';
import { AdminResultObject } from '../models';
+import { AdminResultSqlSugarPagedListSysWechatPay } from '../models';
import { AdminResultSysWechatPay } from '../models';
import { AdminResultWechatPayOutput } from '../models';
+import { PageSysWechatPayInput } from '../models';
+import { RefundRequestInput } from '../models';
import { WechatPayParaInput } from '../models';
import { WechatPayTransactionInput } from '../models';
/**
@@ -76,6 +81,54 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config
options: localVarRequestOptions,
};
},
+ /**
+ *
+ * @summary 获取支付记录列表(分页)
+ * @param {PageSysWechatPayInput} [body] PageSysWechatPayInput
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ */
+ apiSysWechatPayPagePost: async (body?: PageSysWechatPayInput, options: AxiosRequestConfig = {}): Promise => {
+ const localVarPath = `/api/sysWechatPay/page`;
+ // use dummy base URL string because the URL constructor only accepts absolute URLs.
+ const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+ let baseOptions;
+ if (configuration) {
+ baseOptions = configuration.baseOptions;
+ }
+ const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
+ const localVarHeaderParameter = {} as any;
+ const localVarQueryParameter = {} as any;
+
+ // authentication Bearer required
+ // http bearer authentication required
+ if (configuration && configuration.accessToken) {
+ const accessToken = typeof configuration.accessToken === 'function'
+ ? await configuration.accessToken()
+ : await configuration.accessToken;
+ localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+ }
+
+ localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
+
+ const query = new URLSearchParams(localVarUrlObj.search);
+ for (const key in localVarQueryParameter) {
+ query.set(key, localVarQueryParameter[key]);
+ }
+ for (const key in options.params) {
+ query.set(key, options.params[key]);
+ }
+ localVarUrlObj.search = (new URLSearchParams(query)).toString();
+ let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+ localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+ const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
+ localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
+
+ return {
+ url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+ options: localVarRequestOptions,
+ };
+ },
/**
*
* @summary 微信支付成功回调(商户直连) 🔖
@@ -259,6 +312,104 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config
options: localVarRequestOptions,
};
},
+ /**
+ *
+ * @summary 微信支付订单号查询(校正) https://api.mch.weixin.qq.com/v3/pay/transactions/id/{transaction_id}
+ * @param {string} transactionId
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ */
+ apiSysWechatPayPayTransactionByIdTransactionIdGet: async (transactionId: string, options: AxiosRequestConfig = {}): Promise => {
+ // verify required parameter 'transactionId' is not null or undefined
+ if (transactionId === null || transactionId === undefined) {
+ throw new RequiredError('transactionId','Required parameter transactionId was null or undefined when calling apiSysWechatPayPayTransactionByIdTransactionIdGet.');
+ }
+ const localVarPath = `/api/sysWechatPay/payTransactionById/{transactionId}`
+ .replace(`{${"transactionId"}}`, encodeURIComponent(String(transactionId)));
+ // use dummy base URL string because the URL constructor only accepts absolute URLs.
+ const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+ let baseOptions;
+ if (configuration) {
+ baseOptions = configuration.baseOptions;
+ }
+ const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
+ const localVarHeaderParameter = {} as any;
+ const localVarQueryParameter = {} as any;
+
+ // authentication Bearer required
+ // http bearer authentication required
+ if (configuration && configuration.accessToken) {
+ const accessToken = typeof configuration.accessToken === 'function'
+ ? await configuration.accessToken()
+ : await configuration.accessToken;
+ localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+ }
+
+ const query = new URLSearchParams(localVarUrlObj.search);
+ for (const key in localVarQueryParameter) {
+ query.set(key, localVarQueryParameter[key]);
+ }
+ for (const key in options.params) {
+ query.set(key, options.params[key]);
+ }
+ localVarUrlObj.search = (new URLSearchParams(query)).toString();
+ let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+ localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+ return {
+ url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+ options: localVarRequestOptions,
+ };
+ },
+ /**
+ *
+ * @summary 商户订单号查询(校正) https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/{out_trade_no}
+ * @param {string} outTradeNumber
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ */
+ apiSysWechatPayPayTransactionByOutTradeNumberOutTradeNumberGet: async (outTradeNumber: string, options: AxiosRequestConfig = {}): Promise => {
+ // verify required parameter 'outTradeNumber' is not null or undefined
+ if (outTradeNumber === null || outTradeNumber === undefined) {
+ throw new RequiredError('outTradeNumber','Required parameter outTradeNumber was null or undefined when calling apiSysWechatPayPayTransactionByOutTradeNumberOutTradeNumberGet.');
+ }
+ const localVarPath = `/api/sysWechatPay/payTransactionByOutTradeNumber/{outTradeNumber}`
+ .replace(`{${"outTradeNumber"}}`, encodeURIComponent(String(outTradeNumber)));
+ // use dummy base URL string because the URL constructor only accepts absolute URLs.
+ const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+ let baseOptions;
+ if (configuration) {
+ baseOptions = configuration.baseOptions;
+ }
+ const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
+ const localVarHeaderParameter = {} as any;
+ const localVarQueryParameter = {} as any;
+
+ // authentication Bearer required
+ // http bearer authentication required
+ if (configuration && configuration.accessToken) {
+ const accessToken = typeof configuration.accessToken === 'function'
+ ? await configuration.accessToken()
+ : await configuration.accessToken;
+ localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+ }
+
+ const query = new URLSearchParams(localVarUrlObj.search);
+ for (const key in localVarQueryParameter) {
+ query.set(key, localVarQueryParameter[key]);
+ }
+ for (const key in options.params) {
+ query.set(key, options.params[key]);
+ }
+ localVarUrlObj.search = (new URLSearchParams(query)).toString();
+ let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+ localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+ return {
+ url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+ options: localVarRequestOptions,
+ };
+ },
/**
*
* @summary 微信支付统一下单获取Id(商户直连) 🔖
@@ -302,6 +453,103 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config
const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
+ return {
+ url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+ options: localVarRequestOptions,
+ };
+ },
+ /**
+ *
+ * @summary 查询单笔退款（通过商户退款单号） https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/query-by-out-refund-no.html
+ * @param {string} outRefundNumber
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ */
+ apiSysWechatPayRefundByOutRefundNumberOutRefundNumberGet: async (outRefundNumber: string, options: AxiosRequestConfig = {}): Promise => {
+ // verify required parameter 'outRefundNumber' is not null or undefined
+ if (outRefundNumber === null || outRefundNumber === undefined) {
+ throw new RequiredError('outRefundNumber','Required parameter outRefundNumber was null or undefined when calling apiSysWechatPayRefundByOutRefundNumberOutRefundNumberGet.');
+ }
+ const localVarPath = `/api/sysWechatPay/refundByOutRefundNumber/{outRefundNumber}`
+ .replace(`{${"outRefundNumber"}}`, encodeURIComponent(String(outRefundNumber)));
+ // use dummy base URL string because the URL constructor only accepts absolute URLs.
+ const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+ let baseOptions;
+ if (configuration) {
+ baseOptions = configuration.baseOptions;
+ }
+ const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
+ const localVarHeaderParameter = {} as any;
+ const localVarQueryParameter = {} as any;
+
+ // authentication Bearer required
+ // http bearer authentication required
+ if (configuration && configuration.accessToken) {
+ const accessToken = typeof configuration.accessToken === 'function'
+ ? await configuration.accessToken()
+ : await configuration.accessToken;
+ localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+ }
+
+ const query = new URLSearchParams(localVarUrlObj.search);
+ for (const key in localVarQueryParameter) {
+ query.set(key, localVarQueryParameter[key]);
+ }
+ for (const key in options.params) {
+ query.set(key, options.params[key]);
+ }
+ localVarUrlObj.search = (new URLSearchParams(query)).toString();
+ let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+ localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+ return {
+ url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+ options: localVarRequestOptions,
+ };
+ },
+ /**
+ *
+ * @summary 退款申请 https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/create.html
+ * @param {RefundRequestInput} [body]
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ */
+ apiSysWechatPayRefundPost: async (body?: RefundRequestInput, options: AxiosRequestConfig = {}): Promise => {
+ const localVarPath = `/api/sysWechatPay/refund`;
+ // use dummy base URL string because the URL constructor only accepts absolute URLs.
+ const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+ let baseOptions;
+ if (configuration) {
+ baseOptions = configuration.baseOptions;
+ }
+ const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
+ const localVarHeaderParameter = {} as any;
+ const localVarQueryParameter = {} as any;
+
+ // authentication Bearer required
+ // http bearer authentication required
+ if (configuration && configuration.accessToken) {
+ const accessToken = typeof configuration.accessToken === 'function'
+ ? await configuration.accessToken()
+ : await configuration.accessToken;
+ localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+ }
+
+ localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
+
+ const query = new URLSearchParams(localVarUrlObj.search);
+ for (const key in localVarQueryParameter) {
+ query.set(key, localVarQueryParameter[key]);
+ }
+ for (const key in options.params) {
+ query.set(key, options.params[key]);
+ }
+ localVarUrlObj.search = (new URLSearchParams(query)).toString();
+ let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+ localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+ const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
+ localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
+
return {
url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
options: localVarRequestOptions,
@@ -330,6 +578,20 @@ export const SysWechatPayApiFp = function(configuration?: Configuration) {
return axios.request(axiosRequestArgs);
};
},
+ /**
+ *
+ * @summary 获取支付记录列表(分页)
+ * @param {PageSysWechatPayInput} [body] PageSysWechatPayInput
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ */
+ async apiSysWechatPayPagePost(body?: PageSysWechatPayInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> {
+ const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).apiSysWechatPayPagePost(body, options);
+ return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+ const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+ return axios.request(axiosRequestArgs);
+ };
+ },
/**
*
* @summary 微信支付成功回调(商户直连) 🔖
@@ -377,13 +639,41 @@ export const SysWechatPayApiFp = function(configuration?: Configuration) {
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
- async apiSysWechatPayPayPartnerTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> {
+ async apiSysWechatPayPayPartnerTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> {
const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).apiSysWechatPayPayPartnerTransactionPost(body, options);
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
};
},
+ /**
+ *
+ * @summary 微信支付订单号查询(校正) https://api.mch.weixin.qq.com/v3/pay/transactions/id/{transaction_id}
+ * @param {string} transactionId
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ */
+ async apiSysWechatPayPayTransactionByIdTransactionIdGet(transactionId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> {
+ const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).apiSysWechatPayPayTransactionByIdTransactionIdGet(transactionId, options);
+ return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+ const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+ return axios.request(axiosRequestArgs);
+ };
+ },
+ /**
+ *
+ * @summary 商户订单号查询(校正) https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/{out_trade_no}
+ * @param {string} outTradeNumber
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ */
+ async apiSysWechatPayPayTransactionByOutTradeNumberOutTradeNumberGet(outTradeNumber: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> {
+ const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).apiSysWechatPayPayTransactionByOutTradeNumberOutTradeNumberGet(outTradeNumber, options);
+ return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+ const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+ return axios.request(axiosRequestArgs);
+ };
+ },
/**
*
* @summary 微信支付统一下单获取Id(商户直连) 🔖
@@ -391,13 +681,41 @@ export const SysWechatPayApiFp = function(configuration?: Configuration) {
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
- async apiSysWechatPayPayTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> {
+ async apiSysWechatPayPayTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> {
const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).apiSysWechatPayPayTransactionPost(body, options);
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
};
},
+ /**
+ *
+ * @summary 查询单笔退款（通过商户退款单号） https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/query-by-out-refund-no.html
+ * @param {string} outRefundNumber
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ */
+ async apiSysWechatPayRefundByOutRefundNumberOutRefundNumberGet(outRefundNumber: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> {
+ const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).apiSysWechatPayRefundByOutRefundNumberOutRefundNumberGet(outRefundNumber, options);
+ return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+ const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+ return axios.request(axiosRequestArgs);
+ };
+ },
+ /**
+ *
+ * @summary 退款申请 https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/create.html
+ * @param {RefundRequestInput} [body]
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ */
+ async apiSysWechatPayRefundPost(body?: RefundRequestInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> {
+ const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).apiSysWechatPayRefundPost(body, options);
+ return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+ const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+ return axios.request(axiosRequestArgs);
+ };
+ },
}
};
@@ -417,6 +735,16 @@ export const SysWechatPayApiFactory = function (configuration?: Configuration, b
async apiSysWechatPayGenerateParametersForJsapiPayPost(body?: WechatPayParaInput, options?: AxiosRequestConfig): Promise> {
return SysWechatPayApiFp(configuration).apiSysWechatPayGenerateParametersForJsapiPayPost(body, options).then((request) => request(axios, basePath));
},
+ /**
+ *
+ * @summary 获取支付记录列表(分页)
+ * @param {PageSysWechatPayInput} [body] PageSysWechatPayInput
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ */
+ async apiSysWechatPayPagePost(body?: PageSysWechatPayInput, options?: AxiosRequestConfig): Promise> {
+ return SysWechatPayApiFp(configuration).apiSysWechatPayPagePost(body, options).then((request) => request(axios, basePath));
+ },
/**
*
* @summary 微信支付成功回调(商户直连) 🔖
@@ -452,9 +780,29 @@ export const SysWechatPayApiFactory = function (configuration?: Configuration, b
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
- async apiSysWechatPayPayPartnerTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise> {
+ async apiSysWechatPayPayPartnerTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise> {
return SysWechatPayApiFp(configuration).apiSysWechatPayPayPartnerTransactionPost(body, options).then((request) => request(axios, basePath));
},
+ /**
+ *
+ * @summary 微信支付订单号查询(校正) https://api.mch.weixin.qq.com/v3/pay/transactions/id/{transaction_id}
+ * @param {string} transactionId
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ */
+ async apiSysWechatPayPayTransactionByIdTransactionIdGet(transactionId: string, options?: AxiosRequestConfig): Promise> {
+ return SysWechatPayApiFp(configuration).apiSysWechatPayPayTransactionByIdTransactionIdGet(transactionId, options).then((request) => request(axios, basePath));
+ },
+ /**
+ *
+ * @summary 商户订单号查询(校正) https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/{out_trade_no}
+ * @param {string} outTradeNumber
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ */
+ async apiSysWechatPayPayTransactionByOutTradeNumberOutTradeNumberGet(outTradeNumber: string, options?: AxiosRequestConfig): Promise> {
+ return SysWechatPayApiFp(configuration).apiSysWechatPayPayTransactionByOutTradeNumberOutTradeNumberGet(outTradeNumber, options).then((request) => request(axios, basePath));
+ },
/**
*
* @summary 微信支付统一下单获取Id(商户直连) 🔖
@@ -462,9 +810,29 @@ export const SysWechatPayApiFactory = function (configuration?: Configuration, b
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
- async apiSysWechatPayPayTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise> {
+ async apiSysWechatPayPayTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise> {
return SysWechatPayApiFp(configuration).apiSysWechatPayPayTransactionPost(body, options).then((request) => request(axios, basePath));
},
+ /**
+ *
+ * @summary 查询单笔退款（通过商户退款单号） https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/query-by-out-refund-no.html
+ * @param {string} outRefundNumber
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ */
+ async apiSysWechatPayRefundByOutRefundNumberOutRefundNumberGet(outRefundNumber: string, options?: AxiosRequestConfig): Promise> {
+ return SysWechatPayApiFp(configuration).apiSysWechatPayRefundByOutRefundNumberOutRefundNumberGet(outRefundNumber, options).then((request) => request(axios, basePath));
+ },
+ /**
+ *
+ * @summary 退款申请 https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/create.html
+ * @param {RefundRequestInput} [body]
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ */
+ async apiSysWechatPayRefundPost(body?: RefundRequestInput, options?: AxiosRequestConfig): Promise> {
+ return SysWechatPayApiFp(configuration).apiSysWechatPayRefundPost(body, options).then((request) => request(axios, basePath));
+ },
};
};
@@ -486,6 +854,17 @@ export class SysWechatPayApi extends BaseAPI {
public async apiSysWechatPayGenerateParametersForJsapiPayPost(body?: WechatPayParaInput, options?: AxiosRequestConfig) : Promise> {
return SysWechatPayApiFp(this.configuration).apiSysWechatPayGenerateParametersForJsapiPayPost(body, options).then((request) => request(this.axios, this.basePath));
}
+ /**
+ *
+ * @summary 获取支付记录列表(分页)
+ * @param {PageSysWechatPayInput} [body] PageSysWechatPayInput
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ * @memberof SysWechatPayApi
+ */
+ public async apiSysWechatPayPagePost(body?: PageSysWechatPayInput, options?: AxiosRequestConfig) : Promise> {
+ return SysWechatPayApiFp(this.configuration).apiSysWechatPayPagePost(body, options).then((request) => request(this.axios, this.basePath));
+ }
/**
*
* @summary 微信支付成功回调(商户直连) 🔖
@@ -525,9 +904,31 @@ export class SysWechatPayApi extends BaseAPI {
* @throws {RequiredError}
* @memberof SysWechatPayApi
*/
- public async apiSysWechatPayPayPartnerTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig) : Promise> {
+ public async apiSysWechatPayPayPartnerTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig) : Promise> {
return SysWechatPayApiFp(this.configuration).apiSysWechatPayPayPartnerTransactionPost(body, options).then((request) => request(this.axios, this.basePath));
}
+ /**
+ *
+ * @summary 微信支付订单号查询(校正) https://api.mch.weixin.qq.com/v3/pay/transactions/id/{transaction_id}
+ * @param {string} transactionId
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ * @memberof SysWechatPayApi
+ */
+ public async apiSysWechatPayPayTransactionByIdTransactionIdGet(transactionId: string, options?: AxiosRequestConfig) : Promise> {
+ return SysWechatPayApiFp(this.configuration).apiSysWechatPayPayTransactionByIdTransactionIdGet(transactionId, options).then((request) => request(this.axios, this.basePath));
+ }
+ /**
+ *
+ * @summary 商户订单号查询(校正) https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/{out_trade_no}
+ * @param {string} outTradeNumber
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ * @memberof SysWechatPayApi
+ */
+ public async apiSysWechatPayPayTransactionByOutTradeNumberOutTradeNumberGet(outTradeNumber: string, options?: AxiosRequestConfig) : Promise> {
+ return SysWechatPayApiFp(this.configuration).apiSysWechatPayPayTransactionByOutTradeNumberOutTradeNumberGet(outTradeNumber, options).then((request) => request(this.axios, this.basePath));
+ }
/**
*
* @summary 微信支付统一下单获取Id(商户直连) 🔖
@@ -536,7 +937,29 @@ export class SysWechatPayApi extends BaseAPI {
* @throws {RequiredError}
* @memberof SysWechatPayApi
*/
- public async apiSysWechatPayPayTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig) : Promise> {
+ public async apiSysWechatPayPayTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig) : Promise> {
return SysWechatPayApiFp(this.configuration).apiSysWechatPayPayTransactionPost(body, options).then((request) => request(this.axios, this.basePath));
}
+ /**
+ *
+ * @summary 查询单笔退款（通过商户退款单号） https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/query-by-out-refund-no.html
+ * @param {string} outRefundNumber
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ * @memberof SysWechatPayApi
+ */
+ public async apiSysWechatPayRefundByOutRefundNumberOutRefundNumberGet(outRefundNumber: string, options?: AxiosRequestConfig) : Promise> {
+ return SysWechatPayApiFp(this.configuration).apiSysWechatPayRefundByOutRefundNumberOutRefundNumberGet(outRefundNumber, options).then((request) => request(this.axios, this.basePath));
+ }
+ /**
+ *
+ * @summary 退款申请 https://pay.weixin.qq.com/docs/merchant/apis/mini-program-payment/create.html
+ * @param {RefundRequestInput} [body]
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ * @memberof SysWechatPayApi
+ */
+ public async apiSysWechatPayRefundPost(body?: RefundRequestInput, options?: AxiosRequestConfig) : Promise> {
+ return SysWechatPayApiFp(this.configuration).apiSysWechatPayRefundPost(body, options).then((request) => request(this.axios, this.basePath));
+ }
}
diff --git a/Web/src/api-services/apis/sys-wx-open-api.ts b/Web/src/api-services/apis/sys-wx-open-api.ts
index 04e39e18..dd2c9b66 100644
--- a/Web/src/api-services/apis/sys-wx-open-api.ts
+++ b/Web/src/api-services/apis/sys-wx-open-api.ts
@@ -168,6 +168,69 @@ export const SysWxOpenApiAxiosParamCreator = function (configuration?: Configura
options: localVarRequestOptions,
};
},
+ /**
+ *
+ * @summary 验证签名 🔖
+ * @param {string} [signature] 签名
+ * @param {string} [timestamp] 时间戳
+ * @param {string} [nonce] 随机数
+ * @param {string} [echostr] 随机字符串
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ */
+ apiSysWxOpenVerifySignatureGet: async (signature?: string, timestamp?: string, nonce?: string, echostr?: string, options: AxiosRequestConfig = {}): Promise => {
+ const localVarPath = `/api/sysWxOpen/verifySignature`;
+ // use dummy base URL string because the URL constructor only accepts absolute URLs.
+ const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+ let baseOptions;
+ if (configuration) {
+ baseOptions = configuration.baseOptions;
+ }
+ const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
+ const localVarHeaderParameter = {} as any;
+ const localVarQueryParameter = {} as any;
+
+ // authentication Bearer required
+ // http bearer authentication required
+ if (configuration && configuration.accessToken) {
+ const accessToken = typeof configuration.accessToken === 'function'
+ ? await configuration.accessToken()
+ : await configuration.accessToken;
+ localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+ }
+
+ if (signature !== undefined) {
+ localVarQueryParameter['signature'] = signature;
+ }
+
+ if (timestamp !== undefined) {
+ localVarQueryParameter['timestamp'] = timestamp;
+ }
+
+ if (nonce !== undefined) {
+ localVarQueryParameter['nonce'] = nonce;
+ }
+
+ if (echostr !== undefined) {
+ localVarQueryParameter['echostr'] = echostr;
+ }
+
+ const query = new URLSearchParams(localVarUrlObj.search);
+ for (const key in localVarQueryParameter) {
+ query.set(key, localVarQueryParameter[key]);
+ }
+ for (const key in options.params) {
+ query.set(key, options.params[key]);
+ }
+ localVarUrlObj.search = (new URLSearchParams(query)).toString();
+ let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+ localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+ return {
+ url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+ options: localVarRequestOptions,
+ };
+ },
/**
*
* @summary 获取微信用户OpenId 🔖
@@ -379,6 +442,23 @@ export const SysWxOpenApiFp = function(configuration?: Configuration) {
return axios.request(axiosRequestArgs);
};
},
+ /**
+ *
+ * @summary 验证签名 🔖
+ * @param {string} [signature] 签名
+ * @param {string} [timestamp] 时间戳
+ * @param {string} [nonce] 随机数
+ * @param {string} [echostr] 随机字符串
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ */
+ async apiSysWxOpenVerifySignatureGet(signature?: string, timestamp?: string, nonce?: string, echostr?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> {
+ const localVarAxiosArgs = await SysWxOpenApiAxiosParamCreator(configuration).apiSysWxOpenVerifySignatureGet(signature, timestamp, nonce, echostr, options);
+ return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+ const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+ return axios.request(axiosRequestArgs);
+ };
+ },
/**
*
* @summary 获取微信用户OpenId 🔖
@@ -460,6 +540,19 @@ export const SysWxOpenApiFactory = function (configuration?: Configuration, base
async apiSysWxOpenSendSubscribeMessagePost(body?: SendSubscribeMessageInput, options?: AxiosRequestConfig): Promise> {
return SysWxOpenApiFp(configuration).apiSysWxOpenSendSubscribeMessagePost(body, options).then((request) => request(axios, basePath));
},
+ /**
+ *
+ * @summary 验证签名 🔖
+ * @param {string} [signature] 签名
+ * @param {string} [timestamp] 时间戳
+ * @param {string} [nonce] 随机数
+ * @param {string} [echostr] 随机字符串
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ */
+ async apiSysWxOpenVerifySignatureGet(signature?: string, timestamp?: string, nonce?: string, echostr?: string, options?: AxiosRequestConfig): Promise> {
+ return SysWxOpenApiFp(configuration).apiSysWxOpenVerifySignatureGet(signature, timestamp, nonce, echostr, options).then((request) => request(axios, basePath));
+ },
/**
*
* @summary 获取微信用户OpenId 🔖
@@ -533,6 +626,20 @@ export class SysWxOpenApi extends BaseAPI {
public async apiSysWxOpenSendSubscribeMessagePost(body?: SendSubscribeMessageInput, options?: AxiosRequestConfig) : Promise> {
return SysWxOpenApiFp(this.configuration).apiSysWxOpenSendSubscribeMessagePost(body, options).then((request) => request(this.axios, this.basePath));
}
+ /**
+ *
+ * @summary 验证签名 🔖
+ * @param {string} [signature] 签名
+ * @param {string} [timestamp] 时间戳
+ * @param {string} [nonce] 随机数
+ * @param {string} [echostr] 随机字符串
+ * @param {*} [options] Override http request option.
+ * @throws {RequiredError}
+ * @memberof SysWxOpenApi
+ */
+ public async apiSysWxOpenVerifySignatureGet(signature?: string, timestamp?: string, nonce?: string, echostr?: string, options?: AxiosRequestConfig) : Promise> {
+ return SysWxOpenApiFp(this.configuration).apiSysWxOpenVerifySignatureGet(signature, timestamp, nonce, echostr, options).then((request) => request(this.axios, this.basePath));
+ }
/**
*
* @summary 获取微信用户OpenId 🔖
diff --git a/Web/src/api-services/models/add-code-gen-input.ts b/Web/src/api-services/models/add-code-gen-input.ts
index e9d0db3d..85a1d0de 100644
--- a/Web/src/api-services/models/add-code-gen-input.ts
+++ b/Web/src/api-services/models/add-code-gen-input.ts
@@ -12,6 +12,8 @@
* Do not edit the class manually.
*/
+import { Filter } from './filter';
+import { Search } from './search';
/**
*
*
@@ -20,6 +22,26 @@
*/
export interface AddCodeGenInput {
+ /**
+ * @type {Search}
+ * @memberof AddCodeGenInput
+ */
+ search?: Search;
+
+ /**
+ * 模糊查询关键字
+ *
+ * @type {string}
+ * @memberof AddCodeGenInput
+ */
+ keyword?: string | null;
+
+ /**
+ * @type {Filter}
+ * @memberof AddCodeGenInput
+ */
+ filter?: Filter;
+
/**
* 当前页码
*
@@ -203,4 +225,12 @@ export interface AddCodeGenInput {
* @memberof AddCodeGenInput
*/
generateMenu: boolean;
+
+ /**
+ * 是否使用 Api Service
+ *
+ * @type {boolean}
+ * @memberof AddCodeGenInput
+ */
+ isApiService?: boolean;
}
diff --git a/Web/src/api-services/models/add-open-access-input.ts b/Web/src/api-services/models/add-open-access-input.ts
index a8b2345a..166ab4cd 100644
--- a/Web/src/api-services/models/add-open-access-input.ts
+++ b/Web/src/api-services/models/add-open-access-input.ts
@@ -12,6 +12,7 @@
* Do not edit the class manually.
*/
+import { SysUser } from './sys-user';
/**
*
*
@@ -92,6 +93,12 @@ export interface AddOpenAccessInput {
*/
bindTenantId?: number;
+ /**
+ * @type {SysUser}
+ * @memberof AddOpenAccessInput
+ */
+ bindUser?: SysUser;
+
/**
* 身份标识
*
diff --git a/Web/src/api-services/models/admin-result-create-pay-transaction-output.ts b/Web/src/api-services/models/admin-result-create-pay-transaction-output.ts
new file mode 100644
index 00000000..50f92dcd
--- /dev/null
+++ b/Web/src/api-services/models/admin-result-create-pay-transaction-output.ts
@@ -0,0 +1,69 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { CreatePayTransactionOutput } from './create-pay-transaction-output'; + /** + * 全局返回结果 + * + * @export + * @interface AdminResultCreatePayTransactionOutput + */ +export interface AdminResultCreatePayTransactionOutput { + + /** + * 状态码 + * + * @type {number} + * @memberof AdminResultCreatePayTransactionOutput + */ + code?: number; + + /** + * 类型success、warning、error + * + * @type {string} + * @memberof AdminResultCreatePayTransactionOutput + */ + type?: string | null; + + /** + * 错误信息 + * + * @type {string} + * @memberof AdminResultCreatePayTransactionOutput + */ + message?: string | null; + + /** + * @type {CreatePayTransactionOutput} + * @memberof AdminResultCreatePayTransactionOutput + */ + result?: CreatePayTransactionOutput; + + /** + * 附加数据 + * + * @type {any} + * @memberof AdminResultCreatePayTransactionOutput + */ + extras?: any | null; + + /** + * 时间 + * + * @type {Date} + * @memberof AdminResultCreatePayTransactionOutput + */ + time?: Date; +} diff --git a/Web/src/api-services/models/admin-result-get-refund-domestic-refund-by-out-refund-number-response.ts b/Web/src/api-services/models/admin-result-get-refund-domestic-refund-by-out-refund-number-response.ts new file mode 100644 index 00000000..51706d2a --- /dev/null +++ b/Web/src/api-services/models/admin-result-get-refund-domestic-refund-by-out-refund-number-response.ts @@ -0,0 +1,69 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { GetRefundDomesticRefundByOutRefundNumberResponse } from './get-refund-domestic-refund-by-out-refund-number-response'; + /** + * 全局返回结果 + * + * @export + * @interface AdminResultGetRefundDomesticRefundByOutRefundNumberResponse + */ +export interface AdminResultGetRefundDomesticRefundByOutRefundNumberResponse { + + /** + * 状态码 + * + * @type {number} + * @memberof AdminResultGetRefundDomesticRefundByOutRefundNumberResponse + */ + code?: number; + + /** + * 类型success、warning、error + * + * @type {string} + * @memberof AdminResultGetRefundDomesticRefundByOutRefundNumberResponse + */ + type?: string | null; + + /** + * 错误信息 + * + * @type {string} + * @memberof AdminResultGetRefundDomesticRefundByOutRefundNumberResponse + */ + message?: string | null; + + /** + * @type {GetRefundDomesticRefundByOutRefundNumberResponse} + * @memberof AdminResultGetRefundDomesticRefundByOutRefundNumberResponse + */ + result?: GetRefundDomesticRefundByOutRefundNumberResponse; + + /** + * 附加数据 + * + * @type {any} + * @memberof AdminResultGetRefundDomesticRefundByOutRefundNumberResponse + */ + extras?: any | null; + + /** + * 时间 + * + * @type {Date} + * @memberof AdminResultGetRefundDomesticRefundByOutRefundNumberResponse + */ + time?: Date; +} diff --git a/Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-wechat-pay.ts b/Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-wechat-pay.ts new file mode 100644 index 00000000..acbc3877 --- /dev/null +++ b/Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-wechat-pay.ts @@ -0,0 +1,69 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { SqlSugarPagedListSysWechatPay } from './sql-sugar-paged-list-sys-wechat-pay'; + /** + * 全局返回结果 + * + * @export + * @interface AdminResultSqlSugarPagedListSysWechatPay + */ +export interface AdminResultSqlSugarPagedListSysWechatPay { + + /** + * 状态码 + * + * @type {number} + * @memberof AdminResultSqlSugarPagedListSysWechatPay + */ + code?: number; + + /** + * 类型success、warning、error + * + * @type {string} + * @memberof AdminResultSqlSugarPagedListSysWechatPay + */ + type?: string | null; + + /** + * 错误信息 + * + * @type {string} + * @memberof AdminResultSqlSugarPagedListSysWechatPay + */ + message?: string | null; + + /** + * @type {SqlSugarPagedListSysWechatPay} + * @memberof AdminResultSqlSugarPagedListSysWechatPay + */ + result?: SqlSugarPagedListSysWechatPay; + + /** + * 附加数据 + * + * @type {any} + * @memberof AdminResultSqlSugarPagedListSysWechatPay + */ + extras?: any | null; + + /** + * 时间 + * + * @type {Date} + * @memberof AdminResultSqlSugarPagedListSysWechatPay + */ + time?: Date; +} diff --git a/Web/src/api-services/models/amount.ts b/Web/src/api-services/models/amount.ts new file mode 100644 index 00000000..64ff0985 --- /dev/null +++ b/Web/src/api-services/models/amount.ts @@ -0,0 +1,83 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { From } from './from'; + /** + * + * + * @export + * @interface Amount + */ +export interface Amount { + + /** + * @type {number} + * @memberof Amount + */ + total?: number; + + /** + * @type {number} + * @memberof Amount + */ + refund?: number; + + /** + * @type {string} + * @memberof Amount + */ + currency?: string | null; + + /** + * @type {number} + * @memberof Amount + */ + payerTotal?: number; + + /** + * @type {number} + * @memberof Amount + */ + payerRefund?: number; + + /** + * @type {number} + * @memberof Amount + */ + settlementTotal?: number; + + /** + * @type {number} + * @memberof Amount + */ + settlementRefund?: number; + + /** + * @type {number} + * @memberof Amount + */ + discountRefund?: number; + + /** + * @type {Array}
+ * @memberof Amount
+ */
+ from?: Array | null;
+
+ /**
+ * @type {number}
+ * @memberof Amount
+ */
+ refundFee?: number | null;
+}
diff --git a/Web/src/api-services/models/create-pay-transaction-output.ts b/Web/src/api-services/models/create-pay-transaction-output.ts
new file mode 100644
index 00000000..3d23b334
--- /dev/null
+++ b/Web/src/api-services/models/create-pay-transaction-output.ts
@@ -0,0 +1,34 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + /** + * + * + * @export + * @interface CreatePayTransactionOutput + */ +export interface CreatePayTransactionOutput { + + /** + * @type {string} + * @memberof CreatePayTransactionOutput + */ + prepayId?: string | null; + + /** + * @type {string} + * @memberof CreatePayTransactionOutput + */ + outTradeNumber?: string | null; +} diff --git a/Web/src/api-services/models/db-type.ts b/Web/src/api-services/models/db-type.ts index 44de8445..c3867028 100644 --- a/Web/src/api-services/models/db-type.ts +++ b/Web/src/api-services/models/db-type.ts @@ -42,6 +42,8 @@ export enum DbType { NUMBER_21 = 21, NUMBER_22 = 22, NUMBER_23 = 23, + NUMBER_24 = 24, + NUMBER_25 = 25, NUMBER_900 = 900 } diff --git a/Web/src/api-services/models/filter-logic-enum.ts b/Web/src/api-services/models/filter-logic-enum.ts new file mode 100644 index 00000000..b535525a --- /dev/null +++ b/Web/src/api-services/models/filter-logic-enum.ts @@ -0,0 +1,25 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +/** + * 过滤条件
并且 And = 0
或者 Or = 1
异或 Xor = 2
+ * @export + * @enum {string} + */ +export enum FilterLogicEnum { + NUMBER_0 = 0, + NUMBER_1 = 1, + NUMBER_2 = 2 +} + diff --git a/Web/src/api-services/models/filter-operator-enum.ts b/Web/src/api-services/models/filter-operator-enum.ts new file mode 100644 index 00000000..ed0a3e7c --- /dev/null +++ b/Web/src/api-services/models/filter-operator-enum.ts @@ -0,0 +1,31 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +/** + * 过滤逻辑运算符
等于 EQ = 0
不等于 NEQ = 1
小于 LT = 2
小于等于 LTE = 3
大于 GT = 4
大于等于 GTE = 5
开始包含 StartsWith = 6
末尾包含 EndsWith = 7
包含 Contains = 8
+ * @export + * @enum {string} + */ +export enum FilterOperatorEnum { + NUMBER_0 = 0, + NUMBER_1 = 1, + NUMBER_2 = 2, + NUMBER_3 = 3, + NUMBER_4 = 4, + NUMBER_5 = 5, + NUMBER_6 = 6, + NUMBER_7 = 7, + NUMBER_8 = 8 +} + diff --git a/Web/src/api-services/models/filter.ts b/Web/src/api-services/models/filter.ts new file mode 100644 index 00000000..60d9216e --- /dev/null +++ b/Web/src/api-services/models/filter.ts @@ -0,0 +1,61 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { Filter } from './filter'; +import { FilterLogicEnum } from './filter-logic-enum'; +import { FilterOperatorEnum } from './filter-operator-enum'; + /** + * 筛选过滤条件 + * + * @export + * @interface Filter + */ +export interface Filter { + + /** + * @type {FilterLogicEnum} + * @memberof Filter + */ + logic?: FilterLogicEnum; + + /** + * 筛选过滤条件子项 + * + * @type {Array}
+ * @memberof Filter
+ */
+ filters?: Array | null;
+
+ /**
+ * 字段名称
+ *
+ * @type {string}
+ * @memberof Filter
+ */
+ field?: string | null;
+
+ /**
+ * @type {FilterOperatorEnum}
+ * @memberof Filter
+ */
+ operator?: FilterOperatorEnum;
+
+ /**
+ * 字段值
+ *
+ * @type {any}
+ * @memberof Filter
+ */
+ value?: any | null;
+}
diff --git a/Web/src/api-services/models/from.ts b/Web/src/api-services/models/from.ts
new file mode 100644
index 00000000..42f776c1
--- /dev/null
+++ b/Web/src/api-services/models/from.ts
@@ -0,0 +1,34 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + /** + * + * + * @export + * @interface From + */ +export interface From { + + /** + * @type {number} + * @memberof From + */ + amount?: number; + + /** + * @type {string} + * @memberof From + */ + account?: string | null; +} diff --git a/Web/src/api-services/models/gender-enum.ts b/Web/src/api-services/models/gender-enum.ts index 8a3d9898..170584f1 100644 --- a/Web/src/api-services/models/gender-enum.ts +++ b/Web/src/api-services/models/gender-enum.ts @@ -13,13 +13,14 @@ */ /** - * 性别枚举
男 Male = 1
女 Female = 2
其他 Other = 3
+ * 性别枚举（GB/T 2261.1-2003）
未知的性别 Unknown = 0
男性 Male = 1
女性 Female = 2
未说明的性别 Unspecified = 9
* @export * @enum {string} */ export enum GenderEnum { + NUMBER_0 = 0, NUMBER_1 = 1, NUMBER_2 = 2, - NUMBER_3 = 3 + NUMBER_9 = 9 } diff --git a/Web/src/api-services/models/get-refund-domestic-refund-by-out-refund-number-response.ts b/Web/src/api-services/models/get-refund-domestic-refund-by-out-refund-number-response.ts new file mode 100644 index 00000000..d7484ac6 --- /dev/null +++ b/Web/src/api-services/models/get-refund-domestic-refund-by-out-refund-number-response.ts @@ -0,0 +1,114 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { Amount } from './amount'; +import { Promotion } from './promotion'; + /** + * + * + * @export + * @interface GetRefundDomesticRefundByOutRefundNumberResponse + */ +export interface GetRefundDomesticRefundByOutRefundNumberResponse { + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + code?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + message?: string | null; + + /** + * @type {{ [key: string]: any; }} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + detail?: { [key: string]: any; } | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + refundId?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + outRefundNo?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + transactionId?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + outTradeNo?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + channel?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + userReceivedAccount?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + fundsAccount?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + status?: string | null; + + /** + * @type {Date} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + successTime?: Date | null; + + /** + * @type {Date} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + createTime?: Date; + + /** + * @type {Amount} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + amount?: Amount; + + /** + * @type {Array}
+ * @memberof GetRefundDomesticRefundByOutRefundNumberResponse
+ */
+ promotionDetail?: Array | null;
+}
diff --git a/Web/src/api-services/models/goods-detail.ts b/Web/src/api-services/models/goods-detail.ts
new file mode 100644
index 00000000..93a561af
--- /dev/null
+++ b/Web/src/api-services/models/goods-detail.ts
@@ -0,0 +1,58 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + /** + * + * + * @export + * @interface GoodsDetail + */ +export interface GoodsDetail { + + /** + * @type {string} + * @memberof GoodsDetail + */ + merchantGoodsId?: string | null; + + /** + * @type {string} + * @memberof GoodsDetail + */ + wechatpayGoodsId?: string | null; + + /** + * @type {string} + * @memberof GoodsDetail + */ + goodsName?: string | null; + + /** + * @type {number} + * @memberof GoodsDetail + */ + unitPrice?: number; + + /** + * @type {number} + * @memberof GoodsDetail + */ + refundAmount?: number; + + /** + * @type {number} + * @memberof GoodsDetail + */ + refundQuantity?: number; +} diff --git a/Web/src/api-services/models/index.ts b/Web/src/api-services/models/index.ts index eb8039df..d1f06166 100644 --- a/Web/src/api-services/models/index.ts +++ b/Web/src/api-services/models/index.ts @@ -19,9 +19,11 @@ export * from './add-sys-ldap-input'; export * from './add-tenant-input'; export * from './add-user-input'; export * from './admin-result-boolean'; +export * from './admin-result-create-pay-transaction-output'; export * from './admin-result-data-set'; export * from './admin-result-data-table'; export * from './admin-result-dictionary-string-string'; +export * from './admin-result-get-refund-domestic-refund-by-out-refund-number-response'; export * from './admin-result-iaction-result'; export * from './admin-result-int32'; export * from './admin-result-int64'; @@ -82,6 +84,7 @@ export * from './admin-result-sql-sugar-paged-list-sys-online-user'; export * from './admin-result-sql-sugar-paged-list-sys-plugin'; export * from './admin-result-sql-sugar-paged-list-sys-print'; export * from './admin-result-sql-sugar-paged-list-sys-region'; +export * from './admin-result-sql-sugar-paged-list-sys-wechat-pay'; export * from './admin-result-sql-sugar-paged-list-tenant-output'; export * from './admin-result-sql-sugar-paged-list-user-output'; export * from './admin-result-string'; @@ -101,6 +104,7 @@ export * from './admin-result-visual-db-table'; export * from './admin-result-wechat-pay-output'; export * from './admin-result-wx-open-id-output'; export * from './admin-result-wx-phone-output'; +export * from './amount'; export * from './api-output'; export * from './assembly'; export * from './base-api-input'; @@ -114,13 +118,13 @@ export * from './card-type-enum'; export * from './change-pwd-input'; export * from './cluster-status'; export * from './code-gen-config'; -export * from './code-gen-input'; export * from './column-ouput'; export * from './column-relation'; export * from './compare-info'; export * from './const-output'; export * from './constructor-info'; export * from './create-entity-input'; +export * from './create-pay-transaction-output'; export * from './create-seed-data-input'; export * from './culture-info'; export * from './culture-level-enum'; @@ -179,10 +183,16 @@ export * from './field-attributes'; export * from './field-info'; export * from './file-input'; export * from './file-output'; +export * from './filter'; +export * from './filter-logic-enum'; +export * from './filter-operator-enum'; +export * from './from'; export * from './gen-auth-url-input'; export * from './gender-enum'; export * from './generate-signature-input'; export * from './generic-parameter-attributes'; +export * from './get-refund-domestic-refund-by-out-refund-number-response'; +export * from './goods-detail'; export * from './http-method-enum'; export * from './iaction-result'; export * from './icomponent'; @@ -225,8 +235,8 @@ export * from './notice-user-status-enum'; export * from './number-format-info'; export * from './oauth-user-input'; export * from './oauth-user-output'; -export * from './open-access-input'; export * from './open-access-output'; +export * from './page-code-gen-input'; export * from './page-config-input'; export * from './page-dict-data-input'; export * from './page-dict-type-input'; @@ -236,6 +246,7 @@ export * from './page-job-trigger-record-input'; export * from './page-log-input'; export * from './page-notice-input'; export * from './page-online-user-input'; +export * from './page-open-access-input'; export * from './page-plugin-input'; export * from './page-pos-input'; export * from './page-pos-output'; @@ -243,6 +254,8 @@ export * from './page-print-input'; export * from './page-region-input'; export * from './page-role-input'; export * from './page-role-output'; +export * from './page-sys-ldap-input'; +export * from './page-sys-wechat-pay-input'; export * from './page-tenant-input'; export * from './page-user-input'; export * from './parameter-attributes'; @@ -250,8 +263,10 @@ export * from './parameter-info'; export * from './platform-type-enum'; export * from './pos-output'; export * from './print-type-enum'; +export * from './promotion'; export * from './property-attributes'; export * from './property-info'; +export * from './refund-request-input'; export * from './reset-pwd-user-input'; export * from './role-api-input'; export * from './role-input'; @@ -262,6 +277,7 @@ export * from './runtime-field-handle'; export * from './runtime-method-handle'; export * from './runtime-type-handle'; export * from './schema-serialization-mode'; +export * from './search'; export * from './security-rule-set'; export * from './send-subscribe-message-input'; export * from './serialization-format'; @@ -290,6 +306,7 @@ export * from './sql-sugar-paged-list-sys-online-user'; export * from './sql-sugar-paged-list-sys-plugin'; export * from './sql-sugar-paged-list-sys-print'; export * from './sql-sugar-paged-list-sys-region'; +export * from './sql-sugar-paged-list-sys-wechat-pay'; export * from './sql-sugar-paged-list-tenant-output'; export * from './sql-sugar-paged-list-user-output'; export * from './status-enum'; @@ -311,7 +328,6 @@ export * from './sys-job-detail'; export * from './sys-job-trigger'; export * from './sys-job-trigger-record'; export * from './sys-ldap'; -export * from './sys-ldap-input'; export * from './sys-log-diff'; export * from './sys-log-ex'; export * from './sys-log-op'; diff --git a/Web/src/api-services/models/info-save-input.ts b/Web/src/api-services/models/info-save-input.ts index 198f63e9..e07b3ef6 100644 --- a/Web/src/api-services/models/info-save-input.ts +++ b/Web/src/api-services/models/info-save-input.ts @@ -28,6 +28,14 @@ export interface InfoSaveInput { */ sysLogoBase64?: string | null; + /** + * 系统图标文件名 + * + * @type {string} + * @memberof InfoSaveInput + */ + sysLogoFileName?: string | null; + /** * 系统主标题 * diff --git a/Web/src/api-services/models/member-info.ts b/Web/src/api-services/models/member-info.ts index 983879e9..b1fbee1e 100644 --- a/Web/src/api-services/models/member-info.ts +++ b/Web/src/api-services/models/member-info.ts @@ -30,12 +30,6 @@ export interface MemberInfo { */ memberType?: MemberTypes; - /** - * @type {string} - * @memberof MemberInfo - */ - name?: string | null; - /** * @type {Type} * @memberof MemberInfo @@ -48,6 +42,12 @@ export interface MemberInfo { */ reflectedType?: Type; + /** + * @type {string} + * @memberof MemberInfo + */ + name?: string | null; + /** * @type {Module} * @memberof MemberInfo diff --git a/Web/src/api-services/models/oauth-user-input.ts b/Web/src/api-services/models/oauth-user-input.ts index 81a8ab1f..03ac9324 100644 --- a/Web/src/api-services/models/oauth-user-input.ts +++ b/Web/src/api-services/models/oauth-user-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface OAuthUserInput { + /** + * @type {Search} + * @memberof OAuthUserInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof OAuthUserInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof OAuthUserInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/open-access-output.ts b/Web/src/api-services/models/open-access-output.ts index 1b482e70..262b2c21 100644 --- a/Web/src/api-services/models/open-access-output.ts +++ b/Web/src/api-services/models/open-access-output.ts @@ -12,6 +12,7 @@ * Do not edit the class manually. */ +import { SysUser } from './sys-user'; /** * * @@ -116,6 +117,12 @@ export interface OpenAccessOutput { */ bindUserId?: number; + /** + * @type {SysUser} + * @memberof OpenAccessOutput + */ + bindUser?: SysUser; + /** * 绑定用户账号 * diff --git a/Web/src/api-services/models/code-gen-input.ts b/Web/src/api-services/models/page-code-gen-input.ts similarity index 69% rename from Web/src/api-services/models/code-gen-input.ts rename to Web/src/api-services/models/page-code-gen-input.ts index bdaf3756..010e2cea 100644 --- a/Web/src/api-services/models/code-gen-input.ts +++ b/Web/src/api-services/models/page-code-gen-input.ts @@ -12,19 +12,41 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * 代码生成参数类 * * @export - * @interface CodeGenInput + * @interface PageCodeGenInput */ -export interface CodeGenInput { +export interface PageCodeGenInput { + + /** + * @type {Search} + * @memberof PageCodeGenInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageCodeGenInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageCodeGenInput + */ + filter?: Filter; /** * 当前页码 * * @type {number} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ page?: number; @@ -32,7 +54,7 @@ export interface CodeGenInput { * 页码容量 * * @type {number} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ pageSize?: number; @@ -40,7 +62,7 @@ export interface CodeGenInput { * 排序字段 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ field?: string | null; @@ -48,7 +70,7 @@ export interface CodeGenInput { * 排序方向 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ order?: string | null; @@ -56,7 +78,7 @@ export interface CodeGenInput { * 降序排序 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ descStr?: string | null; @@ -64,7 +86,7 @@ export interface CodeGenInput { * 作者姓名 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ authorName?: string | null; @@ -72,7 +94,7 @@ export interface CodeGenInput { * 类名 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ className?: string | null; @@ -80,7 +102,7 @@ export interface CodeGenInput { * 是否移除表前缀 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ tablePrefix?: string | null; @@ -88,7 +110,7 @@ export interface CodeGenInput { * 库定位器名 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ configId?: string | null; @@ -96,7 +118,7 @@ export interface CodeGenInput { * 数据库名(保留字段) * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ dbName?: string | null; @@ -104,7 +126,7 @@ export interface CodeGenInput { * 数据库类型 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ dbType?: string | null; @@ -112,7 +134,7 @@ export interface CodeGenInput { * 数据库链接 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ connectionString?: string | null; @@ -120,7 +142,7 @@ export interface CodeGenInput { * 生成方式 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ generateType?: string | null; @@ -128,7 +150,7 @@ export interface CodeGenInput { * 数据库表名 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ tableName?: string | null; @@ -136,7 +158,7 @@ export interface CodeGenInput { * 命名空间 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ nameSpace?: string | null; @@ -144,7 +166,7 @@ export interface CodeGenInput { * 业务名（业务代码包名称） * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ busName?: string | null; @@ -152,7 +174,7 @@ export interface CodeGenInput { * 功能名（数据库表名称） * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ tableComment?: string | null; @@ -160,7 +182,7 @@ export interface CodeGenInput { * 菜单应用分类（应用编码） * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ menuApplication?: string | null; @@ -168,7 +190,7 @@ export interface CodeGenInput { * 是否生成菜单 * * @type {boolean} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ generateMenu?: boolean; @@ -176,7 +198,7 @@ export interface CodeGenInput { * 菜单父级 * * @type {number} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ menuPid?: number | null; @@ -184,7 +206,7 @@ export interface CodeGenInput { * 页面目录 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ pagePath?: string | null; @@ -192,7 +214,7 @@ export interface CodeGenInput { * 支持打印类型 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ printType?: string | null; @@ -200,7 +222,15 @@ export interface CodeGenInput { * 打印模版名称 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ printName?: string | null; + + /** + * 是否使用 Api Service + * + * @type {boolean} + * @memberof PageCodeGenInput + */ + isApiService?: boolean; } diff --git a/Web/src/api-services/models/page-config-input.ts b/Web/src/api-services/models/page-config-input.ts index f8f36b7e..ed065e99 100644 --- a/Web/src/api-services/models/page-config-input.ts +++ b/Web/src/api-services/models/page-config-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PageConfigInput { + /** + * @type {Search} + * @memberof PageConfigInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageConfigInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageConfigInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-dict-data-input.ts b/Web/src/api-services/models/page-dict-data-input.ts index 448fd305..12bed662 100644 --- a/Web/src/api-services/models/page-dict-data-input.ts +++ b/Web/src/api-services/models/page-dict-data-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PageDictDataInput { + /** + * @type {Search} + * @memberof PageDictDataInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageDictDataInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageDictDataInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-dict-type-input.ts b/Web/src/api-services/models/page-dict-type-input.ts index e722cc36..138860bd 100644 --- a/Web/src/api-services/models/page-dict-type-input.ts +++ b/Web/src/api-services/models/page-dict-type-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PageDictTypeInput { + /** + * @type {Search} + * @memberof PageDictTypeInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageDictTypeInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageDictTypeInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-file-input.ts b/Web/src/api-services/models/page-file-input.ts index 06353cba..1ca5f868 100644 --- a/Web/src/api-services/models/page-file-input.ts +++ b/Web/src/api-services/models/page-file-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PageFileInput { + /** + * @type {Search} + * @memberof PageFileInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageFileInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageFileInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-job-detail-input.ts b/Web/src/api-services/models/page-job-detail-input.ts index 8f41ca3f..1934cbb7 100644 --- a/Web/src/api-services/models/page-job-detail-input.ts +++ b/Web/src/api-services/models/page-job-detail-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PageJobDetailInput { + /** + * @type {Search} + * @memberof PageJobDetailInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageJobDetailInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageJobDetailInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-job-trigger-record-input.ts b/Web/src/api-services/models/page-job-trigger-record-input.ts index 56b0bcb0..c38afda9 100644 --- a/Web/src/api-services/models/page-job-trigger-record-input.ts +++ b/Web/src/api-services/models/page-job-trigger-record-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PageJobTriggerRecordInput { + /** + * @type {Search} + * @memberof PageJobTriggerRecordInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageJobTriggerRecordInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageJobTriggerRecordInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-log-input.ts b/Web/src/api-services/models/page-log-input.ts index d98381b1..b0bdfb57 100644 --- a/Web/src/api-services/models/page-log-input.ts +++ b/Web/src/api-services/models/page-log-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PageLogInput { + /** + * @type {Search} + * @memberof PageLogInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageLogInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageLogInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-notice-input.ts b/Web/src/api-services/models/page-notice-input.ts index 80e5dfea..f99944e9 100644 --- a/Web/src/api-services/models/page-notice-input.ts +++ b/Web/src/api-services/models/page-notice-input.ts @@ -12,7 +12,9 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; import { NoticeTypeEnum } from './notice-type-enum'; +import { Search } from './search'; /** * * @@ -21,6 +23,26 @@ import { NoticeTypeEnum } from './notice-type-enum'; */ export interface PageNoticeInput { + /** + * @type {Search} + * @memberof PageNoticeInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageNoticeInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageNoticeInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-online-user-input.ts b/Web/src/api-services/models/page-online-user-input.ts index 2c26e022..0cc039e8 100644 --- a/Web/src/api-services/models/page-online-user-input.ts +++ b/Web/src/api-services/models/page-online-user-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PageOnlineUserInput { + /** + * @type {Search} + * @memberof PageOnlineUserInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageOnlineUserInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageOnlineUserInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/open-access-input.ts b/Web/src/api-services/models/page-open-access-input.ts similarity index 65% rename from Web/src/api-services/models/open-access-input.ts rename to Web/src/api-services/models/page-open-access-input.ts index add1f46a..189d5bcd 100644 --- a/Web/src/api-services/models/open-access-input.ts +++ b/Web/src/api-services/models/page-open-access-input.ts @@ -12,19 +12,41 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * 开放接口身份输入参数 * * @export - * @interface OpenAccessInput + * @interface PageOpenAccessInput */ -export interface OpenAccessInput { +export interface PageOpenAccessInput { + + /** + * @type {Search} + * @memberof PageOpenAccessInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageOpenAccessInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageOpenAccessInput + */ + filter?: Filter; /** * 当前页码 * * @type {number} - * @memberof OpenAccessInput + * @memberof PageOpenAccessInput */ page?: number; @@ -32,7 +54,7 @@ export interface OpenAccessInput { * 页码容量 * * @type {number} - * @memberof OpenAccessInput + * @memberof PageOpenAccessInput */ pageSize?: number; @@ -40,7 +62,7 @@ export interface OpenAccessInput { * 排序字段 * * @type {string} - * @memberof OpenAccessInput + * @memberof PageOpenAccessInput */ field?: string | null; @@ -48,7 +70,7 @@ export interface OpenAccessInput { * 排序方向 * * @type {string} - * @memberof OpenAccessInput + * @memberof PageOpenAccessInput */ order?: string | null; @@ -56,7 +78,7 @@ export interface OpenAccessInput { * 降序排序 * * @type {string} - * @memberof OpenAccessInput + * @memberof PageOpenAccessInput */ descStr?: string | null; @@ -64,7 +86,7 @@ export interface OpenAccessInput { * 身份标识 * * @type {string} - * @memberof OpenAccessInput + * @memberof PageOpenAccessInput */ accessKey?: string | null; } diff --git a/Web/src/api-services/models/page-plugin-input.ts b/Web/src/api-services/models/page-plugin-input.ts index ea139ea0..e841f3e5 100644 --- a/Web/src/api-services/models/page-plugin-input.ts +++ b/Web/src/api-services/models/page-plugin-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PagePluginInput { + /** + * @type {Search} + * @memberof PagePluginInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PagePluginInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PagePluginInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-pos-input.ts b/Web/src/api-services/models/page-pos-input.ts index fd15aa05..8784fcce 100644 --- a/Web/src/api-services/models/page-pos-input.ts +++ b/Web/src/api-services/models/page-pos-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PagePosInput { + /** + * @type {Search} + * @memberof PagePosInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PagePosInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PagePosInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-print-input.ts b/Web/src/api-services/models/page-print-input.ts index 8caa9026..1c3b5a48 100644 --- a/Web/src/api-services/models/page-print-input.ts +++ b/Web/src/api-services/models/page-print-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PagePrintInput { + /** + * @type {Search} + * @memberof PagePrintInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PagePrintInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PagePrintInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-region-input.ts b/Web/src/api-services/models/page-region-input.ts index b713fcd2..f368cc32 100644 --- a/Web/src/api-services/models/page-region-input.ts +++ b/Web/src/api-services/models/page-region-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PageRegionInput { + /** + * @type {Search} + * @memberof PageRegionInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageRegionInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageRegionInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-role-input.ts b/Web/src/api-services/models/page-role-input.ts index d2053394..271e2275 100644 --- a/Web/src/api-services/models/page-role-input.ts +++ b/Web/src/api-services/models/page-role-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PageRoleInput { + /** + * @type {Search} + * @memberof PageRoleInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageRoleInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageRoleInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/sys-ldap-input.ts b/Web/src/api-services/models/page-sys-ldap-input.ts similarity index 66% rename from Web/src/api-services/models/sys-ldap-input.ts rename to Web/src/api-services/models/page-sys-ldap-input.ts index 7882fa15..b6037d7c 100644 --- a/Web/src/api-services/models/sys-ldap-input.ts +++ b/Web/src/api-services/models/page-sys-ldap-input.ts @@ -12,19 +12,41 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * 系统域登录信息配置输入参数 * * @export - * @interface SysLdapInput + * @interface PageSysLdapInput */ -export interface SysLdapInput { +export interface PageSysLdapInput { + + /** + * @type {Search} + * @memberof PageSysLdapInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageSysLdapInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageSysLdapInput + */ + filter?: Filter; /** * 当前页码 * * @type {number} - * @memberof SysLdapInput + * @memberof PageSysLdapInput */ page?: number; @@ -32,7 +54,7 @@ export interface SysLdapInput { * 页码容量 * * @type {number} - * @memberof SysLdapInput + * @memberof PageSysLdapInput */ pageSize?: number; @@ -40,7 +62,7 @@ export interface SysLdapInput { * 排序字段 * * @type {string} - * @memberof SysLdapInput + * @memberof PageSysLdapInput */ field?: string | null; @@ -48,7 +70,7 @@ export interface SysLdapInput { * 排序方向 * * @type {string} - * @memberof SysLdapInput + * @memberof PageSysLdapInput */ order?: string | null; @@ -56,7 +78,7 @@ export interface SysLdapInput { * 降序排序 * * @type {string} - * @memberof SysLdapInput + * @memberof PageSysLdapInput */ descStr?: string | null; @@ -64,7 +86,7 @@ export interface SysLdapInput { * 关键字查询 * * @type {string} - * @memberof SysLdapInput + * @memberof PageSysLdapInput */ searchKey?: string | null; @@ -72,7 +94,7 @@ export interface SysLdapInput { * 主机 * * @type {string} - * @memberof SysLdapInput + * @memberof PageSysLdapInput */ host?: string | null; } diff --git a/Web/src/api-services/models/page-sys-wechat-pay-input.ts b/Web/src/api-services/models/page-sys-wechat-pay-input.ts new file mode 100644 index 00000000..63a8ce1c --- /dev/null +++ b/Web/src/api-services/models/page-sys-wechat-pay-input.ts @@ -0,0 +1,124 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { Filter } from './filter'; +import { Search } from './search'; + /** + * + * + * @export + * @interface PageSysWechatPayInput + */ +export interface PageSysWechatPayInput { + + /** + * @type {Search} + * @memberof PageSysWechatPayInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageSysWechatPayInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageSysWechatPayInput + */ + filter?: Filter; + + /** + * 当前页码 + * + * @type {number} + * @memberof PageSysWechatPayInput + */ + page?: number; + + /** + * 页码容量 + * + * @type {number} + * @memberof PageSysWechatPayInput + */ + pageSize?: number; + + /** + * 排序字段 + * + * @type {string} + * @memberof PageSysWechatPayInput + */ + field?: string | null; + + /** + * 排序方向 + * + * @type {string} + * @memberof PageSysWechatPayInput + */ + order?: string | null; + + /** + * 降序排序 + * + * @type {string} + * @memberof PageSysWechatPayInput + */ + descStr?: string | null; + + /** + * order_id + * + * @type {number} + * @memberof PageSysWechatPayInput + */ + orderId?: number | null; + + /** + * order_status + * + * @type {number} + * @memberof PageSysWechatPayInput + */ + orderStatus?: number | null; + + /** + * out_trade_number + * + * @type {string} + * @memberof PageSysWechatPayInput + */ + outTradeNumber?: string | null; + + /** + * success_time范围 + * + * @type {Array}
+ * @memberof PageSysWechatPayInput
+ */
+ successTimeRange?: Array | null;
+
+ /**
+ * expire_time范围
+ *
+ * @type {Array}
+ * @memberof PageSysWechatPayInput
+ */
+ expireTimeRange?: Array | null;
+}
diff --git a/Web/src/api-services/models/page-tenant-input.ts b/Web/src/api-services/models/page-tenant-input.ts
index e7f5edf3..e63adbed 100644
--- a/Web/src/api-services/models/page-tenant-input.ts
+++ b/Web/src/api-services/models/page-tenant-input.ts
@@ -12,6 +12,8 @@
* Do not edit the class manually.
*/
+import { Filter } from './filter';
+import { Search } from './search';
/**
*
*
@@ -20,6 +22,26 @@
*/
export interface PageTenantInput {
+ /**
+ * @type {Search}
+ * @memberof PageTenantInput
+ */
+ search?: Search;
+
+ /**
+ * 模糊查询关键字
+ *
+ * @type {string}
+ * @memberof PageTenantInput
+ */
+ keyword?: string | null;
+
+ /**
+ * @type {Filter}
+ * @memberof PageTenantInput
+ */
+ filter?: Filter;
+
/**
* 当前页码
*
diff --git a/Web/src/api-services/models/page-user-input.ts b/Web/src/api-services/models/page-user-input.ts
index 35610565..6e85de61 100644
--- a/Web/src/api-services/models/page-user-input.ts
+++ b/Web/src/api-services/models/page-user-input.ts
@@ -12,6 +12,8 @@
* Do not edit the class manually.
*/
+import { Filter } from './filter';
+import { Search } from './search';
/**
* 获取用户分页列表输入参数
*
@@ -20,6 +22,26 @@
*/
export interface PageUserInput {
+ /**
+ * @type {Search}
+ * @memberof PageUserInput
+ */
+ search?: Search;
+
+ /**
+ * 模糊查询关键字
+ *
+ * @type {string}
+ * @memberof PageUserInput
+ */
+ keyword?: string | null;
+
+ /**
+ * @type {Filter}
+ * @memberof PageUserInput
+ */
+ filter?: Filter;
+
/**
* 当前页码
*
diff --git a/Web/src/api-services/models/promotion.ts b/Web/src/api-services/models/promotion.ts
new file mode 100644
index 00000000..4b8e3d99
--- /dev/null
+++ b/Web/src/api-services/models/promotion.ts
@@ -0,0 +1,59 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { GoodsDetail } from './goods-detail'; + /** + * + * + * @export + * @interface Promotion + */ +export interface Promotion { + + /** + * @type {string} + * @memberof Promotion + */ + promotionId?: string | null; + + /** + * @type {string} + * @memberof Promotion + */ + scope?: string | null; + + /** + * @type {string} + * @memberof Promotion + */ + type?: string | null; + + /** + * @type {number} + * @memberof Promotion + */ + amount?: number; + + /** + * @type {number} + * @memberof Promotion + */ + refundAmount?: number; + + /** + * @type {Array}
+ * @memberof Promotion
+ */
+ goodsDetail?: Array | null;
+}
diff --git a/Web/src/api-services/models/refund-request-input.ts b/Web/src/api-services/models/refund-request-input.ts
new file mode 100644
index 00000000..0d24f8f0
--- /dev/null
+++ b/Web/src/api-services/models/refund-request-input.ts
@@ -0,0 +1,126 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + /** + * + * + * @export + * @interface RefundRequestInput + */ +export interface RefundRequestInput { + + /** + * 商户订单号(原支付交易对应的付款单号) + * + * @type {string} + * @memberof RefundRequestInput + */ + outTradeNumber?: string | null; + + /** + * 原订单金额(分) + * + * @type {number} + * @memberof RefundRequestInput + */ + total?: number; + + /** + * 退款金额(分) + * + * @type {number} + * @memberof RefundRequestInput + */ + refund?: number; + + /** + * 退款原因 + * + * @type {string} + * @memberof RefundRequestInput + */ + reason?: string | null; + + /** + * 关联的商户订单号 + * + * @type {number} + * @memberof RefundRequestInput + */ + orderId?: number; + + /** + * 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款) + * + * @type {number} + * @memberof RefundRequestInput + */ + orderStatus?: number; + + /** + * 关联的商户商品编码 + * + * @type {string} + * @memberof RefundRequestInput + */ + merchantGoodsId?: string | null; + + /** + * 关联的商户商品名称 + * + * @type {string} + * @memberof RefundRequestInput + */ + goodsName?: string | null; + + /** + * 关联的商户商品单价 + * + * @type {number} + * @memberof RefundRequestInput + */ + unitPrice?: number; + + /** + * 关联的商户商品退款金额 + * + * @type {number} + * @memberof RefundRequestInput + */ + refundAmount?: number; + + /** + * 关联的商户商品退货数量 + * + * @type {number} + * @memberof RefundRequestInput + */ + refundQuantity?: number; + + /** + * 附加数据 + * + * @type {string} + * @memberof RefundRequestInput + */ + attachment?: string | null; + + /** + * 备注 + * + * @type {string} + * @memberof RefundRequestInput + */ + remark?: string | null; +} diff --git a/Web/src/api-services/models/search.ts b/Web/src/api-services/models/search.ts new file mode 100644 index 00000000..afa1712f --- /dev/null +++ b/Web/src/api-services/models/search.ts @@ -0,0 +1,38 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + /** + * 模糊查询条件 + * + * @export + * @interface Search + */ +export interface Search { + + /** + * 字段名称集合 + * + * @type {Array}
+ * @memberof Search
+ */
+ fields?: Array | null;
+
+ /**
+ * 关键字
+ *
+ * @type {string}
+ * @memberof Search
+ */
+ keyword?: string | null;
+}
diff --git a/Web/src/api-services/models/sql-sugar-paged-list-sys-wechat-pay.ts b/Web/src/api-services/models/sql-sugar-paged-list-sys-wechat-pay.ts
new file mode 100644
index 00000000..dcb7a6b0
--- /dev/null
+++ b/Web/src/api-services/models/sql-sugar-paged-list-sys-wechat-pay.ts
@@ -0,0 +1,79 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { SysWechatPay } from './sys-wechat-pay'; + /** + * 分页泛型集合 + * + * @export + * @interface SqlSugarPagedListSysWechatPay + */ +export interface SqlSugarPagedListSysWechatPay { + + /** + * 页码 + * + * @type {number} + * @memberof SqlSugarPagedListSysWechatPay + */ + page?: number; + + /** + * 页容量 + * + * @type {number} + * @memberof SqlSugarPagedListSysWechatPay + */ + pageSize?: number; + + /** + * 总条数 + * + * @type {number} + * @memberof SqlSugarPagedListSysWechatPay + */ + total?: number; + + /** + * 总页数 + * + * @type {number} + * @memberof SqlSugarPagedListSysWechatPay + */ + totalPages?: number; + + /** + * 当前页集合 + * + * @type {Array}
+ * @memberof SqlSugarPagedListSysWechatPay
+ */
+ items?: Array | null;
+
+ /**
+ * 是否有上一页
+ *
+ * @type {boolean}
+ * @memberof SqlSugarPagedListSysWechatPay
+ */
+ hasPrevPage?: boolean;
+
+ /**
+ * 是否有下一页
+ *
+ * @type {boolean}
+ * @memberof SqlSugarPagedListSysWechatPay
+ */
+ hasNextPage?: boolean;
+}
diff --git a/Web/src/api-services/models/sys-code-gen.ts b/Web/src/api-services/models/sys-code-gen.ts
index 8017f169..4d68550a 100644
--- a/Web/src/api-services/models/sys-code-gen.ts
+++ b/Web/src/api-services/models/sys-code-gen.ts
@@ -211,4 +211,12 @@ export interface SysCodeGen {
* @memberof SysCodeGen
*/
printName?: string | null;
+
+ /**
+ * 是否使用 Api Service
+ *
+ * @type {boolean}
+ * @memberof SysCodeGen
+ */
+ isApiService?: boolean;
}
diff --git a/Web/src/api-services/models/sys-wechat-pay.ts b/Web/src/api-services/models/sys-wechat-pay.ts
index b1244f11..c7fb08f9 100644
--- a/Web/src/api-services/models/sys-wechat-pay.ts
+++ b/Web/src/api-services/models/sys-wechat-pay.ts
@@ -84,6 +84,22 @@ export interface SysWechatPay {
*/
isDelete?: boolean;
+ /**
+ * 关联的商户订单号
+ *
+ * @type {number}
+ * @memberof SysWechatPay
+ */
+ orderId?: number;
+
+ /**
+ * 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款)
+ *
+ * @type {number}
+ * @memberof SysWechatPay
+ */
+ orderStatus?: number;
+
/**
* 微信商户号
*
diff --git a/Web/src/api-services/models/update-code-gen-input.ts b/Web/src/api-services/models/update-code-gen-input.ts
index 616f60b7..887afb4b 100644
--- a/Web/src/api-services/models/update-code-gen-input.ts
+++ b/Web/src/api-services/models/update-code-gen-input.ts
@@ -12,6 +12,8 @@
* Do not edit the class manually.
*/
+import { Filter } from './filter';
+import { Search } from './search';
/**
*
*
@@ -20,6 +22,26 @@
*/
export interface UpdateCodeGenInput {
+ /**
+ * @type {Search}
+ * @memberof UpdateCodeGenInput
+ */
+ search?: Search;
+
+ /**
+ * 模糊查询关键字
+ *
+ * @type {string}
+ * @memberof UpdateCodeGenInput
+ */
+ keyword?: string | null;
+
+ /**
+ * @type {Filter}
+ * @memberof UpdateCodeGenInput
+ */
+ filter?: Filter;
+
/**
* 当前页码
*
@@ -204,6 +226,14 @@ export interface UpdateCodeGenInput {
*/
printName?: string | null;
+ /**
+ * 是否使用 Api Service
+ *
+ * @type {boolean}
+ * @memberof UpdateCodeGenInput
+ */
+ isApiService?: boolean;
+
/**
* 代码生成器Id
*
diff --git a/Web/src/api-services/models/update-open-access-input.ts b/Web/src/api-services/models/update-open-access-input.ts
index 7b4d29db..cc6cf06e 100644
--- a/Web/src/api-services/models/update-open-access-input.ts
+++ b/Web/src/api-services/models/update-open-access-input.ts
@@ -12,6 +12,7 @@
* Do not edit the class manually.
*/
+import { SysUser } from './sys-user';
/**
*
*
@@ -92,6 +93,12 @@ export interface UpdateOpenAccessInput {
*/
bindTenantId?: number;
+ /**
+ * @type {SysUser}
+ * @memberof UpdateOpenAccessInput
+ */
+ bindUser?: SysUser;
+
/**
* 身份标识
*
diff --git a/Web/src/api-services/models/wechat-pay-output.ts b/Web/src/api-services/models/wechat-pay-output.ts
index 621ca70a..1becf524 100644
--- a/Web/src/api-services/models/wechat-pay-output.ts
+++ b/Web/src/api-services/models/wechat-pay-output.ts
@@ -28,6 +28,30 @@ export interface WechatPayOutput {
*/
openId?: string | null;
+ /**
+ * 商户(支付交易)单号,微信唯一
+ *
+ * @type {string}
+ * @memberof WechatPayOutput
+ */
+ outTradeNumber?: string | null;
+
+ /**
+ * 关联的商户(商品交易)订单号
+ *
+ * @type {number}
+ * @memberof WechatPayOutput
+ */
+ orderId?: number;
+
+ /**
+ * 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款)
+ *
+ * @type {number}
+ * @memberof WechatPayOutput
+ */
+ orderStatus?: number;
+
/**
* 订单金额
*
@@ -51,4 +75,36 @@ export interface WechatPayOutput {
* @memberof WechatPayOutput
*/
goodsTag?: string | null;
+
+ /**
+ * 支付发起时间
+ *
+ * @type {Date}
+ * @memberof WechatPayOutput
+ */
+ createTime?: Date;
+
+ /**
+ * 支付完成时间
+ *
+ * @type {Date}
+ * @memberof WechatPayOutput
+ */
+ successTime?: Date;
+
+ /**
+ * 交易状态(支付成功后，微信返回)
+ *
+ * @type {string}
+ * @memberof WechatPayOutput
+ */
+ tradeState?: string | null;
+
+ /**
+ * 交易状态描述(支付成功后，微信返回)
+ *
+ * @type {string}
+ * @memberof WechatPayOutput
+ */
+ tradeStateDescription?: string | null;
}
diff --git a/Web/src/api-services/models/wechat-pay-transaction-input.ts b/Web/src/api-services/models/wechat-pay-transaction-input.ts
index 03f3ef8e..7ca3936e 100644
--- a/Web/src/api-services/models/wechat-pay-transaction-input.ts
+++ b/Web/src/api-services/models/wechat-pay-transaction-input.ts
@@ -59,4 +59,20 @@ export interface WechatPayTransactionInput {
* @memberof WechatPayTransactionInput
*/
goodsTag?: string | null;
+
+ /**
+ * 关联的商户订单号
+ *
+ * @type {number}
+ * @memberof WechatPayTransactionInput
+ */
+ orderId?: number;
+
+ /**
+ * 关联的商户订单付款状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款)
+ *
+ * @type {number}
+ * @memberof WechatPayTransactionInput
+ */
+ orderStatus?: number;
}
diff --git a/Web/src/hooks/setupVXETableHook.ts b/Web/src/hooks/setupVXETableHook.ts
index 8905b88b..332873da 100644
--- a/Web/src/hooks/setupVXETableHook.ts
+++ b/Web/src/hooks/setupVXETableHook.ts
@@ -9,8 +9,7 @@ import 'vxe-table-plugin-element/dist/style.css';
import VxeUI, { VxeComponentSizeType } from 'vxe-pc-ui';
import ExcelJS from 'exceljs';
import { useThemeConfig } from '/@/stores/themeConfig';
-const vxeSize:VxeComponentSizeType = useThemeConfig().themeConfig.globalComponentSize == 'small' ? 'mini'
- : useThemeConfig().themeConfig.globalComponentSize == 'default' ? 'small' : 'medium';
+const vxeSize: VxeComponentSizeType = useThemeConfig().themeConfig.globalComponentSize == 'small' ? 'mini' : useThemeConfig().themeConfig.globalComponentSize == 'default' ? 'small' : 'medium';
export const setupVXETable = (app: App) => {
// 加载插件
@@ -109,4 +108,4 @@ export const setupVXETable = (app: App) => {
// app.config.globalProperties.$XPrint = VxeUI.print
// app.config.globalProperties.$XSaveFile = VxeUI.saveFile
// app.config.globalProperties.$XReadFile = VxeUI.readFile
-};
\ No newline at end of file
+};
diff --git a/Web/src/hooks/useVxeTableOptionsHook.ts b/Web/src/hooks/useVxeTableOptionsHook.ts
index 73c9d681..e8f0b0f7 100644
--- a/Web/src/hooks/useVxeTableOptionsHook.ts
+++ b/Web/src/hooks/useVxeTableOptionsHook.ts
@@ -1,11 +1,10 @@
import { dayjs } from 'element-plus';
import { reactive } from 'vue';
-import { VxeGridProps, VxeGridPropTypes,VxeComponentSizeType } from 'vxe-table';
+import { VxeGridProps, VxeGridPropTypes, VxeComponentSizeType } from 'vxe-table';
import { useThemeConfig } from '/@/stores/themeConfig';
import { merge } from 'lodash-es';
-const vxeSize:VxeComponentSizeType = useThemeConfig().themeConfig.globalComponentSize == 'small' ? 'mini'
-: useThemeConfig().themeConfig.globalComponentSize == 'default' ? 'small' : 'medium';
+const vxeSize: VxeComponentSizeType = useThemeConfig().themeConfig.globalComponentSize == 'small' ? 'mini' : useThemeConfig().themeConfig.globalComponentSize == 'default' ? 'small' : 'medium';
/**
* @param {String} id 表格唯一标识，为空时自动随机产生;
diff --git a/Web/src/layout/component/columnsAside.vue b/Web/src/layout/component/columnsAside.vue
index 7eaf2603..68b4876c 100644
--- a/Web/src/layout/component/columnsAside.vue
+++ b/Web/src/layout/component/columnsAside.vue
@@ -79,8 +79,9 @@ const onColumnsAsideMenuClick = async (v: RouteItem) => {
if (route.path.startsWith(redirect)) mittBus.emit('setSendColumnsChildren', setSendChildren(redirect));
else router.push(redirect);
} else {
- if (!v.children) {
+ if (!v.children || v.children?.length === 0) {
router.push(path);
+ onColumnsAsideDown(v.k);
} else {
// 显示子级菜单
const resData: MittMenu = setSendChildren(path);
@@ -92,7 +93,7 @@ const onColumnsAsideMenuClick = async (v: RouteItem) => {
// 一个路由设置自动收起菜单
// https://gitee.com/lyt-top/vue-next-admin/issues/I6HW7H
- if (!v.children) themeConfig.value.isCollapse = true;
+ if (!v.children || v.children?.length === 0) themeConfig.value.isCollapse = true;
else if (v.children.length > 1) themeConfig.value.isCollapse = false;
};
// 鼠标移入时，显示当前的子级菜单
diff --git a/Web/src/stores/userInfo.ts b/Web/src/stores/userInfo.ts
index 53190884..d4667bae 100644
--- a/Web/src/stores/userInfo.ts
+++ b/Web/src/stores/userInfo.ts
@@ -132,14 +132,16 @@ export const useUserInfo = defineStore('userInfo', {
// 根据字典类型和代码取字典项
getDictItemByCode(typePCode: string, val: string) {
- val = val.toString();
- if (val) {
- const _val = val.toString();
- const ds = this.getDictDatasByCode(typePCode);
- for (let index = 0; index < ds.length; index++) {
- const element = ds[index];
- if (element.code == _val) {
- return element;
+ if (val != undefined) {
+ val = val.toString();
+ if (val) {
+ const _val = val.toString();
+ const ds = this.getDictDatasByCode(typePCode);
+ for (let index = 0; index < ds.length; index++) {
+ const element = ds[index];
+ if (element.code == _val) {
+ return element;
+ }
}
}
}
diff --git a/Web/src/theme/element.scss b/Web/src/theme/element.scss
index 83daf5b7..47524694 100644
--- a/Web/src/theme/element.scss
+++ b/Web/src/theme/element.scss
@@ -376,13 +376,13 @@
/* Table 表格 element plus 2.2.0 版本
------------------------------- */
.el-table {
+ // 表头背景色
+ --el-table-header-bg-color: var(--next-bg-main-color);
+
.el-button.is-text {
padding: 0;
}
- // 表头背景色
- --el-table-header-bg-color: var(--next-bg-main-color);
-
// 表头字体颜色
thead {
color: var(--el-text-color-regular);
diff --git a/Web/src/theme/vxeTable.scss b/Web/src/theme/vxeTable.scss
index 2482ce3b..a1be7244 100644
--- a/Web/src/theme/vxeTable.scss
+++ b/Web/src/theme/vxeTable.scss
@@ -36,10 +36,11 @@
.vxe-cell {
padding-left: 5px !important;
padding-right: 5px !important;
+ user-select: text !important;
+
.el-button {
padding: 0 !important;
}
- user-select: text !important;
}
.vxe-pager.size--mini {
diff --git a/Web/src/views/about/index.vue b/Web/src/views/about/index.vue
index f3864372..d5dd711a 100644
--- a/Web/src/views/about/index.vue
+++ b/Web/src/views/about/index.vue
@@ -5,8 +5,8 @@
简介(About)
- 基于 .NET6 (Furion/SqlSugar) 实现的通用权限开发框架，前端采用
- Vue3+Element-plus+Vite5，整合众多优秀技术和框架，模块插件式开发。集成多租户、缓存、数据校验、鉴权、事件总线、动态API、通讯、远程请求、任务调度、打印等众多黑科技。代码结构简单清晰，注释详尽，易于上手与二次开发，即便是复杂业务逻辑也能迅速实现，真正实现“开箱即用”。
+ 🔥基于 .NET 6/8 (Furion/SqlSugar) 实现的通用权限开发框架，前端采用
+ Vue3/Element-plus，代码简洁、易扩展。整合最新技术，模块插件式开发，前后端分离，开箱即用。集成多租户、缓存、数据校验、鉴权、事件总线、动态API、通讯、远程请求、任务调度、打印等众多黑科技。让开发更简单、更通用、更流行！
diff --git a/Web/src/views/home/widgets/components/welcome.vue b/Web/src/views/home/widgets/components/welcome.vue
index fb83f5c5..7cf1a42a 100644
--- a/Web/src/views/home/widgets/components/welcome.vue
+++ b/Web/src/views/home/widgets/components/welcome.vue
@@ -7,7 +7,7 @@
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { CreatePayTransactionOutput } from './create-pay-transaction-output'; + /** + * 全局返回结果 + * + * @export + * @interface AdminResultCreatePayTransactionOutput + */ +export interface AdminResultCreatePayTransactionOutput { + + /** + * 状态码 + * + * @type {number} + * @memberof AdminResultCreatePayTransactionOutput + */ + code?: number; + + /** + * 类型success、warning、error + * + * @type {string} + * @memberof AdminResultCreatePayTransactionOutput + */ + type?: string | null; + + /** + * 错误信息 + * + * @type {string} + * @memberof AdminResultCreatePayTransactionOutput + */ + message?: string | null; + + /** + * @type {CreatePayTransactionOutput} + * @memberof AdminResultCreatePayTransactionOutput + */ + result?: CreatePayTransactionOutput; + + /** + * 附加数据 + * + * @type {any} + * @memberof AdminResultCreatePayTransactionOutput + */ + extras?: any | null; + + /** + * 时间 + * + * @type {Date} + * @memberof AdminResultCreatePayTransactionOutput + */ + time?: Date; +} diff --git a/Web/src/api-services/models/admin-result-get-refund-domestic-refund-by-out-refund-number-response.ts b/Web/src/api-services/models/admin-result-get-refund-domestic-refund-by-out-refund-number-response.ts new file mode 100644 index 00000000..51706d2a --- /dev/null +++ b/Web/src/api-services/models/admin-result-get-refund-domestic-refund-by-out-refund-number-response.ts @@ -0,0 +1,69 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { GetRefundDomesticRefundByOutRefundNumberResponse } from './get-refund-domestic-refund-by-out-refund-number-response'; + /** + * 全局返回结果 + * + * @export + * @interface AdminResultGetRefundDomesticRefundByOutRefundNumberResponse + */ +export interface AdminResultGetRefundDomesticRefundByOutRefundNumberResponse { + + /** + * 状态码 + * + * @type {number} + * @memberof AdminResultGetRefundDomesticRefundByOutRefundNumberResponse + */ + code?: number; + + /** + * 类型success、warning、error + * + * @type {string} + * @memberof AdminResultGetRefundDomesticRefundByOutRefundNumberResponse + */ + type?: string | null; + + /** + * 错误信息 + * + * @type {string} + * @memberof AdminResultGetRefundDomesticRefundByOutRefundNumberResponse + */ + message?: string | null; + + /** + * @type {GetRefundDomesticRefundByOutRefundNumberResponse} + * @memberof AdminResultGetRefundDomesticRefundByOutRefundNumberResponse + */ + result?: GetRefundDomesticRefundByOutRefundNumberResponse; + + /** + * 附加数据 + * + * @type {any} + * @memberof AdminResultGetRefundDomesticRefundByOutRefundNumberResponse + */ + extras?: any | null; + + /** + * 时间 + * + * @type {Date} + * @memberof AdminResultGetRefundDomesticRefundByOutRefundNumberResponse + */ + time?: Date; +} diff --git a/Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-wechat-pay.ts b/Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-wechat-pay.ts new file mode 100644 index 00000000..acbc3877 --- /dev/null +++ b/Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-wechat-pay.ts @@ -0,0 +1,69 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { SqlSugarPagedListSysWechatPay } from './sql-sugar-paged-list-sys-wechat-pay'; + /** + * 全局返回结果 + * + * @export + * @interface AdminResultSqlSugarPagedListSysWechatPay + */ +export interface AdminResultSqlSugarPagedListSysWechatPay { + + /** + * 状态码 + * + * @type {number} + * @memberof AdminResultSqlSugarPagedListSysWechatPay + */ + code?: number; + + /** + * 类型success、warning、error + * + * @type {string} + * @memberof AdminResultSqlSugarPagedListSysWechatPay + */ + type?: string | null; + + /** + * 错误信息 + * + * @type {string} + * @memberof AdminResultSqlSugarPagedListSysWechatPay + */ + message?: string | null; + + /** + * @type {SqlSugarPagedListSysWechatPay} + * @memberof AdminResultSqlSugarPagedListSysWechatPay + */ + result?: SqlSugarPagedListSysWechatPay; + + /** + * 附加数据 + * + * @type {any} + * @memberof AdminResultSqlSugarPagedListSysWechatPay + */ + extras?: any | null; + + /** + * 时间 + * + * @type {Date} + * @memberof AdminResultSqlSugarPagedListSysWechatPay + */ + time?: Date; +} diff --git a/Web/src/api-services/models/amount.ts b/Web/src/api-services/models/amount.ts new file mode 100644 index 00000000..64ff0985 --- /dev/null +++ b/Web/src/api-services/models/amount.ts @@ -0,0 +1,83 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { From } from './from'; + /** + * + * + * @export + * @interface Amount + */ +export interface Amount { + + /** + * @type {number} + * @memberof Amount + */ + total?: number; + + /** + * @type {number} + * @memberof Amount + */ + refund?: number; + + /** + * @type {string} + * @memberof Amount + */ + currency?: string | null; + + /** + * @type {number} + * @memberof Amount + */ + payerTotal?: number; + + /** + * @type {number} + * @memberof Amount + */ + payerRefund?: number; + + /** + * @type {number} + * @memberof Amount + */ + settlementTotal?: number; + + /** + * @type {number} + * @memberof Amount + */ + settlementRefund?: number; + + /** + * @type {number} + * @memberof Amount + */ + discountRefund?: number; + + /** + * @type {Array
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + /** + * + * + * @export + * @interface CreatePayTransactionOutput + */ +export interface CreatePayTransactionOutput { + + /** + * @type {string} + * @memberof CreatePayTransactionOutput + */ + prepayId?: string | null; + + /** + * @type {string} + * @memberof CreatePayTransactionOutput + */ + outTradeNumber?: string | null; +} diff --git a/Web/src/api-services/models/db-type.ts b/Web/src/api-services/models/db-type.ts index 44de8445..c3867028 100644 --- a/Web/src/api-services/models/db-type.ts +++ b/Web/src/api-services/models/db-type.ts @@ -42,6 +42,8 @@ export enum DbType { NUMBER_21 = 21, NUMBER_22 = 22, NUMBER_23 = 23, + NUMBER_24 = 24, + NUMBER_25 = 25, NUMBER_900 = 900 } diff --git a/Web/src/api-services/models/filter-logic-enum.ts b/Web/src/api-services/models/filter-logic-enum.ts new file mode 100644 index 00000000..b535525a --- /dev/null +++ b/Web/src/api-services/models/filter-logic-enum.ts @@ -0,0 +1,25 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +/** + * 过滤条件
并且 And = 0
或者 Or = 1
异或 Xor = 2
+ * @export + * @enum {string} + */ +export enum FilterLogicEnum { + NUMBER_0 = 0, + NUMBER_1 = 1, + NUMBER_2 = 2 +} + diff --git a/Web/src/api-services/models/filter-operator-enum.ts b/Web/src/api-services/models/filter-operator-enum.ts new file mode 100644 index 00000000..ed0a3e7c --- /dev/null +++ b/Web/src/api-services/models/filter-operator-enum.ts @@ -0,0 +1,31 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +/** + * 过滤逻辑运算符
等于 EQ = 0
不等于 NEQ = 1
小于 LT = 2
小于等于 LTE = 3
大于 GT = 4
大于等于 GTE = 5
开始包含 StartsWith = 6
末尾包含 EndsWith = 7
包含 Contains = 8
+ * @export + * @enum {string} + */ +export enum FilterOperatorEnum { + NUMBER_0 = 0, + NUMBER_1 = 1, + NUMBER_2 = 2, + NUMBER_3 = 3, + NUMBER_4 = 4, + NUMBER_5 = 5, + NUMBER_6 = 6, + NUMBER_7 = 7, + NUMBER_8 = 8 +} + diff --git a/Web/src/api-services/models/filter.ts b/Web/src/api-services/models/filter.ts new file mode 100644 index 00000000..60d9216e --- /dev/null +++ b/Web/src/api-services/models/filter.ts @@ -0,0 +1,61 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { Filter } from './filter'; +import { FilterLogicEnum } from './filter-logic-enum'; +import { FilterOperatorEnum } from './filter-operator-enum'; + /** + * 筛选过滤条件 + * + * @export + * @interface Filter + */ +export interface Filter { + + /** + * @type {FilterLogicEnum} + * @memberof Filter + */ + logic?: FilterLogicEnum; + + /** + * 筛选过滤条件子项 + * + * @type {Array
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + /** + * + * + * @export + * @interface From + */ +export interface From { + + /** + * @type {number} + * @memberof From + */ + amount?: number; + + /** + * @type {string} + * @memberof From + */ + account?: string | null; +} diff --git a/Web/src/api-services/models/gender-enum.ts b/Web/src/api-services/models/gender-enum.ts index 8a3d9898..170584f1 100644 --- a/Web/src/api-services/models/gender-enum.ts +++ b/Web/src/api-services/models/gender-enum.ts @@ -13,13 +13,14 @@ */ /** - * 性别枚举
男 Male = 1
女 Female = 2
其他 Other = 3
+ * 性别枚举（GB/T 2261.1-2003）
未知的性别 Unknown = 0
男性 Male = 1
女性 Female = 2
未说明的性别 Unspecified = 9
* @export * @enum {string} */ export enum GenderEnum { + NUMBER_0 = 0, NUMBER_1 = 1, NUMBER_2 = 2, - NUMBER_3 = 3 + NUMBER_9 = 9 } diff --git a/Web/src/api-services/models/get-refund-domestic-refund-by-out-refund-number-response.ts b/Web/src/api-services/models/get-refund-domestic-refund-by-out-refund-number-response.ts new file mode 100644 index 00000000..d7484ac6 --- /dev/null +++ b/Web/src/api-services/models/get-refund-domestic-refund-by-out-refund-number-response.ts @@ -0,0 +1,114 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { Amount } from './amount'; +import { Promotion } from './promotion'; + /** + * + * + * @export + * @interface GetRefundDomesticRefundByOutRefundNumberResponse + */ +export interface GetRefundDomesticRefundByOutRefundNumberResponse { + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + code?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + message?: string | null; + + /** + * @type {{ [key: string]: any; }} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + detail?: { [key: string]: any; } | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + refundId?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + outRefundNo?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + transactionId?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + outTradeNo?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + channel?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + userReceivedAccount?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + fundsAccount?: string | null; + + /** + * @type {string} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + status?: string | null; + + /** + * @type {Date} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + successTime?: Date | null; + + /** + * @type {Date} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + createTime?: Date; + + /** + * @type {Amount} + * @memberof GetRefundDomesticRefundByOutRefundNumberResponse + */ + amount?: Amount; + + /** + * @type {Array
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + /** + * + * + * @export + * @interface GoodsDetail + */ +export interface GoodsDetail { + + /** + * @type {string} + * @memberof GoodsDetail + */ + merchantGoodsId?: string | null; + + /** + * @type {string} + * @memberof GoodsDetail + */ + wechatpayGoodsId?: string | null; + + /** + * @type {string} + * @memberof GoodsDetail + */ + goodsName?: string | null; + + /** + * @type {number} + * @memberof GoodsDetail + */ + unitPrice?: number; + + /** + * @type {number} + * @memberof GoodsDetail + */ + refundAmount?: number; + + /** + * @type {number} + * @memberof GoodsDetail + */ + refundQuantity?: number; +} diff --git a/Web/src/api-services/models/index.ts b/Web/src/api-services/models/index.ts index eb8039df..d1f06166 100644 --- a/Web/src/api-services/models/index.ts +++ b/Web/src/api-services/models/index.ts @@ -19,9 +19,11 @@ export * from './add-sys-ldap-input'; export * from './add-tenant-input'; export * from './add-user-input'; export * from './admin-result-boolean'; +export * from './admin-result-create-pay-transaction-output'; export * from './admin-result-data-set'; export * from './admin-result-data-table'; export * from './admin-result-dictionary-string-string'; +export * from './admin-result-get-refund-domestic-refund-by-out-refund-number-response'; export * from './admin-result-iaction-result'; export * from './admin-result-int32'; export * from './admin-result-int64'; @@ -82,6 +84,7 @@ export * from './admin-result-sql-sugar-paged-list-sys-online-user'; export * from './admin-result-sql-sugar-paged-list-sys-plugin'; export * from './admin-result-sql-sugar-paged-list-sys-print'; export * from './admin-result-sql-sugar-paged-list-sys-region'; +export * from './admin-result-sql-sugar-paged-list-sys-wechat-pay'; export * from './admin-result-sql-sugar-paged-list-tenant-output'; export * from './admin-result-sql-sugar-paged-list-user-output'; export * from './admin-result-string'; @@ -101,6 +104,7 @@ export * from './admin-result-visual-db-table'; export * from './admin-result-wechat-pay-output'; export * from './admin-result-wx-open-id-output'; export * from './admin-result-wx-phone-output'; +export * from './amount'; export * from './api-output'; export * from './assembly'; export * from './base-api-input'; @@ -114,13 +118,13 @@ export * from './card-type-enum'; export * from './change-pwd-input'; export * from './cluster-status'; export * from './code-gen-config'; -export * from './code-gen-input'; export * from './column-ouput'; export * from './column-relation'; export * from './compare-info'; export * from './const-output'; export * from './constructor-info'; export * from './create-entity-input'; +export * from './create-pay-transaction-output'; export * from './create-seed-data-input'; export * from './culture-info'; export * from './culture-level-enum'; @@ -179,10 +183,16 @@ export * from './field-attributes'; export * from './field-info'; export * from './file-input'; export * from './file-output'; +export * from './filter'; +export * from './filter-logic-enum'; +export * from './filter-operator-enum'; +export * from './from'; export * from './gen-auth-url-input'; export * from './gender-enum'; export * from './generate-signature-input'; export * from './generic-parameter-attributes'; +export * from './get-refund-domestic-refund-by-out-refund-number-response'; +export * from './goods-detail'; export * from './http-method-enum'; export * from './iaction-result'; export * from './icomponent'; @@ -225,8 +235,8 @@ export * from './notice-user-status-enum'; export * from './number-format-info'; export * from './oauth-user-input'; export * from './oauth-user-output'; -export * from './open-access-input'; export * from './open-access-output'; +export * from './page-code-gen-input'; export * from './page-config-input'; export * from './page-dict-data-input'; export * from './page-dict-type-input'; @@ -236,6 +246,7 @@ export * from './page-job-trigger-record-input'; export * from './page-log-input'; export * from './page-notice-input'; export * from './page-online-user-input'; +export * from './page-open-access-input'; export * from './page-plugin-input'; export * from './page-pos-input'; export * from './page-pos-output'; @@ -243,6 +254,8 @@ export * from './page-print-input'; export * from './page-region-input'; export * from './page-role-input'; export * from './page-role-output'; +export * from './page-sys-ldap-input'; +export * from './page-sys-wechat-pay-input'; export * from './page-tenant-input'; export * from './page-user-input'; export * from './parameter-attributes'; @@ -250,8 +263,10 @@ export * from './parameter-info'; export * from './platform-type-enum'; export * from './pos-output'; export * from './print-type-enum'; +export * from './promotion'; export * from './property-attributes'; export * from './property-info'; +export * from './refund-request-input'; export * from './reset-pwd-user-input'; export * from './role-api-input'; export * from './role-input'; @@ -262,6 +277,7 @@ export * from './runtime-field-handle'; export * from './runtime-method-handle'; export * from './runtime-type-handle'; export * from './schema-serialization-mode'; +export * from './search'; export * from './security-rule-set'; export * from './send-subscribe-message-input'; export * from './serialization-format'; @@ -290,6 +306,7 @@ export * from './sql-sugar-paged-list-sys-online-user'; export * from './sql-sugar-paged-list-sys-plugin'; export * from './sql-sugar-paged-list-sys-print'; export * from './sql-sugar-paged-list-sys-region'; +export * from './sql-sugar-paged-list-sys-wechat-pay'; export * from './sql-sugar-paged-list-tenant-output'; export * from './sql-sugar-paged-list-user-output'; export * from './status-enum'; @@ -311,7 +328,6 @@ export * from './sys-job-detail'; export * from './sys-job-trigger'; export * from './sys-job-trigger-record'; export * from './sys-ldap'; -export * from './sys-ldap-input'; export * from './sys-log-diff'; export * from './sys-log-ex'; export * from './sys-log-op'; diff --git a/Web/src/api-services/models/info-save-input.ts b/Web/src/api-services/models/info-save-input.ts index 198f63e9..e07b3ef6 100644 --- a/Web/src/api-services/models/info-save-input.ts +++ b/Web/src/api-services/models/info-save-input.ts @@ -28,6 +28,14 @@ export interface InfoSaveInput { */ sysLogoBase64?: string | null; + /** + * 系统图标文件名 + * + * @type {string} + * @memberof InfoSaveInput + */ + sysLogoFileName?: string | null; + /** * 系统主标题 * diff --git a/Web/src/api-services/models/member-info.ts b/Web/src/api-services/models/member-info.ts index 983879e9..b1fbee1e 100644 --- a/Web/src/api-services/models/member-info.ts +++ b/Web/src/api-services/models/member-info.ts @@ -30,12 +30,6 @@ export interface MemberInfo { */ memberType?: MemberTypes; - /** - * @type {string} - * @memberof MemberInfo - */ - name?: string | null; - /** * @type {Type} * @memberof MemberInfo @@ -48,6 +42,12 @@ export interface MemberInfo { */ reflectedType?: Type; + /** + * @type {string} + * @memberof MemberInfo + */ + name?: string | null; + /** * @type {Module} * @memberof MemberInfo diff --git a/Web/src/api-services/models/oauth-user-input.ts b/Web/src/api-services/models/oauth-user-input.ts index 81a8ab1f..03ac9324 100644 --- a/Web/src/api-services/models/oauth-user-input.ts +++ b/Web/src/api-services/models/oauth-user-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface OAuthUserInput { + /** + * @type {Search} + * @memberof OAuthUserInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof OAuthUserInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof OAuthUserInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/open-access-output.ts b/Web/src/api-services/models/open-access-output.ts index 1b482e70..262b2c21 100644 --- a/Web/src/api-services/models/open-access-output.ts +++ b/Web/src/api-services/models/open-access-output.ts @@ -12,6 +12,7 @@ * Do not edit the class manually. */ +import { SysUser } from './sys-user'; /** * * @@ -116,6 +117,12 @@ export interface OpenAccessOutput { */ bindUserId?: number; + /** + * @type {SysUser} + * @memberof OpenAccessOutput + */ + bindUser?: SysUser; + /** * 绑定用户账号 * diff --git a/Web/src/api-services/models/code-gen-input.ts b/Web/src/api-services/models/page-code-gen-input.ts similarity index 69% rename from Web/src/api-services/models/code-gen-input.ts rename to Web/src/api-services/models/page-code-gen-input.ts index bdaf3756..010e2cea 100644 --- a/Web/src/api-services/models/code-gen-input.ts +++ b/Web/src/api-services/models/page-code-gen-input.ts @@ -12,19 +12,41 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * 代码生成参数类 * * @export - * @interface CodeGenInput + * @interface PageCodeGenInput */ -export interface CodeGenInput { +export interface PageCodeGenInput { + + /** + * @type {Search} + * @memberof PageCodeGenInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageCodeGenInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageCodeGenInput + */ + filter?: Filter; /** * 当前页码 * * @type {number} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ page?: number; @@ -32,7 +54,7 @@ export interface CodeGenInput { * 页码容量 * * @type {number} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ pageSize?: number; @@ -40,7 +62,7 @@ export interface CodeGenInput { * 排序字段 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ field?: string | null; @@ -48,7 +70,7 @@ export interface CodeGenInput { * 排序方向 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ order?: string | null; @@ -56,7 +78,7 @@ export interface CodeGenInput { * 降序排序 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ descStr?: string | null; @@ -64,7 +86,7 @@ export interface CodeGenInput { * 作者姓名 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ authorName?: string | null; @@ -72,7 +94,7 @@ export interface CodeGenInput { * 类名 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ className?: string | null; @@ -80,7 +102,7 @@ export interface CodeGenInput { * 是否移除表前缀 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ tablePrefix?: string | null; @@ -88,7 +110,7 @@ export interface CodeGenInput { * 库定位器名 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ configId?: string | null; @@ -96,7 +118,7 @@ export interface CodeGenInput { * 数据库名(保留字段) * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ dbName?: string | null; @@ -104,7 +126,7 @@ export interface CodeGenInput { * 数据库类型 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ dbType?: string | null; @@ -112,7 +134,7 @@ export interface CodeGenInput { * 数据库链接 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ connectionString?: string | null; @@ -120,7 +142,7 @@ export interface CodeGenInput { * 生成方式 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ generateType?: string | null; @@ -128,7 +150,7 @@ export interface CodeGenInput { * 数据库表名 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ tableName?: string | null; @@ -136,7 +158,7 @@ export interface CodeGenInput { * 命名空间 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ nameSpace?: string | null; @@ -144,7 +166,7 @@ export interface CodeGenInput { * 业务名（业务代码包名称） * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ busName?: string | null; @@ -152,7 +174,7 @@ export interface CodeGenInput { * 功能名（数据库表名称） * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ tableComment?: string | null; @@ -160,7 +182,7 @@ export interface CodeGenInput { * 菜单应用分类（应用编码） * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ menuApplication?: string | null; @@ -168,7 +190,7 @@ export interface CodeGenInput { * 是否生成菜单 * * @type {boolean} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ generateMenu?: boolean; @@ -176,7 +198,7 @@ export interface CodeGenInput { * 菜单父级 * * @type {number} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ menuPid?: number | null; @@ -184,7 +206,7 @@ export interface CodeGenInput { * 页面目录 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ pagePath?: string | null; @@ -192,7 +214,7 @@ export interface CodeGenInput { * 支持打印类型 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ printType?: string | null; @@ -200,7 +222,15 @@ export interface CodeGenInput { * 打印模版名称 * * @type {string} - * @memberof CodeGenInput + * @memberof PageCodeGenInput */ printName?: string | null; + + /** + * 是否使用 Api Service + * + * @type {boolean} + * @memberof PageCodeGenInput + */ + isApiService?: boolean; } diff --git a/Web/src/api-services/models/page-config-input.ts b/Web/src/api-services/models/page-config-input.ts index f8f36b7e..ed065e99 100644 --- a/Web/src/api-services/models/page-config-input.ts +++ b/Web/src/api-services/models/page-config-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PageConfigInput { + /** + * @type {Search} + * @memberof PageConfigInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageConfigInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageConfigInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-dict-data-input.ts b/Web/src/api-services/models/page-dict-data-input.ts index 448fd305..12bed662 100644 --- a/Web/src/api-services/models/page-dict-data-input.ts +++ b/Web/src/api-services/models/page-dict-data-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PageDictDataInput { + /** + * @type {Search} + * @memberof PageDictDataInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageDictDataInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageDictDataInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-dict-type-input.ts b/Web/src/api-services/models/page-dict-type-input.ts index e722cc36..138860bd 100644 --- a/Web/src/api-services/models/page-dict-type-input.ts +++ b/Web/src/api-services/models/page-dict-type-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PageDictTypeInput { + /** + * @type {Search} + * @memberof PageDictTypeInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageDictTypeInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageDictTypeInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-file-input.ts b/Web/src/api-services/models/page-file-input.ts index 06353cba..1ca5f868 100644 --- a/Web/src/api-services/models/page-file-input.ts +++ b/Web/src/api-services/models/page-file-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PageFileInput { + /** + * @type {Search} + * @memberof PageFileInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageFileInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageFileInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-job-detail-input.ts b/Web/src/api-services/models/page-job-detail-input.ts index 8f41ca3f..1934cbb7 100644 --- a/Web/src/api-services/models/page-job-detail-input.ts +++ b/Web/src/api-services/models/page-job-detail-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PageJobDetailInput { + /** + * @type {Search} + * @memberof PageJobDetailInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageJobDetailInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageJobDetailInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-job-trigger-record-input.ts b/Web/src/api-services/models/page-job-trigger-record-input.ts index 56b0bcb0..c38afda9 100644 --- a/Web/src/api-services/models/page-job-trigger-record-input.ts +++ b/Web/src/api-services/models/page-job-trigger-record-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PageJobTriggerRecordInput { + /** + * @type {Search} + * @memberof PageJobTriggerRecordInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageJobTriggerRecordInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageJobTriggerRecordInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-log-input.ts b/Web/src/api-services/models/page-log-input.ts index d98381b1..b0bdfb57 100644 --- a/Web/src/api-services/models/page-log-input.ts +++ b/Web/src/api-services/models/page-log-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PageLogInput { + /** + * @type {Search} + * @memberof PageLogInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageLogInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageLogInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-notice-input.ts b/Web/src/api-services/models/page-notice-input.ts index 80e5dfea..f99944e9 100644 --- a/Web/src/api-services/models/page-notice-input.ts +++ b/Web/src/api-services/models/page-notice-input.ts @@ -12,7 +12,9 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; import { NoticeTypeEnum } from './notice-type-enum'; +import { Search } from './search'; /** * * @@ -21,6 +23,26 @@ import { NoticeTypeEnum } from './notice-type-enum'; */ export interface PageNoticeInput { + /** + * @type {Search} + * @memberof PageNoticeInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageNoticeInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageNoticeInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-online-user-input.ts b/Web/src/api-services/models/page-online-user-input.ts index 2c26e022..0cc039e8 100644 --- a/Web/src/api-services/models/page-online-user-input.ts +++ b/Web/src/api-services/models/page-online-user-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PageOnlineUserInput { + /** + * @type {Search} + * @memberof PageOnlineUserInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageOnlineUserInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageOnlineUserInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/open-access-input.ts b/Web/src/api-services/models/page-open-access-input.ts similarity index 65% rename from Web/src/api-services/models/open-access-input.ts rename to Web/src/api-services/models/page-open-access-input.ts index add1f46a..189d5bcd 100644 --- a/Web/src/api-services/models/open-access-input.ts +++ b/Web/src/api-services/models/page-open-access-input.ts @@ -12,19 +12,41 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * 开放接口身份输入参数 * * @export - * @interface OpenAccessInput + * @interface PageOpenAccessInput */ -export interface OpenAccessInput { +export interface PageOpenAccessInput { + + /** + * @type {Search} + * @memberof PageOpenAccessInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageOpenAccessInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageOpenAccessInput + */ + filter?: Filter; /** * 当前页码 * * @type {number} - * @memberof OpenAccessInput + * @memberof PageOpenAccessInput */ page?: number; @@ -32,7 +54,7 @@ export interface OpenAccessInput { * 页码容量 * * @type {number} - * @memberof OpenAccessInput + * @memberof PageOpenAccessInput */ pageSize?: number; @@ -40,7 +62,7 @@ export interface OpenAccessInput { * 排序字段 * * @type {string} - * @memberof OpenAccessInput + * @memberof PageOpenAccessInput */ field?: string | null; @@ -48,7 +70,7 @@ export interface OpenAccessInput { * 排序方向 * * @type {string} - * @memberof OpenAccessInput + * @memberof PageOpenAccessInput */ order?: string | null; @@ -56,7 +78,7 @@ export interface OpenAccessInput { * 降序排序 * * @type {string} - * @memberof OpenAccessInput + * @memberof PageOpenAccessInput */ descStr?: string | null; @@ -64,7 +86,7 @@ export interface OpenAccessInput { * 身份标识 * * @type {string} - * @memberof OpenAccessInput + * @memberof PageOpenAccessInput */ accessKey?: string | null; } diff --git a/Web/src/api-services/models/page-plugin-input.ts b/Web/src/api-services/models/page-plugin-input.ts index ea139ea0..e841f3e5 100644 --- a/Web/src/api-services/models/page-plugin-input.ts +++ b/Web/src/api-services/models/page-plugin-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PagePluginInput { + /** + * @type {Search} + * @memberof PagePluginInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PagePluginInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PagePluginInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-pos-input.ts b/Web/src/api-services/models/page-pos-input.ts index fd15aa05..8784fcce 100644 --- a/Web/src/api-services/models/page-pos-input.ts +++ b/Web/src/api-services/models/page-pos-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PagePosInput { + /** + * @type {Search} + * @memberof PagePosInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PagePosInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PagePosInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-print-input.ts b/Web/src/api-services/models/page-print-input.ts index 8caa9026..1c3b5a48 100644 --- a/Web/src/api-services/models/page-print-input.ts +++ b/Web/src/api-services/models/page-print-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PagePrintInput { + /** + * @type {Search} + * @memberof PagePrintInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PagePrintInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PagePrintInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-region-input.ts b/Web/src/api-services/models/page-region-input.ts index b713fcd2..f368cc32 100644 --- a/Web/src/api-services/models/page-region-input.ts +++ b/Web/src/api-services/models/page-region-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PageRegionInput { + /** + * @type {Search} + * @memberof PageRegionInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageRegionInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageRegionInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/page-role-input.ts b/Web/src/api-services/models/page-role-input.ts index d2053394..271e2275 100644 --- a/Web/src/api-services/models/page-role-input.ts +++ b/Web/src/api-services/models/page-role-input.ts @@ -12,6 +12,8 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * * @@ -20,6 +22,26 @@ */ export interface PageRoleInput { + /** + * @type {Search} + * @memberof PageRoleInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageRoleInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageRoleInput + */ + filter?: Filter; + /** * 当前页码 * diff --git a/Web/src/api-services/models/sys-ldap-input.ts b/Web/src/api-services/models/page-sys-ldap-input.ts similarity index 66% rename from Web/src/api-services/models/sys-ldap-input.ts rename to Web/src/api-services/models/page-sys-ldap-input.ts index 7882fa15..b6037d7c 100644 --- a/Web/src/api-services/models/sys-ldap-input.ts +++ b/Web/src/api-services/models/page-sys-ldap-input.ts @@ -12,19 +12,41 @@ * Do not edit the class manually. */ +import { Filter } from './filter'; +import { Search } from './search'; /** * 系统域登录信息配置输入参数 * * @export - * @interface SysLdapInput + * @interface PageSysLdapInput */ -export interface SysLdapInput { +export interface PageSysLdapInput { + + /** + * @type {Search} + * @memberof PageSysLdapInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageSysLdapInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageSysLdapInput + */ + filter?: Filter; /** * 当前页码 * * @type {number} - * @memberof SysLdapInput + * @memberof PageSysLdapInput */ page?: number; @@ -32,7 +54,7 @@ export interface SysLdapInput { * 页码容量 * * @type {number} - * @memberof SysLdapInput + * @memberof PageSysLdapInput */ pageSize?: number; @@ -40,7 +62,7 @@ export interface SysLdapInput { * 排序字段 * * @type {string} - * @memberof SysLdapInput + * @memberof PageSysLdapInput */ field?: string | null; @@ -48,7 +70,7 @@ export interface SysLdapInput { * 排序方向 * * @type {string} - * @memberof SysLdapInput + * @memberof PageSysLdapInput */ order?: string | null; @@ -56,7 +78,7 @@ export interface SysLdapInput { * 降序排序 * * @type {string} - * @memberof SysLdapInput + * @memberof PageSysLdapInput */ descStr?: string | null; @@ -64,7 +86,7 @@ export interface SysLdapInput { * 关键字查询 * * @type {string} - * @memberof SysLdapInput + * @memberof PageSysLdapInput */ searchKey?: string | null; @@ -72,7 +94,7 @@ export interface SysLdapInput { * 主机 * * @type {string} - * @memberof SysLdapInput + * @memberof PageSysLdapInput */ host?: string | null; } diff --git a/Web/src/api-services/models/page-sys-wechat-pay-input.ts b/Web/src/api-services/models/page-sys-wechat-pay-input.ts new file mode 100644 index 00000000..63a8ce1c --- /dev/null +++ b/Web/src/api-services/models/page-sys-wechat-pay-input.ts @@ -0,0 +1,124 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { Filter } from './filter'; +import { Search } from './search'; + /** + * + * + * @export + * @interface PageSysWechatPayInput + */ +export interface PageSysWechatPayInput { + + /** + * @type {Search} + * @memberof PageSysWechatPayInput + */ + search?: Search; + + /** + * 模糊查询关键字 + * + * @type {string} + * @memberof PageSysWechatPayInput + */ + keyword?: string | null; + + /** + * @type {Filter} + * @memberof PageSysWechatPayInput + */ + filter?: Filter; + + /** + * 当前页码 + * + * @type {number} + * @memberof PageSysWechatPayInput + */ + page?: number; + + /** + * 页码容量 + * + * @type {number} + * @memberof PageSysWechatPayInput + */ + pageSize?: number; + + /** + * 排序字段 + * + * @type {string} + * @memberof PageSysWechatPayInput + */ + field?: string | null; + + /** + * 排序方向 + * + * @type {string} + * @memberof PageSysWechatPayInput + */ + order?: string | null; + + /** + * 降序排序 + * + * @type {string} + * @memberof PageSysWechatPayInput + */ + descStr?: string | null; + + /** + * order_id + * + * @type {number} + * @memberof PageSysWechatPayInput + */ + orderId?: number | null; + + /** + * order_status + * + * @type {number} + * @memberof PageSysWechatPayInput + */ + orderStatus?: number | null; + + /** + * out_trade_number + * + * @type {string} + * @memberof PageSysWechatPayInput + */ + outTradeNumber?: string | null; + + /** + * success_time范围 + * + * @type {Array
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { GoodsDetail } from './goods-detail'; + /** + * + * + * @export + * @interface Promotion + */ +export interface Promotion { + + /** + * @type {string} + * @memberof Promotion + */ + promotionId?: string | null; + + /** + * @type {string} + * @memberof Promotion + */ + scope?: string | null; + + /** + * @type {string} + * @memberof Promotion + */ + type?: string | null; + + /** + * @type {number} + * @memberof Promotion + */ + amount?: number; + + /** + * @type {number} + * @memberof Promotion + */ + refundAmount?: number; + + /** + * @type {Array
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + /** + * + * + * @export + * @interface RefundRequestInput + */ +export interface RefundRequestInput { + + /** + * 商户订单号(原支付交易对应的付款单号) + * + * @type {string} + * @memberof RefundRequestInput + */ + outTradeNumber?: string | null; + + /** + * 原订单金额(分) + * + * @type {number} + * @memberof RefundRequestInput + */ + total?: number; + + /** + * 退款金额(分) + * + * @type {number} + * @memberof RefundRequestInput + */ + refund?: number; + + /** + * 退款原因 + * + * @type {string} + * @memberof RefundRequestInput + */ + reason?: string | null; + + /** + * 关联的商户订单号 + * + * @type {number} + * @memberof RefundRequestInput + */ + orderId?: number; + + /** + * 关联的商户订单状态(或者为第几次支付，有些订单涉及多次支付，比如先付预付款，后补尾款) + * + * @type {number} + * @memberof RefundRequestInput + */ + orderStatus?: number; + + /** + * 关联的商户商品编码 + * + * @type {string} + * @memberof RefundRequestInput + */ + merchantGoodsId?: string | null; + + /** + * 关联的商户商品名称 + * + * @type {string} + * @memberof RefundRequestInput + */ + goodsName?: string | null; + + /** + * 关联的商户商品单价 + * + * @type {number} + * @memberof RefundRequestInput + */ + unitPrice?: number; + + /** + * 关联的商户商品退款金额 + * + * @type {number} + * @memberof RefundRequestInput + */ + refundAmount?: number; + + /** + * 关联的商户商品退货数量 + * + * @type {number} + * @memberof RefundRequestInput + */ + refundQuantity?: number; + + /** + * 附加数据 + * + * @type {string} + * @memberof RefundRequestInput + */ + attachment?: string | null; + + /** + * 备注 + * + * @type {string} + * @memberof RefundRequestInput + */ + remark?: string | null; +} diff --git a/Web/src/api-services/models/search.ts b/Web/src/api-services/models/search.ts new file mode 100644 index 00000000..afa1712f --- /dev/null +++ b/Web/src/api-services/models/search.ts @@ -0,0 +1,38 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + /** + * 模糊查询条件 + * + * @export + * @interface Search + */ +export interface Search { + + /** + * 字段名称集合 + * + * @type {Array
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { SysWechatPay } from './sys-wechat-pay'; + /** + * 分页泛型集合 + * + * @export + * @interface SqlSugarPagedListSysWechatPay + */ +export interface SqlSugarPagedListSysWechatPay { + + /** + * 页码 + * + * @type {number} + * @memberof SqlSugarPagedListSysWechatPay + */ + page?: number; + + /** + * 页容量 + * + * @type {number} + * @memberof SqlSugarPagedListSysWechatPay + */ + pageSize?: number; + + /** + * 总条数 + * + * @type {number} + * @memberof SqlSugarPagedListSysWechatPay + */ + total?: number; + + /** + * 总页数 + * + * @type {number} + * @memberof SqlSugarPagedListSysWechatPay + */ + totalPages?: number; + + /** + * 当前页集合 + * + * @type {Array
-
欢迎使用 Admin.NET
+欢迎使用 {{ themeConfig.globalTitle }}
@@ -37,6 +37,12 @@
diff --git a/Web/src/views/system/database/database.ts b/Web/src/views/system/database/database.ts
index c99a0bde..4bbd5d69 100644
--- a/Web/src/views/system/database/database.ts
+++ b/Web/src/views/system/database/database.ts
@@ -104,4 +104,9 @@ export const dataTypeList = [
hasLength: false,
hasDecimalDigits: false,
},
+ {
+ value: 'boolean',
+ hasLength: false,
+ hasDecimalDigits: false,
+ },
];
diff --git a/Web/src/views/system/database/index.vue b/Web/src/views/system/database/index.vue
index d0a90d27..dde043c4 100644
--- a/Web/src/views/system/database/index.vue
+++ b/Web/src/views/system/database/index.vue
@@ -32,7 +32,7 @@
增加列
生成实体
-
+
生成种子
@@ -81,7 +81,7 @@ import { onMounted, reactive, ref } from 'vue';
import { ElMessageBox, ElMessage } from 'element-plus';
import { useRouter } from 'vue-router';
import { VxeGridInstance } from 'vxe-table';
-import { useVxeTable } from '/@/hooks/vxeTableOptionsHook';
+import { useVxeTable } from '/@/hooks/useVxeTableOptionsHook';
import EditTable from '/@/views/system/database/component/editTable.vue';
import EditColumn from '/@/views/system/database/component/editColumn.vue';
@@ -118,54 +118,58 @@ const state = reactive({
});
// 表格参数配置
-const options = useVxeTable({
- id: 'sysDatabase',
- name: '库表信息',
- columns: [
- // { type: 'checkbox', width: 40, fixed: 'left' },
- { type: 'seq', title: '序号', width: 50, fixed: 'left' },
- { field: 'dbColumnName', title: '字段名', minWidth: 200, showOverflow: 'tooltip' },
- { field: 'dataType', title: '数据类型', minWidth: 120, showOverflow: 'tooltip' },
- { field: 'isPrimarykey', title: '主键', minWidth: 70, slots: { default: 'row_isPrimarykey' } },
- { field: 'isIdentity', title: '自增', minWidth: 70, slots: { default: 'row_isIdentity' } },
- { field: 'isNullable', title: '可空', minWidth: 70, slots: { default: 'row_isNullable' } },
- { field: 'length', title: '长度', minWidth: 80, showOverflow: 'tooltip' },
- { field: 'decimalDigits', title: '精度', minWidth: 80, showOverflow: 'tooltip' },
- { field: 'defaultValue', title: '默认值', minWidth: 80, showOverflow: 'tooltip' },
- { field: 'columnDescription', title: '描述', minWidth: 200, showOverflow: 'tooltip' },
- { title: '操作', fixed: 'right', width: 100, showOverflow: true, slots: { default: 'row_buttons' } },
- ],
- enableExport: true,
- searchCallback: () => handleQueryColumn(),
- queryAllCallback: () => fetchData({ pageSize: 99999 }),
-});
+const options = useVxeTable(
+ {
+ id: 'sysDatabase',
+ name: '库表信息',
+ columns: [
+ // { type: 'checkbox', width: 40, fixed: 'left' },
+ { type: 'seq', title: '序号', width: 50, fixed: 'left' },
+ { field: 'dbColumnName', title: '字段名', minWidth: 200, showOverflow: 'tooltip' },
+ { field: 'dataType', title: '数据类型', minWidth: 120, showOverflow: 'tooltip' },
+ { field: 'isPrimarykey', title: '主键', minWidth: 70, slots: { default: 'row_isPrimarykey' } },
+ { field: 'isIdentity', title: '自增', minWidth: 70, slots: { default: 'row_isIdentity' } },
+ { field: 'isNullable', title: '可空', minWidth: 70, slots: { default: 'row_isNullable' } },
+ { field: 'length', title: '长度', minWidth: 80, showOverflow: 'tooltip' },
+ { field: 'decimalDigits', title: '精度', minWidth: 80, showOverflow: 'tooltip' },
+ { field: 'defaultValue', title: '默认值', minWidth: 80, showOverflow: 'tooltip' },
+ { field: 'columnDescription', title: '描述', minWidth: 200, showOverflow: 'tooltip' },
+ { title: '操作', fixed: 'right', width: 100, showOverflow: true, slots: { default: 'row_buttons' } },
+ ],
+ },
+ // vxeGrid配置参数(此处可覆写任何参数)，参考vxe-table官方文档
+ {
+ // 代理配置
+ proxyConfig: { autoLoad: true, ajax: { query: () => handleQueryColumnApi() } },
+ // 分页配置
+ pagerConfig: { enabled: false },
+ // 工具栏配置
+ toolbarConfig: { export: true },
+ }
+);
// 页面初始化
onMounted(async () => {
options.loading = true;
- var res = await getAPI(SysDatabaseApi).apiSysDatabaseListGet();
+ let res = await getAPI(SysDatabaseApi).apiSysDatabaseListGet();
state.dbData = res.data.result;
- options.loading = false;
+
let appNamesRes = await getAPI(SysCodeGenApi).apiSysCodeGenApplicationNamespacesGet();
state.appNamespaces = appNamesRes.data.result as Array;
+ options.loading = false;
});
-// 查询操作
-const handleQueryColumn = async () => {
+// 查询列api
+const handleQueryColumnApi = async () => {
if (state.tableName == '' || typeof state.tableName == 'undefined') {
- await xGrid.value?.loadData([]);
- options.loading = false;
return;
}
- options.loading = true;
- var res = await fetchData();
- await xGrid.value?.loadData(res.data.result ?? []);
- options.loading = false;
+ return getAPI(SysDatabaseApi).apiSysDatabaseColumnListTableNameConfigIdGet(state.tableName, state.configId);
};
-// 获取数据
-const fetchData = async (tableParams?: any) => {
- return getAPI(SysDatabaseApi).apiSysDatabaseColumnListTableNameConfigIdGet(state.tableName, state.configId);
+// 查询列操作
+const handleQueryColumn = async () => {
+ await xGrid.value?.commitProxy('query');
};
// 增加表
diff --git a/Web/src/views/system/dict/component/editDictData.vue b/Web/src/views/system/dict/component/editDictData.vue
index e9285172..8c29e081 100644
--- a/Web/src/views/system/dict/component/editDictData.vue
+++ b/Web/src/views/system/dict/component/editDictData.vue
@@ -1,6 +1,6 @@
-
+
@@ -20,7 +20,7 @@
-
+
diff --git a/Web/src/views/system/dict/component/editDictType.vue b/Web/src/views/system/dict/component/editDictType.vue
index 832c3b52..c599a4a5 100644
--- a/Web/src/views/system/dict/component/editDictType.vue
+++ b/Web/src/views/system/dict/component/editDictType.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/Web/src/views/system/dict/index.vue b/Web/src/views/system/dict/index.vue
index df10f9d1..5d6e95d3 100644
--- a/Web/src/views/system/dict/index.vue
+++ b/Web/src/views/system/dict/index.vue
@@ -1,18 +1,18 @@
-
+
![]()
@@ -46,18 +46,21 @@
+
-
+
-
-
@@ -21,15 +21,15 @@
- 查询
- 重置
+ 查询
+ 重置
-
+
新增
@@ -50,34 +50,25 @@
-
+
-
-
-
+
-
-
@@ -86,18 +77,18 @@
- 查询
- 重置
+ 查询
+ 重置
-
+
新增
+ 新增
@@ -119,28 +110,19 @@
-
+
-
+
-
-
- ();
-const xDictGrid = ref();
-const editRef = ref>();
-const editDictRef = ref>();
+const xGridDictType = ref();
+const xGridDictData = ref();
+const editRefDictType = ref>();
+const editRefDictData = ref>();
const state = reactive({
- queryParams: {
+ queryParamsDictType: {
name: undefined,
code: undefined,
},
- queryDictParams: {
+ queryParamsDictData: {
dictTypeId: undefined,
value: undefined,
code: undefined,
},
- tableParams: {
- page: 1,
- pageSize: 50,
- field: 'orderNo', // 默认的排序字段
- order: 'aes', // 排序方向
- descStr: 'desc', // 降序排序的关键字符
- total: 0 as any,
+ localPageParamDictType: {
+ pageSize: 50 as number,
+ defaultSort: { field: 'orderNo', order: 'asc', descStr: 'desc' },
},
- tableDictParams: {
- page: 1,
- pageSize: 50,
- field: 'orderNo', // 默认的排序字段
- order: 'aes', // 排序方向
- descStr: 'desc', // 降序排序的关键字符
- total: 0 as any,
+ localPageParamDictData: {
+ pageSize: 50 as number,
+ defaultSort: { field: 'orderNo', order: 'asc', descStr: 'desc' },
},
title: '',
});
+// 本地存储参数
+const localPageParamKey = 'localPageParam:sysDictType';
// 表格参数配置-字典类型
-const options = useVxeTable(
+const optionsDictType = useVxeTable(
{
- id: 'sysDict',
+ id: 'sysDictType',
name: '字典信息',
columns: [
{ type: 'seq', title: '序号', width: 60, fixed: 'left' },
@@ -207,75 +184,67 @@ const options = useVxeTable(
{ field: '', title: '修改记录', width: 100, showOverflow: 'tooltip', slots: { default: 'row_record' } },
{ title: '操作', fixed: 'right', width: 100, showOverflow: true, slots: { default: 'row_buttons' } },
],
- enableExport: auth('sysDictType:export'),
- searchCallback: () => handleQuery(),
- queryAllCallback: () => fetchData({ pageSize: 99999 }),
},
- { rowConfig: { isCurrent: true, isHover: true }, checkboxConfig: { range: true, highlight: false } }
+ // vxeGrid配置参数(此处可覆写任何参数)，参考vxe-table官方文档
+ {
+ // 代理配置
+ proxyConfig: { autoLoad: true, ajax: { query: ({ page, sort }) => handleQueryApi(page, sort) } },
+ // 排序配置
+ sortConfig: { defaultSort: Local.get(localPageParamKey)?.defaultSort || state.localPageParamDictType.defaultSort },
+ // 分页配置
+ pagerConfig: { pageSize: Local.get(localPageParamKey)?.pageSize || state.localPageParamDictType.pageSize },
+ // 工具栏配置
+ toolbarConfig: { export: false },
+ // 行配置
+ rowConfig: { isCurrent: true, isHover: true },
+ checkboxConfig: { range: true, highlight: false },
+ }
);
// 页面初始化
onMounted(async () => {
+ state.localPageParamDictType = Local.get(localPageParamKey) || state.localPageParamDictType;
await handleQuery();
});
-// 查询操作
-const handleQuery = async (reset = false) => {
- options.loading = true;
- if (reset) state.tableParams.page = 1;
- var res = await fetchData(null);
- await xGrid.value?.loadData(res.data.result?.items ?? []);
- state.tableParams.total = res.data.result?.total;
- options.loading = false;
+// 查询api
+const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, sort: VxeGridPropTypes.ProxyAjaxQuerySortCheckedParams) => {
+ const params = Object.assign(state.queryParamsDictType, { page: page.currentPage, pageSize: page.pageSize, field: sort.field, order: sort.order, descStr: 'desc' }) as PageDictTypeInput;
+ return getAPI(SysDictTypeApi).apiSysDictTypePagePost(params);
};
-// 获取数据
-const fetchData = async (tableParams: any) => {
- let params = Object.assign(state.queryParams, state.tableParams, tableParams);
- return getAPI(SysDictTypeApi).apiSysDictTypePagePost(params);
+// 查询操作
+const handleQuery = async () => {
+ await xGridDictType.value?.commitProxy('query');
};
// 重置操作
const resetQuery = async () => {
- state.queryParams.code = undefined;
- state.queryParams.name = undefined;
- await handleQuery(true);
-};
-
-// 改变页码序号或页面容量
-const pageChange: VxePagerEvents.PageChange = async ({ currentPage, pageSize }: VxePagerDefines.PageChangeEventParams) => {
- state.tableParams.page = currentPage;
- state.tableParams.pageSize = pageSize;
- await handleQuery();
-};
-
-// 列排序
-const sortChange = async (options: any) => {
- state.tableParams.field = options.field;
- state.tableParams.order = options.order;
- await handleQuery();
+ state.queryParamsDictType.code = undefined;
+ state.queryParamsDictType.name = undefined;
+ await xGridDictType.value?.commitProxy('reload');
};
// 打开新增页面
const handleAdd = () => {
state.title = '添加字典';
- editRef.value?.openDialog({ status: 1, orderNo: 100 });
+ editRefDictType.value?.openDialog({ status: 1, orderNo: 100 });
};
// 打开编辑页面
const handleEdit = (row: any) => {
state.title = '编辑字典';
- editRef.value?.openDialog(row);
+ editRefDictType.value?.openDialog(row);
};
-// 点击表格，加载字典值表格数据
+// 点击字典类型，加载其字典值数据
const handleDictData = async (scope: any) => {
- state.queryDictParams.dictTypeId = scope.row.id;
- await handleDictQuery(true);
+ state.queryParamsDictData.dictTypeId = scope.row.id;
+ await handleQueryDictData();
};
-// 删除
-const handleDelete = (row: any) => {
+// 删除字典
+const handleDeleteDictType = (row: any) => {
ElMessageBox.confirm(`确定删除字典：【${row.name}】?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -283,19 +252,32 @@ const handleDelete = (row: any) => {
})
.then(async () => {
await getAPI(SysDictTypeApi).apiSysDictTypeDeletePost({ id: row.id });
- handleQuery();
- updateDictSession();
- xDictGrid.value?.loadData([]);
- state.tableDictParams.total = 0;
+ await handleQuery();
+ await updateDictSession();
+ xGridDictData.value?.loadData([]);
ElMessage.success('删除成功');
})
.catch(() => {});
};
+// 表格事件
+const gridEventsDictType: VxeGridListeners = {
+ // 只对 pager-config 配置时有效，分页发生改变时会触发该事件
+ async pageChange({ pageSize }) {
+ state.localPageParamDictType.pageSize = pageSize;
+ // Local.set(localPageParamKey, state.localPageParam);
+ },
+ // 当排序条件发生变化时会触发该事件
+ async sortChange({ field, order }) {
+ state.localPageParamDictType.defaultSort = { field: field, order: order!, descStr: 'desc' };
+ // Local.set(localPageParamKey, state.localPageParam);
+ },
+};
+
// 表格参数配置-字典值
-const dictOptions = useVxeTable(
+const optionsDictData = useVxeTable(
{
- id: 'dictInfo',
+ id: 'sysDictData',
name: '字典值信息',
columns: [
{ type: 'seq', title: '序号', width: 60, fixed: 'left' },
@@ -308,53 +290,62 @@ const dictOptions = useVxeTable(
{ field: '', title: '修改记录', width: 100, showOverflow: 'tooltip', slots: { default: 'row_record' } },
{ title: '操作', fixed: 'right', width: 100, showOverflow: true, slots: { default: 'row_buttons' } },
],
- enableExport: auth('sysDictType:export'),
- searchCallback: () => handleDictQuery(),
- queryAllCallback: () => fetchDictData({ pageSize: 99999 }),
},
- { loading: false, rowConfig: { isCurrent: true, isHover: true }, checkboxConfig: { range: true, highlight: false } }
+ // vxeGrid配置参数(此处可覆写任何参数)，参考vxe-table官方文档
+ {
+ // 代理配置
+ proxyConfig: { autoLoad: true, ajax: { query: ({ page, sort }) => handleQueryDictDataApi(page, sort) } },
+ // // 排序配置
+ // sortConfig: { defaultSort: Local.get(localPageParamKey)?.defaultSort || state.localPageParam.defaultSort },
+ // // 分页配置
+ // pagerConfig: { pageSize: Local.get(localPageParamKey)?.pageSize || state.localPageParam.pageSize },
+ // 工具栏配置
+ toolbarConfig: { export: false },
+ // 等待
+ loading: false,
+ // 行配置
+ rowConfig: { isCurrent: true, isHover: true },
+ // 多选配置
+ checkboxConfig: { range: true, highlight: false },
+ }
);
-// 查询操作
-const handleDictQuery = async (reset = false) => {
- dictOptions.loading = true;
- if (reset) state.tableDictParams.page = 1;
- var res = await fetchDictData(null);
- xDictGrid.value?.loadData(res.data.result?.items ?? []);
- state.tableDictParams.total = res.data.result?.total;
- dictOptions.loading = false;
-};
-
-// 获取数据
-const fetchDictData = async (tableParams: any) => {
- let params = Object.assign(state.queryDictParams, state.tableDictParams, tableParams);
+// 查询api
+const handleQueryDictDataApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, sort: VxeGridPropTypes.ProxyAjaxQuerySortCheckedParams) => {
+ const params = Object.assign(state.queryParamsDictData, { page: page.currentPage, pageSize: page.pageSize, field: sort.field, order: sort.order, descStr: 'desc' }) as PageDictDataInput;
return getAPI(SysDictDataApi).apiSysDictDataPagePost(params);
};
-// 重置操作
-const resetDictQuery = async () => {
- state.queryDictParams.value = undefined;
- state.queryDictParams.code = undefined;
- await handleDictQuery(true);
+// 查询操作
+const handleQueryDictData = async () => {
+ await xGridDictData.value?.commitProxy('query');
};
-const handleDictAdd = () => {
- if (!state.queryDictParams.dictTypeId) {
+// 重置操作
+const resetQueryDictData = async () => {
+ state.queryParamsDictData.value = undefined;
+ state.queryParamsDictData.code = undefined;
+ await xGridDictData.value?.commitProxy('reload');
+};
+
+// 添加字典值
+const handleAddDictData = () => {
+ if (!state.queryParamsDictData.dictTypeId) {
ElMessage.warning('请选择字典');
return;
}
state.title = '添加字典值';
- editDictRef.value?.openDialog({ status: 1, orderNo: 100, dictTypeId: state.queryDictParams.dictTypeId });
+ editRefDictData.value?.openDialog({ status: 1, orderNo: 100, dictTypeId: state.queryParamsDictData.dictTypeId });
};
// 打开编辑页面
-const handleDictEdit = (row: any) => {
+const handleEditDictData = (row: any) => {
state.title = '编辑字典值';
- editDictRef.value?.openDialog(row);
+ editRefDictData.value?.openDialog(row);
};
-// 删除
-const handleDictDelete = (row: any) => {
+// 删除字典值
+const handleDeleteDictData = (row: any) => {
ElMessageBox.confirm(`确定删除字典值：【${row.value}】?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -362,25 +353,25 @@ const handleDictDelete = (row: any) => {
})
.then(async () => {
await getAPI(SysDictDataApi).apiSysDictDataDeletePost({ id: row.id });
- handleDictQuery();
- updateDictSession();
+ await handleQueryDictData();
+ await updateDictSession();
ElMessage.success('删除成功');
})
.catch(() => {});
};
-// 改变字典值页码序号或页面容量
-const dictPageChange: VxePagerEvents.PageChange = async ({ currentPage, pageSize }: VxePagerDefines.PageChangeEventParams) => {
- state.tableDictParams.page = currentPage;
- state.tableDictParams.pageSize = pageSize;
- await handleDictQuery();
-};
-
-// 字典值列排序
-const dictSortChange = async (options: any) => {
- state.tableDictParams.field = options.field;
- state.tableDictParams.order = options.order;
- await handleDictQuery();
+// 表格事件
+const gridEventsDictData: VxeGridListeners = {
+ // 只对 pager-config 配置时有效，分页发生改变时会触发该事件
+ async pageChange({ pageSize }) {
+ state.localPageParamDictData.pageSize = pageSize;
+ // Local.set(localPageParamKey, state.localPageParam);
+ },
+ // 当排序条件发生变化时会触发该事件
+ async sortChange({ field, order }) {
+ state.localPageParamDictData.defaultSort = { field: field, order: order!, descStr: 'desc' };
+ // Local.set(localPageParamKey, state.localPageParam);
+ },
};
// 更新前端字典缓存
diff --git a/Web/src/views/system/file/component/editSysfile.vue b/Web/src/views/system/file/component/editFile.vue
similarity index 100%
rename from Web/src/views/system/file/component/editSysfile.vue
rename to Web/src/views/system/file/component/editFile.vue
diff --git a/Web/src/views/system/file/index.vue b/Web/src/views/system/file/index.vue
index 0333ff12..126f641b 100644
--- a/Web/src/views/system/file/index.vue
+++ b/Web/src/views/system/file/index.vue
@@ -5,17 +5,17 @@
-
-
-
@@ -26,7 +26,7 @@
- 查询
+ 查询
重置
@@ -34,7 +34,7 @@
-
+
上传
@@ -72,15 +72,6 @@
@@ -133,8 +124,9 @@
import { onMounted, reactive, ref } from 'vue';
import { ElMessageBox, ElMessage, UploadInstance } from 'element-plus';
import { auth } from '/@/utils/authFunction';
-import { VxeGridInstance, VxePagerEvents, VxePagerDefines } from 'vxe-table';
-import { useVxeTable } from '/@/hooks/vxeTableOptionsHook';
+import { VxeGridInstance, VxeGridListeners, VxeGridPropTypes } from 'vxe-table';
+import { useVxeTable } from '/@/hooks/useVxeTableOptionsHook';
+import { Local } from '/@/utils/storage';
import { downloadByUrl } from '/@/utils/download';
import VueOfficeDocx from '@vue-office/docx';
import VueOfficeExcel from '@vue-office/excel';
@@ -142,11 +134,11 @@ import VueOfficePdf from '@vue-office/pdf';
import '@vue-office/docx/lib/index.css';
import '@vue-office/excel/lib/index.css';
-import EditFile from '/@/views/system/file/component/editSysfile.vue';
+import EditFile from '/@/views/system/file/component/editFile.vue';
import { getAPI } from '/@/utils/axios-utils';
import { SysFileApi } from '/@/api-services/api';
-import { SysFile } from '/@/api-services/models';
+import { SysFile, PageFileInput } from '/@/api-services/models';
const xGrid = ref();
// const baseUrl = window.__env__.VITE_API_URL;
@@ -158,13 +150,9 @@ const state = reactive({
startTime: undefined,
endTime: undefined,
},
- tableParams: {
- page: 1,
- pageSize: 50,
- field: 'id', // 默认的排序字段
- order: 'aes', // 排序方向
- descStr: 'desc', // 降序排序的关键字符
- total: 0 as any,
+ localPageParam: {
+ pageSize: 50 as number,
+ defaultSort: { field: 'orderNo', order: 'asc', descStr: 'desc' },
},
visible: false,
diaglogEditFile: false,
@@ -181,6 +169,8 @@ const state = reactive({
previewList: [] as string[],
});
+// 本地存储参数
+const localPageParamKey = 'localPageParam:sysFile';
// 表格参数配置
const options = useVxeTable(
{
@@ -204,11 +194,20 @@ const options = useVxeTable(
{ field: 'remark', title: '备注', minWidth: 200, showOverflow: 'tooltip' },
{ title: '操作', fixed: 'right', width: 150, showOverflow: true, slots: { default: 'row_buttons' } },
],
- enableExport: auth('sysFile:export'),
- searchCallback: () => handleQuery(),
- queryAllCallback: () => fetchData({ pageSize: 99999 }),
},
- { rowConfig: { height: 80 } }
+ // vxeGrid配置参数(此处可覆写任何参数)，参考vxe-table官方文档
+ {
+ // 代理配置
+ proxyConfig: { autoLoad: true, ajax: { query: ({ page, sort }) => handleQueryApi(page, sort) } },
+ // 排序配置
+ sortConfig: { defaultSort: Local.get(localPageParamKey)?.defaultSort || state.localPageParam.defaultSort },
+ // 分页配置
+ pagerConfig: { pageSize: Local.get(localPageParamKey)?.pageSize || state.localPageParam.pageSize },
+ // 工具栏配置
+ toolbarConfig: { export: false },
+ // 行设置
+ rowConfig: { height: 80 },
+ }
);
// 页面初始化
@@ -216,42 +215,23 @@ onMounted(async () => {
await handleQuery();
});
-// 查询操作
-const handleQuery = async (reset = false) => {
- options.loading = true;
- if (reset) state.tableParams.page = 1;
- var res = await fetchData(null);
- xGrid.value?.loadData(res.data.result?.items ?? []);
- state.tableParams.total = res.data.result?.total;
- options.loading = false;
-};
-
-// 获取数据
-const fetchData = async (tableParams: any) => {
- let params = Object.assign(state.queryParams, state.tableParams, tableParams);
+// 查询api
+const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, sort: VxeGridPropTypes.ProxyAjaxQuerySortCheckedParams) => {
+ const params = Object.assign(state.queryParams, { page: page.currentPage, pageSize: page.pageSize, field: sort.field, order: sort.order, descStr: 'desc' }) as PageFileInput;
return getAPI(SysFileApi).apiSysFilePagePost(params);
};
+// 查询操作
+const handleQuery = async () => {
+ await xGrid.value?.commitProxy('query');
+};
+
// 重置操作
-const resetQuery = () => {
+const resetQuery = async () => {
state.queryParams.fileName = undefined;
state.queryParams.startTime = undefined;
state.queryParams.endTime = undefined;
- handleQuery(true);
-};
-
-// 改变页码序号或页面容量
-const pageChange: VxePagerEvents.PageChange = ({ currentPage, pageSize }: VxePagerDefines.PageChangeEventParams) => {
- state.tableParams.page = currentPage;
- state.tableParams.pageSize = pageSize;
- handleQuery();
-};
-
-// 列排序
-const sortChange = (options: any) => {
- state.tableParams.field = options.field;
- state.tableParams.order = options.order;
- handleQuery();
+ await xGrid.value?.commitProxy('reload');
};
// 打开上传页面
@@ -296,6 +276,20 @@ const handleDelete = (row: any) => {
.catch(() => {});
};
+// 表格事件
+const gridEvents: VxeGridListeners = {
+ // 只对 pager-config 配置时有效，分页发生改变时会触发该事件
+ async pageChange({ pageSize }) {
+ state.localPageParam.pageSize = pageSize;
+ Local.set(localPageParamKey, state.localPageParam);
+ },
+ // 当排序条件发生变化时会触发该事件
+ async sortChange({ field, order }) {
+ state.localPageParam.defaultSort = { field: field, order: order!, descStr: 'desc' };
+ Local.set(localPageParamKey, state.localPageParam);
+ },
+};
+
// 打开Pdf预览页面
const showPreviewDialog = async (row: any) => {
if (row.suffix == '.pdf') {
diff --git a/Web/src/views/system/infoSetting/index.vue b/Web/src/views/system/infoSetting/index.vue
index a4491d1a..eb6adc0b 100644
--- a/Web/src/views/system/infoSetting/index.vue
+++ b/Web/src/views/system/infoSetting/index.vue
@@ -11,7 +11,7 @@
-->
-