Browse Source

Merge branch 'qin_s4'

qin_s5
herenshan112 2 weeks ago
parent
commit
bffe38a98a
  1. 4
      src/components/DesignForm/public/expand/lowcodeImage.vue
  2. 2
      src/components/DesignForm/public/form/formItem.vue
  3. 2
      src/views/sysworkflow/lowcodepage/appPage/appPageForm/previewPage.vue
  4. 2
      src/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/design.vue

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

@ -354,7 +354,7 @@ const fit = computed(()=>{
:fit="fit"
/>
</el-upload>
<el-upload
<!-- <el-upload
v-if="props.type==1&&!props.isEdit"
v-bind="$props"
class="upload-demo"
@ -371,7 +371,7 @@ const fit = computed(()=>{
:style="getFormItemInputStyle(configStyle, 2)"
:fit="fit"
/>
</el-upload>
</el-upload> -->
<!-- <img referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']" /> -->
<!-- <div></div> -->

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

@ -1118,7 +1118,7 @@ const diGuiJilian = (val: any, options: any[]) => {
</script>
<template>
{{data.type}}
<BaiduMap
v-if="judgeIsShow(data.name) && data.type === 'baidumap' && type != 4"
:data="data"

2
src/views/sysworkflow/lowcodepage/appPage/appPageForm/previewPage.vue

@ -67,7 +67,7 @@ const clickClose = () => {
v-model="state.previewVisible"
title="预览"
:append-to-body="true"
size="50%"
size="1170"
>
<FormDesign
ref="previewForm"

2
src/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/design.vue

@ -3413,7 +3413,7 @@ onUnmounted(() => {
<el-button class="fa fa-eye" size="small" @click="btnClick('eye')">预览</el-button>
<el-button class="fa fa-file-code-o" size="small" @click="btnClick('json')">脚本预览</el-button>
<el-button class="fa fa-save" type="success" size="small" @click="btnClick('save')">保存</el-button>
<el-button class="fa fa-code-fork" type="warning" size="small" @click="btnClick('branch')">另存新版本</el-button>
<el-button class="fa fa-code-fork" type="warning" size="small" @click="btnClick('branch')">另存新版本</el-button>
</el-button-group>
</div>
<div class="webPcBoday">

Loading…
Cancel
Save