herenshan112
/
ShutongInterconnectedChemicalCloudPlatform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

近期数据修改

qin_24
herenshan112 4 months ago
parent
1f20b21f93
commit
c3f3967aeb
8 changed files with 279 additions and 274 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 343
      src/components/DesignForm/app/index.vue
  2. 108
      src/components/DesignForm/tableListPage/formPageCont.vue
  3. 90
      src/components/DesignForm/tableListPage/index.vue
  4. 1
      src/permission.ts
  5. 3
      src/store/modules/permission.ts
  6. 2
      src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
  7. 2
      src/views/sysworkflow/lowcodepage/pageList.vue
  8. 4
      src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue

343
src/components/DesignForm/app/index.vue
View File

@ -54,7 +54,7 @@ import CalendarPage from "@/components/DesignForm/app/calendar/calendar1/calenda
import SearchSelect from "@/components/DesignForm/app/calendar/selectSearch.vue"; import SearchSelect from "@/components/DesignForm/app/calendar/selectSearch.vue";
import AKSelect from "@/components/DesignForm/public/form/select.vue"; import AKSelect from "@/components/DesignForm/public/form/select.vue";
import ContainerPath from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/container.vue"; import ContainerPath from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/container.vue";
import exportPanel from '../exportPanel.vue'; import exportPanel from "../exportPanel.vue";
import importPanel from "../importPanel.vue"; import importPanel from "../importPanel.vue";
const props = withDefaults( const props = withDefaults(
@ -155,7 +155,7 @@ const currentAsfTableDataList = ref([]); //当前点击的关联表单数据
const openTaskDrawer = ref(false); //新增数据 const openTaskDrawer = ref(false); //新增数据
//导出窗口的父元素 //导出窗口的父元素
const dynamicVNode = ref<VNode | null>(null) //组件的父组件 const dynamicVNode = ref<VNode | null>(null); //组件的父组件
const state = reactive({ const state = reactive({
loading: false, loading: false,
@ -551,10 +551,10 @@ const setUpClick = (val: string, id: string) => {
if (val.key == "newAdd") { if (val.key == "newAdd") {
drawerWith.value = container.value?.clientWidth; drawerWith.value = container.value?.clientWidth;
openTaskDrawer.value = true; openTaskDrawer.value = true;
}else if (val.key === "export"){ } else if (val.key === "export") {
doExportTableData() doExportTableData();
}else if (val.key === "import"){ } else if (val.key === "import") {
doImportTableData() doImportTableData();
} else if (val.key == "showQrCode") { } else if (val.key == "showQrCode") {
//liwenxuan 20250114 二维码打印弹窗 start //liwenxuan 20250114 二维码打印弹窗 start
//在此组装参数,以生成二维码图片 //在此组装参数,以生成二维码图片
@ -869,19 +869,19 @@ const columnsFilter = computed(() => {
console.log("获取表格头内容", props.data.columns); console.log("获取表格头内容", props.data.columns);
}); });
const subTableFieldsFilter=computed(()=>{ const subTableFieldsFilter = computed(() => {
const arr:{table:string,field:string,label:string}[]=[] const arr: { table: string; field: string; label: string }[] = [];
const names:string[]=[] const names: string[] = [];
props.fieldsDetailList.forEach((item:any) => { props.fieldsDetailList.forEach((item: any) => {
if(item.type==="table"){ if (item.type === "table") {
names.push(item.name) names.push(item.name);
item.list.forEach((sub: any) => { item.list.forEach((sub: any) => {
arr.push({table:item.name, field: sub.name, label: sub.item.label}) arr.push({ table: item.name, field: sub.name, label: sub.item.label });
}) });
} }
}) });
return {tables:names,fields:arr} return { tables: names, fields: arr };
}) });
/** /**
@ 作者: 秦东 @ 作者: 秦东
@ -981,42 +981,46 @@ const getPageData = () => {
default: default:
state.loading = true; state.loading = true;
//by han2015, 抽成独立部分，方便其他功能调用 //by han2015, 抽成独立部分，方便其他功能调用
doGainFormPageListCont(sendData).then(datas=>{ doGainFormPageListCont(sendData)
tableDataList.value = datas.list .then((datas) => {
state.total=datas.total tableDataList.value = datas.list;
}).finally(()=>{ state.total = datas.total;
//原 finally的处理内容 })
state.loading = false; .finally(() => {
asfs = []; //原 finally的处理内容
radios = []; state.loading = false;
checkboxs = []; asfs = [];
switchs = []; radios = [];
selects = []; checkboxs = [];
tables = []; switchs = [];
dofs = []; selects = [];
getAsfs(); tables = [];
}) dofs = [];
getAsfs();
});
} }
}; };
//表单导入 //表单导入
function doImportTableData(){ function doImportTableData() {
dynamicVNode.value=h(importPanel,{ dynamicVNode.value = h(importPanel, {
fields:props.fieldsDetailList.filter(val=>val.type!=="table"), fields: props.fieldsDetailList.filter((val) => val.type !== "table"),
formId:props.versionid, formId: props.versionid,
commitFunc:()=>{ commitFunc: () => {
getPageData() //刷新table页面 getPageData(); //刷新table页面
dynamicVNode.value=null dynamicVNode.value = null;
}, },
closeFunc:()=>dynamicVNode.value=null closeFunc: () => (dynamicVNode.value = null),
}) });
} }
//表格导出 //表格导出
function doExportTableData(){ function doExportTableData() {
//fields表示主表单的导出字段，subs表示主表单包含的子表格的导出字段 //fields表示主表单的导出字段，subs表示主表单包含的子表格的导出字段
function exportFunc(fields:{field:string,label:string}[],subs:{table:string,field:string,label:string}[]){ function exportFunc(
fields: { field: string; label: string }[],
subs: { table: string; field: string; label: string }[]
) {
let sendData = { let sendData = {
formId: props.formId, formId: props.formId,
page: 1, page: 1,
@ -1024,79 +1028,87 @@ function doExportTableData(){
searchData: json2string(props.searchData), searchData: json2string(props.searchData),
}; };
//全量获取页面的数据 //全量获取页面的数据
doGainFormPageListCont(sendData).then(datas=>{ doGainFormPageListCont(sendData)
const array: string[] = []; .then((datas) => {
//写入表头行 const array: string[] = [];
const title:string[] = []; //写入表头行
for (let val of fields){ const title: string[] = [];
title.push(val.label) for (let val of fields) {
} title.push(val.label);
for (let val of subs){
title.push(val.label)
}
array.push(title.join(","))
//写入数据行
datas.list.forEach((item)=>{
const line=[];
let maxline=0;
//写主表列
for (let val of fields){
if(typeof(val)==="string") line.push((item[val.field] as string).replaceAll(",","，"))
else line.push(item[val.field])
} }
for (let val of subs) {
//写子表列 title.push(val.label);
if (subs.length>0){ }
//计算所有子列表的最大行数 array.push(title.join(","));
for (let tab of subTableFieldsFilter.value.tables){
if(item[tab] && item[tab].length>maxline) maxline=item[tab].length //写入数据行
} datas.list.forEach((item) => {
//全都是空的 const line = [];
if(maxline===0){ let maxline = 0;
array.push(line.join(",")+","+Array(subs.length).fill("")) //写主表列
return for (let val of fields) {
if (typeof val === "string")
line.push((item[val.field] as string).replaceAll(",", "，"));
else line.push(item[val.field]);
} }
//除第一行数据包含子表数据外，其他行都省略主表字段数据，用spaceprefix填充，避免重复 //写子表列
const spacePrefix=Array(line.length).fill("") if (subs.length > 0) {
//计算所有子列表的最大行数
for(let i=0;i<maxline;i++){ for (let tab of subTableFieldsFilter.value.tables) {
const row:any[]=[] if (item[tab] && item[tab].length > maxline) maxline = item[tab].length;
subTableFieldsFilter.value.tables.forEach(name => { }
if(item[name] && item[name].length-1>=i){ //全都是空的
//添加实际数据 if (maxline === 0) {
subs.filter(v=>v.table===name).forEach(f=>{ array.push(line.join(",") + "," + Array(subs.length).fill(""));
row.push(item[name][i][f.field]) return;
}) }
}else{
//添加字段长度的N个空列 //除第一行数据包含子表数据外，其他行都省略主表字段数据，用spaceprefix填充，避免重复
row.push(...(Array(subs.filter(v=>v.table===name).length).fill(""))) const spacePrefix = Array(line.length).fill("");
}
}) for (let i = 0; i < maxline; i++) {
const row: any[] = [];
//写入总csv数组 subTableFieldsFilter.value.tables.forEach((name) => {
if(i===0){ if (item[name] && item[name].length - 1 >= i) {
array.push(line.join(",")+","+row.join(",")) //添加实际数据
}else{ subs
array.push(spacePrefix+","+row.join(",")) .filter((v) => v.table === name)
.forEach((f) => {
row.push(item[name][i][f.field]);
});
} else {
//添加字段长度的N个空列
row.push(
...Array(subs.filter((v) => v.table === name).length).fill("")
);
}
});
//写入总csv数组
if (i === 0) {
array.push(line.join(",") + "," + row.join(","));
} else {
array.push(spacePrefix + "," + row.join(","));
}
} }
return;
} }
//没有子表
array.push(line.join(","));
});
return //去掉标题行的统计
} if (array.length - 1 !== datas.total)
//没有子表 alert(`导出记录数：${datas.total}, 共计：${array.length - 1} 行`);
array.push(line.join(","))
})
//去掉标题行的统计 const filename = props.pickAppMenu.label + ".csv";
if((array.length-1)!==datas.total) alert(`导出记录数：${datas.total}, 共计：${array.length-1} 行`) const csvString = array.join("\n");
const blob = new Blob([csvString], { type: "text/csv;charset=utf-8;" });
const filename= props.pickAppMenu.label+".csv" const link = document.createElement("a");
const csvString = array.join('\n'); if (link.download !== undefined) {
const blob = new Blob([csvString], { type: "text/csv;charset=utf-8;" }); // feature detection
const link = document.createElement("a");
if (link.download !== undefined) { // feature detection
// Browsers that support HTML5 download attribute // Browsers that support HTML5 download attribute
const url = URL.createObjectURL(blob); const url = URL.createObjectURL(blob);
link.setAttribute("href", url); link.setAttribute("href", url);
@ -1105,21 +1117,22 @@ function doExportTableData(){
document.body.appendChild(link); document.body.appendChild(link);
link.click(); link.click();
document.body.removeChild(link); document.body.removeChild(link);
} }
}).finally(()=>dynamicVNode.value=null) })
.finally(() => (dynamicVNode.value = null));
} }
dynamicVNode.value=h(exportPanel,{ dynamicVNode.value = h(exportPanel, {
fields:columnsFilter.value.filter((item)=>item.pattern!=="table"), fields: columnsFilter.value.filter((item) => item.pattern !== "table"),
subtabs:columnsFilter.value.filter((item)=>item.pattern==="table"), subtabs: columnsFilter.value.filter((item) => item.pattern === "table"),
subFields:subTableFieldsFilter.value.fields, subFields: subTableFieldsFilter.value.fields,
commitFunc:exportFunc, commitFunc: exportFunc,
closeFunc:()=>dynamicVNode.value=null closeFunc: () => (dynamicVNode.value = null),
}) });
} }
async function doGainFormPageListCont(sendData:any){ async function doGainFormPageListCont(sendData: any) {
const data =await gainFormPageListCont(sendData) const data = await gainFormPageListCont(sendData);
// console.log("获取列表详细信息----------------->",data) // console.log("获取列表详细信息----------------->",data)
//console.log(dataList) //console.log(dataList)
asfDetails = props.data.columns.filter((item: any) => { asfDetails = props.data.columns.filter((item: any) => {
@ -1179,68 +1192,68 @@ async function doGainFormPageListCont(sendData:any){
} }
return dataList.data; return dataList.data;
}); });
} }
return data.data; return data.data;
} }
//console.log(data.data.list) //console.log(data.data.list)
transferDetails.forEach(element => { transferDetails.forEach((element) => {
//console.log(element) //console.log(element)
data.data.list.forEach((obj: any) => { data.data.list.forEach((obj: any) => {
//console.log(obj) //console.log(obj)
for (const key in obj) { for (const key in obj) {
// 确保只处理对象自身的属性（不包括原型链上的） // 确保只处理对象自身的属性（不包括原型链上的）
if (Object.prototype.hasOwnProperty.call(obj, key)) { if (Object.prototype.hasOwnProperty.call(obj, key)) {
const value = obj[key]; const value = obj[key];
// 特殊处理数组/嵌套对象（使用JSON格式化） // 特殊处理数组/嵌套对象（使用JSON格式化）
const formattedValue = const formattedValue =
(Array.isArray(value) || (typeof value === 'object' && value !== null)) Array.isArray(value) || (typeof value === "object" && value !== null)
? JSON.stringify(value, null, 2) ? JSON.stringify(value, null, 2)
: value; : value;
//console.log(`${key}: ${formattedValue}`); //console.log(`${key}: ${formattedValue}`);
if(key==element.field){ if (key == element.field) {
//console.log(key) //console.log(key)
/* console.log(element.control.fixedOptions) /* console.log(element.control.fixedOptions)
console.log(obj[key]) */ console.log(obj[key]) */
obj[key] = mapIdsToLabels(element.control.fixedOptions,obj[key]) obj[key] = mapIdsToLabels(element.control.fixedOptions, obj[key]);
} }
} }
} }
}); });
}); });
return data.data; return data.data;
//tableDataList.value = data.data.list //tableDataList.value = data.data.list
//liwenxuan 关联表单数据获取 end //liwenxuan 关联表单数据获取 end
} }
interface TreeNode { interface TreeNode {
id: string; id: string;
label: string; label: string;
disabled: boolean; disabled: boolean;
children: TreeNode[]; children: TreeNode[];
} }
function mapIdsToLabels(treeNodes: TreeNode[], ids1: string): string[] { function mapIdsToLabels(treeNodes: TreeNode[], ids1: string): string[] {
const ids: string[] = JSON.parse(ids1); const ids: string[] = JSON.parse(ids1);
// 创建id到label的映射字典 // 创建id到label的映射字典
const idToLabelMap: Record<string, string> = {}; const idToLabelMap: Record<string, string> = {};
// 递归遍历树节点并填充映射字典 // 递归遍历树节点并填充映射字典
function traverse(node: TreeNode) { function traverse(node: TreeNode) {
idToLabelMap[node.id] = node.label; // 存储当前节点的映射 idToLabelMap[node.id] = node.label; // 存储当前节点的映射
node.children.forEach(child => traverse(child)); // 递归处理子节点 node.children.forEach((child) => traverse(child)); // 递归处理子节点
} }
// 遍历根节点列表 // 遍历根节点列表
treeNodes.forEach(root => traverse(root)); treeNodes.forEach((root) => traverse(root));
//console.log(ids) //console.log(ids)
// 将id数组转换为label数组 // 将id数组转换为label数组
return ids.map(id => idToLabelMap[id] || "已删除的节点(id):"+id); return ids.map((id) => idToLabelMap[id] || "已删除的节点(id):" + id);
} }
const asfGetPageData = (asfFormId: any, asfToSelectMastersKey: any) => { const asfGetPageData = (asfFormId: any, asfToSelectMastersKey: any) => {
@ -1764,9 +1777,9 @@ const readerColumnSun = (column: any) => {
let countLenght = 3; let countLenght = 3;
column.children.forEach((item: any) => { column.children.forEach((item: any) => {
if (item.label.length < 3) { if (item.label.length < 3) {
countLenght = countLenght + 90; countLenght = countLenght + 15;
} else { } else {
countLenght = countLenght + item.label.length * 40; countLenght = countLenght + item.label.length * 15;
} }
}); });
console.log("表头label长度-->", countLenght); console.log("表头label长度-->", countLenght);
@ -2044,7 +2057,6 @@ const readerColumnSun = (column: any) => {
> >
<template #default="scope"> <template #default="scope">
<el-button-group> <el-button-group>
<el-tooltip <el-tooltip
v-if="scope.row.flowIsOpens == 1 && scope.row.taskStatus == 1" v-if="scope.row.flowIsOpens == 1 && scope.row.taskStatus == 1"
class="box-item" class="box-item"
@ -2204,7 +2216,7 @@ const readerColumnSun = (column: any) => {
</el-table> </el-table>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-else v-else
:prop="item.field" :prop="item.field"
@ -2263,7 +2275,6 @@ const readerColumnSun = (column: any) => {
{{ scope.row[scope.column.property] }}== {{ scope.row[scope.column.property] }}==
</el-link> </el-link>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
</el-table> </el-table>
@ -2516,7 +2527,7 @@ const readerColumnSun = (column: any) => {
width: 100%; width: 100%;
} }
.table-list-comm { .table-list-comm {
padding: 0px 15px 5px 15px; padding: 0px 5px 5px 5px;
} }
.seacherForm { .seacherForm {
min-height: auto; min-height: auto;

108
src/components/DesignForm/tableListPage/formPageCont.vue
View File

@ -80,7 +80,7 @@ const formProps = inject(constFormProps, {}) as any;
let getFieldRecordPromises: any[] = []; let getFieldRecordPromises: any[] = [];
let objMastesform: any; let objMastesform: any;
let transferDetails:any = []; let transferDetails: any = [];
/** /**
@ 作者: 秦东 @ 作者: 秦东
@ -159,8 +159,6 @@ watch(
}); });
}) })
.finally(() => { .finally(() => {
//console.log(objMastesform.list) //console.log(objMastesform.list)
transferDetails = objMastesform.list.filter((item: any) => { transferDetails = objMastesform.list.filter((item: any) => {
return item.type == "lowcodeTransfer"; return item.type == "lowcodeTransfer";
@ -169,44 +167,44 @@ watch(
//alert(props.pageInfo.masters_key) //alert(props.pageInfo.masters_key)
gainEditDataLog({ id: props.pageInfo.masters_key }).then(({ data }) => { gainEditDataLog({ id: props.pageInfo.masters_key }).then(({ data }) => {
//console.log(formState.formData.list) //console.log(formState.formData.list)
//console.log("获取修改记录-1111-->",data) //console.log("获取修改记录-1111-->",data)
transferDetails.forEach((element: any) => { transferDetails.forEach((element: any) => {
//console.log(element) //console.log(element)
data.forEach((obj: any) => { data.forEach((obj: any) => {
//console.log(obj.masterdata) //console.log(obj.masterdata)
obj.masterdata.forEach((item: any) => { obj.masterdata.forEach((item: any) => {
if(item.field==element.name){ if (item.field == element.name) {
//console.log(element.control.fixedOptions) //console.log(element.control.fixedOptions)
//console.log(item) //console.log(item)
for (const key in item) { for (const key in item) {
const value = item[key]; const value = item[key];
// 确保只处理对象自身的属性（不包括原型链上的） // 确保只处理对象自身的属性（不包括原型链上的）
if (Object.prototype.hasOwnProperty.call(item, key)) { if (Object.prototype.hasOwnProperty.call(item, key)) {
if (key == "value") {
if(key=="value"){ // 特殊处理数组/嵌套对象（使用JSON格式化）
const formattedValue =
// 特殊处理数组/嵌套对象（使用JSON格式化） Array.isArray(value) ||
const formattedValue = (typeof value === "object" && value !== null)
(Array.isArray(value) || (typeof value === 'object' && value !== null)) ? JSON.stringify(value, null, 2)
? JSON.stringify(value, null, 2) : value;
: value;
//console.log(`${key}: ${formattedValue}`);
//console.log(`${key}: ${formattedValue}`); if (item[key] && item[key].length > 0) {
if(item[key]&&item[key].length>0){ item[key] = mapIdsToLabels(
item[key] = mapIdsToLabels(element.control.fixedOptions,item[key]) element.control.fixedOptions,
} item[key]
);
} }
} }
} }
} }
}); }
}); });
});
}); });
pageLog.value = data; pageLog.value = data;
}); });
}); });
@ -216,37 +214,33 @@ watch(
} }
); );
interface TreeNode { interface TreeNode {
id: string; id: string;
label: string; label: string;
disabled: boolean; disabled: boolean;
children: TreeNode[]; children: TreeNode[];
} }
function mapIdsToLabels(treeNodes: TreeNode[], ids1: string): string[] { function mapIdsToLabels(treeNodes: TreeNode[], ids1: string): string[] {
/* console.log(treeNodes) /* console.log(treeNodes)
console.log(ids1) */ console.log(ids1) */
const ids: string[] = JSON.parse(ids1); const ids: string[] = JSON.parse(ids1);
// 创建id到label的映射字典 // 创建id到label的映射字典
const idToLabelMap: Record<string, string> = {}; const idToLabelMap: Record<string, string> = {};
// 递归遍历树节点并填充映射字典 // 递归遍历树节点并填充映射字典
function traverse(node: TreeNode) { function traverse(node: TreeNode) {
idToLabelMap[node.id] = node.label; // 存储当前节点的映射 idToLabelMap[node.id] = node.label; // 存储当前节点的映射
node.children.forEach(child => traverse(child)); // 递归处理子节点 node.children.forEach((child) => traverse(child)); // 递归处理子节点
} }
// 遍历根节点列表 // 遍历根节点列表
treeNodes.forEach(root => traverse(root)); treeNodes.forEach((root) => traverse(root));
//console.log(ids) //console.log(ids)
// 将id数组转换为label数组 // 将id数组转换为label数组
return ids.map(id => idToLabelMap[id]); return ids.map((id) => idToLabelMap[id]);
} }
/** /**
@ 作者: 秦东 @ 作者: 秦东
@ 时间: 2024-04-03 14:25:15 @ 时间: 2024-04-03 14:25:15
@ -272,8 +266,6 @@ const pageLog = ref<any[]>([]);
let gainTaskFormInfoData: customerFormVersionCont; let gainTaskFormInfoData: customerFormVersionCont;
let gainTaskFormInfoPromise: any[] = []; let gainTaskFormInfoPromise: any[] = [];
/** /**
@ 作者: 秦东 @ 作者: 秦东
@ 时间: 2024-04-03 14:33:15 @ 时间: 2024-04-03 14:33:15
@ -418,7 +410,7 @@ const jsuanKuandu = () => {
if (props.pageInfo.flowIsOpen == 1) { if (props.pageInfo.flowIsOpen == 1) {
return 900 + 350; return 900 + 350;
} else { } else {
return 900; return 900 + 350;
} }
}; };

90
src/components/DesignForm/tableListPage/index.vue
View File

@ -547,10 +547,10 @@ const setUpClick = (val: string, id: string) => {
if (val.key == "newAdd") { if (val.key == "newAdd") {
drawerWith.value = container.value?.clientWidth; drawerWith.value = container.value?.clientWidth;
openTaskDrawer.value = true; openTaskDrawer.value = true;
}else if (val.key === "export"){ } else if (val.key === "export") {
alert("请在非编辑模式操作") alert("请在非编辑模式操作");
}else if (val.key === "import"){ } else if (val.key === "import") {
alert("请在非编辑模式操作") alert("请在非编辑模式操作");
} else if (val.key == "showQrCode") { } else if (val.key == "showQrCode") {
//liwenxuan 20250114 二维码打印弹窗 start //liwenxuan 20250114 二维码打印弹窗 start
//在此组装参数,以生成二维码图片 //在此组装参数,以生成二维码图片
@ -978,7 +978,7 @@ const getPageData = () => {
//console.log(asfDetails) //console.log(asfDetails)
if (asfDetails.length > 0 && data.data.list != null) { if (asfDetails.length > 0 && data.data.list != null) {
console.log(data.data.list) console.log(data.data.list);
//拼装参数,asf值对象数组 //拼装参数,asf值对象数组
asfQueryParams = []; asfQueryParams = [];
for (let j = 0; j < asfDetails.length; j++) { for (let j = 0; j < asfDetails.length; j++) {
@ -1020,7 +1020,7 @@ const getPageData = () => {
} }
} }
} }
tableDataList.value = dataList.data.list; tableDataList.value = dataList.data.list;
}); });
} else { } else {
@ -1028,32 +1028,32 @@ const getPageData = () => {
} }
} else { } else {
//console.log(data.data.list) //console.log(data.data.list)
transferDetails.forEach(element => { transferDetails.forEach((element) => {
//console.log(element) //console.log(element)
data.data.list.forEach((obj: any) => { data.data.list.forEach((obj: any) => {
//console.log(obj) //console.log(obj)
for (const key in obj) { for (const key in obj) {
// 确保只处理对象自身的属性（不包括原型链上的） // 确保只处理对象自身的属性（不包括原型链上的）
if (Object.prototype.hasOwnProperty.call(obj, key)) { if (Object.prototype.hasOwnProperty.call(obj, key)) {
const value = obj[key]; const value = obj[key];
// 特殊处理数组/嵌套对象（使用JSON格式化） // 特殊处理数组/嵌套对象（使用JSON格式化）
const formattedValue = const formattedValue =
(Array.isArray(value) || (typeof value === 'object' && value !== null)) Array.isArray(value) ||
? JSON.stringify(value, null, 2) (typeof value === "object" && value !== null)
: value; ? JSON.stringify(value, null, 2)
: value;
//console.log(`${key}: ${formattedValue}`);
if(key==element.field){ //console.log(`${key}: ${formattedValue}`);
//console.log(key) if (key == element.field) {
/* console.log(element.control.fixedOptions) //console.log(key)
/* console.log(element.control.fixedOptions)
console.log(obj[key]) */ console.log(obj[key]) */
obj[key] = mapIdsToLabels(element.control.fixedOptions,obj[key]) obj[key] = mapIdsToLabels(element.control.fixedOptions, obj[key]);
}
} }
}
} }
}); });
}); });
//console.log(transferDetails) //console.log(transferDetails)
//convertIdsToLabels(data.data.list.) //convertIdsToLabels(data.data.list.)
@ -1077,28 +1077,28 @@ const getPageData = () => {
}; };
interface TreeNode { interface TreeNode {
id: string; id: string;
label: string; label: string;
disabled: boolean; disabled: boolean;
children: TreeNode[]; children: TreeNode[];
} }
function mapIdsToLabels(treeNodes: TreeNode[], ids1: string): string[] { function mapIdsToLabels(treeNodes: TreeNode[], ids1: string): string[] {
const ids: string[] = JSON.parse(ids1); const ids: string[] = JSON.parse(ids1);
// 创建id到label的映射字典 // 创建id到label的映射字典
const idToLabelMap: Record<string, string> = {}; const idToLabelMap: Record<string, string> = {};
// 递归遍历树节点并填充映射字典 // 递归遍历树节点并填充映射字典
function traverse(node: TreeNode) { function traverse(node: TreeNode) {
idToLabelMap[node.id] = node.label; // 存储当前节点的映射 idToLabelMap[node.id] = node.label; // 存储当前节点的映射
node.children.forEach(child => traverse(child)); // 递归处理子节点 node.children.forEach((child) => traverse(child)); // 递归处理子节点
} }
// 遍历根节点列表 // 遍历根节点列表
treeNodes.forEach(root => traverse(root)); treeNodes.forEach((root) => traverse(root));
//console.log(ids) //console.log(ids)
// 将id数组转换为label数组 // 将id数组转换为label数组
return ids.map(id => idToLabelMap[id] || "已删除的节点( id : "+id+") "); return ids.map((id) => idToLabelMap[id] || "已删除的节点( id : " + id + ") ");
} }
const asfGetPageData = (asfFormId: any, asfToSelectMastersKey: any) => { const asfGetPageData = (asfFormId: any, asfToSelectMastersKey: any) => {
@ -1624,7 +1624,7 @@ const readerColumn = (column: any, isSun: int) => {
if (column.label.length < 3) { if (column.label.length < 3) {
labelLong = 3; labelLong = 3;
} }
let size = 30; // 根据需求定义一个字体的标尺 let size = 15; // 根据需求定义一个字体的标尺
return labelLong * size; return labelLong * size;
} else { } else {
return "100%"; return "100%";
@ -1639,9 +1639,9 @@ const readerColumnSun = (column: any) => {
let countLenght = 3; let countLenght = 3;
column.children.forEach((item: any) => { column.children.forEach((item: any) => {
if (item.label.length < 3) { if (item.label.length < 3) {
countLenght = countLenght + 90; countLenght = countLenght + 15;
} else { } else {
countLenght = countLenght + item.label.length * 40; countLenght = countLenght + item.label.length * 15;
} }
}); });
console.log("表头label长度-->", countLenght); console.log("表头label长度-->", countLenght);

1
src/permission.ts
View File

@ -43,6 +43,7 @@ router.beforeEach(async (to:any, from:any, next:any) => {
try { try {
// const { roles } = await userStore.getInfo(); // const { roles } = await userStore.getInfo();
const { perms } = await userStore.getInfo(); const { perms } = await userStore.getInfo();
console.log("路由权限---》",perms);
const accessRoutes = await permissionStore.generateRoutes(perms); const accessRoutes = await permissionStore.generateRoutes(perms);
console.log("路由权限--perms--》",accessRoutes); console.log("路由权限--perms--》",accessRoutes);
accessRoutes.forEach((route:any) => { accessRoutes.forEach((route:any) => {

3
src/store/modules/permission.ts
View File

@ -61,9 +61,10 @@ const filterAsyncRoutes = (routes: RouteRecordRaw[], roles: string[]) => {
tmpRoute.component = Layout; tmpRoute.component = Layout;
// console.log(); // console.log();
} else { } else {
console.log("判断用户-251->",tmpRoute.component);
const component = modules[`../../views/${tmpRoute.component}.vue`]; const component = modules[`../../views/${tmpRoute.component}.vue`];
// const component = modules[`${tmpRoute.component}.vue`]; // const component = modules[`${tmpRoute.component}.vue`];
// console.log("判断用户-->",component); console.log("判断用户-1111111111111111->",component);
if (component) { if (component) {
tmpRoute.component = component; tmpRoute.component = component;
} else { } else {

2
src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
View File

@ -608,7 +608,7 @@ const readerColumn = (column: any, isSun: int) => {
if (column.label.length < 3) { if (column.label.length < 3) {
labelLong = 3; labelLong = 3;
} }
let size = 30; // 根据需求定义一个字体的标尺 let size = 15; // 根据需求定义一个字体的标尺
return labelLong * size; return labelLong * size;
} else { } else {
return "100%"; return "100%";

2
src/views/sysworkflow/lowcodepage/pageList.vue
View File

@ -612,7 +612,7 @@ const readerColumn = (column: any) => {
if (column.label.length < 3) { if (column.label.length < 3) {
labelLong = 3; labelLong = 3;
} }
let size = 30; // 根据需求定义一个字体的标尺 let size = 15; // 根据需求定义一个字体的标尺
// column.minWidth = labelLong * size // column.minWidth = labelLong * size
//@ts-ignore //@ts-ignore
return labelLong * size; return labelLong * size;

4
src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
View File

@ -459,10 +459,10 @@ function optionsValue3Get3(data: any, fieldName: string) {
justify-content: space-between; justify-content: space-between;
background-color: #ffffff; background-color: #ffffff;
padding: 15px 15px 5px 15px; padding: 15px 15px 5px 15px;
margin-bottom: 15px; margin-bottom: 10px;
} }
.scroBox { .scroBox {
padding: 0 15px; padding: 0 10px;
height: calc(100vh - 110px); height: calc(100vh - 110px);
.tispMsg { .tispMsg {
margin: 0 auto 15px auto; margin: 0 auto 15px auto;

Write Preview
Loading…
Cancel
Save