Browse Source

完成现有BUG修复

qin_v4
超级管理员 1 year ago
parent
commit
da4f8ebb25
  1. 12
      src/api/hr/org/index.ts
  2. 5
      src/api/hr/org/type.ts
  3. 4
      src/components/DesignForm/app/formPage.vue
  4. 16
      src/components/DesignForm/formControlPropertiNew.vue
  5. 50
      src/components/DesignForm/public/expand/digitpage.vue
  6. 121
      src/components/DesignForm/public/expand/lowcodeImage.vue
  7. 85
      src/components/DesignForm/public/expand/org.vue
  8. 134
      src/components/DesignForm/public/form/childTable.vue
  9. 63
      src/components/DesignForm/public/form/formItem.vue
  10. 1153
      src/components/DesignForm/public/form/formItem_20240912.vue
  11. 4
      src/components/DesignForm/tableListPage/formPageCont.vue
  12. 1
      src/components/DesignForm/tableListPage/index.vue
  13. 3
      src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue
  14. 2
      src/widget/lowcodeimage/lowcodeImage.vue
  15. 46
      src/widget/org/cont.vue
  16. 17
      src/widget/videoupload/videoUploadPlay.vue

12
src/api/hr/org/index.ts

@ -1,6 +1,6 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { searchFormTitle,orgClassListCont,addOrgTypesCont,orgClassCont,editOrgTypeEditOrDel,searchOrgCont,orgInfo,addOrgInfo,editOrgDel,searchTeamList,orgTeamListCont,orgFormTree,archivesList } from './type';
import { searchFormTitle,orgClassListCont,addOrgTypesCont,orgClassCont,editOrgTypeEditOrDel,searchOrgCont,orgInfo,addOrgInfo,editOrgDel,searchTeamList,orgTeamListCont,orgFormTree,archivesList,getContId } from './type';
/**
*
*/
@ -31,6 +31,16 @@ export function addOrgClassInfo(data: addOrgTypesCont){
data: data
});
}
/**
*
*/
export function getgovcont(data: getContId){
return request({
url: '/hrapi/org/getgovcont',
method: 'post',
data: data
});
}
/**
*
*/

5
src/api/hr/org/type.ts

@ -178,3 +178,8 @@ export type archivesList = PageResult<criteriaForPeopleList[]>
export interface msgAry {
msg:string[]
}
export interface getContId{
id: number;
idstr?: string;
}

4
src/components/DesignForm/app/formPage.vue

@ -743,8 +743,8 @@ const appFormSubmit = (params = {}) => {
formatParams.versionId=props.versionId
formatParams.appKey=props.groupid
formatParams.status=2
// console.log("-----------1------------>", submitParams)
// console.log("-----------2------------>", formatParams)
console.log("提交表单-----------1------------>", submitParams)
console.log("提交表单-----------2------------>", formatParams)
createAppTask(submitParams ?? formatParams)
.then((data:any) => {

16
src/components/DesignForm/formControlPropertiNew.vue

@ -817,14 +817,14 @@ const attrList = computed(() => {
vIf: state.isSearch,
vShow: ['lowcodeImage']
},
{
label: '内外四边距',
value: config.lowcodeImage,
path: 'config.lowcodeImage',
type: 'lowcodeImage_marginAndPadding',
vIf: state.isSearch,
vShow: ['lowcodeImage']
},
// {
// label: '',
// value: config.lowcodeImage,
// path: 'config.lowcodeImage',
// type: 'lowcodeImage_marginAndPadding',
// vIf: state.isSearch,
// vShow: ['lowcodeImage']
// },
/* {
label: '上传视频封面',
value: config.uploadvideo,

50
src/components/DesignForm/public/expand/digitpage.vue

@ -0,0 +1,50 @@
<!--
@ 作者: 秦东
@ 时间: 2024-09-12 10:25:52
@ 备注: 分值
-->
<script lang='ts' setup>
import { AnalysisCss,AnalysisInputCss } from '@/components/DesignForm/public/form/calculate/cssInfo.ts'
const props = withDefaults(
defineProps<{
modelValue?: string
disabled?: boolean
}>(),
{}
)
const emits = defineEmits<{
(e: 'update:modelValue', value: string): void
}>()
const value = computed({
get: () => {
return props.modelValue
},
set: (newVal: any) => {
emits('update:modelValue', newVal)
},
});
/**
@ 作者: 秦东
@ 时间: 2024-03-01 09:07:11
@ 功能: 布局处理
*/
const getFormItemLableStyle = (ele: any) => {
if(ele?.labelStyle){
// console.log("3",AnalysisCss(ele?.labelStyle))
return AnalysisCss(ele?.labelStyle)
}
}
const getFormItemInputStyle = (ele: any,sty:number) => {
if(ele?.inputStyle){
//console.log("4",AnalysisInputCss(ele?.inputStyle,sty))
return AnalysisInputCss(ele?.inputStyle,sty)
}
}
</script>
<template>
<el-input v-bind="$props" v-model="value" :style="getFormItemInputStyle(configStyle,2)" :input-style="getFormItemInputStyle(configStyle,3)" oninput ="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^\./g, '')" placeholder="请输入"></el-input>
</template>
<style lang='scss' scoped>
</style>

121
src/components/DesignForm/public/expand/lowcodeImage.vue

@ -0,0 +1,121 @@
<!--
@ 作者: 秦东
@ 时间: 2024-09-12 10:44:17
@ 备注: 图片
-->
<script lang='ts' setup>
import { AnalysisCss,AnalysisInputCss } from '@/components/DesignForm/public/form/calculate/cssInfo.ts'
import errimg from '@/assets/404_images/imgNotFound.png'
import { uploadUrl,getRequest } from '@/api/DesignForm'
const props = withDefaults(
defineProps<{
modelValue?: string
disabled?: boolean
tablekey?: Object
data?: Object
formTableSetUp?: Object
imgUrl?: string
}>(),
{}
)
const emits = defineEmits<{
(e: 'update:modelValue', value: string): void
}>()
const value = computed({
get: () => {
if(props.data.control.imgUrl == ""){
return props.modelValue?props.modelValue:errimg;
}else{
return props.data.control.imgUrl
}
},
set: (newVal: any) => {
emits('update:modelValue', newVal)
return newVal
},
});
//css
const configStyle = computed(() => {
return props.data.styles || {}
})
const imgLoading = ref(false)
const imgPath = ref(errimg)
//
const beforeAvatarUpload = (rawFile) => {
imgLoading.value = true
// console.log("",rawFile.type)
let imgType = ['image/jpeg','image/jpg','image/png','image/gif','image/svg']
if (!imgType.includes(rawFile.type)) {
ElMessage.error('您上传的不是图片!')
imgLoading.value = false
return false
} else if (rawFile.size / 1024 / 1024 > 200) {
ElMessage.error('您上传到额图片大于 200MB!')
imgLoading.value = false
return false
}
return true
}
//
const handleAvatarSuccess = (
response,
uploadFile
) => {
// imageUrl.value = URL.createObjectURL(uploadFile.raw!)
console.log("上传成功回调",value)
emits('update:modelValue', response.data.url)
imgPath.value = response.data.url
value.value=response.data.url
console.log("上传成功回调---------->",value.value)
// let oldFormSetUp = props.formTableSetUp
// if(props.formTableSetUp && props.formTableSetUp.list && props.formTableSetUp.list.length > 0){
// oldFormSetUp.list.forEach((item)=>{
// if(item.name && item.name == props.data.name){
// // value.value = response.data.url
// // item.control.link = response.data.url
// value.set(response.data.url)
// emits('update:modelValue', response.data.url)
// console.log("------>",response.data.url)
// }
// })
// }
// props.setimgurl=response.data.url
// emits("update:imgUrl",response.data.url)
// console.log("------>",url.value)
// emits("updateCont",response.data.url)
imgLoading.value = false
}
const getFormItemInputStyle = (ele: any,sty:number) => {
if(ele?.inputStyle){
console.log("返回栅格宽度4",AnalysisInputCss(ele?.inputStyle,sty))
return AnalysisInputCss(ele?.inputStyle,sty)
}
}
</script>
<template>
<el-upload
v-bind="$props"
class="upload-demo"
:action="uploadUrl"
:show-file-list="false"
:on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload"
v-loading="imgLoading"
>
<!-- <img referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']" /> -->
<img v-if="value" :src="value" class="avatar" :style="getFormItemInputStyle(configStyle,2)" />
<el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
</el-upload>
</template>
<style lang='scss' scoped>
</style>

85
src/components/DesignForm/public/expand/org.vue

@ -0,0 +1,85 @@
<!--
@ 作者: 秦东
@ 时间: 2024-09-12 10:03:22
@ 备注: 行政组织选择
-->
<script lang='ts' setup>
import { orgInfo } from '@/api/hr/org/type'
import { getOrgTreeList } from '@/api/hr/org/index'
const props = withDefaults(
defineProps<{
modelValue?: string
disabled?: boolean
}>(),
{}
)
const emits = defineEmits<{
(e: 'update:modelValue', value: string): void
}>()
const value = computed({
get: () => {
return props.modelValue*1
},
set: (newVal: any) => {
emits('update:modelValue', newVal)
// let newValJson:criteriaForPeopleList[] = JSON.parse(newVal)
// if(newValJson.length > 0){
// let userAry = new Array
// let userKeyAry = new Array
// newValJson.forEach(item =>{
// userAry.push(item.name+"("+item.number+")")
// userKeyAry.push(item.userkey.toString())
// })
// emits('update:modelValue', userAry.join(','))
// // userlist.value = userAry.join(',')
// //
// }else{
// emits('update:modelValue', "")
// }
},
});
const orgTreeList = ref<orgInfo[]>();
const orgTreeLoading = ref(false); //
const orgTreeProps ={
children: 'child',
label: 'name',
} //
function haveOrgTreeInfo(){
orgTreeLoading.value = true;
getOrgTreeList({})
.then(({ data })=>{
orgTreeList.value = data
}).finally(()=>{orgTreeLoading.value = false;})
}
onBeforeMount(() => {
haveOrgTreeInfo();
})
onMounted(() => {
// console.log("value---1--",value.value,props.modelValue)
nextTick(() => {})
})
</script>
<template>
<el-tree-select
v-bind="$props"
v-model="value"
v-loading="orgTreeLoading"
node-key="id"
:props="orgTreeProps"
:data="orgTreeList"
check-strictly
:render-after-expand="false"
/>
</template>
<style lang='scss' scoped>
</style>

134
src/components/DesignForm/public/form/childTable.vue

@ -9,6 +9,12 @@ import { inject, computed } from 'vue'
import Tooltips from '@/components/DesignForm/tooltip.vue'
import {constFormProps } from '@/api/DesignForm/utils'
import { jsonParseStringify } from '@/utils/DesignForm'
import LowcodeImagePage from '@/components/DesignForm/public/expand/lowcodeImage.vue'
import LokOrgCentent from '@/widget/org/cont.vue'
const props = withDefaults(
defineProps<{
data: any
@ -59,9 +65,124 @@ const getText = (text: any,val:any,name:any) => {
const delColumn = (index: number) => {
tableDataNew.value.splice(index, 1)
}
/**
@ 作者: 秦东
@ 时间: 2024-08-02 13:22:14
@ 功能: 时间戳转换对象
*/
const timeToAry = (timestamp:number) => {
const date = new Date(timestamp);
const year = date.getFullYear();
const month = ('0' + (date.getMonth() + 1)).slice(-2);
const day = ('0' + date.getDate()).slice(-2);
const hours = ('0' + date.getHours()).slice(-2);
const minutes = ('0' + date.getMinutes()).slice(-2);
const seconds = ('0' + date.getSeconds()).slice(-2);
return {
year:year,
month:month,
day:day,
hours:hours,
minutes:minutes,
seconds
}
}
/**
@ 作者: 秦东
@ 时间: 2024-08-02 13:02:49
@ 功能: 将时间戳转换成字符串
*/
const timeToString = (timeVal:any,types:int) => {
let timeStr = ""
if(Array.isArray(timeVal)){
if(timeVal.length >= 2){
let startTime = timeToAry(timeVal[0])
let endTime = timeToAry(timeVal[1])
switch(types){
case "year": //
timeStr = `${startTime.year}${endTime.year}`;
break;
case "month": //
timeStr = `${startTime.year}-${startTime.month}${endTime.year}-${endTime.month}`;
break;
case "datetime": //+
timeStr = `${startTime.year}-${startTime.month}-${startTime.day} ${startTime.hours}:${startTime.minutes}:${startTime.seconds}${endTime.year}-${endTime.month}-${endTime.day} ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
break;
case "week": //
let startWeek = getYearWeek(startTime)
let endWeek = getYearWeek(endTime)
timeStr = `${startWeek}${endWeek}`;
break;
case "timeCalss": //
timeStr = `${startTime.hours}:${startTime.minutes}:${startTime.seconds}${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
break;
case "datetimerange":
timeStr = `${startTime.year}-${startTime.month}-${startTime.day} ${startTime.hours}:${startTime.minutes}:${startTime.seconds}${endTime.year}-${endTime.month}-${endTime.day} ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
break;
case "daterange":
timeStr = `${startTime.year}-${startTime.month}-${startTime.day}${endTime.year}-${endTime.month}-${endTime.day}`;
break;
case "monthrange":
timeStr = `${startTime.year}-${startTime.month}${endTime.year}-${endTime.month}`;
break;
default:
timeStr = `${startTime.year}-${startTime.month}-${startTime.day}${endTime.year}-${endTime.month}-${endTime.day}`;
break;
}
}else if(timeVal.length == 1){
let {year,month,day,hours,minutes,seconds} = timeToAry(timeVal[0])
switch(types){
case "year": //
timeStr = `${year}`;
break;
case "month": //
timeStr = `${year}-${month}`;
break;
case "datetime": //+
timeStr = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
break;
case "week": //
timeStr = getYearWeek(timeVal)
break;
case "timeCalss": //
timeStr = `${hours}:${minutes}:${seconds}`;
break;
default:
timeStr = `${year}-${month}-${day}`
break;
}
}else{
timeStr = "未知时间"
}
}else{
let {year,month,day,hours,minutes,seconds} = timeToAry(timeVal)
switch(types){
case "year": //
timeStr = `${year}`;
break;
case "month": //
timeStr = `${year}-${month}`;
break;
case "datetime": //+
timeStr = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
break;
case "week": //
timeStr = getYearWeek(timeVal)
break;
case "timeCalss": //
timeStr = `${hours}:${minutes}:${seconds}`;
break;
default:
timeStr = `${year}-${month}-${day}`
break;
}
}
return timeStr
}
</script>
<template>
{{formProps}}
<div class="form-table form-table-add">
<el-table
v-bind="data.control"
@ -76,10 +197,17 @@ const delColumn = (index: number) => {
:width="item.item.span"
>
<template #default="scope">
{{type}}
<span v-if="item.type === 'index'">{{ scope.$index + 1 }}</span>
<div v-if="type === 4 || editDisabled">
{{ getText(scope.row[item.name],scope.row,item.name) }}
<LokOrgCentent v-if="item.type == 'orgCentent'" :orgid="scope.row[item.name].toString()" />
<div v-else-if="item.type=='lowcodeImage'">
<LowcodeImagePage :data="item"
v-model="scope.row[item.name]" />
</div>
<div v-else-if="item.type=='datePicker'" v-html="timeToString(scope.row[item.name],item.control.type)">
</div>
<div v-else>{{ getText(scope.row[item.name],scope.row,item.name) }}</div>
</div>
<div v-else>

63
src/components/DesignForm/public/form/formItem.vue

@ -27,6 +27,12 @@ import {
} from '@/api/DesignForm/utils'
import validate from '@/api/DesignForm/validate'
import ExpandUser from '@/components/DesignForm/public/expand/user.vue'
import OrgCentent from '@/components/DesignForm/public/expand/org.vue'
import LokOrgCentent from '@/widget/org/cont.vue'
import DigitpagePage from '@/components/DesignForm/public/expand/digitpage.vue'
import LowcodeImagePage from '@/components/DesignForm/public/expand/lowcodeImage.vue'
import AKSelect from './select.vue'
import { uploadUrl,getRequest } from '@/api/DesignForm'
import formatResult from '@/utils/DesignForm/formatResult'
@ -41,6 +47,8 @@ import { AnalysisCss,AnalysisInputCss } from '@/components/DesignForm/public/for
import request from '@/utils/request';
import { getgovcont } from '@/api/hr/org/index'
const props = withDefaults(
defineProps<{
data: FormList
@ -164,6 +172,15 @@ const currentComponent = computed(() => {
}
if (props.data.type === 'expand-user') {
return markRaw(ExpandUser)
}
if (props.data.type === 'orgCentent') {
return markRaw(OrgCentent)
}
if (props.data.type === 'digitpage') {
return markRaw(DigitpagePage)
}
if (props.data.type === 'lowcodeImage') {
return markRaw(LowcodeImagePage)
}
if (props.data.type === 'datePicker') {
props.data.control.valueFormat="x"
@ -852,14 +869,15 @@ const pickUserVal = (val:any) => {
// console.log("-2->",valAry)
return val
}
}
</script>
<template>
<BaiduMap v-if="judgeIsShow(data.name) &&data.type === 'baidumap' && type != 4" :data="data" />
<DigitPage v-else-if="judgeIsShow(data.name) &&data.type === 'digitpage' && type != 4" :data="data" :model-value="data.control.modelValue" />
<OrgCentent v-else-if="judgeIsShow(data.name) &&data.type === 'orgCentent'" :data="data" />
<LowcodeImage v-else-if="judgeIsShow(data.name) && data.type === 'lowcodeImage' " :data="data" :tablekey="props.tablekey" :form-table-set-up="props.alldata" ></LowcodeImage>
<!--拥有者-->
<OwnerPage v-else-if="judgeIsShow(data.name) && data.type === 'owner' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
<SerialNumber v-else-if="judgeIsShow(data.name) && data.type === 'serialNumber' && type != 4" :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
@ -885,22 +903,11 @@ const pickUserVal = (val:any) => {
<OrgCitys v-else-if="judgeIsShow(data.name) && data.type === 'organization' " :data="data" />
<UrlLink v-else-if="judgeIsShow(data.name) && data.type === 'urllink' && type != 4" :data="data" />
<el-form-item
v-bind="data.item"
v-if="judgeIsShow(data.name) && type === 4 && data.type == 'digitpage'"
:disabled="judgeIsDisabled(data.name)"
:prop="tProp || data.name"
:class="config.className"
:rules="itemRules as any"
:label="getLabel(data.item as FormItem)"
>
<div class="form-value" v-html="value">
</div>
</el-form-item>
<el-form-item
v-bind="data.item"
v-if="judgeIsShow(data.name) && data.type != 'owner' && data.type != 'baidumap' && data.type != 'digitpage' && data.type != 'orgCentent' && data.type != 'lowcodeImage' && data.type != 'serialNumber' && data.type != 'founder' && data.type != 'founderTime' && data.type != 'editTime' && data.type != 'associatedForms' && data.type != 'videoUpAndPlay' && data.type != 'organization' && data.type != 'lowcodeTransfer' && data.type != 'lowcodeCarsusel' && data.type != 'signaturemap' && data.type != 'signaturemap' && data.type != 'urllink'"
v-if="judgeIsShow(data.name) && data.type != 'owner' && data.type != 'baidumap' && data.type != 'serialNumber' && data.type != 'founder' && data.type != 'founderTime' && data.type != 'editTime' && data.type != 'associatedForms' && data.type != 'videoUpAndPlay' && data.type != 'organization' && data.type != 'lowcodeTransfer' && data.type != 'lowcodeCarsusel' && data.type != 'signaturemap' && data.type != 'signaturemap' && data.type != 'urllink'"
:disabled="judgeIsDisabled(data.name)"
:prop="tProp || data.name"
:class="config.className"
@ -967,6 +974,8 @@ const pickUserVal = (val:any) => {
<div class="form-value" v-else-if="data.type == 'expand-user'" v-html="pickUserVal(value)">
</div>
<LokOrgCentent v-else-if="data.type == 'orgCentent'" :orgid="value" />
<div class="form-value" v-else v-html="value">
</div>
</template>
@ -1112,7 +1121,9 @@ const pickUserVal = (val:any) => {
'datePicker',
'component',
'expand-user'
'expand-user',
'orgCentent',
'digitpage',
].includes(data.type)
"
:is="currentComponent"
@ -1121,7 +1132,21 @@ const pickUserVal = (val:any) => {
:placeholder="data.control.placeholder?data.control.placeholder:'请选择'+getLabel(data.item)"
v-model="value"
/>
<component
v-if="
[
'lowcodeImage'
].includes(data.type)
"
:is="currentComponent"
v-bind="control"
:disabled="judgeIsDisabled(data.name)"
:placeholder="data.control.placeholder?data.control.placeholder:'请选择'+getLabel(data.item)"
:data="data"
:tablekey="props.tablekey"
:form-table-set-up="props.alldata"
v-model="value"
/>
<!--所属部门-->

1153
src/components/DesignForm/public/form/formItem_20240912.vue

File diff suppressed because it is too large

4
src/components/DesignForm/tableListPage/formPageCont.vue

@ -273,7 +273,7 @@ const jsuanKuandu = () => {
:after-submit="afterSubmit"
:submit-edit="submitEdit"
/>
<el-divider v-if="pageLog&&pageLog.length > 0" content-position="left">历史3记录</el-divider>
<el-divider v-if="pageLog&&pageLog.length > 0" content-position="left">历史记录</el-divider>
<el-timeline style="width: 100%">
<el-timeline-item v-for="(item,index) in pageLog" :key="index" :timestamp="item.time+' 操作人:'+item.creater" placement="top">
<el-card>
@ -337,7 +337,7 @@ const jsuanKuandu = () => {
:send-draft-submit= "sendDraftSubmit"
:submit-edit="submitEdit"
/>
<el-divider v-if="pageLog&&pageLog.length > 0" content-position="left">历史3记录</el-divider>
<el-divider v-if="pageLog&&pageLog.length > 0" content-position="left">历史记录</el-divider>
<el-timeline style="width: 100%">
<el-timeline-item v-for="(item,index) in pageLog" :key="index" :timestamp="item.time+' 操作人:'+item.creater" placement="top">
<el-card >

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

@ -287,6 +287,7 @@ const getListData = (page?: number) => {
if (page) {
state.currentPage = page
}
console.log("筛选查询列表数据--->",page)
getPageData()
}
watch(()=>props.lookPageIsShow,(val:boolean)=>{

3
src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue

@ -62,6 +62,7 @@ const state = reactive<any>({
id: 0,
loading: true
})
const emits = defineEmits(["update:isopen","searchquery","optionsValue3Get4"]);
const drawerOpenOrClose = computed({
get: () => props.isopen,
@ -352,6 +353,7 @@ const afterSubmit = (type: string,val?:any) => {
// console.log("------------------>",type,val)
// console.log("------------------>",flowMap)
if (type === 'success') {
emits("searchquery")
if(isFlowTable.value){
if(val.code == 0){
if(val.data){
@ -396,6 +398,7 @@ const closeAppSubmit = () =>{
*/
const saveDraftPage = (type: string,val?:any) => {
if (type === 'success') {
emits("searchquery")
if(isFlowTable.value){
if(val.code == 0){
let sendInfo ={

2
src/widget/lowcodeimage/lowcodeImage.vue

@ -209,7 +209,7 @@ watch(() =>props.imgUrl,(val)=>{
<div>
<!-- <img v-if="url!=errimg" referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']" @click="handleLink(props.data?.control)" /> -->
<el-upload
v-bind="$props"
class="upload-demo"
:action="uploadUrl"

46
src/widget/org/cont.vue

@ -0,0 +1,46 @@
<!--
@ 作者: 秦东
@ 时间: 2024-09-12 14:41:53
@ 备注: 获取行政组织数据
-->
<script lang='ts' setup>
import { getgovcont } from '@/api/hr/org/index'
const props = defineProps({
orgid:{
type: String,
default:""
}
})
const orgName = ref("")
//
const pickOrgVal = (val:any) => {
if(val != "" && val != null){
getgovcont({id:val*1,idstr:val})
.then(({data}) =>{
// console.log("-3->",data,data.name)
orgName.value = data.name
})
.finally(()=>{
})
}
}
onBeforeMount(() => {
pickOrgVal(props.orgid)
})
onMounted(() => {
pickOrgVal(props.orgid)
});
watch(() =>props.orgid,(val:string) => {
// console.log("-4->",val)
pickOrgVal(val)
})
</script>
<template>
<div>{{ orgName }}</div>
</template>
<style lang='scss' scoped>
</style>

17
src/widget/videoupload/videoUploadPlay.vue

@ -5,14 +5,15 @@
:src="data?.control.videoMsg[0].url"
:loop="data?.control.videoMsg[0].loop"
:autoplay="data?.control.videoMsg[0].videoAutoPlay"
:style="{height:heightVal,width:widthtVal}"
:style="getFormItemInputStyle(configStyle,2)"
controls
>
</video>
</template>
<script setup lang="ts">
import { AnalysisCss,AnalysisInputCss } from '@/components/DesignForm/public/form/calculate/cssInfo.ts'
const props = defineProps({
// eslint-disable-next-line vue/require-default-prop
@ -20,7 +21,10 @@ const props = defineProps({
type: Object,
}
})
const configStyle = computed(() => {
console.log("视频宽度",props.data)
return props.data.styles || {}
})
const videoHeight = props.data?.control.videoMsg[0].videoHeight+'px'
const videoWidth = props.data?.control.videoMsg[0].videoWidth+'px'
@ -40,6 +44,13 @@ watch(()=>props.data?.control.videoMsg[0], (val:any) => {
},{
deep: true,
})
const getFormItemInputStyle = (ele: any,sty:number) => {
if(ele?.inputStyle){
console.log("返回栅格宽度4",AnalysisInputCss(ele?.inputStyle,sty))
return AnalysisInputCss(ele?.inputStyle,sty)
}
}
</script>
<style scoped></style>

Loading…
Cancel
Save