Browse Source

修改低代码不兼容问题

lwx_v1
超级管理员 1 year ago
parent
commit
886bb71930
  1. 3
      src/components/DesignForm/app/timeAxis.vue
  2. 5
      src/components/DesignForm/tableListPage/index.vue
  3. 9
      src/views/sysworkflow/lowcodepage/appFormList.vue
  4. 7
      src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
  5. 1
      src/views/sysworkflow/lowcodepage/pageList.vue
  6. 34
      src/views/sysworkflow/lowcodepage/runApp/index.vue
  7. 1
      src/views/sysworkflow/lowcodepage/runApp/regularPage/completedMattersPage.vue
  8. 1
      src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue
  9. 1
      src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate_20240616.vue
  10. 1
      src/views/sysworkflow/lowcodepage/runApp/regularPage/myDrafts.vue
  11. 9
      src/views/sysworkflow/lowcodepage/runApp/regularPage/myToDoPage.vue
  12. 1
      src/views/sysworkflow/lowcodepage/runApp/regularPage/sendCopy.vue
  13. 82
      vite.config.ts

3
src/components/DesignForm/app/timeAxis.vue

@ -100,6 +100,7 @@ const searchTimeList = (val:any,clas?:number) =>{
multiViewPage(val)
.then((data:any) =>{
console.log("时间轴数据搜索--1->",data)
loadTimePage.value = false
total.value = data.data.total
count.value = data.data.count
timeInfoList.value = data.data.list
@ -174,7 +175,7 @@ const lookPageInfo = (val:any) => {
<template>
<ul v-infinite-scroll="loadTimeLog" class="infinite-list" :infinite-scroll-disabled="timeDisabled">
<!-- {{viewLayout}} -->
<el-timeline :reverse="true" class="timeLineStyle" >

5
src/components/DesignForm/tableListPage/index.vue

@ -322,6 +322,7 @@ const getPageData = () => {
switch(viewType.value){
case 2:
nextTick(()=>{
state.loading = false
// console.log("-------555---------->",calendarPageRef.value)
calendarPageRef.value.calendarSearchData(sendData)
})
@ -329,17 +330,21 @@ const getPageData = () => {
break;
case 3:
nextTick(()=>{
state.loading = false
// console.log("-------222---------->",timeAxisRef.value)
timeAxisRef.value.searchTimeList(sendData,1)
})
break;
case 4:
state.loading = false
break;
case 5:
state.loading = false
break;
case 6:
nextTick(()=>{
state.loading = false
cardPageRef.value.getCardList(sendData)
})
break;

9
src/views/sysworkflow/lowcodepage/appFormList.vue

@ -176,7 +176,7 @@ const lookFormList = (val:any) => {
console.log(val.listjson)
console.log("查看表单列表---->",stateData)
//let holeControlAndConfigStateData = string2json(data.data.appForm.mastesformjson)
if(stateData.tableData.columns.length>0){
if(stateData && stateData.tableData.columns.length>0){
for(let i = 0;i<stateData.tableData.columns.length;i++){
if(stateData.tableData.columns[i].config!=undefined && stateData.tableData.columns[i].control!=undefined){
console.log(stateData.tableData.columns[i])
@ -198,7 +198,8 @@ const lookFormList = (val:any) => {
}
}
}
state.tableData = stateData.tableData
if(stateData){
state.tableData = stateData.tableData
state.searchData = stateData.searchData
state.loading = stateData.loading
state.attrObj = stateData.attrObj
@ -213,6 +214,8 @@ const lookFormList = (val:any) => {
state.formApi = stateData.formApi
state.dict = stateData.dict
state.refreshTable = stateData.refreshTable
}
}
@ -377,7 +380,7 @@ const lookAppList = (val:any) => {
<template>
<div v-loading="loadingApp">
<el-row :gutter="10" >
<el-col v-for="item in contList" :key="item.id" :xs="8" :sm="12" :md="8" :lg="8" :xl="8" style=" margin-top: 10px;">
<el-col v-for="item in contList" :key="item.id" :span="8" style=" margin-top: 10px;">
<el-card class="cardpattern" body-style="padding:5px;">
<img
v-if="item.icon==''"

7
src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue

@ -768,7 +768,14 @@ const judjeIsTrue = (val:string) => {
const tabsView = (val:any) => {
val.isClick = !val.isClick
}
/**
@ 作者: 秦东
@ 时间: 2024-07-20 10:41:17
@ 功能: 开关事件
*/
const showCollapse = () => {
}
</script>
<template>
<el-main class="mainBox">

1
src/views/sysworkflow/lowcodepage/pageList.vue

@ -866,6 +866,7 @@ const getListInfo = () => {
}
const showCollapse = () => {}
</script>
<template>

34
src/views/sysworkflow/lowcodepage/runApp/index.vue

@ -114,7 +114,6 @@ const openAppPage = (val:appMenuTreeInfo) => {
<template>
<div class="drawerClass">
<el-drawer v-model="props.runIsOpen" title="设置/编辑自定义表单" :with-header="false" :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="props.drawerWith">
<div class="common-layout">
<el-container>
<el-header class="headerBox">
@ -128,7 +127,6 @@ const openAppPage = (val:appMenuTreeInfo) => {
<el-dropdown>
<el-avatar shape="square" :size="25" :src="userStore.avatar" />
<template #dropdown>
<el-dropdown-item @click="editMenuName(data)">
<table class="userTabel">
<tr>
@ -136,7 +134,6 @@ const openAppPage = (val:appMenuTreeInfo) => {
<td>{{ userStore.nickname }}({{ userStore.userInfoCont.number }})</td>
</tr>
<tr>
<td>{{ userStore.userInfoCont.companyname }}/{{ userStore.userInfoCont.departmentname }}</td>
</tr>
</table>
@ -147,7 +144,6 @@ const openAppPage = (val:appMenuTreeInfo) => {
</el-dropdown-item>
</template>
</el-dropdown>
<!-- <el-avatar shape="square" :size="25" :src="userStore.avatar" /> -->
</div>
</el-header>
<el-container>
@ -184,39 +180,13 @@ const openAppPage = (val:appMenuTreeInfo) => {
</el-tree>
</el-aside>
<el-main class="mainBox">
<RegularPage v-if="switchPAge==1" :pick-app-menu="pickAppMenu" />
<RunAppForm v-else :pick-app-menu="pickAppMenu" />
<RegularPage v-if="switchPAge==1" :pick-app-menu="pickAppMenu" />
<RunAppForm v-else :pick-app-menu="pickAppMenu" />
</el-main>
</el-container>
</el-container>
</div>
</el-drawer >
</div>
</template>
<style lang='scss' scoped>

1
src/views/sysworkflow/lowcodepage/runApp/regularPage/completedMattersPage.vue

@ -64,6 +64,7 @@ const lookFlowInfo = (val:any,types:number) =>{
flowLogInfo.value = val
darwOpenOrClose.value = true
}
const searchQuery = () =>{}
</script>
<template>
<div ref="myappbox" class="app_box">

1
src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue

@ -172,6 +172,7 @@ const confirmEvent = (val:any) => {
getToDoList()
})
}
const searchQuery = () =>{}
</script>
<template>
<div ref="container" class="app_box">

1
src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate_20240616.vue

@ -55,6 +55,7 @@ const getToDoList = () =>{
onMounted(() =>{
getToDoList()
})
const searchQuery = () =>{}
</script>
<template>
<div ref="myappbox" class="app_box">

1
src/views/sysworkflow/lowcodepage/runApp/regularPage/myDrafts.vue

@ -99,6 +99,7 @@ const editFlow = (val:any) =>{
drawerMyWith.value = myappbox.value?.clientWidth
lookPageInfoIsShow.value = true;
}
const searchQuery = () =>{}
</script>
<template>
<div ref="myappbox" class="app_box">

9
src/views/sysworkflow/lowcodepage/runApp/regularPage/myToDoPage.vue

@ -80,11 +80,11 @@ const lookFlowInfo = (val:any,types:number) =>{
flowLogInfo.value = val
darwOpenOrClose.value = true
}
const searchQuery = () =>{}
</script>
<template>
<div ref="myappbox" class="app_box">
<LookAndOperateLogInfo v-if="darwOpenOrClose" v-model:isshow="darwOpenOrClose" :flow-log-info="flowLogInfo" :drawer-with="drawerMyWith" @getmytodolist="getToDoListTd" />
<div class="app-container">
<div class="search">
<div class="titleBox">
@ -104,6 +104,7 @@ const lookFlowInfo = (val:any,types:number) =>{
<el-button @click="resetQueryTd()"><i-ep-refresh />重置</el-button>
</el-form-item>
</el-form>
</div>
<el-card shadow="never">
<el-table
@ -169,7 +170,6 @@ const lookFlowInfo = (val:any,types:number) =>{
删除
</el-tag>
</template>
</el-table-column>
<el-table-column label="当前节点及操作人" prop="currentStep" >
<template #default="scope">
@ -178,7 +178,6 @@ const lookFlowInfo = (val:any,types:number) =>{
</el-table-column>
<el-table-column fixed="right" align="center" label="操作" width="100" >
<template #default="scope">
<el-tooltip
class="box-item"
effect="dark"
@ -187,13 +186,9 @@ const lookFlowInfo = (val:any,types:number) =>{
>
<el-button type="primary" size="small" class="fa fa-eye" @click="lookFlowInfo(scope.row,2)" />
</el-tooltip>
</template>
</el-table-column>
</el-table>
<pagination
v-model:total="totalstd"
v-model:page="selectInfoTd.page"

1
src/views/sysworkflow/lowcodepage/runApp/regularPage/sendCopy.vue

@ -60,6 +60,7 @@ const lookFlowInfo = (val:any,types:number) =>{
flowLogInfo.value = val
darwOpenOrClose.value = true
}
const searchQuery = () =>{}
</script>
<template>
<div ref="myappbox" class="app_box">

82
vite.config.ts

@ -42,51 +42,51 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
open: true, // 运行是否自动打开浏览器
proxy: {
// 反向代理解决跨域
// [env.VITE_APP_BASE_API]: {
// target: env.VITE_APP_BASE_URL, // 线上接口地址
// // target: "http://vapi.youlai.tech", // 线上接口地址
// // target: 'http://localhost:8989', // 本地接口地址 , 后端工程仓库地址:https://gitee.com/youlaiorg/youlai-boot
// changeOrigin: true,
// rewrite: (path) =>
// path.replace(new RegExp("^" + env.VITE_APP_BASE_API), ""), // 替换 /dev-api 为 target 接口地址
// },
'/dev-api/kpiapi': {
target: 'http://120.224.6.6:39100',
[env.VITE_APP_BASE_API]: {
target: env.VITE_APP_BASE_URL, // 线上接口地址
// target: "http://vapi.youlai.tech", // 线上接口地址
// target: 'http://localhost:8989', // 本地接口地址 , 后端工程仓库地址:https://gitee.com/youlaiorg/youlai-boot
changeOrigin: true,
rewrite: (path) =>
path.replace(new RegExp("^" + '/dev-api/kpiapi'), ""),
path.replace(new RegExp("^" + env.VITE_APP_BASE_API), ""), // 替换 /dev-api 为 target 接口地址
},
// '/dev-api/kpiapi': {
// target: 'http://127.0.0.1:6666',
// changeOrigin: true,
// rewrite: (path) =>
// path.replace(new RegExp("^" + '/dev-api/kpiapi'), ""),
// },
'/dev-api/systemapi': {
target: 'http://120.224.6.6:7777',
changeOrigin: true,
rewrite: (path) =>
path.replace(new RegExp("^" + '/dev-api/systemapi'), ""),
},
'/dev-api/hrapi': {
target: 'http://120.224.6.6:33333',
changeOrigin: true,
rewrite: (path) =>
path.replace(new RegExp("^" + '/dev-api/hrapi'), ""),
},
'/dev-api/api': {
target: 'http://120.224.6.6:18888',
changeOrigin: true,
rewrite: (path) =>
path.replace(new RegExp("^" + '/dev-api/api'), ""),
},
'/dev-api/javasys': {
target: 'http://120.224.6.6:8111',
changeOrigin: true,
rewrite: (path) =>
path.replace(new RegExp("^" + '/dev-api/javasys'), ""),
},
'/dev-api/javasys/lowCode ': {
target: 'http://120.224.6.6:8112',
changeOrigin: true,
rewrite: (path) =>
path.replace(new RegExp("^" + '/dev-api/javasys/lowCode '), ""),
}
// '/dev-api/systemapi': {
// target: 'http://127.0.0.1:17777',
// changeOrigin: true,
// rewrite: (path) =>
// path.replace(new RegExp("^" + '/dev-api/systemapi'), ""),
// },
// '/dev-api/hrapi': {
// target: 'http://127.0.0.1:39168',
// changeOrigin: true,
// rewrite: (path) =>
// path.replace(new RegExp("^" + '/dev-api/hrapi'), ""),
// },
// '/dev-api/api': {
// target: 'http://127.0.0.1:8888',
// changeOrigin: true,
// rewrite: (path) =>
// path.replace(new RegExp("^" + '/dev-api/api'), ""),
// },
// '/dev-api/javasys': {
// target: 'http://172.20.2.87:8111',
// changeOrigin: true,
// rewrite: (path) =>
// path.replace(new RegExp("^" + '/dev-api/javasys'), ""),
// },
// '/dev-api/javasys/lowCode ': {
// target: 'http://172.20.2.87:8112',
// changeOrigin: true,
// rewrite: (path) =>
// path.replace(new RegExp("^" + '/dev-api/javasys/lowCode '), ""),
// }
},
},

Loading…
Cancel
Save