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

修改webBUG

qin_v8_test
herenshan112 9 months ago
parent
5facd34b08
commit
b8b868d3e9
7 changed files with 108 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      src/api/common/tableButton.ts
  2. 1
      src/api/lowCode/form/type.ts
  3. 19
      src/components/lowCode/assistant/videoUpAndPlay.vue
  4. 9
      src/components/lowCode/formItem.vue
  5. 87
      src/views/formTable/myTask.vue
  6. 2
      src/views/formTable/page/flowAndLog.vue
  7. 4
      src/views/formTable/taskListPage.vue

21
src/api/common/tableButton.ts
View File

@ -0,0 +1,21 @@
export interface tableButton {
control: any;
id?: string;
name?: string;
field?: string;
type?: string;
attribute:string;
pattern?: string;
fieldClass?: string;
activeValue?: string;
inactiveValue?: string;
options?: optionsInfo[];
config?:any;
label?: string;
}
export interface optionsInfo {
label: string;
value: string;
}

1
src/api/lowCode/form/type.ts
View File

@ -70,6 +70,7 @@ export interface tableFormStruct {
},
dict: Object,
refreshTable: boolean,
isOpen:boolean,
view:{
list:{
status:boolean,

19
src/components/lowCode/assistant/videoUpAndPlay.vue
View File

@ -41,18 +41,33 @@ const getFormItemInputStyle = (ele: any,sty:number) => {
return AnalysisInputCss(ele?.inputStyle,sty)
}
}
const openVideo = () => {
console.log("单机播放")
}
</script>
<template>
<div class="butBox" @click="openVideo">按钮</div>
<div>
<video
:src="data?.control.videoMsg[0].url"
:loop="data?.control.videoMsg[0].loop"
:autoplay="data?.control.videoMsg[0].videoAutoPlay"
:style="getFormItemInputStyle(configStyle,2)"
controls
>
<source :src="data?.control.videoMsg[0].url" type="video/mp4">
您的浏览器不支持 HTML5 标签
</video>
</div>
</template>
<style lang='scss' scoped>
.butBox{
width:150px;
height: 50px;
background-color: #FB041A;
display:none;
}
</style>

9
src/components/lowCode/formItem.vue
View File

@ -20,7 +20,7 @@ import wx from 'weixin-js-sdk'
import request from '@/utils/axios/index'
import { Md5 } from 'ts-md5'
import { debounce } from '@/utils/lowCode/item/index'
import { uploadUrl } from '@/api/lowCode/form/fieldUnit'
//辅助控件
import OrgCitys from '@/components/lowCode/assistant/orgCitys.vue'
import UploadPage from '@/components/lowCode/assistant/uploadPage.vue'
@ -549,15 +549,18 @@ const currentComponent = computed(() => {
}
return `el-${props.data.type}`
})
</script>
<template>
<div>
<div>{{data.type}}
<template class="form-value" v-if="type === 15">
2
</template>
<template v-if="data.type=='index'">
</template>
<template class="form-value" v-else>
<el-form-item
v-bind="data.item"
:prop="tProp || data.name"
@ -969,7 +972,7 @@ const currentComponent = computed(() => {

87
src/views/formTable/myTask.vue
View File

@ -61,10 +61,12 @@ const gainAppTaskList = () => {
if(data.data.list){
appTaskList.value.push(...data.data.list)
}
if(data.total > 0){
if(logCount.value < data.total){
let pagenum = searchInfo.pagesize - data.count
let allPageCount = data.data.total
console.log("获取任务列表内容=====111======>",allPageCount,logCount.value)
if(allPageCount > 0){
if(logCount.value < allPageCount){
let pagenum = searchInfo.pagesize - data.data.count
console.log("获取任务列表内容====pagenum=======>",pagenum)
if (pagenum > 0) {
loadText.value = ""
loadingList.value = true
@ -73,8 +75,15 @@ const gainAppTaskList = () => {
loadingList.value = false
}
}else{
loadText.value = ""
loadingList.value = true
let pagenum = searchInfo.pagesize - data.data.count
if (pagenum < 0) {
loadText.value = ""
loadingList.value = true
}else{
loadText.value = "此选项没有数据！"
loadingList.value = true
}
}
}else{
loadText.value = "此选项没有数据！"
@ -92,9 +101,9 @@ const gainAppTaskList = () => {
appTaskList.value.push(...data.data.list)
}
if(data.total > 0){
if(logCount.value < data.total){
let pagenum = searchInfo.pagesize - data.count
if(data.data.total > 0){
if(logCount.value < data.data.total){
let pagenum = searchInfo.pagesize - data.data.count
if (pagenum > 0) {
loadText.value = ""
loadingList.value = true
@ -103,8 +112,14 @@ const gainAppTaskList = () => {
loadingList.value = false
}
}else{
loadText.value = ""
loadingList.value = true
let pagenum = searchInfo.pagesize - data.data.count
if (pagenum < 0) {
loadText.value = ""
loadingList.value = true
}else{
loadText.value = "此选项没有数据！"
loadingList.value = true
}
}
}else{
loadText.value = "此选项没有数据！"
@ -122,9 +137,9 @@ const gainAppTaskList = () => {
appTaskList.value.push(...data.data.list)
}
if(data.total > 0){
if(logCount.value < data.total){
let pagenum = searchInfo.pagesize - data.count
if(data.data.total > 0){
if(logCount.value < data.data.total){
let pagenum = searchInfo.pagesize - data.data.count
if (pagenum > 0) {
loadText.value = ""
loadingList.value = true
@ -133,8 +148,14 @@ const gainAppTaskList = () => {
loadingList.value = false
}
}else{
loadText.value = ""
loadingList.value = true
let pagenum = searchInfo.pagesize - data.data.count
if (pagenum < 0) {
loadText.value = ""
loadingList.value = true
}else{
loadText.value = "此选项没有数据！"
loadingList.value = true
}
}
}else{
loadText.value = "此选项没有数据！"
@ -153,9 +174,9 @@ const gainAppTaskList = () => {
appTaskList.value.push(...data.data.list)
}
if(data.total > 0){
if(logCount.value < data.total){
let pagenum = searchInfo.pagesize - data.count
if(data.data.total > 0){
if(logCount.value < data.data.total){
let pagenum = searchInfo.pagesize - data.data.count
if (pagenum > 0) {
loadText.value = ""
loadingList.value = true
@ -164,8 +185,14 @@ const gainAppTaskList = () => {
loadingList.value = false
}
}else{
loadText.value = ""
loadingList.value = true
let pagenum = searchInfo.pagesize - data.data.count
if (pagenum < 0) {
loadText.value = ""
loadingList.value = true
}else{
loadText.value = "此选项没有数据！"
loadingList.value = true
}
}
}else{
loadText.value = "此选项没有数据！"
@ -178,11 +205,11 @@ const gainAppTaskList = () => {
gainAppAllTaskList(searchInfo)
.then(({data}) => {
console.log("获取列表内容",data)
logCount.value = logCount.value + data.count
logCount.value = logCount.value + data.data.count
appTaskList.value.push(...data.list)
if(data.total > 0){
if(logCount.value < data.total){
let pagenum = searchInfo.pagesize - data.count
if(data.data.total > 0){
if(logCount.value < data.data.total){
let pagenum = searchInfo.pagesize - data.data.count
if (pagenum > 0) {
loadText.value = ""
loadingList.value = true
@ -191,8 +218,14 @@ const gainAppTaskList = () => {
loadingList.value = false
}
}else{
loadText.value = ""
loadingList.value = true
let pagenum = searchInfo.pagesize - data.data.count
if (pagenum < 0) {
loadText.value = ""
loadingList.value = true
}else{
loadText.value = "此选项没有数据！"
loadingList.value = true
}
}
}else{
loadText.value = "此选项没有数据！"

2
src/views/formTable/page/flowAndLog.vue
View File

@ -116,7 +116,7 @@ const newAddPageData = () => {
}else{
console.log("获取流程==2=1=>",props.appPageInfo)
if(props.appPageInfo && props.appPageInfo.runFlowId && props.appPageInfo.runFlowId != "0" && props.appPageInfo.runFlowId != ""){
gainRunTaskFlow({id:props.appPageInfo.runFlowIdStr})
gainRunTaskFlow({id:props.appPageInfo.runFlowId})
.then(({data})=>{
console.log("获取流程==2==>",data)
flowMap.value = data.flowList

4
src/views/formTable/taskListPage.vue
View File

@ -451,10 +451,10 @@ const setUpClick = (val:string,id:string) => {
message: data.mag,
type: "success",
});
cardPageRef.value.getPageData();
cardPageRef.value.requeryList();
});
}).catch(() => {
cardPageRef.value.getPageData();
cardPageRef.value.requeryList();
});
}else{
ElMessage.error("你还未选中要删除的项目！");

Write Preview
Loading…
Cancel
Save