diff --git a/src/components/DesignForm/app/formPage.vue b/src/components/DesignForm/app/formPage.vue index c5225be31..a1d87861c 100644 --- a/src/components/DesignForm/app/formPage.vue +++ b/src/components/DesignForm/app/formPage.vue @@ -740,6 +740,8 @@ const appFormSubmit = (params = {}) => { afterSubmit('success', data) }) }) + }else{ + afterSubmit('success', data) } }) diff --git a/src/components/DesignForm/app/mapPage.vue b/src/components/DesignForm/app/mapPage.vue index a1ce215b4..1478b1179 100644 --- a/src/components/DesignForm/app/mapPage.vue +++ b/src/components/DesignForm/app/mapPage.vue @@ -22,12 +22,55 @@ const props = defineProps({ default:0 } }); +let mapId = "pickMapView"+ Math.ceil(Math.random()); +const longitude= ref(117.14272945140574) +const latitude= ref(35.91808471435389) +/** +@ 作者: 秦东 +@ 时间: 2024-07-19 14:55:24 +@ 功能: 引入外部js +*/ +const loadJScript = () => { + const script = document.createElement('script'); + script.type = 'text/javascript'; + script.src = 'https://api.map.baidu.com/getscript?v=3.0&ak=ljiKlTAsS7SNVqDM16IUwRVFFhrvbxiF'; + script.onload = () => { + mapInit() + } + document.body.appendChild(script); +} +//初始化地图 +const mapInit = () => { + const map = new window.BMap.Map("pickMapView"); // 创建Map实例 + var opts = {type: BMAP_NAVIGATION_CONTROL_LARGE} + map.addControl(new BMap.NavigationControl(opts)); //添加控件 + map.addControl(new BMap.ScaleControl()); + map.addControl(new BMap.MapTypeControl()); + map.enableScrollWheelZoom(); // 启用滚轮放大缩小 + const point = new BMap.Point(longitude.value,latitude.value); // 创建点坐标 + map.centerAndZoom(point, 16); + var marker = new BMap.Marker(point); + map.addOverlay(marker); + const points = new BMap.Point(117.14372945240574,35.92808471455389); // 创建点坐标 + map.centerAndZoom(points, 16); + var markerd = new BMap.Marker(points); + map.addOverlay(markerd); + +} + +onMounted(() =>{ + loadJScript() +}) diff --git a/src/components/DesignForm/app/timeAxis.vue b/src/components/DesignForm/app/timeAxis.vue index 3e2ff7be5..31eac5073 100644 --- a/src/components/DesignForm/app/timeAxis.vue +++ b/src/components/DesignForm/app/timeAxis.vue @@ -61,6 +61,8 @@ const loadTimeLog = () =>{ if(loadTimePage.value){ props.searchSend.page= chuDiNumber searchTimeList(props.searchSend) + }else{ + loadTimePage.value = false } } diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue index 204b7c2f7..607345c9d 100644 --- a/src/components/DesignForm/tableListPage/index.vue +++ b/src/components/DesignForm/tableListPage/index.vue @@ -879,7 +879,6 @@ const tabsView = (val:any,types:number) => {
{
- + - + - + - + diff --git a/src/types/components.d.ts b/src/types/components.d.ts index b8dbee5e1..df70404c8 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -30,6 +30,7 @@ declare module '@vue/runtime-core' { DragControlApp: typeof import('./../components/DesignForm/dragControlApp.vue')['default'] DragControlNew: typeof import('./../components/DesignForm/dragControlNew.vue')['default'] ElAffix: typeof import('element-plus/es')['ElAffix'] + ElAlert: typeof import('element-plus/es')['ElAlert'] ElAside: typeof import('element-plus/es')['ElAside'] ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] @@ -39,6 +40,7 @@ declare module '@vue/runtime-core' { ElCard: typeof import('element-plus/es')['ElCard'] ElCarousel: typeof import('element-plus/es')['ElCarousel'] ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] + ElCascader: typeof import('element-plus/es')['ElCascader'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] ElCol: typeof import('element-plus/es')['ElCol'] @@ -63,6 +65,7 @@ declare module '@vue/runtime-core' { ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] ElInput: typeof import('element-plus/es')['ElInput'] ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] + ElLink: typeof import('element-plus/es')['ElLink'] ElMain: typeof import('element-plus/es')['ElMain'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] @@ -70,6 +73,7 @@ declare module '@vue/runtime-core' { ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] ElPopover: typeof import('element-plus/es')['ElPopover'] + ElProgress: typeof import('element-plus/es')['ElProgress'] ElRadio: typeof import('element-plus/es')['ElRadio'] ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] @@ -77,6 +81,7 @@ declare module '@vue/runtime-core' { ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] + ElSelectV2: typeof import('element-plus/es')['ElSelectV2'] ElSlider: typeof import('element-plus/es')['ElSlider'] ElSpace: typeof import('element-plus/es')['ElSpace'] ElStep: typeof import('element-plus/es')['ElStep'] @@ -93,6 +98,7 @@ declare module '@vue/runtime-core' { ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem'] ElTimePicker: typeof import('element-plus/es')['ElTimePicker'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] + ElTransfer: typeof import('element-plus/es')['ElTransfer'] ElTree: typeof import('element-plus/es')['ElTree'] ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect'] ElUpload: typeof import('element-plus/es')['ElUpload'] @@ -124,12 +130,26 @@ declare module '@vue/runtime-core' { HeadToolsNew: typeof import('./../components/DesignForm/public/headToolsNew.vue')['default'] IconSelect: typeof import('./../components/IconSelect/index.vue')['default'] IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default'] + IEpCaretTop: typeof import('~icons/ep/caret-top')['default'] IEpClose: typeof import('~icons/ep/close')['default'] + IEpCollection: typeof import('~icons/ep/collection')['default'] + IEpDelete: typeof import('~icons/ep/delete')['default'] + IEpDownload: typeof import('~icons/ep/download')['default'] IEpEdit: typeof import('~icons/ep/edit')['default'] IEpMessageBox: typeof import('~icons/ep/message-box')['default'] + IEpMinus: typeof import('~icons/ep/minus')['default'] + IEpOperation: typeof import('~icons/ep/operation')['default'] + IEpPicture: typeof import('~icons/ep/picture')['default'] + IEpPlus: typeof import('~icons/ep/plus')['default'] + IEpPosition: typeof import('~icons/ep/position')['default'] IEpRefresh: typeof import('~icons/ep/refresh')['default'] + IEpRefreshLeft: typeof import('~icons/ep/refresh-left')['default'] IEpSearch: typeof import('~icons/ep/search')['default'] IEpSetting: typeof import('~icons/ep/setting')['default'] + IEpTop: typeof import('~icons/ep/top')['default'] + IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default'] + IEpUser: typeof import('~icons/ep/user')['default'] + IEpView: typeof import('~icons/ep/view')['default'] LangSelect: typeof import('./../components/LangSelect/index.vue')['default'] LayoutPage: typeof import('./../components/DesignForm/layoutPage/index.vue')['default'] List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default'] diff --git a/src/views/sysworkflow/lowcodepage/appFormList.vue b/src/views/sysworkflow/lowcodepage/appFormList.vue index a42a19e59..af6d205e6 100644 --- a/src/views/sysworkflow/lowcodepage/appFormList.vue +++ b/src/views/sysworkflow/lowcodepage/appFormList.vue @@ -249,7 +249,73 @@ const state = reactive({ lookApiUrl:"" }, dict: {}, - refreshTable: true + refreshTable: true, + view:{ + list:{ + status:true, + isClick:false, + form:{ + sortWord:"", + sortClass:1 + } + }, + date:{ + status:false, + isClick:false, + form:{ + startTime:"", + endTime:"", + dayType:1 + } + } + , + time:{ + status:false, + isClick:false, + form:{ + sortWord:"", + sort:1 + } + } + , + gantt:{ + status:false, + isClick:false, + form:{ + startTime:"", + endTime:"", + dayType:2, + sortWord:"", + sort:1 + } + } + , + map:{ + status:false, + isClick:false, + form:{ + mapWord:"", + sortWord:"", + sort:1 + } + }, + card:{ + status:false, + isClick:false, + form:{ + sort:1, + sortWord:"", + imgWork:"", + imgWidth:50, + imgHeight:50, + imgBorderRadius:5, + imgPadding:2, + titleWork:"", + describe:"", + ranks:3 + } + } + } }) const appFormNameVal = ref("") provide('appFormNAme', appFormNameVal) @@ -378,10 +444,11 @@ const lookAppList = (val:any) => { :config="state.config" :form-id="state.formId" :versionid="versionId" + :viewPage="state.view" :versiontitle="versionTitle" + v-model:look-page-is-show="lookPageIsShow" /> - diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue index 9460d456c..f9533afd4 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue @@ -418,7 +418,7 @@ defineExpose({ } .tispMsg{ width: 100%; - margin: 20px 0 0 0; + margin: 10px 0 0 0; height: calc(100vh - 80px); display: flex; align-items: center; diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue index 375ea3ccc..4535fd96e 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue @@ -945,6 +945,7 @@ const tabsView = (val:any) => { :search-data="state.searchData" :config="state.config" :form-id="props.appPageKey" + :viewPage="stateList.view" v-if="state.previewVisible" /> diff --git a/src/views/sysworkflow/lowcodepage/index.vue b/src/views/sysworkflow/lowcodepage/index.vue index e846ed35b..afe974faf 100644 --- a/src/views/sysworkflow/lowcodepage/index.vue +++ b/src/views/sysworkflow/lowcodepage/index.vue @@ -189,7 +189,7 @@ const getRongQiAttr = () => {