From 68d75a540ec8b3168c3af956ea00b898036d92cd Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 04 七月 2024 00:17:17 +0800
Subject: [PATCH] 包装规则更新
---
src/views/tigerprojects/system/lowcode/entityts/MES_SHIFT.ts | 5 -
src/views/tigerprojects/system/lowcode/high/baseForm.vue | 3
src/views/tigerprojects/system/lowcode/entityts/BAS_REASON.ts | 9 +-
src/views/tigerprojects/system/lowcode/entityts/BAS_DEFECT.ts | 9 +-
src/views/tigerprojects/system/role/RoleDrawer.vue | 2
src/views/tigerprojects/system/lowcode/entityts/MES_SHIFT_SYS.ts | 6
src/views/tigerprojects/system/lowcode/setting/pageDetail.vue | 3
src/views/tigerprojects/system/lowcode/normalDrawer.vue | 53 ++++++------
src/views/tigerprojects/system/lowcode/high/dtl.vue | 11 ++
src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts | 3
src/layouts/default/menu/index.vue | 1
src/views/components/bizMesWo.ts | 6
src/views/tigerprojects/system/lowcode/entityts/BAS_PKG_RULE.ts | 6
src/api/tigerapi/system.ts | 4
src/views/tigerprojects/system/lowcode/normal/index.vue | 3
src/views/tigerprojects/system/lowcode/entityts/BAS_PKG_DTL.ts | 76 ++++++++++++------
16 files changed, 117 insertions(+), 83 deletions(-)
diff --git a/src/api/tigerapi/system.ts b/src/api/tigerapi/system.ts
index 0d53fb4..a3fb7df 100644
--- a/src/api/tigerapi/system.ts
+++ b/src/api/tigerapi/system.ts
@@ -919,11 +919,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 },
diff --git a/src/layouts/default/menu/index.vue b/src/layouts/default/menu/index.vue
index e7359eb..0eaaf6f 100644
--- a/src/layouts/default/menu/index.vue
+++ b/src/layouts/default/menu/index.vue
@@ -116,6 +116,7 @@
getEntity({
sqlcmd: `ASSEMBLY_NAME ='${path.split('/')[1]}'`,
entityName: 'SYS_LOW_CODE',
+ order: ''
}).then((data) => {
var searchForms = JSON.parse(data.Data.Items[0].SEARCH_FORM_JSON);
let colSlots = [] as string[];
diff --git a/src/views/components/bizMesWo.ts b/src/views/components/bizMesWo.ts
index 180edf1..f2f4919 100644
--- a/src/views/components/bizMesWo.ts
+++ b/src/views/components/bizMesWo.ts
@@ -3,8 +3,8 @@
* @Author: Ben Lin
* @version:
* @Date: 2024-06-05 16:10:24
- * @LastEditors: your name
- * @LastEditTime: 2024-06-15 22:43:55
+ * @LastEditors: Ben Lin
+ * @LastEditTime: 2024-07-03 21:56:56
*/
/* 宸ュ崟鐩稿叧鑷畾涔夋柟娉� */
import { FunctionType } from '/@/api/tigerapi/model/systemModel';
@@ -404,7 +404,7 @@
},
componentProps: {
api: getEntity,
- params: { entityName: 'MES_LINE', sqlcmd: ' 1=1 ' },
+ params: { entityName: 'MES_LINE', sqlcmd: ' 1=1 ', order: '' },
resultField: 'Data.Items',
labelField: 'LINE_NAME',
valueField: 'LINE_CODE',
diff --git a/src/views/tigerprojects/system/lowcode/entityts/BAS_DEFECT.ts b/src/views/tigerprojects/system/lowcode/entityts/BAS_DEFECT.ts
index d809216..956891a 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/BAS_DEFECT.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/BAS_DEFECT.ts
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-02 20:00:10
+ * @LastEditTime: 2024-07-03 21:37:02
*/
import { Ref, h, unref } from 'vue';
@@ -239,14 +239,15 @@
* @return {*}
*/
function DftGrpDel(args: Fn[], params: {}) {
+ const name = params['name'];
if (!isNullOrEmpty(params['data'])) {
- var _data = params['data'].value.filter((item) => item['ID'] != params['record']['ID']);
- params['data'].value = _data;
+ var _data = params['data'].value[name].filter((item) => item['ID'] != params['record']['ID']);
+ params['data'].value[name] = _data;
args[6]({
dataSource: [],
});
args[6]({
- dataSource: params['data'],
+ dataSource: params['data'].value[name],
});
args[1]();
} else {
diff --git a/src/views/tigerprojects/system/lowcode/entityts/BAS_PKG_DTL.ts b/src/views/tigerprojects/system/lowcode/entityts/BAS_PKG_DTL.ts
index c52f115..e36ae97 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/BAS_PKG_DTL.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/BAS_PKG_DTL.ts
@@ -4,16 +4,13 @@
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-02 19:59:52
+ * @LastEditTime: 2024-07-04 00:10:35
*/
-import { Ref } from 'vue';
+import { Ref, ref } from 'vue';
import { DeleteEntity, getEntity } from '/@/api/tigerapi/system';
import { ActionItem, BasicColumn, FormSchema, useTable } from '/@/components/Table';
import { isNullOrEmpty, isNullOrUnDef } from '/@/utils/is';
-import { buildUUID } from '/@/utils/uuid';
-import { useUserStore } from '/@/store/modules/user';
-import { formatToDateTime } from '/@/utils/dateUtil';
import { useDrawer } from '/@/components/Drawer';
import { EditOperation, Search } from '../data';
@@ -26,6 +23,8 @@
fixed: undefined,
};
+ let _data = ref<any>({});
+ let record = {};
/**
* @description: 涓�浜涜嚜瀹氫箟鏂规硶
* @return {*}
@@ -72,7 +71,7 @@
};
return item;
});
- EditOperation(data,d, u, item, _data);
+ EditOperation(data, d, u, item, _data);
},
/**
* @description: 楂樼骇琛ㄥ崟鍜岃鎯呴〉闈㈣繑鍥炰富椤甸潰鐨剈rl
@@ -99,7 +98,9 @@
* @description: 楂樼骇琛ㄥ崟澧炲垹鏀硅〃鍗曞瓧娈�
* @return {*}
*/
- GetCrudForm: (type: string) => {
+ GetCrudForm: (type: string, ...args) => {
+ _data = args[0];
+ record = args[1];
return crudForms[type];
},
KeyFieldValues: (val: string, id: string) => {
@@ -271,14 +272,15 @@
* @return {*}
*/
function custDel(args: Fn[], params: {}) {
+ const name = params['name'];
if (!isNullOrEmpty(params['data'])) {
- var _data = params['data'].value.filter((item) => item['ID'] != params['record']['ID']);
- params['data'].value = _data;
+ var _data = params['data'].value[name].filter((item) => item['ID'] != params['record']['ID']);
+ params['data'].value[name] = _data;
args[6]({
dataSource: [],
});
args[6]({
- dataSource: params['data'],
+ dataSource: params['data'].value[name],
});
args[1]();
} else {
@@ -342,19 +344,14 @@
const crudForms = {
BAS_PKG_DTL: [
{
- field: 'PKG_CODE',
- label: '鍖呰/杞藉叿缂栫爜',
- component: 'ApiSelect',
- required: true,
+ label: '鍖呰瑙勫垯ID',
+ field: 'PKG_RULE_ID',
+ component: 'Input',
colProps: {
span: 24,
},
- componentProps: {
- api: getEntity,
- params: { entityName: 'BAS_PKG_TYPE', sqlcmd: ' 1=1 ' },
- resultField: 'Data.Items',
- labelField: 'PKG_NAME',
- valueField: 'PKG_CODE',
+ dynamicDisabled: ({ values }) => {
+ return true;
},
},
{
@@ -365,19 +362,44 @@
colProps: {
span: 24,
},
- },
- {
- label: '鍖呰瑙勫垯ID',
- field: 'PKG_RULE_ID',
- component: 'Input',
- colProps: {
- span: 24,
+ componentProps: ({ formModel }) => {
+ formModel.PKG_LEVEL =
+ _data['BAS_PKG_DTL'].reduce((max, item) => {
+ return max < Number(item.PKG_LEVEL) ? Number(item.PKG_LEVEL) : max;
+ }, 0) + 1;
+ return {
+ onChange: (e) => {},
+ };
},
dynamicDisabled: ({ values }) => {
return true;
},
},
{
+ field: 'PKG_CODE',
+ label: '鍖呰/杞藉叿缂栫爜',
+ component: 'ApiSelect',
+ required: true,
+ colProps: {
+ span: 24,
+ },
+ componentProps: ({ formModel }) => {
+ let sqlcmd = ' 1=1 ';
+ if (!isNullOrEmpty(record) && record['PKG_LEVEL'] == 1) {
+ sqlcmd += ` And IS_MIN_PKG = 'Y'`;
+ } else {
+ sqlcmd += ` And IS_MIN_PKG != 'Y'`;
+ }
+ return {
+ api: getEntity,
+ params: { entityName: 'BAS_PKG_TYPE', sqlcmd: sqlcmd },
+ resultField: 'Data.Items',
+ labelField: 'PKG_NAME',
+ valueField: 'PKG_CODE',
+ };
+ },
+ },
+ {
label: '鍖呰鏁伴噺',
field: 'PKG_QTY',
component: 'Input',
diff --git a/src/views/tigerprojects/system/lowcode/entityts/BAS_PKG_RULE.ts b/src/views/tigerprojects/system/lowcode/entityts/BAS_PKG_RULE.ts
index 0913481..a7229ff 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/BAS_PKG_RULE.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/BAS_PKG_RULE.ts
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-03 11:42:41
+ * @LastEditTime: 2024-07-03 22:04:40
*/
import { ActionItem, BasicColumn } from '/@/components/Table';
@@ -40,7 +40,7 @@
Title: '鏂板鍖呰瑙勫垯',
pCode: 'PKG_RULE_ID',
IsID: true,
- drawers: [{ name: 'BAS_PKG_DTL', code: 'PKG_RULE_ID', type: 'one' }], //drawers鏄彸杈瑰脊鍑哄鏀逛晶妗嗙殑鍚嶅瓧鍒楄〃
+ drawers: [{ name: 'BAS_PKG_DTL', code: 'PKG_RULE_ID', type: 'one', order: 'PKG_LEVEL' }], //drawers鏄彸杈瑰脊鍑哄鏀逛晶妗嗙殑鍚嶅瓧鍒楄〃
},
};
},
@@ -73,7 +73,7 @@
Title: `缂栬緫鍖呰瑙勫垯锛�${params['record']['RULE_CODE']}`,
pCode: 'PKG_RULE_ID',
IsID: true,
- drawers: [{ name: 'BAS_PKG_DTL', code: 'PKG_RULE_ID', type: 'one' }], //drawers鏄彸杈瑰脊鍑哄鏀逛晶妗嗙殑鍚嶅瓧鍒楄〃
+ drawers: [{ name: 'BAS_PKG_DTL', code: 'PKG_RULE_ID', type: 'one', order: 'PKG_LEVEL' }], //drawers鏄彸杈瑰脊鍑哄鏀逛晶妗嗙殑鍚嶅瓧鍒楄〃
};
// 灏嗗璞¤浆鎹负JSON瀛楃涓插苟淇濆瓨鍒皊essionStorage
sessionStorage.removeItem(`${param.SessionName}_params`);
diff --git a/src/views/tigerprojects/system/lowcode/entityts/BAS_REASON.ts b/src/views/tigerprojects/system/lowcode/entityts/BAS_REASON.ts
index b7359b0..fbf62b6 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/BAS_REASON.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/BAS_REASON.ts
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-22 00:58:43
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-02 19:59:39
+ * @LastEditTime: 2024-07-03 21:39:08
*/
import { Ref, h } from 'vue';
import { DeleteEntity, getEntity } from '/@/api/tigerapi/system';
@@ -229,14 +229,15 @@
* @return {*}
*/
function rsnGrpDel(args: Fn[], params: {}) {
+ const name = params['name'];
if (!isNullOrEmpty(params['data'])) {
- var _data = params['data'].value.filter((item) => item['ID'] != params['record']['ID']);
- params['data'].value = _data;
+ var _data = params['data'].value[name].filter((item) => item['ID'] != params['record']['ID']);
+ params['data'].value[name] = _data;
args[6]({
dataSource: [],
});
args[6]({
- dataSource: params['data'],
+ dataSource: params['data'].value[name],
});
args[1]();
} else {
diff --git a/src/views/tigerprojects/system/lowcode/entityts/MES_SHIFT.ts b/src/views/tigerprojects/system/lowcode/entityts/MES_SHIFT.ts
index e2ad384..f19a8e6 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/MES_SHIFT.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/MES_SHIFT.ts
@@ -4,16 +4,13 @@
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-03 10:15:44
+ * @LastEditTime: 2024-07-03 22:27:11
*/
import { Ref, h, ref, unref } from 'vue';
import { DeleteEntity, GetEnum, getEntity } from '/@/api/tigerapi/system';
import { ActionItem, BasicColumn, FormSchema, useTable } from '/@/components/Table';
import { isNullOrEmpty, isNullOrUnDef } from '/@/utils/is';
-import { buildUUID } from '/@/utils/uuid';
-import { useUserStore } from '/@/store/modules/user';
-import { formatToDateTime } from '/@/utils/dateUtil';
import { Tag } from 'ant-design-vue';
import { useLocale } from '/@/locales/useLocale';
import { useDrawer } from '/@/components/Drawer';
diff --git a/src/views/tigerprojects/system/lowcode/entityts/MES_SHIFT_SYS.ts b/src/views/tigerprojects/system/lowcode/entityts/MES_SHIFT_SYS.ts
index f2b795d..5fd4efd 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/MES_SHIFT_SYS.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/MES_SHIFT_SYS.ts
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-03 11:42:15
+ * @LastEditTime: 2024-07-03 21:59:28
*/
import { ActionItem, BasicColumn } from '/@/components/Table';
@@ -42,8 +42,8 @@
pCode: 'SFTS_CODE', //涓讳俊鎭叧閿瓧娈礐ODE
IsID: false, //鏄惁甯﹁繃鍘讳晶杈规鐨勬槸ID锛宖alse灏辨槸CODE锛宼rue鏄疘D
drawers: [
- { name: 'MES_SHIFT', code: 'SFTS_CODE', type: 'one' },
- { name: 'MES_SHIFT_PRD', code: 'SFT_CODE', type: 'all', keyName: 'MES_SHIFT' },
+ { name: 'MES_SHIFT', code: 'SFTS_CODE', type: 'one', order: '' },
+ { name: 'MES_SHIFT_PRD', code: 'SFT_CODE', type: 'all', keyName: 'MES_SHIFT', order: '' },
], //drawers鏄彸杈瑰脊鍑哄鏀逛晶妗嗙殑鍚嶅瓧鍒楄〃
},
};
diff --git a/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts b/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
index 0753369..1caea9b 100644
--- a/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
+++ b/src/views/tigerprojects/system/lowcode/entityts/ProdRouteBinding.ts
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-19 20:34:27
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-03 20:40:54
+ * @LastEditTime: 2024-07-03 21:57:20
*/
import { Ref, h, ref, render, unref } from 'vue';
@@ -139,6 +139,7 @@
sqlcmd: sqlcmd,
entityName:
params['selectedNodes'].value[0].type == 'Action' ? 'MES_PROD_ACTION' : 'MES_PROD_OPER',
+ order: '',
}).then((res) => {
params['resetFields']();
if (params['selectedNodes'].value[0].type == 'Action') {
diff --git a/src/views/tigerprojects/system/lowcode/high/baseForm.vue b/src/views/tigerprojects/system/lowcode/high/baseForm.vue
index 80bf4ef..c44a330 100644
--- a/src/views/tigerprojects/system/lowcode/high/baseForm.vue
+++ b/src/views/tigerprojects/system/lowcode/high/baseForm.vue
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-23 17:21:29
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-02 21:26:46
+ * @LastEditTime: 2024-07-03 21:57:32
-->
<template>
<a-card
@@ -59,6 +59,7 @@
getEntity({
sqlcmd: ` ID = '${objParams.value['ID']}'`,
entityName: _baseCards.value[0]['entityName'],
+ order: ''
}).then((res) => {
if (!isNullOrEmpty(res.Data.Items)) {
useFormData.value[_baseCards.value[0]['name']][1].setFieldsValue(res.Data.Items[0]);
diff --git a/src/views/tigerprojects/system/lowcode/high/dtl.vue b/src/views/tigerprojects/system/lowcode/high/dtl.vue
index 1b3f4e3..39fe51c 100644
--- a/src/views/tigerprojects/system/lowcode/high/dtl.vue
+++ b/src/views/tigerprojects/system/lowcode/high/dtl.vue
@@ -131,9 +131,14 @@
if (!isNullOrEmpty(keyFieldValues.value[drawers.value[i].code])) {
sqlcmd += ` And ${drawers.value[i].code} = '${keyFieldValues.value[drawers.value[i].code]}'`;
}
+ /* type: all-琛ㄧず闇�瑕乧ode鐨勬墍鏈夌殑鍊� */
+ if (drawers.value[i]['type'] == 'all') {
+ sqlcmd += ` And ${drawers.value[i]['code']} in (${data.value[drawers.value[i]['keyName']].map((value) => `'${value[drawers.value[i]['code']]}'`).join(',')})`;
+ }
const list = await getEntity({
sqlcmd: sqlcmd,
entityName: drawers.value[i].name,
+ order: drawers.value[i].order,
});
if (!isNullOrEmpty(list.Data) && !isNullOrEmpty(list.Data.Items)) {
data.value[drawers.value[i].name] = list.Data.Items;
@@ -159,7 +164,7 @@
isUpdate: true,
ifSave: true,
entityName: props.entityName,
- formJson: GetCrudForm(item, data), //getFormSchema(`${entityName.value}_Crud`),
+ formJson: [], //getFormSchema(`${entityName.value}_Crud`),
cType,
dtlSlots,
useModalData,
@@ -258,9 +263,11 @@
isUpdate: false,
ifSave: true,
entityName: drawers.value[t]['name'], //props.entityName,
- formJson: GetCrudForm(item, data), //鑾峰彇澧炲垹鏀硅〃鍗曞瓧娈�
+ // formJson: GetCrudForm(item, data), //鑾峰彇澧炲垹鏀硅〃鍗曞瓧娈�
crudColSlots: props.crudColSlots,
keyFieldValues: keyFieldValues.value,
+ data,
+ name: item, //drawers鍒楄〃閲岄潰鐨刵ame锛岃〃绀烘槸鍝竴涓疄浣擄紝涔熷氨鏄珮绾ц〃鍗曚腑琛ㄦ牸鐨勫悕瀛�
});
}
});
diff --git a/src/views/tigerprojects/system/lowcode/normal/index.vue b/src/views/tigerprojects/system/lowcode/normal/index.vue
index 6b80bfd..bf776e3 100644
--- a/src/views/tigerprojects/system/lowcode/normal/index.vue
+++ b/src/views/tigerprojects/system/lowcode/normal/index.vue
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-05-30 13:28:20
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-03 08:52:44
+ * @LastEditTime: 2024-07-03 21:57:53
-->
<template>
<div>
@@ -118,6 +118,7 @@
const data = await getEntity({
sqlcmd: "ASSEMBLY_NAME ='" + objParams.value.ID + "'",
entityName: 'SYS_LOW_CODE',
+ order: ''
});
var searchForms = JSON.parse(data.Data.Items[0].SEARCH_FORM_JSON);
for (const i in searchForms) {
diff --git a/src/views/tigerprojects/system/lowcode/normalDrawer.vue b/src/views/tigerprojects/system/lowcode/normalDrawer.vue
index d21e398..d597a63 100644
--- a/src/views/tigerprojects/system/lowcode/normalDrawer.vue
+++ b/src/views/tigerprojects/system/lowcode/normalDrawer.vue
@@ -89,29 +89,32 @@
});
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
- isUpdate.value = !!data?.isUpdate;
- ifSave.value = !!data?.ifSave;
- entityName.value = data?.entityName;
- // formSchema.value = await fetchJson(
- // `${globSetting.downloadUrl}/LowCode/${unref(entityName)}/${
- // entityName.value
- // }_addEditform.json`,
- // );
- formSchema.value = data?.formJson;
- crudColSlots.value = data?.crudColSlots;
- isExistSql.value = data?.isExistSql;
- resetFields();
- setDrawerProps({ confirmLoading: false });
+ /* 鍔ㄦ�乮mport瀹炰綋鍚�.ts鐨勮嚜瀹氫箟鏂规硶 */
+ try {
+ import(`./entityts/${data?.name}.ts`)
+ .then((m) => {
+ const [{ GetCrudForm }] = m.default();
+ isUpdate.value = !!data?.isUpdate;
+ ifSave.value = !!data?.ifSave;
+ entityName.value = data?.entityName;
+ formSchema.value = GetCrudForm(data?.name, data?.data, data.record);
+ crudColSlots.value = data?.crudColSlots;
+ isExistSql.value = data?.isExistSql;
+ resetFields();
+ setDrawerProps({ confirmLoading: false });
- if (unref(isUpdate)) {
- setFieldsValue({
- ...data.record,
- });
- } else {
- if (!isNullOrUnDef(data?.keyFieldValues)) {
- setFieldsValue(data?.keyFieldValues);
- }
- }
+ if (unref(isUpdate)) {
+ setFieldsValue({
+ ...data.record,
+ });
+ } else {
+ if (!isNullOrUnDef(data?.keyFieldValues)) {
+ setFieldsValue(data?.keyFieldValues);
+ }
+ }
+ })
+ .catch(() => {});
+ } catch (e) {}
});
const getTitle = computed(() => (!unref(isUpdate) ? '鏂板' : '缂栬緫'));
@@ -158,8 +161,7 @@
function handleItemSuccess(d, u, item) {
/* 鍔ㄦ�乮mport瀹炰綋鍚�.ts鐨勮嚜瀹氫箟鏂规硶 */
try {
- import(`./entityts/${getFieldsValue()[`${item.replace(/add/, '')}PSelect_0`]}.ts`
- )
+ import(`./entityts/${getFieldsValue()[`${item.replace(/add/, '')}PSelect_0`]}.ts`)
.then((m) => {
const [{ GetSelectSuccess }] = m.default();
setFieldsValue(GetSelectSuccess(d, u));
@@ -180,8 +182,7 @@
function handleSelectItem(item) {
/* 鍔ㄦ�乮mport瀹炰綋鍚�.ts鐨勮嚜瀹氫箟鏂规硶 */
try {
- import(`./entityts/${getFieldsValue()[`${item.replace(/add/, '')}PSelect_0`]}.ts`
- )
+ import(`./entityts/${getFieldsValue()[`${item.replace(/add/, '')}PSelect_0`]}.ts`)
.then((m) => {
const [{ OpenSelectItem }] = m.default();
OpenSelectItem(openItemModal);
diff --git a/src/views/tigerprojects/system/lowcode/setting/pageDetail.vue b/src/views/tigerprojects/system/lowcode/setting/pageDetail.vue
index 736cf45..ba03b94 100644
--- a/src/views/tigerprojects/system/lowcode/setting/pageDetail.vue
+++ b/src/views/tigerprojects/system/lowcode/setting/pageDetail.vue
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-05-30 22:00:44
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-06-18 11:37:37
+ * @LastEditTime: 2024-07-03 21:58:06
-->
<!-- eslint-disable prettier/prettier -->
<template>
@@ -465,6 +465,7 @@
getEntity({
sqlcmd: "ID ='" + objParams.value.ID + "'",
entityName: 'SYS_LOW_CODE',
+ order: ''
}).then((data) => {
/* 鏌ヨ鍔犺浇 */
var searchForms = JSON.parse(data.Data.Items[0].SEARCH_FORM_JSON);
diff --git a/src/views/tigerprojects/system/role/RoleDrawer.vue b/src/views/tigerprojects/system/role/RoleDrawer.vue
index e7dfdbb..296d7ac 100644
--- a/src/views/tigerprojects/system/role/RoleDrawer.vue
+++ b/src/views/tigerprojects/system/role/RoleDrawer.vue
@@ -133,7 +133,7 @@
}
if (unref(treeDataProd).length === 0) {
// treeDataProd.value = (await getProdTreeList()) as any as TreeItem[];
- let prodTreeData = await getEntity({sqlcmd: '', entityName: 'V_PROD_TREE'});
+ let prodTreeData = await getEntity({sqlcmd: '', entityName: 'V_PROD_TREE', order: ''});
treeDataProd.value = convertToTree(prodTreeData.Data.Items,'PARENT_CODE', 'CODE', '');
}
if (unref(treeDataWh).length === 0) {
--
Gitblit v1.9.3