From 3d2c48733b86a03fc2e5a1f12ac3667ab0863b80 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 08 十一月 2024 01:03:56 +0800
Subject: [PATCH] 标签模板，主页，默认工艺路线更新
---
src/api/tigerapi/system.ts | 132 +++++++++++++++++++++++++++++++++++--------
1 files changed, 106 insertions(+), 26 deletions(-)
diff --git a/src/api/tigerapi/system.ts b/src/api/tigerapi/system.ts
index 0d53fb4..b419524 100644
--- a/src/api/tigerapi/system.ts
+++ b/src/api/tigerapi/system.ts
@@ -28,9 +28,11 @@
EntityParams,
EntityList,
iSYS_ROLE_PROD,
+ pParams,
} from './model/systemModel';
import { defHttp } from '/@/utils/http/axios';
import { isArray, isNullOrEmpty, isTimeViaRegExp8601 } from '/@/utils/is';
+import { isNumber } from 'xe-utils';
export enum Api {
QueryUrl = '/Base/Query',
@@ -43,6 +45,7 @@
MenuList = '/SYS/getMenuListAll',
SaveMenu = '/SYS/SaveMenu',
SaveRole = '/SYS/SaveRole',
+ getSysParam = '/SYS/getSysParam',
AddEntity = '/Base/Add',
AddListEntity = '/Base/AddList',
UpdateEntity = '/Base/Update',
@@ -62,7 +65,11 @@
StartJob = '/Tsk/StartJob',
StopJob = '/Tsk/PauseJob',
AddJob = '/Tsk/AddJob',
+ AddTskJob = '/Tsk/AddTskJob',
+ ImmediateRun = '/Tsk/ImmediateRun',
+ RemoveTskJob = '/Tsk/RemoveTskJob',
UpdateJob = '/Tsk/UpdateJob',
+ SaveTskJob = '/Tsk/SaveTskJob',
urlQueryEnum = '/Base/QueryEnum',
DeleteWareHouse = '/WMS/DelWareHouseModel',
AddLocation = '/WMS/AddLoctionModel',
@@ -130,7 +137,7 @@
/*
* 鐢熸垚Action
*/
-export function genAction<T>(datatype: string, data: T, option?: object) {
+export function genAction<T>(datatype: string, data: T, option?: object, NeedInclude?: boolean) {
const time = new Date();
const params: ApiAction<T> = {
ID: buildUUID(),
@@ -144,7 +151,23 @@
StatusCode: 0,
Data: data,
LocaleMsg: undefined,
+ NeedInclude: isNullOrEmpty(NeedInclude) ? false : NeedInclude,
};
+ return params;
+}
+
+/**
+ * @desc 鐢熸垚Action
+ */
+export function generateAction<T>(
+ datatype: string,
+ DataAssembly: string,
+ data: T,
+ option?: object,
+ NeedInclude?: boolean,
+) {
+ const params = genAction(datatype, data, option, NeedInclude);
+ params.DataAssembly = DataAssembly;
return params;
}
export function genActionjob<sting>(
@@ -285,7 +308,7 @@
* @param {T} data
* @param {string} parentField 鐖跺瓧娈靛悕
* @param {string} idField 鍞竴key瀛楁鍚�
- * @param {string} pid_val 鐖秈d鍊�
+ * @param {string} pid 鐖秈d鍊�
* @return {*}
*/
export function convertToTree<T>(data: T[], parentField: string, idField: string, pid?: string) {
@@ -304,6 +327,30 @@
}
}
return result;
+}
+
+/**
+ * @description: 鑾峰彇鐖堕」
+ * @param {any} nodes
+ * @param {string} childId
+ * @return {*}
+ */
+export function findParent(tree: any[], nodeId: string): any | undefined {
+ for (const node of tree) {
+ if (node.children) {
+ for (const child of node.children) {
+ if (child.tid === nodeId) {
+ return node;
+ }
+ // 閫掑綊鏌ユ壘瀛愭爲
+ const potentialParent = findParent(node.children, nodeId);
+ if (potentialParent) {
+ return potentialParent;
+ }
+ }
+ }
+ }
+ return undefined; // 娌℃湁鎵惧埌瀵瑰簲鐨勭埗浜茶妭鐐�
}
/*
@@ -709,22 +756,29 @@
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'],
- },
- });
- return getListByPageAsync(rParams);
+ const rParams = genAction(
+ params['TABLE_NAME'],
+ !isNullOrEmpty(params['apiUrl'])
+ ? params
+ : {
+ QueryAble_T: '',
+ where: sqlcmd,
+ order: order,
+ page: {
+ pageAble_T: 'string',
+ draw: 1,
+ pageIndex: params['page'],
+ pageSize: params['pageSize'],
+ },
+ },
+ params['option'],
+ params['NeedInclude'],
+ );
+ return getListByPageAsync(rParams, params['apiUrl']); //濡傛灉涓嶆兂鐢ㄩ粯璁ょ殑鍩虹鏂规硶鑾峰彇鍒嗛〉鏁版嵁锛屽彲浠ユ崲鍏朵粬鐨刟pi
}
-async function getListByPageAsync(params: any) {
+async function getListByPageAsync(params: any, apiUrl: string | null | undefined) {
const data = await defHttp.post(
- { url: Api.QueryUrl, params, timeout: 50000 },
+ { url: !isNullOrEmpty(apiUrl) ? apiUrl : Api.QueryUrl, params, timeout: 50000 },
{
isTransformResponse: false,
},
@@ -753,14 +807,27 @@
Keys[k] != 'TABLE_NAME' &&
Keys[k] != 'order' &&
Keys[k] != 'field' &&
+ Keys[k] != 'option' &&
Keys[k] != '0' &&
+ Keys[k] != 'apiUrl' &&
+ Keys[k] != 'NeedInclude' &&
+ Keys[k] != 'nolike' &&
!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]}'`;
+ if (!isNullOrEmpty(params[Keys[k]].length) && isArray(params[Keys[k]])) {
+ if (isTimeViaRegExp8601(params[Keys[k]][0])) {
+ sqlcmd += ` And ${Keys[k]} > '${params[Keys[k]][0]}'`;
+ sqlcmd += ` And ${Keys[k]} < '${params[Keys[k]][1]}'`;
+ } else {
+ sqlcmd += `And '${params[Keys[k]].join(',')}' like '%'+${Keys[k]}+'%'`;
+ }
+ } else if (isNumber(params[Keys[k]])) {
+ sqlcmd += `And ${Keys[k]} = ${params[Keys[k]]}`;
} else {
- sqlcmd += `And ${Keys[k]} like '%${params[Keys[k]]}%'`;
+ sqlcmd +=
+ params['nolike'] == 'Y'
+ ? `And ${Keys[k]} = '${params[Keys[k]]}'`
+ : `And ${Keys[k]} like '%${params[Keys[k]]}%'`;
}
}
}
@@ -778,13 +845,13 @@
},
);
} else {
- var check = await isExist(genAction(entityName, args[0]));
+ const check = await isExist(genAction(entityName, args[0]));
if (check.Data) {
check.IsSuccessed = false;
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) },
{
@@ -797,7 +864,7 @@
}
export async function AddListEntity<T>(params: T, entityName: string) {
- let data = await defHttp.post(
+ const data = await defHttp.post(
{ url: Api.AddListEntity, params: genAction(entityName, params) },
{
errorMessageMode: 'none',
@@ -826,7 +893,7 @@
* @return {*}
*/
export async function AddAfterDelete(entityName: string, items: [], where: string) {
- let data = await defHttp.post(
+ const data = await defHttp.post(
{
url: Api.AddAfterDelete,
params: genAction(entityName, {
@@ -919,11 +986,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 +1015,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