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

修复列表显示BUG

qin_v11_master
超级管理员 1 year ago
parent
0a708aa662
commit
30dd479169
10 changed files with 220 additions and 172 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. 60
      src/components/DesignForm/app/index.vue
  2. 6
      src/components/DesignForm/tableListPage/index.vue
  3. 2
      src/permission.ts
  4. 2
      src/store/modules/user.ts
  5. 4
      src/views/sysworkflow/lowcodepage/appFormList.vue
  6. 28
      src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
  7. 2
      src/views/sysworkflow/lowcodepage/index.vue
  8. 262
      src/views/sysworkflow/lowcodepage/pageList.vue
  9. 6
      src/views/sysworkflow/lowcodepage/runApp/index.vue
  10. 20
      src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue

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

@ -195,7 +195,7 @@ const resetFields = (formEl: FormInstance | undefined) => {
@ 功能: 功能按钮动作 @ 功能: 功能按钮动作
*/ */
const setUpClick = (val:string,id:string) =>{ const setUpClick = (val:string,id:string) =>{
console.log("功能按钮动作",val,"----id----->",props.versionid,"-----formId---->",props.versiontitle) // console.log("功能按钮动作",val,"----id----->",props.versionid,"-----formId---->",props.versiontitle)
if(val.key == "newAdd"){ if(val.key == "newAdd"){
drawerWith.value = container.value?.clientWidth drawerWith.value = container.value?.clientWidth
openTaskDrawer.value = true openTaskDrawer.value = true
@ -212,7 +212,7 @@ const setUpClick = (val:string,id:string) =>{
} }
softDeletion(sendData) softDeletion(sendData)
.then((data)=>{ .then((data)=>{
console.log('cancel!',data) // console.log('cancel!',data)
ElNotification({ ElNotification({
title: '温馨提示！', title: '温馨提示！',
message: data.mag, message: data.mag,
@ -237,16 +237,16 @@ const setUpClick = (val:string,id:string) =>{
const selectionChange = (row: any) => { const selectionChange = (row: any) => {
state.selectionChecked = row state.selectionChecked = row
emits('selectionChange', row) emits('selectionChange', row)
console.log('selectionChange', row) // console.log('selectionChange', row)
idList.value.length = 0 idList.value.length = 0
console.log('idList.value-1-->', idList.value) // console.log('idList.value-1-->', idList.value)
if(row && row.length>0){ if(row && row.length>0){
row.forEach((item:any) => { row.forEach((item:any) => {
console.log('item', item.masters_key) // console.log('item', item.masters_key)
idList.value.push(item.masters_key.toString()) idList.value.push(item.masters_key.toString())
}) })
} }
console.log('idList.value--->', idList.value) // console.log('idList.value--->', idList.value)
} }
/** /**
@ 作者: 秦东 @ 作者: 秦东
@ -268,7 +268,7 @@ const columnsFilter = computed(() => {
@ 功能: 翻页操作 @ 功能: 翻页操作
*/ */
const handleSizeChange = (page: number) => { const handleSizeChange = (page: number) => {
console.log("翻页操作",page) // console.log("翻页操作",page)
state.pageSize = page state.pageSize = page
getListData(1) getListData(1)
} }
@ -324,20 +324,20 @@ const getPageData = () => {
pagesize:state.pageSize, pagesize:state.pageSize,
searchData:json2string(props.searchData) searchData:json2string(props.searchData)
} }
console.log("获取列表详细信息",sendData) // console.log("获取列表详细信息",sendData)
switch(viewType.value){ switch(viewType.value){
case 2: case 2:
nextTick(()=>{ nextTick(()=>{
console.log("获取列表详细信息-------555---------->",calendarPageRef.value) // console.log("获取列表详细信息-------555---------->",calendarPageRef.value)
calendarPageRef.value.calendarSearchData(sendData) calendarPageRef.value.calendarSearchData(sendData)
}) })
// calendarPageRef.value.calendarSearchData() // calendarPageRef.value.calendarSearchData()
break; break;
case 3: case 3:
nextTick(()=>{ nextTick(()=>{
console.log("获取列表详细信息-------222---------->",timeAxisRef.value) // console.log("获取列表详细信息-------222---------->",timeAxisRef.value)
timeAxisRef.value.searchTimeList(sendData,1) timeAxisRef.value.searchTimeList(sendData,1)
}) })
@ -350,7 +350,7 @@ const getPageData = () => {
state.loading = true; state.loading = true;
gainFormPageListCont(sendData) gainFormPageListCont(sendData)
.then((data)=>{ .then((data)=>{
console.log("获取列表详细信息----------------->",data) // console.log("获取列表详细信息----------------->",data)
//liwenxuan 关联表单数据获取 start //liwenxuan 关联表单数据获取 start
let dataList = data let dataList = data
@ -371,7 +371,7 @@ const getPageData = () => {
asfQueryParamsItem.field = asfDetails[j].field asfQueryParamsItem.field = asfDetails[j].field
let asfToSelectIds = [] let asfToSelectIds = []
console.log(data.data.list) // console.log(data.data.list)
for(let i = 0;i<data.data.list.length;i++){ for(let i = 0;i<data.data.list.length;i++){
let asfMasterAndAsfId:any = {} let asfMasterAndAsfId:any = {}
asfMasterAndAsfId.asfId = data.data.list[i][asfDetails[j].field] asfMasterAndAsfId.asfId = data.data.list[i][asfDetails[j].field]
@ -580,6 +580,7 @@ function showAsfDetailDialog(item: any,scope: any,asfQueryParams: any){
onMounted(()=>{ onMounted(()=>{
console.log("视图数据提交---》",props.viewPage);
getPageData() getPageData()
nextTick(()=>{ nextTick(()=>{
drawerWith.value = container.value?.clientWidth drawerWith.value = container.value?.clientWidth
@ -626,7 +627,7 @@ const confirmEvent = (val:any) => {
} }
softDeletion(sendData) softDeletion(sendData)
.then((data)=>{ .then((data)=>{
console.log('cancel!',data) // console.log('cancel!',data)
ElNotification({ ElNotification({
title: '系统提示！', title: '系统提示！',
message: data.mag?data.mag:"删除成功", message: data.mag?data.mag:"删除成功",
@ -663,7 +664,7 @@ const lookPageInfo = (val:any) => {
*/ */
const editInfo = (val:any) => { const editInfo = (val:any) => {
console.log('修改数据!',val) // console.log('修改数据!',val)
operState.value = 5; operState.value = 5;
tablePageClass.value = 2; tablePageClass.value = 2;
pageInfoCont.value = val pageInfoCont.value = val
@ -688,7 +689,7 @@ const submitApproval = (val:any) => {
@ 功能: 撤回申请 @ 功能: 撤回申请
*/ */
const withdrawApplication = (val:any) => { const withdrawApplication = (val:any) => {
console.log("撤回申请", val); // console.log("撤回申请", val);
let sendInfo = { let sendInfo = {
// id: val.masters_key, // id: val.masters_key,
id: val.runFlowId id: val.runFlowId
@ -737,7 +738,7 @@ const tabsView = (val:any,types:number) => {
viewType.value = types viewType.value = types
val.isClick = true val.isClick = true
viewLayout.value = val viewLayout.value = val
console.log("切换视图展示方式",val) // console.log("切换视图展示方式",val)
switch(types){ switch(types){
case 2: case 2:
props.viewPage.list.isClick = false props.viewPage.list.isClick = false
@ -788,7 +789,6 @@ const tabsView = (val:any,types:number) => {
</script> </script>
<template> <template>
<div ref="container" v-loading="state.loading" class="table-list-comm"> <div ref="container" v-loading="state.loading" class="table-list-comm">
<el-row class="rowBox"> <el-row class="rowBox">
<el-col :span="24"> <el-col :span="24">
<el-form v-if="config.searchIsShow" ref="ruleSearchForm" class="seacherForm"> <el-form v-if="config.searchIsShow" ref="ruleSearchForm" class="seacherForm">
@ -870,7 +870,6 @@ const tabsView = (val:any,types:number) => {
</el-form> </el-form>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<div class="operateButArea"> <div class="operateButArea">
<div class="operatLeft"> <div class="operatLeft">
<el-text v-if="data.controlBtn.length === 0" class="mx-1 tipBox" type="info">操作按钮区域</el-text> <el-text v-if="data.controlBtn.length === 0" class="mx-1 tipBox" type="info">操作按钮区域</el-text>
@ -895,60 +894,59 @@ const tabsView = (val:any,types:number) => {
<el-button size="small" @click="config.searchIsShow=!config.searchIsShow" class="fa fa-search" /> <el-button size="small" @click="config.searchIsShow=!config.searchIsShow" class="fa fa-search" />
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
v-if="viewPage.list.status" v-if="props.viewPage.list.status"
class="box-item" class="box-item"
effect="dark" effect="dark"
content="列表视图" content="列表视图"
placement="top" placement="top"
> >
<el-button size="small" class="fa fa-table" :color="viewPage.list.isClick?'#a0cfff':''" @click="tabsView(viewPage.list,1)" /> <el-button size="small" class="fa fa-table" :color="props.viewPage.list.isClick?'#a0cfff':''" @click="tabsView(props.viewPage.list,1)" />
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
v-if="viewPage.card.status" v-if="props.viewPage.card&&props.viewPage.card.status"
class="box-item" class="box-item"
effect="dark" effect="dark"
content="卡片视图" content="卡片视图"
placement="top" placement="top"
> >
<el-button size="small" class="fa fa-id-card-o" :color="viewPage.card.isClick?'#a0cfff':''" @click="tabsView(viewPage.card,6)" /> <el-button size="small" class="fa fa-id-card-o" :color="props.viewPage.card&&props.viewPage.card.isClick?'#a0cfff':''" @click="tabsView(props.viewPage.card,6)" />
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
v-if="viewPage.date.status" v-if="props.viewPage.date.status"
class="box-item" class="box-item"
effect="dark" effect="dark"
content="日历视图" content="日历视图"
placement="top" placement="top"
> >
<el-button size="small" class="fa fa-calendar" :color="viewPage.date.isClick?'#a0cfff':''" @click="tabsView(viewPage.date,2)" /> <el-button size="small" class="fa fa-calendar" :color="props.viewPage.date.isClick?'#a0cfff':''" @click="tabsView(props.viewPage.date,2)" />
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
v-if="viewPage.time.status" v-if="props.viewPage.time.status"
class="box-item" class="box-item"
effect="dark" effect="dark"
content="时间轴" content="时间轴"
placement="top" placement="top"
> >
<el-button size="small" class="fa fa-clock-o" :color="viewPage.time.isClick?'#a0cfff':''" @click="tabsView(viewPage.time,3)" /> <el-button size="small" class="fa fa-clock-o" :color="props.viewPage.time.isClick?'#a0cfff':''" @click="tabsView(props.viewPage.time,3)" />
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
v-if="viewPage.gantt.status" v-if="props.viewPage.gantt.status"
class="box-item" class="box-item"
effect="dark" effect="dark"
content="甘特图" content="甘特图"
placement="top" placement="top"
> >
<el-button size="small" class="fa fa-bar-chart" :color="viewPage.gantt.isClick?'#a0cfff':''" @click="tabsView(viewPage.gantt,4)" /> <el-button size="small" class="fa fa-bar-chart" :color="props.viewPage.gantt.isClick?'#a0cfff':''" @click="tabsView(props.viewPage.gantt,4)" />
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
v-if="viewPage.map.status" v-if="props.viewPage.map.status"
class="box-item" class="box-item"
effect="dark" effect="dark"
content="地图视图" content="地图视图"
placement="top" placement="top"
> >
<el-button size="small" class="fa fa-map-signs" :color="viewPage.map.isClick?'#a0cfff':''" @click="tabsView(viewPage.map,5)" /> <el-button size="small" class="fa fa-map-signs" :color="props.viewPage.map.isClick?'#a0cfff':''" @click="tabsView(props.viewPage.map,5)" />
</el-tooltip> </el-tooltip>
</el-button-group> </el-button-group>
</div> </div>
</div> </div>

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

@ -843,7 +843,7 @@ const tabsView = (val:any,types:number) => {
:key="item.type" :key="item.type"
@click="setUpClick(item)" @click="setUpClick(item)"
> >
{{ item.label }}123 {{ item.label }}
</el-button> </el-button>
</div> </div>
<div> <div>
@ -867,13 +867,13 @@ const tabsView = (val:any,types:number) => {
<el-button size="small" class="fa fa-table" :color="viewPage.list.isClick?'#a0cfff':''" @click="tabsView(viewPage.list,1)" /> <el-button size="small" class="fa fa-table" :color="viewPage.list.isClick?'#a0cfff':''" @click="tabsView(viewPage.list,1)" />
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
v-if="viewPage.card.status" v-if="props.viewPage.card&&props.viewPage.card.status"
class="box-item" class="box-item"
effect="dark" effect="dark"
content="卡片视图" content="卡片视图"
placement="top" placement="top"
> >
<el-button size="small" class="fa fa-id-card-o" :color="viewPage.card.isClick?'#a0cfff':''" @click="tabsView(viewPage.card,6)" /> <el-button size="small" class="fa fa-id-card-o" :color="props.viewPage.card&&props.viewPage.card.isClick?'#a0cfff':''" @click="tabsView(props.viewPage.card,6)" />
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
v-if="viewPage.date.status" v-if="viewPage.date.status"

2
src/permission.ts
View File

@ -18,7 +18,7 @@ router.beforeEach(async (to:any, from:any, next:any) => {
NProgress.start(); NProgress.start();
const hasToken = localStorage.getItem(appTokenKey); const hasToken = localStorage.getItem(appTokenKey);
console.log("白名单路由----》",hasToken,"--->",to.path); // console.log("白名单路由----》",hasToken,"--->",to.path);
if (hasToken) { if (hasToken) {
// console.log("白名单路由--22--》",hasToken,to.path); // console.log("白名单路由--22--》",hasToken,to.path);
if (to.path === "/login") { if (to.path === "/login") {

2
src/store/modules/user.ts
View File

@ -92,7 +92,7 @@ export const useUserStore = defineStore("user", () => {
// }); // });
getUserInfoIng() getUserInfoIng()
.then(({data})=>{ .then(({data})=>{
console.log("获取用户信息：角色必须是非null数组！",data); // console.log("获取用户信息：角色必须是非null数组！",data);
// debugger; // debugger;
if (!data) { if (!data) {
return reject("验证失败，请重新登录。"); return reject("验证失败，请重新登录。");

4
src/views/sysworkflow/lowcodepage/appFormList.vue
View File

@ -71,7 +71,7 @@ const getFormAppList = () => {
} }
getCustomerFormList(sendInfo) getCustomerFormList(sendInfo)
.then(({ data }) => { .then(({ data }) => {
console.log("搜索表单-->",data); // console.log("搜索表单-->",data);
pageAppTotal.value = data.total pageAppTotal.value = data.total
contList.value = data.list contList.value = data.list
}) })
@ -291,7 +291,7 @@ const lookAppList = (val:any) => {
pickAppInfo.value = val pickAppInfo.value = val
appJwtPower({id:val.signCodeStr,types:1}) appJwtPower({id:val.signCodeStr,types:1})
.then(({data})=>{ .then(({data})=>{
console.log("打开应用------>data:",data) // console.log("打开应用------>data:",data)
if(data){ if(data){
runIsOpen.value = true runIsOpen.value = true
}else{ }else{

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

@ -369,8 +369,32 @@ const getListInfo = () => {
state.formApi = stateData.formApi state.formApi = stateData.formApi
state.dict = stateData.dict state.dict = stateData.dict
state.refreshTable = stateData.refreshTable state.refreshTable = stateData.refreshTable
if(stateData.view){ // if(stateData.view){
state.view = stateData.view // state.view = stateData.view
// }
if(stateData.view && stateData.view != null && stateData.view != ""){
if(stateData.view.card && stateData.view.card != null && stateData.view.card != ""){
state.view = stateData.view
}else{
state.view = stateData.view
state.view.card ={
status:false,
isClick:false,
form:{
sort:1,
sortWord:"",
imgWork:"",
imgWidth:50,
imgHeight:50,
imgBorderRadius:5,
imgPadding:2,
titleWork:"",
describe:"",
ranks:3
}
}
}
} }
} }

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

@ -106,7 +106,7 @@ const gainFormGroup = () => {
} }
customerFormGroupList(sendInfo) customerFormGroupList(sendInfo)
.then((data) =>{ .then((data) =>{
console.log("获取表单分组",data) // console.log("获取表单分组",data)
pageTotal.value = data.data.total pageTotal.value = data.data.total
groupFormList.value = data.data.list groupFormList.value = data.data.list
}) })

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

@ -172,11 +172,11 @@ const state = reactive({
const kaif = (id: number, callback?: (list: any) => void) => { const kaif = (id: number, callback?: (list: any) => void) => {
// const content = stringToObj(props.state.formData) // const content = stringToObj(props.state.formData)
console.log('获取当前数据下所有字段',statePro.value.formData) // console.log('获取当前数据下所有字段',statePro.value.formData)
filterFiled(statePro.value.formData) filterFiled(statePro.value.formData)
callback && callback(statePro.value.formData.list) callback && callback(statePro.value.formData.list)
console.log('获取当前数据下所有字段--->',state.formFieldList) // console.log('获取当前数据下所有字段--->',state.formFieldList)
} }
const filterFiled = (obj: any) => { const filterFiled = (obj: any) => {
obj?.list.forEach((item: FormList) => { obj?.list.forEach((item: FormList) => {
@ -232,7 +232,7 @@ const jieForm = () => {
if(props.formKey != ""){ if(props.formKey != ""){
gainFormTableField({id:props.formKey.toString()}) gainFormTableField({id:props.formKey.toString()})
.then((data)=>{ .then((data)=>{
console.log('解析表单--->',data) // console.log('解析表单--->',data)
formTableField.masterTable=data.data.masterTable formTableField.masterTable=data.data.masterTable
formTableField.sunTable=data.data.sunTable formTableField.sunTable=data.data.sunTable
}) })
@ -273,10 +273,10 @@ const isMapTrue = ref(true)
@ 功能: 获取数据表字段数据 @ 功能: 获取数据表字段数据
*/ */
const gainFormTableKeyWord = (val:string) => { const gainFormTableKeyWord = (val:string) => {
console.log("获取数据表字段数据-----------》",val) // console.log("获取数据表字段数据-----------》",val)
gainListTableField({id:val.toString()}) gainListTableField({id:val.toString()})
.then((data) =>{ .then((data) =>{
console.log("获取数据表字段数据",data) // console.log("获取数据表字段数据",data)
allKeyWords.value = data.data.allKeyWords allKeyWords.value = data.data.allKeyWords
timeKeyWords.value = data.data.timeKeyWords timeKeyWords.value = data.data.timeKeyWords
mapKeyWords.value = data.data.mapKeyWords mapKeyWords.value = data.data.mapKeyWords
@ -295,12 +295,12 @@ const tableAttrBut = ref<InstanceType<typeof ElTable>>()
@ 功能: 设置字段属性 @ 功能: 设置字段属性
*/ */
const setUpField = (val:any) =>{ const setUpField = (val:any) =>{
console.log("设置字段属性-->",val) // console.log("设置字段属性-->",val)
setUpFieldInfo.value = val setUpFieldInfo.value = val
setUpFieldIsOpen.value = true setUpFieldIsOpen.value = true
console.log("设置字段属性-1->",setUpFieldIsOpen) // console.log("设置字段属性-1->",setUpFieldIsOpen)
} }
/** /**
@ 作者: 秦东 @ 作者: 秦东
@ -404,7 +404,7 @@ const zhuDaunIsTrue = ref(false);
@ 功能: 列表字段处理 @ 功能: 列表字段处理
*/ */
const tableListFieldClick = (val:any[]) => { const tableListFieldClick = (val:any[]) => {
console.log("列表字段处理-->",val) // console.log("列表字段处理-->",val)
// zhuDaunIsTrue.value = true // zhuDaunIsTrue.value = true
if(zhuDaunIsTrue.value == true){ if(zhuDaunIsTrue.value == true){
if(val.length > 0){ if(val.length > 0){
@ -413,7 +413,7 @@ const tableListFieldClick = (val:any[]) => {
let isTrue = true; let isTrue = true;
state.tableData.columns.forEach((itemTab:tableButton)=>{ state.tableData.columns.forEach((itemTab:tableButton)=>{
if(item.id == itemTab.id){ if(item.id == itemTab.id){
console.log("列表字段处理-111->",val) // console.log("列表字段处理-111->",val)
isTrue = false; isTrue = false;
} }
}); });
@ -469,12 +469,12 @@ const columnDrop = () => {
const wrapperTr = container.value.querySelector( const wrapperTr = container.value.querySelector(
'.el-table__header-wrapper tr' '.el-table__header-wrapper tr'
) )
console.log("wrapperTr",wrapperTr) // console.log("wrapperTr",wrapperTr)
Sortable.create(wrapperTr, { Sortable.create(wrapperTr, {
animation: 180, animation: 180,
delay: 0, delay: 0,
onEnd: (evt: any) => { onEnd: (evt: any) => {
console.log("evt",evt.oldIndex,evt.newIndex) // console.log("evt",evt.oldIndex,evt.newIndex)
const oldItem = state.tableData.columns[evt.oldIndex] const oldItem = state.tableData.columns[evt.oldIndex]
state.tableData.columns.splice(evt.oldIndex, 1) state.tableData.columns.splice(evt.oldIndex, 1)
state.tableData.columns.splice(evt.newIndex, 0, oldItem) state.tableData.columns.splice(evt.newIndex, 0, oldItem)
@ -516,7 +516,7 @@ const delCol = (val:any) => {
}) })
// tableFieldList.value!.toggleRowSelection(delInfo, true) // tableFieldList.value!.toggleRowSelection(delInfo, true)
console.log("delInfo",delInfo) // console.log("delInfo",delInfo)
// tableFieldList.value!.clearSelection() // tableFieldList.value!.clearSelection()
}else{ }else{
tableFieldList.value!.clearSelection() tableFieldList.value!.clearSelection()
@ -539,7 +539,7 @@ const delCol = (val:any) => {
@ 功能: 更新列表记录操作按钮 @ 功能: 更新列表记录操作按钮
*/ */
const updataLogBut = (val:attrButton[]) => { const updataLogBut = (val:attrButton[]) => {
console.log("更新列表记录操作按钮",val) // console.log("更新列表记录操作按钮",val)
let isWrete = true let isWrete = true
if(state.tableData.columns && state.tableData.columns.length > 0){ if(state.tableData.columns && state.tableData.columns.length > 0){
state.tableData.columns.forEach((item:any)=>{ state.tableData.columns.forEach((item:any)=>{
@ -622,7 +622,7 @@ const codeIsShow = ref(false) //生成代码
@ 功能: 列表头部按钮操作 @ 功能: 列表头部按钮操作
*/ */
const listPageTools = (type: string) => { const listPageTools = (type: string) => {
console.log("列表头部操作--》",type) // console.log("列表头部操作--》",type)
switch(type){ switch(type){
case "del": case "del":
clearData() clearData()
@ -719,7 +719,7 @@ const saveFormListData = () => {
if(!props.formKey || props.formKey == "" || props.formKey == null || props.formKey == undefined){ if(!props.formKey || props.formKey == "" || props.formKey == null || props.formKey == undefined){
return ElMessage.error('未知表单参数！请先保存前置表单后再操作！') return ElMessage.error('未知表单参数！请先保存前置表单后再操作！')
} }
console.log("添加自定义表单列表设定",state.formApi) // console.log("添加自定义表单列表设定",state.formApi)
if(type != 1){ if(type != 1){
if(addApiUrl=="" || editApiUrl=="" || delApiUrl=="" || lookApiUrl == ""){ if(addApiUrl=="" || editApiUrl=="" || delApiUrl=="" || lookApiUrl == ""){
return ElMessage.error('请补全列表第三方APIUrl！') return ElMessage.error('请补全列表第三方APIUrl！')
@ -732,10 +732,10 @@ const saveFormListData = () => {
data: json2string(state), data: json2string(state),
id: props.formKey.toString() id: props.formKey.toString()
} }
console.log("添加自定义表单列表设定",params) // console.log("添加自定义表单列表设定",params)
editCustomerFormList(params) editCustomerFormList(params)
.then((data)=>{ .then((data)=>{
console.log("添加自定义表单列表设定",data) // console.log("添加自定义表单列表设定",data)
ElMessage.success(data.msg) ElMessage.success(data.msg)
}) })
} }
@ -745,13 +745,13 @@ const saveFormListData = () => {
@ 功能: 获取列表内容 @ 功能: 获取列表内容
*/ */
const getListInfo = () => { const getListInfo = () => {
console.log("获取列表内容1111",props.formKey) // console.log("获取列表内容1111",props.formKey)
gainFormListCont({id:props.formKey.toString()}) gainFormListCont({id:props.formKey.toString()})
.then((data)=>{ .then((data)=>{
console.log("获取列表内容",data) // console.log("获取列表内容",data)
if(data.data.listjson != null && data.data.listjson != "" && data.data.listjson != "null"){ if(data.data.listjson != null && data.data.listjson != "" && data.data.listjson != "null"){
let stateData = string2json(data.data.listjson) let stateData = string2json(data.data.listjson)
console.log("获取列表内容---->",stateData) // console.log("获取列表内容---->",stateData)
state.tableData = stateData.tableData state.tableData = stateData.tableData
state.searchData = stateData.searchData state.searchData = stateData.searchData
state.loading = stateData.loading state.loading = stateData.loading
@ -767,10 +767,34 @@ const getListInfo = () => {
state.formApi = stateData.formApi state.formApi = stateData.formApi
state.dict = stateData.dict state.dict = stateData.dict
state.refreshTable = stateData.refreshTable state.refreshTable = stateData.refreshTable
state.view = stateData.view if(stateData.view && stateData.view != null && stateData.view != ""){
if(stateData.view.card && stateData.view.card != null && stateData.view.card != ""){
state.view = stateData.view
}else{
state.view = stateData.view
state.view.card ={
status:false,
isClick:false,
form:{
sort:1,
sortWord:"",
imgWork:"",
imgWidth:50,
imgHeight:50,
imgBorderRadius:5,
imgPadding:2,
titleWork:"",
describe:"",
ranks:3
}
}
}
}
console.log("获取列表内容--1-->",stateData.view) // console.log("获取列表内容--1-->",stateData.view)
console.log("获取列表内容--2-->",state.view) // console.log("获取列表内容--2-->",state.view)
} }
@ -782,7 +806,7 @@ const getListInfo = () => {
state.tableData.columns.forEach((itemCol:any)=>{ state.tableData.columns.forEach((itemCol:any)=>{
formTableField.masterTable.forEach((item:any)=>{ formTableField.masterTable.forEach((item:any)=>{
if(itemCol.id == item.id){ if(itemCol.id == item.id){
console.log("========>",item) // console.log("========>",item)
item.isSearch = true item.isSearch = true
tableFieldList.value!.toggleRowSelection(item, true) tableFieldList.value!.toggleRowSelection(item, true)
} }
@ -860,6 +884,7 @@ const getListInfo = () => {
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> --> </div> -->
<div class="main-body"> <div class="main-body">
<div class="header"> <div class="header">
<div class="field"> <div class="field">
@ -872,6 +897,7 @@ const getListInfo = () => {
<div class="search-box" > <div class="search-box" >
<SearchField v-if="state.searchData&&state.searchData.length>0&&state.config.searchIsShow" v-model:searchData="state.searchData" /> <SearchField v-if="state.searchData&&state.searchData.length>0&&state.config.searchIsShow" v-model:searchData="state.searchData" />
<div v-else class="tipBox" >条件查询搜索区域</div> <div v-else class="tipBox" >条件查询搜索区域</div>
</div> </div>
@ -1073,102 +1099,102 @@ const getListInfo = () => {
</el-form> </el-form>
</div> </div>
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="Consistency" name="card" :class="state.view.card.status?'isTrueItem':''" :disabled="!state.view.card.status"> <el-collapse-item title="Consistency" name="card" :class="state.view.card&&state.view.card.status?'isTrueItem':''" :disabled="!state.view.card.status">
<template #title> <template #title>
<div class="collapse-title"> <div class="collapse-title">
<div>
<i class="fa fa-id-card-o"></i>
<el-text>卡片视图</el-text>
</div>
<el-switch class="openOfClose" v-model="state.view.card.status" :disabled="isCardTrue" @click.stop="showCollapse" />
</div>
</template>
<div> <div>
<i class="fa fa-id-card-o"></i> <el-form
<el-text>卡片视图</el-text> label-position="top"
</div> label-width="auto"
<el-switch class="openOfClose" v-model="state.view.card.status" :disabled="isCardTrue" @click.stop="showCollapse" /> :model="state.view.card.form"
</div> style="max-width: 600px"
</template>
<div>
<el-form
label-position="top"
label-width="auto"
:model="state.view.card.form"
style="max-width: 600px"
>
<el-form-item label="图片字段">
<el-select v-model="state.view.card.form.imgWork" placeholder="请选择图片字段">
<el-option v-for="item in cardKeyWords" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="图片宽度与高度">
<el-input
v-model="state.view.card.form.imgWidth"
placeholder="请输入图片宽度"
>
<template #prepend>宽度</template>
<template #suffix>PX</template>
</el-input>
<el-input
v-model="state.view.card.form.imgHeight"
placeholder="请输入图片高度"
style="margin-top:10px;"
>
<template #prepend>高度</template>
<template #suffix>PX</template>
</el-input>
</el-form-item>
<el-form-item label="图片圆角">
<el-input
v-model="state.view.card.form.imgBorderRadius"
placeholder="请输入图片圆角"
style="margin-top:10px;"
>
<template #prepend>圆角</template>
<template #suffix>PX</template>
</el-input>
</el-form-item>
<el-form-item label="图片边框缩进">
<el-input
v-model="state.view.card.form.imgPadding"
placeholder="请输入图片边框缩进"
style="margin-top:10px;"
>
<template #prepend>缩进</template>
<template #suffix>PX</template>
</el-input>
</el-form-item>
<el-form-item label="卡片标题">
<el-select v-model="state.view.card.form.titleWork" placeholder="请选择时间轴段">
<el-option v-for="item in allKeyWords" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="卡片标题描述">
<el-select v-model="state.view.card.form.describe" placeholder="请选择时间轴段">
<el-option v-for="item in allKeyWords" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="每行几列">
<el-input
v-model="state.view.card.form.ranks"
placeholder="请输入每行几列"
style="margin-top:10px;"
> >
<template #suffix>列</template> <el-form-item label="图片字段">
</el-input> <el-select v-model="state.view.card.form.imgWork" placeholder="请选择图片字段">
</el-form-item> <el-option v-for="item in cardKeyWords" :key="item.value" :label="item.label" :value="item.value" />
<el-form-item label="排序字段"> </el-select>
<el-select v-model="state.view.card.form.sortWord" placeholder="请选择时间轴段"> </el-form-item>
<el-option v-for="item in allKeyWords" :key="item.value" :label="item.label" :value="item.value" /> <el-form-item label="图片宽度与高度">
</el-select> <el-input
</el-form-item> v-model="state.view.card.form.imgWidth"
placeholder="请输入图片宽度"
<el-form-item label="排序方式"> >
<el-radio-group v-model="state.view.card.form.sort"> <template #prepend>宽度</template>
<el-radio :label="1">降序</el-radio> <template #suffix>PX</template>
<el-radio :label="2">升序</el-radio> </el-input>
</el-radio-group> <el-input
</el-form-item> v-model="state.view.card.form.imgHeight"
placeholder="请输入图片高度"
style="margin-top:10px;"
</el-form> >
</div> <template #prepend>高度</template>
</el-collapse-item> <template #suffix>PX</template>
</el-input>
</el-form-item>
<el-form-item label="图片圆角">
<el-input
v-model="state.view.card.form.imgBorderRadius"
placeholder="请输入图片圆角"
style="margin-top:10px;"
>
<template #prepend>圆角</template>
<template #suffix>PX</template>
</el-input>
</el-form-item>
<el-form-item label="图片边框缩进">
<el-input
v-model="state.view.card.form.imgPadding"
placeholder="请输入图片边框缩进"
style="margin-top:10px;"
>
<template #prepend>缩进</template>
<template #suffix>PX</template>
</el-input>
</el-form-item>
<el-form-item label="卡片标题">
<el-select v-model="state.view.card.form.titleWork" placeholder="请选择时间轴段">
<el-option v-for="item in allKeyWords" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="卡片标题描述">
<el-select v-model="state.view.card.form.describe" placeholder="请选择时间轴段">
<el-option v-for="item in allKeyWords" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="每行几列">
<el-input
v-model="state.view.card.form.ranks"
placeholder="请输入每行几列"
style="margin-top:10px;"
>
<template #suffix>列</template>
</el-input>
</el-form-item>
<el-form-item label="排序字段">
<el-select v-model="state.view.card.form.sortWord" placeholder="请选择时间轴段">
<el-option v-for="item in allKeyWords" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="排序方式">
<el-radio-group v-model="state.view.card.form.sort">
<el-radio :label="1">降序</el-radio>
<el-radio :label="2">升序</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
</div>
</el-collapse-item>
<el-collapse-item title="Consistency" name="date" :class="state.view.date.status?'isTrueItem':''" :disabled="!state.view.date.status"> <el-collapse-item title="Consistency" name="date" :class="state.view.date.status?'isTrueItem':''" :disabled="!state.view.date.status">
<template #title> <template #title>
<div class="collapse-title"> <div class="collapse-title">

6
src/views/sysworkflow/lowcodepage/runApp/index.vue
View File

@ -55,7 +55,7 @@ const gainAppContent = () =>{
} }
gainAppEditPsge(sendInfo) gainAppEditPsge(sendInfo)
.then((data)=>{ .then((data)=>{
console.log("获取app信息---》",data) // console.log("获取app信息---》",data)
menusTree.value = data.data.menuTree menusTree.value = data.data.menuTree
appCont.appKey = data.data.appKey; appCont.appKey = data.data.appKey;
appCont.appName = data.data.appName; appCont.appName = data.data.appName;
@ -98,7 +98,7 @@ const closeRunApp = () => {
@ 功能: 打开页面 @ 功能: 打开页面
*/ */
const openAppPage = (val:appMenuTreeInfo) => { const openAppPage = (val:appMenuTreeInfo) => {
console.log("打开页面---->",val.type,switchPAge.value) // console.log("打开页面---->",val.type,switchPAge.value)
if(val.type!=1){ if(val.type!=1){
if(val.isLock==1){ if(val.isLock==1){
switchPAge.value = 1 switchPAge.value = 1
@ -107,7 +107,7 @@ const openAppPage = (val:appMenuTreeInfo) => {
} }
pickAppMenu.value = val pickAppMenu.value = val
} }
console.log("打开页面--2-->",val.type,switchPAge.value) // console.log("打开页面--2-->",val.type,switchPAge.value)
} }
</script> </script>

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

@ -160,14 +160,14 @@ onMounted(() => {
@ 功能: 初始化数据 @ 功能: 初始化数据
*/ */
const initLoadData = () => { const initLoadData = () => {
console.log("initLoadData",props.pickAppMenu.type,props.pickAppMenu.type != 1) // console.log("initLoadData",props.pickAppMenu.type,props.pickAppMenu.type != 1)
if(props.pickAppMenu.type != 1){ if(props.pickAppMenu.type != 1){
appFormTitle.value = props.pickAppMenu.label appFormTitle.value = props.pickAppMenu.label
gainAppPageInfo({id:props.pickAppMenu.id}) gainAppPageInfo({id:props.pickAppMenu.id})
.then((data)=>{ .then((data)=>{
console.log("获取初始化表单数据bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",data) // console.log("获取初始化表单数据bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",data)
appInitData.value = data.data appInitData.value = data.data
console.log("获取初始化表单数据---!",appInitData.value) // console.log("获取初始化表单数据---!",appInitData.value)
mastesformjson.value = data.data.appForm.mastesformjson mastesformjson.value = data.data.appForm.mastesformjson
isFlow.value = data.data.appForm.flowIsOpen isFlow.value = data.data.appForm.flowIsOpen
if (data.data.page && data.data.pageList && data.data.appFlow){ if (data.data.page && data.data.pageList && data.data.appFlow){
@ -200,7 +200,7 @@ const initLoadData = () => {
if(stateData.tableData.columns[i].config!=undefined && stateData.tableData.columns[i].control!=undefined){ if(stateData.tableData.columns[i].config!=undefined && stateData.tableData.columns[i].control!=undefined){
//console.log(stateData.tableData.columns[i]) // console.log(stateData.tableData.columns[i])
let paramx:string = ""+stateData.tableData.columns[i].control.optionsValue3Field let paramx:string = ""+stateData.tableData.columns[i].control.optionsValue3Field
/* /*
在这里请求后台获取字段 在这里请求后台获取字段
@ -209,7 +209,7 @@ const initLoadData = () => {
stateData.tableData.columns[i].options = data stateData.tableData.columns[i].options = data
if(stateData.searchData.length>0){ if(stateData.searchData.length>0){
for(let j = 0;j<stateData.searchData.length;j++){ for(let j = 0;j<stateData.searchData.length;j++){
//console.log(stateData.searchData[j]) // console.log(stateData.searchData[j])
if(stateData.searchData[j].id==stateData.tableData.columns[i].id){ if(stateData.searchData[j].id==stateData.tableData.columns[i].id){
stateData.searchData[j].options = data stateData.searchData[j].options = data
} }
@ -219,14 +219,14 @@ const initLoadData = () => {
if(stateData.searchData.length>0){ if(stateData.searchData.length>0){
for(let j = 0;j<stateData.searchData.length;j++){ for(let j = 0;j<stateData.searchData.length;j++){
//console.log(stateData.searchData[j]) // console.log(stateData.searchData[j])
if(stateData.searchData[j].id==stateData.tableData.columns[i].id){ if(stateData.searchData[j].id==stateData.tableData.columns[i].id){
//console.log(stateData.tableData.columns[i]) // console.log(stateData.tableData.columns[i])
stateData.searchData[j].control = stateData.tableData.columns[i].control stateData.searchData[j].control = stateData.tableData.columns[i].control
stateData.searchData[j].config = stateData.tableData.columns[i].config stateData.searchData[j].config = stateData.tableData.columns[i].config
//console.log(stateData.searchData[j]) // console.log(stateData.searchData[j])
} }
} }
} }
@ -253,14 +253,14 @@ const initLoadData = () => {
} }
if(data.data.page){ if(data.data.page){
console.log("data.data.mastesform", data.data) // console.log("data.data.mastesform", data.data)
stateForm.id=data.data.appForm.version.toString() stateForm.id=data.data.appForm.version.toString()
stateForm.formId =data.data.appForm.cfid.toString() stateForm.formId =data.data.appForm.cfid.toString()
stateForm.versionId =data.data.appForm.id.toString() stateForm.versionId =data.data.appForm.id.toString()
stateForm.formData = stringToObj(data.data.appForm.mastesform) stateForm.formData = stringToObj(data.data.appForm.mastesform)
stateForm.dict = string2json(data.data.appForm.dict) stateForm.dict = string2json(data.data.appForm.dict)
stateForm.formData.powerstr = string2json(data.data.appForm.powerstr) stateForm.formData.powerstr = string2json(data.data.appForm.powerstr)
console.log("data.data.mastesform", stateForm.formData) // console.log("data.data.mastesform", stateForm.formData)
judgeSubmitCancel({"name":data.data.appForm.mastesformjson}) judgeSubmitCancel({"name":data.data.appForm.mastesformjson})
.then((datajud:any) =>{ .then((datajud:any) =>{

Write Preview
Loading…
Cancel
Save