From fee83fc57f553595cc3a4891b8a692fa66cd77fe Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 25 二月 2025 10:43:52 +0800
Subject: [PATCH] 一些更新
---
src/layouts/default/menu/index.vue | 6 +-
src/views/tigerprojects/bas/checkrule/checkrule.data.ts | 4 -
src/views/tigerprojects/system/lowcode/data.ts | 2
src/views/tigerprojects/system/lowcode/setting/setting.data.ts | 16 +++++--
src/views/tigerprojects/system/lowcode/normal/mainTable.vue | 16 ++++----
src/views/tigerprojects/system/lowcode/composition/LeftTable.vue | 2
src/views/dashboard/workbench/components/QuickNav.vue | 2
src/views/tigerprojects/system/lowcode/setting/pageDetail.vue | 10 +++--
src/views/tigerprojects/system/lowcode/normal/index.vue | 14 +++---
src/views/tigerprojects/system/lowcode/setting/index.vue | 2
10 files changed, 40 insertions(+), 34 deletions(-)
diff --git a/src/layouts/default/menu/index.vue b/src/layouts/default/menu/index.vue
index 99c20e4..6230c96 100644
--- a/src/layouts/default/menu/index.vue
+++ b/src/layouts/default/menu/index.vue
@@ -114,7 +114,7 @@
function handleMenuClick(path: string) {
if (path.split('/').length > 2 && path.split('/')[2] == 'LC') {
getEntity({
- sqlcmd: `ASSEMBLY_NAME ='${path.split('/')[1]}'`,
+ sqlcmd: `CODE_NAME ='${path.split('/')[1]}'`,
entityName: 'SYS_LOW_CODE',
order: '',
}).then((data) => {
@@ -133,7 +133,7 @@
crudColSlots.push(_cruds[i]['colSlot']);
}
}
- const id = { ID: path.split('/')[1], colSlots: colSlots, crudColSlots: crudColSlots };
+ const id = { ID:path.split('/')[1], EntityName: data.Data.Items[0].ASSEMBLY_NAME, colSlots: colSlots, crudColSlots: crudColSlots };
go(`/${path.split('/')[1]}/${path.split('/')[2]}/${encodeURI(JSON.stringify(id))}`);
});
} else if (
@@ -147,7 +147,7 @@
crudColSlots: [],
OtherTableName: [],
SessionName:
- 'ProdRouteBinding_update' /* session鍚嶏紝鐢ㄦ潵浼犻�掑弬鏁帮紝涓嶅湪娴忚鍣ㄥ湴鍧�鏍忔樉绀� */,
+ `${path.split('/')[1]}_update` /* session鍚嶏紝鐢ㄦ潵浼犻�掑弬鏁帮紝涓嶅湪娴忚鍣ㄥ湴鍧�鏍忔樉绀� */,
};
// 灏嗗璞¤浆鎹负JSON瀛楃涓插苟淇濆瓨鍒皊essionStorage
sessionStorage.removeItem(`${id.SessionName}_params`);
diff --git a/src/views/dashboard/workbench/components/QuickNav.vue b/src/views/dashboard/workbench/components/QuickNav.vue
index 0b080ad..743e4ba 100644
--- a/src/views/dashboard/workbench/components/QuickNav.vue
+++ b/src/views/dashboard/workbench/components/QuickNav.vue
@@ -48,7 +48,7 @@
let id = {};
if (url.split('/').length > 1 && url.split('/')[1] == 'LC') {
getEntity({
- sqlcmd: `ASSEMBLY_NAME ='${url.split('/')[0]}'`,
+ sqlcmd: `CODE_NAME ='${url.split('/')[0]}'`,
entityName: 'SYS_LOW_CODE',
order: '',
}).then((data) => {
diff --git a/src/views/tigerprojects/bas/checkrule/checkrule.data.ts b/src/views/tigerprojects/bas/checkrule/checkrule.data.ts
index e07c451..cdda900 100644
--- a/src/views/tigerprojects/bas/checkrule/checkrule.data.ts
+++ b/src/views/tigerprojects/bas/checkrule/checkrule.data.ts
@@ -1057,9 +1057,7 @@
label: '鏉＄爜闀垮害',
component: 'Input',
colProps: { span: 8 },
- dynamicDisabled: ({ values }) => {
- return true;
- },
+ dynamicDisabled: true,
},
{
field: 'CHECK_TYPE',
diff --git a/src/views/tigerprojects/system/lowcode/composition/LeftTable.vue b/src/views/tigerprojects/system/lowcode/composition/LeftTable.vue
index cffa149..3804aa2 100644
--- a/src/views/tigerprojects/system/lowcode/composition/LeftTable.vue
+++ b/src/views/tigerprojects/system/lowcode/composition/LeftTable.vue
@@ -342,7 +342,7 @@
isMounted.value = true;
const data = await getEntity({
- sqlcmd: `ASSEMBLY_NAME ='${objParams.value.Name}'`,
+ sqlcmd: `CODE_NAME ='${objParams.value.Name}'`,
entityName: 'SYS_LOW_CODE',
order: '',
});
diff --git a/src/views/tigerprojects/system/lowcode/data.ts b/src/views/tigerprojects/system/lowcode/data.ts
index 7b6020a..ee752f4 100644
--- a/src/views/tigerprojects/system/lowcode/data.ts
+++ b/src/views/tigerprojects/system/lowcode/data.ts
@@ -339,7 +339,7 @@
export function goByParams(path: string, params: {}, go) {
if (path.split('/').length > 2 && path.split('/')[2] == 'LC') {
getEntity({
- sqlcmd: `ASSEMBLY_NAME ='${path.split('/')[1]}'`,
+ sqlcmd: `CODE_NAME ='${path.split('/')[1]}'`,
entityName: 'SYS_LOW_CODE',
order: '',
}).then((data) => {
diff --git a/src/views/tigerprojects/system/lowcode/normal/index.vue b/src/views/tigerprojects/system/lowcode/normal/index.vue
index 3cbb6f3..8f1eee0 100644
--- a/src/views/tigerprojects/system/lowcode/normal/index.vue
+++ b/src/views/tigerprojects/system/lowcode/normal/index.vue
@@ -50,7 +50,7 @@
// 浠巗essionStorage涓鍙栧弬鏁板苟杞崲鍥炲璞�
const _savedParams = sessionStorage.getItem(`${objParams.value.sName}_params`);
const savedParams = _savedParams ? ref(JSON.parse(decodeURI(_savedParams))) : ref({});
- const entityName = ref(objParams.value.ID);
+ const entityName = ref(objParams.value.EntityName);
const _columns = ref<any[]>([]);
const _searchFormSchema = ref<any[]>([]);
const _crudFormSchema = ref<any[]>([]);
@@ -111,7 +111,7 @@
//鑾峰彇琛ㄥ崟涓彃妲芥覆鏌撶殑鎸夐挳鐐瑰嚮寮瑰嚭妯℃�佺獥鍙ｇ殑瀹炰緥
useModalData.value = GetUseModalData(objParams.value.ID);
const data = await getEntity({
- sqlcmd: "ASSEMBLY_NAME ='" + objParams.value.ID + "'",
+ sqlcmd: "CODE_NAME ='" + objParams.value.ID + "'",
entityName: 'SYS_LOW_CODE',
order: '',
});
@@ -134,7 +134,7 @@
) {
searchForms[i].componentProps.api = GetEnum;
searchForms[i].componentProps.params.name =
- `${objParams.value.ID}+${searchForms[i].field}s`;
+ `${objParams.value.EntityName}+${searchForms[i].field}s`;
searchForms[i].componentProps.labelField = unref(getLocale) == 'zh_CN' ? 'Desc' : 'Name';
searchForms[i].defaultValue = null;
}
@@ -153,7 +153,7 @@
var _cruds: any[] = [];
/* 濡傛灉鏈夊垵濮嬪寲澧炲垹鏀归〉闈㈢粨鏋勭殑鏂规硶锛屽垯杩涘叆 */
if (InitCrudFormSchema && isFunction(InitCrudFormSchema)) {
- _cruds = InitCrudFormSchema(objParams.value.ID);
+ _cruds = InitCrudFormSchema(objParams.value.EntityName);
} else {
/* 娌℃湁鍒濆鍖栧鍒犳敼椤甸潰缁撴瀯鐨勬柟娉曟椂杩涘叆 */
_cruds = JSON.parse(data.Data.Items[0].FORM_JSON);
@@ -165,7 +165,7 @@
_cruds[i].componentProps.api == 'GetEnum'
) {
_cruds[i].componentProps.api = GetEnum;
- _cruds[i].componentProps.params.name = `${objParams.value.ID}+${_cruds[i].field}s`;
+ _cruds[i].componentProps.params.name = `${objParams.value.EntityName}+${_cruds[i].field}s`;
_cruds[i].componentProps.labelField = unref(getLocale) == 'zh_CN' ? 'Desc' : 'Name';
_cruds[i].defaultValue = null;
}
@@ -183,7 +183,7 @@
_cruds[i].componentProps.api = uploadApi;
_cruds[i].componentProps.multiple = false;
_cruds[i].componentProps.maxNumber = 1;
- _cruds[i].componentProps.uploadParams = { entityName: objParams.value.ID };
+ _cruds[i].componentProps.uploadParams = { entityName: objParams.value.EntityName };
_cruds[i].rules = [{ required: true, message: '璇烽�夋嫨涓婁紶鏂囦欢' }];
}
if (_cruds[i].isexist == 'Y') {
@@ -236,7 +236,7 @@
obj.componentProps = ({ schema, tableAction, formActionType, formModel }) => {
return {
options: options,
- onChange: (e) => custOnChange(e, onChange, objParams.value.ID),
+ onChange: (e) => custOnChange(e, onChange, objParams.value.EntityName),
};
};
}
diff --git a/src/views/tigerprojects/system/lowcode/normal/mainTable.vue b/src/views/tigerprojects/system/lowcode/normal/mainTable.vue
index 8cb9080..e58b968 100644
--- a/src/views/tigerprojects/system/lowcode/normal/mainTable.vue
+++ b/src/views/tigerprojects/system/lowcode/normal/mainTable.vue
@@ -10,7 +10,7 @@
<div v-show="false">
<printTemplate />
</div>
- <CollapseContainer title="鎿嶄綔" class="m-2" v-if="!isSearch[String(currentTab.name)]">
+ <CollapseContainer title="鎿嶄綔淇℃伅" class="m-2" v-if="!isSearch[String(currentTab.name)]">
<BasicForm @register="registerbaseForm">
<template #[l]="{ field }" v-for="l in colSlots" :key="l">
<a-button
@@ -153,7 +153,7 @@
const isExistSql = inject('isExistSql') as Ref<string>;
const keyFieldValues = inject('keyFieldValues') as Ref<Recordable[]>;
const AuthOption = inject('AuthOption') as Ref<{}>;
- const entityName = ref(objParams.value['ID']);
+ const entityName = ref(objParams.value['EntityName']);
const go = useGo();
const [registerDrawer, { openDrawer }] = useDrawer();
const [registerRv, { openModal: openRvModal, closeModal: RvcloseModal }] = useModal();
@@ -208,7 +208,7 @@
/* 鍔ㄦ�乮mport瀹炰綋鍚�.ts鐨勮嚜瀹氫箟鏂规硶 */
try {
- custImport.value = await import(`../entityts/${objParams.value['ID']}.ts`);
+ custImport.value = await import(`../entityts/${objParams.value['EntityName']}.ts`);
} catch (e) {
console.log(e);
}
@@ -231,7 +231,7 @@
keyFieldValues.value = isNullOrUnDef(KeyFieldValues)
? {}
- : KeyFieldValues(objParams.value['CODE'], objParams.value['ID']);
+ : KeyFieldValues(objParams.value['CODE'], objParams.value['EntityName']);
const dtlSlots = ref<any[]>([]);
const ImportTitle = GetTitle && isFunction(GetTitle) ? ref(GetTitle().importTitle) : ref('');
const useformdata = GetUseForm && isFunction(GetUseForm) ? GetUseForm() : {};
@@ -263,7 +263,7 @@
title: '鍒楄〃淇℃伅',
api: getListByPage,
searchInfo: {
- TABLE_NAME: objParams.value['ID'],
+ TABLE_NAME: objParams.value['EntityName'],
option:
AuthOption.value['BY_ORG'] == 'Y'
? {
@@ -308,7 +308,7 @@
getForm().setFieldsValue(savedParams.value['params']);
setProps({
searchInfo: {
- TABLE_NAME: objParams.value['ID'],
+ TABLE_NAME: objParams.value['EntityName'],
option:
AuthOption.value['BY_ORG'] == 'Y'
? {
@@ -380,7 +380,7 @@
const params = {
record,
isUpdate: true,
- entityName: objParams.value['ID'],
+ entityName: objParams.value['EntityName'],
formJson: _crudFormSchema.value,
cType,
dtlSlots,
@@ -520,7 +520,7 @@
)
.then((m) => {
const [{ GetSelectSuccess: GetSelectSuccess2 }] = m.default();
- getForm().setFieldsValue(GetSelectSuccess2(d, u, objParams.value['ID']));
+ getForm().setFieldsValue(GetSelectSuccess2(d, u, objParams.value['EntityName']));
})
.catch(() => {
getForm().setFieldsValue({
diff --git a/src/views/tigerprojects/system/lowcode/setting/index.vue b/src/views/tigerprojects/system/lowcode/setting/index.vue
index 1336ae7..387ae49 100644
--- a/src/views/tigerprojects/system/lowcode/setting/index.vue
+++ b/src/views/tigerprojects/system/lowcode/setting/index.vue
@@ -134,7 +134,7 @@
// `${globSetting.downloadUrl}/LowCode/SYS_LOW_CODE/SYS_LOW_CODE_Baseform.json`,
// );
const data = await getEntity({
- sqlcmd: "ASSEMBLY_NAME ='SYS_LOW_CODE'",
+ sqlcmd: "CODE_NAME ='SYS_LOW_CODE'",
entityName: 'SYS_LOW_CODE',
order: '',
});
diff --git a/src/views/tigerprojects/system/lowcode/setting/pageDetail.vue b/src/views/tigerprojects/system/lowcode/setting/pageDetail.vue
index cc985eb..8161cf2 100644
--- a/src/views/tigerprojects/system/lowcode/setting/pageDetail.vue
+++ b/src/views/tigerprojects/system/lowcode/setting/pageDetail.vue
@@ -494,9 +494,9 @@
SearchEntName.value = data.Data.Items[0].SEARCH_ASSY_NAME;
setFieldsValue({
ASSEMBLY_NAME: data.Data.Items[0].SEARCH_ASSY_NAME,
- IsSearch: searchData.searh ? 'Y' : 'N',
+ IsSearch: searchData.search ? 'Y' : 'N',
});
- IsSearch.value = searchData.searh ? 'Y' : 'N';
+ IsSearch.value = searchData.search ? 'Y' : 'N';
searchForms = searchForms.filter(
(item) =>
!item['field'].toString().startsWith(SearchEntName.value) &&
@@ -608,6 +608,7 @@
setFieldsValueMain({
MainAssemblyName: MainEntName.value,
BY_ORG: data.Data.Items[0].BY_ORG,
+ CODE_NAME: data.Data.Items[0].CODE_NAME
});
for (const i in objs) {
mainCondAdd();
@@ -825,6 +826,7 @@
CRUD_ASSY_NAME: getFieldsValueCrud().crudAssemblyName,
SEARCH_ASSY_NAME: getFieldsValue().ASSEMBLY_NAME,
BY_ORG: getFieldsValueMain().BY_ORG,
+ CODE_NAME: getFieldsValueMain().CODE_NAME,
};
SaveEntity(entity, unref(objParams.value.Update) == '1', 'SYS_LOW_CODE').then((action) => {
if (action.IsSuccessed) {
@@ -1506,7 +1508,7 @@
label: '瀛楁' + j.value,
// required: true,
slot: 'crudfac' + j.value,
- colProps: { span: 12 },
+ colProps: { span: 11 },
},
{
field: `Switch${j.value}`,
@@ -1526,7 +1528,7 @@
field: `InputNumber${j.value}`,
component: 'InputNumber',
label: '鍒楀',
- colProps: { span: 3 },
+ colProps: { span: 4 },
},
{
field: `${j.value}`,
diff --git a/src/views/tigerprojects/system/lowcode/setting/setting.data.ts b/src/views/tigerprojects/system/lowcode/setting/setting.data.ts
index 75a3c6a..8abbbc5 100644
--- a/src/views/tigerprojects/system/lowcode/setting/setting.data.ts
+++ b/src/views/tigerprojects/system/lowcode/setting/setting.data.ts
@@ -110,10 +110,16 @@
*/
export const mainSchemas: FormSchema[] = [
{
+ field: 'CODE_NAME',
+ label: '浠ｇ爜鍚嶇О',
+ component: 'Input',
+ colProps: { span: 12 },
+ },
+ {
field: 'MainAssemblyName',
label: '瀹炰綋绫诲悕',
component: 'Input',
- colProps: { span: 8 },
+ colProps: { span: 10 },
},
{
field: '00',
@@ -129,7 +135,7 @@
label: '鏄惁鎸夌粍缁囨煡璇�',
component: 'Select',
defaultValue: 'N',
- colProps: { span: 4 },
+ colProps: { span: 7 },
componentProps: {
options: [
{
@@ -148,7 +154,7 @@
label: '鏄惁鎸夊伐鍘傛煡璇�',
component: 'Select',
defaultValue: 'N',
- colProps: { span: 4 },
+ colProps: { span: 7 },
componentProps: {
options: [
{
@@ -167,7 +173,7 @@
label: '鏄惁鎸変粨搴撴煡璇�',
component: 'Select',
defaultValue: 'N',
- colProps: { span: 4 },
+ colProps: { span: 7 },
componentProps: {
options: [
{
@@ -187,7 +193,7 @@
label: '1',
colSlot: 'mainCondAdd',
colProps: {
- span: 2,
+ span: 3,
},
},
];
--
Gitblit v1.9.3