From 439e3b0f076280311b7cd4251a95820730242780 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 07 八月 2024 10:43:33 +0800
Subject: [PATCH] 一些更新
---
src/api/tigerapi/system.ts | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/src/api/tigerapi/system.ts b/src/api/tigerapi/system.ts
index 0d53fb4..6903b0a 100644
--- a/src/api/tigerapi/system.ts
+++ b/src/api/tigerapi/system.ts
@@ -28,9 +28,12 @@
EntityParams,
EntityList,
iSYS_ROLE_PROD,
+ pParams,
} from './model/systemModel';
import { defHttp } from '/@/utils/http/axios';
-import { isArray, isNullOrEmpty, isTimeViaRegExp8601 } from '/@/utils/is';
+import { isArray, isNullOrEmpty, isNullOrUnDef, isTimeViaRegExp8601 } from '/@/utils/is';
+import { isNumber } from 'xe-utils';
+import { dateUtil, formatToDateTime } from '/@/utils/dateUtil';
export enum Api {
QueryUrl = '/Base/Query',
@@ -43,6 +46,7 @@
MenuList = '/SYS/getMenuListAll',
SaveMenu = '/SYS/SaveMenu',
SaveRole = '/SYS/SaveRole',
+ getSysParam = '/SYS/getSysParam',
AddEntity = '/Base/Add',
AddListEntity = '/Base/AddList',
UpdateEntity = '/Base/Update',
@@ -709,17 +713,21 @@
if (!isNullOrEmpty(params['order'])) {
order = params['order'] == 'descend' ? params['field'] + ' desc' : params['field'];
}
- const rParams = genAction(params['TABLE_NAME'], {
- QueryAble_T: '',
- where: sqlcmd,
- order: order,
- page: {
- pageAble_T: 'string',
- draw: 1,
- pageIndex: params['page'],
- pageSize: params['pageSize'],
+ const rParams = genAction(
+ params['TABLE_NAME'],
+ {
+ QueryAble_T: '',
+ where: sqlcmd,
+ order: order,
+ page: {
+ pageAble_T: 'string',
+ draw: 1,
+ pageIndex: params['page'],
+ pageSize: params['pageSize'],
+ },
},
- });
+ params['option'],
+ );
return getListByPageAsync(rParams);
}
async function getListByPageAsync(params: any) {
@@ -753,12 +761,15 @@
Keys[k] != 'TABLE_NAME' &&
Keys[k] != 'order' &&
Keys[k] != 'field' &&
+ Keys[k] != 'option' &&
Keys[k] != '0' &&
!Keys[k].toString().endsWith('PSelect_0')
) {
if (!isNullOrEmpty(params[Keys[k]].length) && isTimeViaRegExp8601(params[Keys[k]][0])) {
sqlcmd += ` And ${Keys[k]} > '${params[Keys[k]][0]}'`;
sqlcmd += ` And ${Keys[k]} < '${params[Keys[k]][1]}'`;
+ } else if (isNumber(params[Keys[k]])) {
+ sqlcmd += `And ${Keys[k]} = ${params[Keys[k]]}`;
} else {
sqlcmd += `And ${Keys[k]} like '%${params[Keys[k]]}%'`;
}
@@ -784,7 +795,7 @@
check.Message = '璁板綍宸茬粡瀛樺湪锛屼笉鑳芥柊澧烇紒';
return check;
}
- params.ID = buildUUID(); //鐢熸垚GUID
+ params['ID'] = args[1] == true ? params['ID'] : buildUUID(); //鐢熸垚GUID
data = await defHttp.post(
{ url: Api.AddEntity, params: genAction(entityName, params) },
{
@@ -919,11 +930,11 @@
}
/* 閫氱敤鑾峰彇瀹炰綋璁板綍 */
-export const getEntity = async (params: { sqlcmd: string; entityName: string }) => {
+export const getEntity = async (params: { sqlcmd: string; entityName: string; order: string }) => {
const usParams = genAction(params.entityName, {
QueryAble_T: '',
where: params.sqlcmd,
- order: '',
+ order: params.order,
});
return await defHttp.post(
{ url: Api.QueryUrl, params: usParams },
@@ -948,3 +959,16 @@
}
return values;
}
+
+/**
+ * @description: 鑾峰彇鍙傛暟
+ * @param {pParams} params
+ * @return {*}
+ */
+export const getSysParam = (params?: pParams) =>
+ defHttp.get<ApiAction<treeParamsListItem[]>>(
+ { url: Api.getSysParam, params },
+ {
+ isTransformResponse: false,
+ },
+ );
--
Gitblit v1.9.3